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

gframe/deck_con.cpp

@@ -58,52 +58,10 @@ static bool check_set_code(const CardDataC& data, int set_code) {
 	return res;
 }
 
-inline void ShowBigCard(int code, float zoom) {
-	mainGame->deckBuilder.bigcard_code = code;
-	mainGame->deckBuilder.bigcard_zoom = zoom;
-	ITexture* img = imageManager.GetBigPicture(code, zoom);
-	mainGame->imgBigCard->setImage(img);
-	auto size = img->getSize();
-	s32 left = mainGame->window_size.Width / 2 - size.Width / 2;
-	s32 top = mainGame->window_size.Height / 2 - size.Height / 2;
-	mainGame->imgBigCard->setRelativePosition(recti(0, 0, size.Width, size.Height));
-	mainGame->wBigCard->setRelativePosition(recti(left, top, left + size.Width, top + size.Height));
-	mainGame->gMutex.lock();
-	mainGame->btnBigCardOriginalSize->setVisible(true);
-	mainGame->btnBigCardZoomIn->setVisible(true);
-	mainGame->btnBigCardZoomOut->setVisible(true);
-	mainGame->btnBigCardClose->setVisible(true);
-	mainGame->ShowElement(mainGame->wBigCard);
-	mainGame->env->getRootGUIElement()->bringToFront(mainGame->wBigCard);
-	mainGame->gMutex.unlock();
-}
-inline void ZoomBigCard(s32 centerx = -1, s32 centery = -1) {
-	if(mainGame->deckBuilder.bigcard_zoom >= 4)
-		mainGame->deckBuilder.bigcard_zoom = 4;
-	if(mainGame->deckBuilder.bigcard_zoom <= 0.2)
-		mainGame->deckBuilder.bigcard_zoom = 0.2;
-	ITexture* img = imageManager.GetBigPicture(mainGame->deckBuilder.bigcard_code, mainGame->deckBuilder.bigcard_zoom);
-	mainGame->imgBigCard->setImage(img);
-	auto size = img->getSize();
-	auto pos = mainGame->wBigCard->getRelativePosition();
-	if(centerx == -1) {
-		centerx = pos.UpperLeftCorner.X + pos.getWidth() / 2;
-		centery = pos.UpperLeftCorner.Y + pos.getHeight() * 0.444f;
-	}
-	float posx = (float)(centerx - pos.UpperLeftCorner.X) / pos.getWidth();
-	float posy = (float)(centery - pos.UpperLeftCorner.Y) / pos.getHeight();
-	s32 left = centerx - size.Width * posx;
-	s32 top = centery - size.Height * posy;
-	mainGame->imgBigCard->setRelativePosition(recti(0, 0, size.Width, size.Height));
-	mainGame->wBigCard->setRelativePosition(recti(left, top, left + size.Width, top + size.Height));
-}
-inline void CloseBigCard() {
-	mainGame->HideElement(mainGame->wBigCard);
-	mainGame->btnBigCardOriginalSize->setVisible(false);
-	mainGame->btnBigCardZoomIn->setVisible(false);
-	mainGame->btnBigCardZoomOut->setVisible(false);
-	mainGame->btnBigCardClose->setVisible(false);
+static inline bool havePopupWindow() {
+	return mainGame->wQuery->isVisible() || mainGame->wCategories->isVisible() || mainGame->wLinkMarks->isVisible() || mainGame->wDeckManage->isVisible() || mainGame->wDMQuery->isVisible();
 }
+
 void DeckBuilder::Initialize() {
 	mainGame->is_building = true;
 	mainGame->is_siding = false;
@@ -119,8 +77,7 @@ void DeckBuilder::Initialize() {
 	mainGame->btnSideShuffle->setVisible(false);
 	mainGame->btnSideSort->setVisible(false);
 	mainGame->btnSideReload->setVisible(false);
-	filterList = &deckManager._lfList[0].content;
-	mainGame->cbDBLFList->setSelected(0);
+	filterList = &deckManager._lfList[mainGame->gameConf.use_lflist ? mainGame->gameConf.default_lflist : deckManager._lfList.size() - 1].content;
 	ClearSearch();
 	mouse_pos.set(0, 0);
 	hovered_code = 0;
@@ -130,6 +87,10 @@ void DeckBuilder::Initialize() {
 	is_draging = false;
 	is_starting_dragging = false;
 	prev_deck = mainGame->cbDBDecks->getSelected();
+	prev_category = mainGame->cbDBCategory->getSelected();
+	readonly = prev_category < 2;
+	mainGame->btnSaveDeck->setEnabled(!readonly);
+	mainGame->btnDeleteDeck->setEnabled(!readonly);
 	prev_operation = 0;
 	prev_sel = -1;
 	is_modified = false;
@@ -156,9 +117,12 @@ void DeckBuilder::Terminate() {
 	mainGame->ClearTextures();
 	mainGame->showingcode = 0;
 	mainGame->scrFilter->setVisible(false);
-	int sel = mainGame->cbDBDecks->getSelected();
-	if(sel >= 0)
-		BufferIO::CopyWStr(mainGame->cbDBDecks->getItem(sel), mainGame->gameConf.lastdeck, 64);
+	int catesel = mainGame->cbDBCategory->getSelected();
+	if(catesel >= 0)
+		BufferIO::CopyWStr(mainGame->cbDBCategory->getItem(catesel), mainGame->gameConf.lastcategory, 64);
+	int decksel = mainGame->cbDBDecks->getSelected();
+	if(decksel >= 0)
+		BufferIO::CopyWStr(mainGame->cbDBDecks->getItem(decksel), mainGame->gameConf.lastdeck, 64);
 	if(exit_on_return)
 		mainGame->device->closeDevice();
 }
@@ -168,13 +132,25 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 	switch(event.EventType) {
 	case irr::EET_GUI_EVENT: {
 		s32 id = event.GUIEvent.Caller->getID();
-		if(mainGame->wCategories->isVisible() && id != BUTTON_CATEGORY_OK)
-			break;
-		if(mainGame->wQuery->isVisible() && id != BUTTON_YES && id != BUTTON_NO)
-			break;
-		if(mainGame->wLinkMarks->isVisible() && id != BUTTON_MARKERS_OK)
+		if(((mainGame->wCategories->isVisible() && id != BUTTON_CATEGORY_OK) ||
+			(mainGame->wQuery->isVisible() && id != BUTTON_YES && id != BUTTON_NO) ||
+			(mainGame->wLinkMarks->isVisible() && id != BUTTON_MARKERS_OK) ||
+			(mainGame->wDMQuery->isVisible() && id != BUTTON_DM_OK && id != BUTTON_DM_CANCEL) ||
+			(mainGame->wDeckManage->isVisible() && !(id >= WINDOW_DECK_MANAGE && id < COMBOBOX_LFLIST)))
+			&& event.GUIEvent.EventType != irr::gui::EGET_LISTBOX_CHANGED
+			&& event.GUIEvent.EventType != irr::gui::EGET_COMBO_BOX_CHANGED) {
+			if(mainGame->wDMQuery->isVisible())
+				mainGame->wDMQuery->getParent()->bringToFront(mainGame->wDMQuery);
 			break;
+		}
 		switch(event.GUIEvent.EventType) {
+		case irr::gui::EGET_ELEMENT_CLOSED: {
+			if(id == WINDOW_DECK_MANAGE) {
+				mainGame->HideElement(mainGame->wDeckManage);
+				return true;
+				break;
+			}
+		}
 		case irr::gui::EGET_BUTTON_CLICKED: {
 			soundManager.PlaySoundEffect(SOUND_BUTTON);
 			switch(id) {
@@ -198,7 +174,11 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 			}
 			case BUTTON_SAVE_DECK: {
 				int sel = mainGame->cbDBDecks->getSelected();
-				if(sel >= 0 && deckManager.SaveDeck(deckManager.current_deck, mainGame->cbDBDecks->getItem(sel))) {
+				if(sel == -1)
+					break;
+				wchar_t filepath[256];
+				deckManager.GetDeckFile(filepath, mainGame->cbDBCategory, mainGame->cbDBDecks);
+				if(deckManager.SaveDeck(deckManager.current_deck, filepath)) {
 					mainGame->stACMessage->setText(dataManager.GetSysString(1335));
 					mainGame->PopupElement(mainGame->wACMessage, 20);
 					is_modified = false;
@@ -222,10 +202,24 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					mainGame->cbDBDecks->addItem(dname);
 					mainGame->cbDBDecks->setSelected(mainGame->cbDBDecks->getItemCount() - 1);
 				}
-				if(deckManager.SaveDeck(deckManager.current_deck, dname)) {
+				int catesel = mainGame->cbDBCategory->getSelected();
+				wchar_t catepath[256];
+				deckManager.GetCategoryPath(catepath, catesel, mainGame->cbDBCategory->getText());
+				wchar_t filepath[256];
+				myswprintf(filepath, L"%ls/%ls.ydk", catepath, dname);
+				if(deckManager.SaveDeck(deckManager.current_deck, filepath)) {
 					mainGame->stACMessage->setText(dataManager.GetSysString(1335));
 					mainGame->PopupElement(mainGame->wACMessage, 20);
 					is_modified = false;
+					if(catesel == -1) {
+						catesel = 2;
+						prev_category = catesel;
+						RefreshReadonly(catesel);
+						mainGame->cbDBCategory->setSelected(catesel);
+						mainGame->btnManageDeck->setEnabled(true);
+						mainGame->cbDBCategory->setEnabled(true);
+						mainGame->cbDBDecks->setEnabled(true);
+					}
 				}
 				break;
 			}
@@ -244,7 +238,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				break;
 			}
 			case BUTTON_LEAVE_GAME: {
-				if(is_modified && !mainGame->chkIgnoreDeckChanges->isChecked()) {
+				if(is_modified && !readonly && !mainGame->chkIgnoreDeckChanges->isChecked()) {
 					mainGame->gMutex.lock();
 					mainGame->SetStaticText(mainGame->stQMessage, 310, mainGame->guiFont, dataManager.GetSysString(1356));
 					mainGame->PopupElement(mainGame->wQuery);
@@ -280,9 +274,377 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				InstantSearch();
 				break;
 			}
+			case BUTTON_MANAGE_DECK: {
+				if(is_modified && !readonly && !mainGame->chkIgnoreDeckChanges->isChecked()) {
+					mainGame->gMutex.lock();
+					mainGame->SetStaticText(mainGame->stQMessage, 310, mainGame->guiFont, dataManager.GetSysString(1356));
+					mainGame->PopupElement(mainGame->wQuery);
+					mainGame->gMutex.unlock();
+					prev_operation = id;
+					break;
+				}
+				ShowDeckManage();
+				break;
+			}
+			case BUTTON_NEW_CATEGORY: {
+				mainGame->gMutex.lock();
+				mainGame->stDMMessage->setText(dataManager.GetSysString(1469));
+				mainGame->ebDMName->setVisible(true);
+				mainGame->ebDMName->setText(L"");
+				mainGame->PopupElement(mainGame->wDMQuery);
+				mainGame->gMutex.unlock();
+				prev_operation = id;
+				break;
+			}
+			case BUTTON_RENAME_CATEGORY: {
+				if(mainGame->lstCategories->getSelected() < 4)
+					break;
+				mainGame->gMutex.lock();
+				mainGame->stDMMessage->setText(dataManager.GetSysString(1469));
+				mainGame->ebDMName->setVisible(true);
+				mainGame->ebDMName->setText(mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected()));
+				mainGame->PopupElement(mainGame->wDMQuery);
+				mainGame->gMutex.unlock();
+				prev_operation = id;
+				break;
+			}
+			case BUTTON_DELETE_CATEGORY: {
+				mainGame->gMutex.lock();
+				mainGame->stDMMessage->setText(dataManager.GetSysString(1470));
+				mainGame->stDMMessage2->setVisible(true);
+				mainGame->stDMMessage2->setText(mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected()));
+				mainGame->PopupElement(mainGame->wDMQuery);
+				mainGame->gMutex.unlock();
+				prev_operation = id;
+				break;
+			}
+			case BUTTON_NEW_DECK: {
+				mainGame->gMutex.lock();
+				mainGame->stDMMessage->setText(dataManager.GetSysString(1471));
+				mainGame->ebDMName->setVisible(true);
+				mainGame->ebDMName->setText(L"");
+				mainGame->PopupElement(mainGame->wDMQuery);
+				mainGame->gMutex.unlock();
+				prev_operation = id;
+				break;
+			}
+			case BUTTON_RENAME_DECK: {
+				mainGame->gMutex.lock();
+				mainGame->stDMMessage->setText(dataManager.GetSysString(1471));
+				mainGame->ebDMName->setVisible(true);
+				mainGame->ebDMName->setText(mainGame->lstDecks->getListItem(mainGame->lstDecks->getSelected()));
+				mainGame->PopupElement(mainGame->wDMQuery);
+				mainGame->gMutex.unlock();
+				prev_operation = id;
+				break;
+			}
+			case BUTTON_DELETE_DECK_DM: {
+				mainGame->gMutex.lock();
+				mainGame->stDMMessage->setText(dataManager.GetSysString(1337));
+				mainGame->stDMMessage2->setVisible(true);
+				mainGame->stDMMessage2->setText(mainGame->lstDecks->getListItem(mainGame->lstDecks->getSelected()));
+				mainGame->PopupElement(mainGame->wDMQuery);
+				mainGame->gMutex.unlock();
+				prev_operation = id;
+				break;
+			}
+			case BUTTON_MOVE_DECK: {
+				mainGame->gMutex.lock();
+				mainGame->stDMMessage->setText(dataManager.GetSysString(1472));
+				mainGame->cbDMCategory->setVisible(true);
+				mainGame->cbDMCategory->clear();
+				int catesel = mainGame->lstCategories->getSelected();
+				if(catesel != 2)
+					mainGame->cbDMCategory->addItem(dataManager.GetSysString(1452));
+				for(int i = 4; i < mainGame->lstCategories->getItemCount(); i++) {
+					if(i != catesel)
+						mainGame->cbDMCategory->addItem(mainGame->lstCategories->getListItem(i));
+				}
+				mainGame->PopupElement(mainGame->wDMQuery);
+				mainGame->gMutex.unlock();
+				prev_operation = id;
+				break;
+			}
+			case BUTTON_COPY_DECK: {
+				mainGame->gMutex.lock();
+				mainGame->stDMMessage->setText(dataManager.GetSysString(1473));
+				mainGame->cbDMCategory->setVisible(true);
+				mainGame->cbDMCategory->clear();
+				int catesel = mainGame->lstCategories->getSelected();
+				if(catesel != 2)
+					mainGame->cbDMCategory->addItem(dataManager.GetSysString(1452));
+				for(int i = 4; i < mainGame->lstCategories->getItemCount(); i++) {
+					if(i != catesel)
+						mainGame->cbDMCategory->addItem(mainGame->lstCategories->getListItem(i));
+				}
+				mainGame->PopupElement(mainGame->wDMQuery);
+				mainGame->gMutex.unlock();
+				prev_operation = id;
+				break;
+			}
+			case BUTTON_DM_OK: {
+				switch(prev_operation) {
+				case BUTTON_NEW_CATEGORY: {
+					int catesel = 0;
+					const wchar_t* catename = mainGame->ebDMName->getText();
+					if(deckManager.CreateCategory(catename)) {
+						mainGame->cbDBCategory->addItem(catename);
+						mainGame->lstCategories->addItem(catename);
+						catesel = mainGame->lstCategories->getItemCount() - 1;
+					} else {
+						for(int i = 3; i < mainGame->lstCategories->getItemCount(); i++) {
+							if(!mywcsncasecmp(mainGame->lstCategories->getListItem(i), catename, 256)) {
+								catesel = i;
+								mainGame->stACMessage->setText(dataManager.GetSysString(1474));
+								mainGame->PopupElement(mainGame->wACMessage, 20);
+								break;
+							}
+						}
+					}
+					if(catesel > 0) {
+						mainGame->lstCategories->setSelected(catesel);
+						RefreshDeckList();
+						mainGame->lstDecks->setSelected(0);
+						mainGame->cbDBCategory->setSelected(catesel);
+						ChangeCategory(catesel);
+					}
+					break;
+				}
+				case BUTTON_RENAME_CATEGORY: {
+					int catesel = mainGame->lstCategories->getSelected();
+					const wchar_t* oldcatename = mainGame->lstCategories->getListItem(catesel);
+					const wchar_t* newcatename = mainGame->ebDMName->getText();
+					if(deckManager.RenameCategory(oldcatename, newcatename)) {
+						mainGame->cbDBCategory->removeItem(catesel);
+						mainGame->cbDBCategory->addItem(newcatename);
+						mainGame->lstCategories->removeItem(catesel);
+						mainGame->lstCategories->addItem(newcatename);
+						catesel = mainGame->lstCategories->getItemCount() - 1;
+					} else {
+						catesel = 0;
+						for(int i = 3; i < mainGame->lstCategories->getItemCount(); i++) {
+							if(!mywcsncasecmp(mainGame->lstCategories->getListItem(i), newcatename, 256)) {
+								catesel = i;
+								mainGame->stACMessage->setText(dataManager.GetSysString(1474));
+								mainGame->PopupElement(mainGame->wACMessage, 20);
+								break;
+							}
+						}
+					}
+					if(catesel > 0) {
+						mainGame->lstCategories->setSelected(catesel);
+						RefreshDeckList();
+						mainGame->lstDecks->setSelected(0);
+						mainGame->cbDBCategory->setSelected(catesel);
+						ChangeCategory(catesel);
+					}
+					break;
+				}
+				case BUTTON_DELETE_CATEGORY: {
+					int catesel = mainGame->lstCategories->getSelected();
+					const wchar_t* catename = mainGame->lstCategories->getListItem(catesel);
+					if(deckManager.DeleteCategory(catename)) {
+						mainGame->cbDBCategory->removeItem(catesel);
+						mainGame->lstCategories->removeItem(catesel);
+						catesel = 2;
+						mainGame->lstCategories->setSelected(catesel);
+						RefreshDeckList();
+						mainGame->lstDecks->setSelected(0);
+						mainGame->cbDBCategory->setSelected(catesel);
+						ChangeCategory(catesel);
+					} else {
+						mainGame->stACMessage->setText(dataManager.GetSysString(1476));
+						mainGame->PopupElement(mainGame->wACMessage, 20);
+					}
+					break;
+				}
+				case BUTTON_NEW_DECK: {
+					const wchar_t* deckname = mainGame->ebDMName->getText();
+					wchar_t catepath[256];
+					deckManager.GetCategoryPath(catepath, mainGame->cbDBCategory->getSelected(), mainGame->cbDBCategory->getText());
+					wchar_t filepath[256];
+					myswprintf(filepath, L"%ls/%ls.ydk", catepath, deckname);
+					bool res = false;
+					if(!FileSystem::IsFileExists(filepath)) {
+						deckManager.current_deck.main.clear();
+						deckManager.current_deck.extra.clear();
+						deckManager.current_deck.side.clear();
+						res = deckManager.SaveDeck(deckManager.current_deck, filepath);
+						RefreshDeckList();
+						ChangeCategory(mainGame->lstCategories->getSelected());
+					}
+					for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) {
+						if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) {
+							deckManager.LoadDeck(filepath);
+							prev_deck = i;
+							mainGame->cbDBDecks->setSelected(prev_deck);
+							mainGame->lstDecks->setSelected(prev_deck);
+							if(!res) {
+								mainGame->stACMessage->setText(dataManager.GetSysString(1475));
+								mainGame->PopupElement(mainGame->wACMessage, 20);
+							}
+							break;
+						}
+					}
+					break;
+				}
+				case BUTTON_RENAME_DECK: {
+					int catesel = mainGame->lstCategories->getSelected();
+					int decksel = mainGame->lstDecks->getSelected();
+					const wchar_t* catename = mainGame->lstCategories->getListItem(catesel);
+					wchar_t oldfilepath[256];
+					deckManager.GetDeckFile(oldfilepath, mainGame->cbDBCategory, mainGame->cbDBDecks);
+					const wchar_t* newdeckname = mainGame->ebDMName->getText();
+					wchar_t newfilepath[256];
+					if(catesel == 2) {
+						myswprintf(newfilepath, L"./deck/%ls.ydk", newdeckname);
+					} else {
+						myswprintf(newfilepath, L"./deck/%ls/%ls.ydk", catename, newdeckname);
+					}
+					bool res = false;
+					if(!FileSystem::IsFileExists(newfilepath)) {
+						res = FileSystem::Rename(oldfilepath, newfilepath);
+					}
+					RefreshDeckList();
+					ChangeCategory(catesel);
+					for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) {
+						if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), newdeckname, 256)) {
+							deckManager.LoadDeck(newfilepath);
+							prev_deck = i;
+							mainGame->cbDBDecks->setSelected(prev_deck);
+							mainGame->lstDecks->setSelected(prev_deck);
+							if(!res) {
+								mainGame->stACMessage->setText(dataManager.GetSysString(1475));
+								mainGame->PopupElement(mainGame->wACMessage, 20);
+							}
+							break;
+						}
+					}
+					break;
+				}
+				case BUTTON_DELETE_DECK_DM: {
+					int decksel = mainGame->lstDecks->getSelected();
+					wchar_t filepath[256];
+					deckManager.GetDeckFile(filepath, mainGame->cbDBCategory, mainGame->cbDBDecks);
+					if(deckManager.DeleteDeck(filepath)) {
+						mainGame->lstDecks->removeItem(decksel);
+						mainGame->cbDBDecks->removeItem(decksel);
+						decksel--;
+						if(decksel == -1) {
+							decksel = mainGame->lstDecks->getItemCount() - 1;
+						}
+						if(decksel != -1) {
+							mainGame->lstDecks->setSelected(decksel);
+							mainGame->cbDBDecks->setSelected(decksel);
+							deckManager.LoadDeck(mainGame->cbDBCategory, mainGame->cbDBDecks);
+						}
+						RefreshReadonly(prev_category);
+						prev_deck = decksel;
+					} else {
+						mainGame->stACMessage->setText(dataManager.GetSysString(1476));
+						mainGame->PopupElement(mainGame->wACMessage, 20);
+					}
+					break;
+				}
+				case BUTTON_MOVE_DECK: {
+					int oldcatesel = mainGame->lstCategories->getSelected();
+					int newcatesel = mainGame->cbDMCategory->getSelected();
+					int decksel = mainGame->lstDecks->getSelected();
+					const wchar_t* newcatename = mainGame->cbDMCategory->getText();
+					const wchar_t* olddeckname = mainGame->lstDecks->getListItem(decksel);
+					wchar_t deckname[256];
+					BufferIO::CopyWStr(olddeckname, deckname, 256);
+					wchar_t oldfilepath[256];
+					deckManager.GetDeckFile(oldfilepath, mainGame->cbDBCategory, mainGame->cbDBDecks);
+					wchar_t newfilepath[256];
+					if(oldcatesel != 2 && newcatesel == 0) {
+						myswprintf(newfilepath, L"./deck/%ls.ydk", deckname);
+					} else {
+						myswprintf(newfilepath, L"./deck/%ls/%ls.ydk", newcatename, deckname);
+					}
+					bool res = false;
+					if(!FileSystem::IsFileExists(newfilepath)) {
+						res = FileSystem::Rename(oldfilepath, newfilepath);
+					}
+					mainGame->lstCategories->setSelected(newcatename);
+					int catesel = mainGame->lstCategories->getSelected();
+					RefreshDeckList();
+					mainGame->cbDBCategory->setSelected(catesel);
+					ChangeCategory(catesel);
+					for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) {
+						if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) {
+							deckManager.LoadDeck(newfilepath);
+							prev_deck = i;
+							mainGame->cbDBDecks->setSelected(prev_deck);
+							mainGame->lstDecks->setSelected(prev_deck);
+							if(!res) {
+								mainGame->stACMessage->setText(dataManager.GetSysString(1475));
+								mainGame->PopupElement(mainGame->wACMessage, 20);
+							}
+							break;
+						}
+					}
+					break;
+				}
+				case BUTTON_COPY_DECK: {
+					int oldcatesel = mainGame->lstCategories->getSelected();
+					int newcatesel = mainGame->cbDMCategory->getSelected();
+					int decksel = mainGame->lstDecks->getSelected();
+					const wchar_t* newcatename = mainGame->cbDMCategory->getText();
+					const wchar_t* olddeckname = mainGame->lstDecks->getListItem(decksel);
+					wchar_t deckname[256];
+					BufferIO::CopyWStr(olddeckname, deckname, 256);
+					wchar_t newfilepath[256];
+					if(oldcatesel != 2 && newcatesel == 0) {
+						myswprintf(newfilepath, L"./deck/%ls.ydk", deckname);
+					} else {
+						myswprintf(newfilepath, L"./deck/%ls/%ls.ydk", newcatename, deckname);
+					}
+					bool res = false;
+					if(!FileSystem::IsFileExists(newfilepath)) {
+						res = deckManager.SaveDeck(deckManager.current_deck, newfilepath);
+					}
+					mainGame->lstCategories->setSelected(newcatename);
+					int catesel = mainGame->lstCategories->getSelected();
+					RefreshDeckList();
+					mainGame->cbDBCategory->setSelected(catesel);
+					ChangeCategory(catesel);
+					for(int i = 0; i < mainGame->lstDecks->getItemCount(); i++) {
+						if(!mywcsncasecmp(mainGame->lstDecks->getListItem(i), deckname, 256)) {
+							deckManager.LoadDeck(newfilepath);
+							prev_deck = i;
+							mainGame->cbDBDecks->setSelected(prev_deck);
+							mainGame->lstDecks->setSelected(prev_deck);
+							if(!res) {
+								mainGame->stACMessage->setText(dataManager.GetSysString(1475));
+								mainGame->PopupElement(mainGame->wACMessage, 20);
+							}
+							break;
+						}
+					}
+					break;
+				}
+				default:
+					break;
+				}
+				prev_operation = 0;
+				mainGame->HideElement(mainGame->wDMQuery);
+				mainGame->stDMMessage2->setVisible(false);
+				mainGame->ebDMName->setVisible(false);
+				mainGame->cbDMCategory->setVisible(false);
+				break;
+			}
+			case BUTTON_DM_CANCEL: {
+				mainGame->HideElement(mainGame->wDMQuery);
+				mainGame->stDMMessage2->setVisible(false);
+				mainGame->ebDMName->setVisible(false);
+				mainGame->cbDMCategory->setVisible(false);
+				break;
+			}
 			case BUTTON_SIDE_OK: {
-				if(deckManager.current_deck.main.size() != pre_mainc || deckManager.current_deck.extra.size() != pre_extrac
-				        || deckManager.current_deck.side.size() != pre_sidec) {
+				if(deckManager.current_deck.main.size() != pre_mainc
+					|| deckManager.current_deck.extra.size() != pre_extrac
+					|| deckManager.current_deck.side.size() != pre_sidec) {
 					soundManager.PlaySoundEffect(SOUND_INFO);
 					mainGame->env->addMessageBox(L"", dataManager.GetSysString(1410));
 					break;
@@ -302,7 +664,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				break;
 			}
 			case BUTTON_SIDE_RELOAD: {
-				deckManager.LoadDeck(mainGame->cbDeckSelect->getItem(mainGame->cbDeckSelect->getSelected()));
+				deckManager.LoadDeck(mainGame->cbCategorySelect, mainGame->cbDeckSelect);
 				break;
 			}
 			case BUTTON_BIG_CARD_ORIG_SIZE: {
@@ -310,12 +672,12 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				break;
 			}
 			case BUTTON_BIG_CARD_ZOOM_IN: {
-				bigcard_zoom += 0.2;
+				bigcard_zoom += 0.2f;
 				ZoomBigCard();
 				break;
 			}
 			case BUTTON_BIG_CARD_ZOOM_OUT: {
-				bigcard_zoom -= 0.2;
+				bigcard_zoom -= 0.2f;
 				ZoomBigCard();
 				break;
 			}
@@ -338,14 +700,17 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					deckManager.current_deck.side.clear();
 				} else if(prev_operation == BUTTON_DELETE_DECK) {
 					int sel = prev_sel;
-					if(deckManager.DeleteDeck(deckManager.current_deck, mainGame->cbDBDecks->getItem(sel))) {
+					mainGame->cbDBDecks->setSelected(sel);
+					wchar_t filepath[256];
+					deckManager.GetDeckFile(filepath, mainGame->cbDBCategory, mainGame->cbDBDecks);
+					if(deckManager.DeleteDeck(filepath)) {
 						mainGame->cbDBDecks->removeItem(sel);
 						int count = mainGame->cbDBDecks->getItemCount();
 						if(sel >= count)
 							sel = count - 1;
 						mainGame->cbDBDecks->setSelected(sel);
 						if(sel != -1)
-							deckManager.LoadDeck(mainGame->cbDBDecks->getItem(sel));
+							deckManager.LoadDeck(mainGame->cbDBCategory, mainGame->cbDBDecks);
 						mainGame->stACMessage->setText(dataManager.GetSysString(1338));
 						mainGame->PopupElement(mainGame->wACMessage, 20);
 						prev_deck = sel;
@@ -354,18 +719,25 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					prev_sel = -1;
 				} else if(prev_operation == BUTTON_LEAVE_GAME) {
 					Terminate();
+				} else if(prev_operation == COMBOBOX_DBCATEGORY) {
+					int catesel = mainGame->cbDBCategory->getSelected();
+					ChangeCategory(catesel);
 				} else if(prev_operation == COMBOBOX_DBDECKS) {
-					int sel = mainGame->cbDBDecks->getSelected();
-					deckManager.LoadDeck(mainGame->cbDBDecks->getItem(sel));
-					prev_deck = sel;
+					int decksel = mainGame->cbDBDecks->getSelected();
+					deckManager.LoadDeck(mainGame->cbDBCategory, mainGame->cbDBDecks);
+					prev_deck = decksel;
 					is_modified = false;
+				} else if(prev_operation == BUTTON_MANAGE_DECK) {
+					ShowDeckManage();
 				}
 				prev_operation = 0;
 				break;
 			}
 			case BUTTON_NO: {
 				mainGame->HideElement(mainGame->wQuery);
-				if (prev_operation == COMBOBOX_DBDECKS) {
+				if(prev_operation == COMBOBOX_DBCATEGORY) {
+					mainGame->cbDBCategory->setSelected(prev_category);
+				} else if(prev_operation == COMBOBOX_DBDECKS) {
 					mainGame->cbDBDecks->setSelected(prev_deck);
 				}
 				prev_operation = 0;
@@ -431,12 +803,35 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 		}
 		case irr::gui::EGET_COMBO_BOX_CHANGED: {
 			switch(id) {
-			case COMBOBOX_DBLFLIST: {
-				filterList = &deckManager._lfList[mainGame->cbDBLFList->getSelected()].content;
+			case COMBOBOX_DBCATEGORY: {
+				if(havePopupWindow()) {
+					mainGame->cbDBCategory->setSelected(prev_category);
+					break;
+				}
+				int catesel = mainGame->cbDBCategory->getSelected();
+				if(catesel == 3) {
+					catesel = 2;
+					mainGame->cbDBCategory->setSelected(2);
+					if(prev_category == 2)
+						break;
+				}
+				if(is_modified && !readonly && !mainGame->chkIgnoreDeckChanges->isChecked()) {
+					mainGame->gMutex.lock();
+					mainGame->SetStaticText(mainGame->stQMessage, 310, mainGame->guiFont, dataManager.GetSysString(1356));
+					mainGame->PopupElement(mainGame->wQuery);
+					mainGame->gMutex.unlock();
+					prev_operation = id;
+					break;
+				}
+				ChangeCategory(catesel);
 				break;
 			}
 			case COMBOBOX_DBDECKS: {
-				if(is_modified && !mainGame->chkIgnoreDeckChanges->isChecked()) {
+				if(havePopupWindow()) {
+					mainGame->cbDBDecks->setSelected(prev_deck);
+					break;
+				}
+				if(is_modified && !readonly && !mainGame->chkIgnoreDeckChanges->isChecked()) {
 					mainGame->gMutex.lock();
 					mainGame->SetStaticText(mainGame->stQMessage, 310, mainGame->guiFont, dataManager.GetSysString(1356));
 					mainGame->PopupElement(mainGame->wQuery);
@@ -444,10 +839,11 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 					prev_operation = id;
 					break;
 				}
-				int sel = mainGame->cbDBDecks->getSelected();
-				if(sel >= 0)
-					deckManager.LoadDeck(mainGame->cbDBDecks->getItem(sel));
-				prev_deck = sel;
+				int decksel = mainGame->cbDBDecks->getSelected();
+				if(decksel >= 0) {
+					deckManager.LoadDeck(mainGame->cbDBCategory, mainGame->cbDBDecks);
+				}
+				prev_deck = decksel;
 				is_modified = false;
 				break;
 			}
@@ -571,6 +967,46 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				break;
 			}
 		}
+		case irr::gui::EGET_LISTBOX_CHANGED: {
+			switch(id) {
+			case LISTBOX_CATEGORIES: {
+				if(mainGame->wDMQuery->isVisible()) {
+					mainGame->lstCategories->setSelected(prev_category);
+					break;
+				}
+				int catesel = mainGame->lstCategories->getSelected();
+				if(catesel == 3) {
+					catesel = 2;
+					mainGame->lstCategories->setSelected(catesel);
+					if(prev_category == catesel)
+						break;
+				}
+				RefreshDeckList();
+				mainGame->lstDecks->setSelected(0);
+				mainGame->cbDBCategory->setSelected(catesel);
+				ChangeCategory(catesel);
+				break;
+			}
+			case LISTBOX_DECKS: {
+				if(mainGame->wDMQuery->isVisible()) {
+					mainGame->lstDecks->setSelected(prev_deck);
+					break;
+				}
+				int decksel = mainGame->lstDecks->getSelected();
+				mainGame->cbDBDecks->setSelected(decksel);
+				if(decksel == -1)
+					break;
+				wchar_t filepath[256];
+				wchar_t catepath[256];
+				deckManager.GetCategoryPath(catepath, mainGame->lstCategories->getSelected(), mainGame->lstCategories->getListItem(mainGame->lstCategories->getSelected()));
+				myswprintf(filepath, L"%ls/%ls.ydk", catepath, mainGame->lstDecks->getListItem(decksel));
+				deckManager.LoadDeck(filepath);
+				prev_deck = decksel;
+				break;
+			}
+			}
+			break;
+		}
 		default: break;
 		}
 		break;
@@ -581,7 +1017,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 			irr::gui::IGUIElement* root = mainGame->env->getRootGUIElement();
 			if(root->getElementFromPoint(mouse_pos) != root)
 				break;
-			if(mainGame->wCategories->isVisible() || mainGame->wQuery->isVisible())
+			if(havePopupWindow())
 				break;
 			if(hovered_pos == 0 || hovered_seq == -1)
 				break;
@@ -662,7 +1098,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				CloseBigCard();
 				break;
 			}
-			if(mainGame->wCategories->isVisible() || mainGame->wQuery->isVisible())
+			if(havePopupWindow())
 				break;
 			if(!is_draging) {
 				if(hovered_pos == 0 || hovered_seq == -1)
@@ -702,7 +1138,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 		case irr::EMIE_MMOUSE_LEFT_UP: {
 			if (mainGame->is_siding)
 				break;
-			if (mainGame->wCategories->isVisible() || mainGame->wQuery->isVisible())
+			if (havePopupWindow())
 				break;
 			if (hovered_pos == 0 || hovered_seq == -1)
 				break;
@@ -1009,7 +1445,7 @@ void DeckBuilder::FilterCards() {
 		}
 		if(filter_effect && !(data.category & filter_effect))
 			continue;
-		if(filter_marks && (data.link_marker & filter_marks)!= filter_marks)
+		if(filter_marks && (data.link_marker & filter_marks) != filter_marks)
 			continue;
 		if(filter_lm) {
 			if(filter_lm <= 3 && (!filterList->count(ptr->first) || (*filterList).at(ptr->first) != filter_lm - 1))
@@ -1126,6 +1562,116 @@ void DeckBuilder::SortList() {
 		break;
 	}
 }
+
+void DeckBuilder::RefreshDeckList() {
+	irr::gui::IGUIListBox* lstCategories = mainGame->lstCategories;
+	irr::gui::IGUIListBox* lstDecks = mainGame->lstDecks;
+	wchar_t catepath[256];
+	deckManager.GetCategoryPath(catepath, lstCategories->getSelected(), lstCategories->getListItem(lstCategories->getSelected()));
+	lstDecks->clear();
+	FileSystem::TraversalDir(catepath, [lstDecks](const wchar_t* name, bool isdir) {
+		if(!isdir && wcsrchr(name, '.') && !mywcsncasecmp(wcsrchr(name, '.'), L".ydk", 4)) {
+			size_t len = wcslen(name);
+			wchar_t deckname[256];
+			wcsncpy(deckname, name, len - 4);
+			deckname[len - 4] = 0;
+			lstDecks->addItem(deckname);
+		}
+		});
+}
+void DeckBuilder::RefreshReadonly(int catesel) {
+	bool hasDeck = mainGame->cbDBDecks->getItemCount() != 0;
+	readonly = catesel < 2;
+	mainGame->btnSaveDeck->setEnabled(!readonly);
+	mainGame->btnSaveDeckAs->setEnabled(!readonly);
+	mainGame->btnDeleteDeck->setEnabled(hasDeck && !readonly);
+	mainGame->btnRenameCategory->setEnabled(catesel > 3);
+	mainGame->btnDeleteCategory->setEnabled(catesel > 3);
+	mainGame->btnNewDeck->setEnabled(!readonly);
+	mainGame->btnRenameDeck->setEnabled(hasDeck && !readonly);
+	mainGame->btnDMDeleteDeck->setEnabled(hasDeck && !readonly);
+	mainGame->btnMoveDeck->setEnabled(hasDeck && !readonly);
+	mainGame->btnCopyDeck->setEnabled(hasDeck);
+}
+void DeckBuilder::ChangeCategory(int catesel) {
+	mainGame->RefreshDeck(mainGame->cbDBCategory, mainGame->cbDBDecks);
+	mainGame->cbDBDecks->setSelected(0);
+	deckManager.LoadDeck(mainGame->cbDBCategory, mainGame->cbDBDecks);
+	RefreshReadonly(catesel);
+	is_modified = false;
+	prev_category = catesel;
+	prev_deck = 0;
+}
+void DeckBuilder::ShowDeckManage() {
+	mainGame->RefreshCategoryDeck(mainGame->cbDBCategory, mainGame->cbDBDecks, false);
+	mainGame->cbDBCategory->setSelected(prev_category);
+	mainGame->RefreshDeck(mainGame->cbDBCategory, mainGame->cbDBDecks);
+	mainGame->cbDBDecks->setSelected(prev_deck);
+	irr::gui::IGUIListBox* lstCategories = mainGame->lstCategories;
+	lstCategories->clear();
+	lstCategories->addItem(dataManager.GetSysString(1450));
+	lstCategories->addItem(dataManager.GetSysString(1451));
+	lstCategories->addItem(dataManager.GetSysString(1452));
+	lstCategories->addItem(dataManager.GetSysString(1453));
+	FileSystem::TraversalDir(L"./deck", [lstCategories](const wchar_t* name, bool isdir) {
+		if(isdir) {
+			lstCategories->addItem(name);
+		}
+		});
+	lstCategories->setSelected(prev_category);
+	RefreshDeckList();
+	RefreshReadonly(prev_category);
+	mainGame->lstDecks->setSelected(prev_deck);
+	mainGame->PopupElement(mainGame->wDeckManage);
+}
+
+void DeckBuilder::ShowBigCard(int code, float zoom) {
+	bigcard_code = code;
+	bigcard_zoom = zoom;
+	ITexture* img = imageManager.GetBigPicture(code, zoom);
+	mainGame->imgBigCard->setImage(img);
+	auto size = img->getSize();
+	s32 left = mainGame->window_size.Width / 2 - size.Width / 2;
+	s32 top = mainGame->window_size.Height / 2 - size.Height / 2;
+	mainGame->imgBigCard->setRelativePosition(recti(0, 0, size.Width, size.Height));
+	mainGame->wBigCard->setRelativePosition(recti(left, top, left + size.Width, top + size.Height));
+	mainGame->gMutex.lock();
+	mainGame->btnBigCardOriginalSize->setVisible(true);
+	mainGame->btnBigCardZoomIn->setVisible(true);
+	mainGame->btnBigCardZoomOut->setVisible(true);
+	mainGame->btnBigCardClose->setVisible(true);
+	mainGame->ShowElement(mainGame->wBigCard);
+	mainGame->env->getRootGUIElement()->bringToFront(mainGame->wBigCard);
+	mainGame->gMutex.unlock();
+}
+void DeckBuilder::ZoomBigCard(s32 centerx, s32 centery) {
+	if(bigcard_zoom >= 4)
+		bigcard_zoom = 4;
+	if(bigcard_zoom <= 0.2f)
+		bigcard_zoom = 0.2f;
+	ITexture* img = imageManager.GetBigPicture(bigcard_code, bigcard_zoom);
+	mainGame->imgBigCard->setImage(img);
+	auto size = img->getSize();
+	auto pos = mainGame->wBigCard->getRelativePosition();
+	if(centerx == -1) {
+		centerx = pos.UpperLeftCorner.X + pos.getWidth() / 2;
+		centery = pos.UpperLeftCorner.Y + pos.getHeight() * 0.444f;
+	}
+	float posx = (float)(centerx - pos.UpperLeftCorner.X) / pos.getWidth();
+	float posy = (float)(centery - pos.UpperLeftCorner.Y) / pos.getHeight();
+	s32 left = centerx - size.Width * posx;
+	s32 top = centery - size.Height * posy;
+	mainGame->imgBigCard->setRelativePosition(recti(0, 0, size.Width, size.Height));
+	mainGame->wBigCard->setRelativePosition(recti(left, top, left + size.Width, top + size.Height));
+}
+void DeckBuilder::CloseBigCard() {
+	mainGame->HideElement(mainGame->wBigCard);
+	mainGame->btnBigCardOriginalSize->setVisible(false);
+	mainGame->btnBigCardZoomIn->setVisible(false);
+	mainGame->btnBigCardZoomOut->setVisible(false);
+	mainGame->btnBigCardClose->setVisible(false);
+}
+
 static inline wchar_t NormalizeChar(wchar_t c) {
 	/*
 	// Convert all symbols and punctuations to space.
@@ -1146,22 +1692,21 @@ static inline wchar_t NormalizeChar(wchar_t c) {
 	}
 	return c;
 }
-bool DeckBuilder::CardNameContains(const wchar_t *haystack, const wchar_t *needle)
-{
-	if (!needle[0]) {
+bool DeckBuilder::CardNameContains(const wchar_t* haystack, const wchar_t* needle) {
+	if(!needle[0]) {
 		return true;
 	}
-	if (!haystack) {
+	if(!haystack) {
 		return false;
 	}
 	int i = 0;
 	int j = 0;
-	while (haystack[i]) {
+	while(haystack[i]) {
 		wchar_t ca = NormalizeChar(haystack[i]);
 		wchar_t cb = NormalizeChar(needle[j]);
-		if (ca == cb) {
+		if(ca == cb) {
 			j++;
-			if (!needle[j]) {
+			if(!needle[j]) {
 				return true;
 			}
 		} else {

gframe/deck_con.h

@@ -21,6 +21,14 @@ public:
 	void ClearSearch();
 	void SortList();
 
+	void RefreshDeckList();
+	void RefreshReadonly(int catesel);
+	void ChangeCategory(int catesel);
+	void ShowDeckManage();
+	void ShowBigCard(int code, float zoom);
+	void ZoomBigCard(s32 centerx = -1, s32 centery = -1);
+	void CloseBigCard();
+
 	bool CardNameContains(const wchar_t *haystack, const wchar_t *needle);
 
 	bool push_main(code_pointer pointer, int seq = -1);
@@ -62,10 +70,12 @@ public:
 	size_t pre_extrac;
 	size_t pre_sidec;
 	code_pointer draging_pointer;
+	int prev_category;
 	int prev_deck;
 	s32 prev_operation;
 	int prev_sel;
 	bool is_modified;
+	bool readonly;
 
 	const std::unordered_map<int, int>* filterList;
 	std::vector<code_pointer> results;

gframe/deck_manager.cpp

@@ -192,6 +192,43 @@ bool DeckManager::LoadSide(Deck& deck, int* dbuf, int mainc, int sidec) {
 	deck = ndeck;
 	return true;
 }
+void DeckManager::GetCategoryPath(wchar_t* ret, int index, const wchar_t* text) {
+	wchar_t catepath[256];
+	switch(index) {
+	case 0:
+		myswprintf(catepath, L"./pack");
+		break;
+	case 1:
+		myswprintf(catepath, mainGame->gameConf.bot_deck_path);
+		break;
+	case -1:
+	case 2:
+	case 3:
+		myswprintf(catepath, L"./deck");
+		break;
+	default:
+		myswprintf(catepath, L"./deck/%ls", text);
+	}
+	BufferIO::CopyWStr(catepath, ret, 256);
+}
+void DeckManager::GetDeckFile(wchar_t* ret, irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck) {
+	wchar_t filepath[256];
+	wchar_t catepath[256];
+	wchar_t* deckname = (wchar_t*)cbDeck->getItem(cbDeck->getSelected());
+	if(deckname != NULL) {
+		GetCategoryPath(catepath, cbCategory->getSelected(), cbCategory->getText());
+		myswprintf(filepath, L"%ls/%ls.ydk", catepath, deckname);
+		BufferIO::CopyWStr(filepath, ret, 256);
+	}
+	else {
+		BufferIO::CopyWStr(L"", ret, 256);
+	}
+}
+bool DeckManager::LoadDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck) {
+	wchar_t filepath[256];
+	GetDeckFile(filepath, cbCategory, cbDeck);
+	return LoadDeck(filepath);
+}
 FILE* DeckManager::OpenDeckFile(const wchar_t* file, const char* mode) {
 #ifdef WIN32
 	FILE* fp = _wfopen(file, (wchar_t*)mode);
@@ -204,11 +241,11 @@ FILE* DeckManager::OpenDeckFile(const wchar_t* file, const char* mode) {
 }
 bool DeckManager::LoadDeck(const wchar_t* file) {
 	int sp = 0, ct = 0, mainc = 0, sidec = 0, code;
-	wchar_t localfile[64];
-	myswprintf(localfile, L"./deck/%ls.ydk", file);
-	FILE* fp = OpenDeckFile(localfile, "r");
+	FILE* fp = OpenDeckFile(file, "r");
 	if(!fp) {
-		fp = OpenDeckFile(file, "r");
+		wchar_t localfile[64];
+		myswprintf(localfile, L"./deck/%ls.ydk", file);
+		fp = OpenDeckFile(localfile, "r");
 	}
 	if(!fp)
 		return false;
@@ -234,11 +271,9 @@ bool DeckManager::LoadDeck(const wchar_t* file) {
 	LoadDeck(current_deck, cardlist, mainc, sidec);
 	return true;
 }
-bool DeckManager::SaveDeck(Deck& deck, const wchar_t* name) {
+bool DeckManager::SaveDeck(Deck& deck, const wchar_t* file) {
 	if(!FileSystem::IsDirExists(L"./deck") && !FileSystem::MakeDir(L"./deck"))
 		return false;
-	wchar_t file[64];
-	myswprintf(file, L"./deck/%ls.ydk", name);
 	FILE* fp = OpenDeckFile(file, "w");
 	if(!fp)
 		return false;
@@ -254,9 +289,7 @@ 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);
+bool DeckManager::DeleteDeck(const wchar_t* file) {
 #ifdef WIN32
 	BOOL result = DeleteFileW(file);
 	return !!result;
@@ -267,4 +300,31 @@ bool DeckManager::DeleteDeck(Deck& deck, const wchar_t* name) {
 	return result == 0;
 #endif
 }
+bool DeckManager::CreateCategory(const wchar_t* name) {
+	if(!FileSystem::IsDirExists(L"./deck") && !FileSystem::MakeDir(L"./deck"))
+		return false;
+	if(name[0] == 0)
+		return false;
+	wchar_t localname[256];
+	myswprintf(localname, L"./deck/%ls", name);
+	return FileSystem::MakeDir(localname);
+}
+bool DeckManager::RenameCategory(const wchar_t* oldname, const wchar_t* newname) {
+	if(!FileSystem::IsDirExists(L"./deck") && !FileSystem::MakeDir(L"./deck"))
+		return false;
+	if(newname[0] == 0)
+		return false;
+	wchar_t oldlocalname[256];
+	wchar_t newlocalname[256];
+	myswprintf(oldlocalname, L"./deck/%ls", oldname);
+	myswprintf(newlocalname, L"./deck/%ls", newname);
+	return FileSystem::Rename(oldlocalname, newlocalname);
+}
+bool DeckManager::DeleteCategory(const wchar_t* name) {
+	wchar_t localname[256];
+	myswprintf(localname, L"./deck/%ls", name);
+	if(!FileSystem::IsDirExists(localname))
+		return false;
+	return FileSystem::DeleteDir(localname);
+}
 }

gframe/deck_manager.h

@@ -42,10 +42,16 @@ public:
 	int CheckDeck(Deck& deck, int lfhash, bool allow_ocg, bool allow_tcg);
 	int LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec);
 	bool LoadSide(Deck& deck, int* dbuf, int mainc, int sidec);
+	void GetCategoryPath(wchar_t* ret, int index, const wchar_t* text);
+	void GetDeckFile(wchar_t* ret, irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck);
+	bool LoadDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck);
 	FILE* OpenDeckFile(const wchar_t * file, const char * mode);
 	bool LoadDeck(const wchar_t* file);
-	bool SaveDeck(Deck& deck, const wchar_t* name);
-	bool DeleteDeck(Deck& deck, const wchar_t* name);
+	bool SaveDeck(Deck& deck, const wchar_t* file);
+	bool DeleteDeck(const wchar_t* file);
+	bool CreateCategory(const wchar_t* name);
+	bool RenameCategory(const wchar_t* oldname, const wchar_t* newname);
+	bool DeleteCategory(const wchar_t* name);
 };
 
 extern DeckManager deckManager;

gframe/duelclient.cpp

@@ -143,7 +143,7 @@ void DuelClient::ClientEvent(bufferevent *bev, short events, void *ctx) {
 				cscg.info.start_lp = _wtoi(mainGame->ebStartLP->getText());
 				cscg.info.draw_count = _wtoi(mainGame->ebDrawCount->getText());
 				cscg.info.time_limit = _wtoi(mainGame->ebTimeLimit->getText());
-				cscg.info.lflist = mainGame->cbLFlist->getItemData(mainGame->cbLFlist->getSelected());
+				cscg.info.lflist = mainGame->cbHostLFlist->getItemData(mainGame->cbHostLFlist->getSelected());
 				cscg.info.duel_rule = mainGame->cbDuelRule->getSelected() + 1;
 				cscg.info.no_check_deck = mainGame->chkNoCheckDeck->isChecked();
 				cscg.info.no_shuffle_deck = mainGame->chkNoShuffleDeck->isChecked();
@@ -311,6 +311,7 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 			}
 			soundManager.PlaySoundEffect(SOUND_INFO);
 			mainGame->env->addMessageBox(L"", msgbuf);
+			mainGame->cbCategorySelect->setEnabled(true);
 			mainGame->cbDeckSelect->setEnabled(true);
 			mainGame->gMutex.unlock();
 			break;
@@ -477,7 +478,8 @@ void DuelClient::HandleSTOCPacketLan(char* data, unsigned int len) {
 		mainGame->stHostPrepDuelist[3]->setText(L"");
 		mainGame->stHostPrepOB->setText(L"");
 		mainGame->SetStaticText(mainGame->stHostPrepRule, 180, mainGame->guiFont, str.c_str());
-		mainGame->RefreshDeck(mainGame->cbDeckSelect);
+		mainGame->RefreshCategoryDeck(mainGame->cbCategorySelect, mainGame->cbDeckSelect);
+		mainGame->cbCategorySelect->setEnabled(true);
 		mainGame->cbDeckSelect->setEnabled(true);
 		mainGame->HideElement(mainGame->wCreateHost);
 		mainGame->HideElement(mainGame->wLanWindow);

gframe/event_handler.cpp

@@ -1906,6 +1906,27 @@ bool ClientField::OnCommonEvent(const irr::SEvent& event) {
 				return true;
 				break;
 			}
+			case CHECKBOX_LFLIST: {
+				mainGame->gameConf.use_lflist = mainGame->chkLFlist->isChecked() ? 1 : 0;
+				mainGame->cbLFlist->setEnabled(mainGame->gameConf.use_lflist);
+				mainGame->cbLFlist->setSelected(mainGame->gameConf.use_lflist ? mainGame->gameConf.default_lflist : mainGame->cbLFlist->getItemCount() - 1);
+				mainGame->cbHostLFlist->setSelected(mainGame->gameConf.use_lflist ? mainGame->gameConf.default_lflist : mainGame->cbHostLFlist->getItemCount() - 1);
+				mainGame->deckBuilder.filterList = &deckManager._lfList[mainGame->cbLFlist->getSelected()].content;
+				return true;
+				break;
+			}
+			}
+			break;
+		}
+		case irr::gui::EGET_COMBO_BOX_CHANGED: {
+			switch(id) {
+			case COMBOBOX_LFLIST: {
+				mainGame->gameConf.default_lflist = mainGame->cbLFlist->getSelected();
+				mainGame->cbHostLFlist->setSelected(mainGame->gameConf.default_lflist);
+				mainGame->deckBuilder.filterList = &deckManager._lfList[mainGame->gameConf.default_lflist].content;
+				return true;
+				break;
+			}
 			}
 			break;
 		}

gframe/game.cpp

@@ -185,9 +185,10 @@ bool Game::Initialize() {
 	wCreateHost->getCloseButton()->setVisible(false);
 	wCreateHost->setVisible(false);
 	env->addStaticText(dataManager.GetSysString(1226), rect<s32>(20, 30, 220, 50), false, false, wCreateHost);
-	cbLFlist = env->addComboBox(rect<s32>(140, 25, 300, 50), wCreateHost);
+	cbHostLFlist = env->addComboBox(rect<s32>(140, 25, 300, 50), wCreateHost);
 	for(unsigned int i = 0; i < deckManager._lfList.size(); ++i)
-		cbLFlist->addItem(deckManager._lfList[i].listName.c_str(), deckManager._lfList[i].hash);
+		cbHostLFlist->addItem(deckManager._lfList[i].listName.c_str(), deckManager._lfList[i].hash);
+	cbHostLFlist->setSelected(gameConf.use_lflist ? gameConf.default_lflist : cbHostLFlist->getItemCount() - 1);
 	env->addStaticText(dataManager.GetSysString(1225), rect<s32>(20, 60, 220, 80), false, false, wCreateHost);
 	cbRule = env->addComboBox(rect<s32>(140, 55, 300, 80), wCreateHost);
 	cbRule->addItem(dataManager.GetSysString(1240));
@@ -254,10 +255,12 @@ bool Game::Initialize() {
 	}
 	btnHostPrepOB = env->addButton(rect<s32>(10, 180, 110, 205), wHostPrepare, BUTTON_HP_OBSERVER, dataManager.GetSysString(1252));
 	myswprintf(dataManager.strBuffer, L"%ls%d", dataManager.GetSysString(1253), 0);
-	stHostPrepOB = env->addStaticText(dataManager.strBuffer, rect<s32>(10, 210, 270, 230), false, false, wHostPrepare);
+	stHostPrepOB = env->addStaticText(dataManager.strBuffer, rect<s32>(10, 285, 270, 305), false, false, wHostPrepare);
 	stHostPrepRule = env->addStaticText(L"", rect<s32>(280, 30, 460, 230), false, true, wHostPrepare);
-	env->addStaticText(dataManager.GetSysString(1254), rect<s32>(10, 235, 110, 255), false, false, wHostPrepare);
-	cbDeckSelect = env->addComboBox(rect<s32>(120, 230, 270, 255), wHostPrepare);
+	env->addStaticText(dataManager.GetSysString(1254), rect<s32>(10, 210, 110, 230), false, false, wHostPrepare);
+	cbCategorySelect = env->addComboBox(rect<s32>(10, 230, 138, 255), wHostPrepare, COMBOBOX_HP_CATEGORY);
+	cbCategorySelect->setMaxSelectionRows(10);
+	cbDeckSelect = env->addComboBox(rect<s32>(142, 230, 340, 255), wHostPrepare);
 	cbDeckSelect->setMaxSelectionRows(10);
 	btnHostPrepReady = env->addButton(rect<s32>(170, 180, 270, 205), wHostPrepare, BUTTON_HP_READY, dataManager.GetSysString(1218));
 	btnHostPrepNotReady = env->addButton(rect<s32>(170, 180, 270, 205), wHostPrepare, BUTTON_HP_NOTREADY, dataManager.GetSysString(1219));
@@ -379,12 +382,21 @@ bool Game::Initialize() {
 	chkPreferExpansionScript = env->addCheckBox(false, rect<s32>(posX, posY, posX + 260, posY + 25), tabSystem, CHECKBOX_PREFER_EXPANSION, dataManager.GetSysString(1379));
 	chkPreferExpansionScript->setChecked(gameConf.prefer_expansion_script != 0);
 	posY += 30;
-	env->addStaticText(dataManager.GetSysString(1282), rect<s32>(posX + 23, posY + 3, posX + 120, posY + 28), false, false, tabSystem);
+	env->addStaticText(dataManager.GetSysString(1282), rect<s32>(posX + 23, posY + 3, posX + 110, posY + 28), false, false, tabSystem);
 	btnWinResizeS = env->addButton(rect<s32>(posX + 115, posY, posX + 145, posY + 25), tabSystem, BUTTON_WINDOW_RESIZE_S, dataManager.GetSysString(1283));
 	btnWinResizeM = env->addButton(rect<s32>(posX + 150, posY, posX + 180, posY + 25), tabSystem, BUTTON_WINDOW_RESIZE_M, dataManager.GetSysString(1284));
 	btnWinResizeL = env->addButton(rect<s32>(posX + 185, posY, posX + 215, posY + 25), tabSystem, BUTTON_WINDOW_RESIZE_L, dataManager.GetSysString(1285));
 	btnWinResizeXL = env->addButton(rect<s32>(posX + 220, posY, posX + 250, posY + 25), tabSystem, BUTTON_WINDOW_RESIZE_XL, dataManager.GetSysString(1286));
 	posY += 30;
+	chkLFlist = env->addCheckBox(false, rect<s32>(posX, posY, posX + 110, posY + 25), tabSystem, CHECKBOX_LFLIST, dataManager.GetSysString(1288));
+	chkLFlist->setChecked(gameConf.use_lflist);
+	cbLFlist = env->addComboBox(rect<s32>(posX + 115, posY, posX + 250, posY + 25), tabSystem, COMBOBOX_LFLIST);
+	cbLFlist->setMaxSelectionRows(6);
+	for(unsigned int i = 0; i < deckManager._lfList.size(); ++i)
+		cbLFlist->addItem(deckManager._lfList[i].listName.c_str());
+	cbLFlist->setEnabled(gameConf.use_lflist);
+	cbLFlist->setSelected(gameConf.use_lflist ? gameConf.default_lflist : cbLFlist->getItemCount() - 1);
+	posY += 30;
 	chkEnableSound = env->addCheckBox(gameConf.enable_sound, rect<s32>(posX, posY, posX + 120, posY + 25), tabSystem, -1, dataManager.GetSysString(1279));
 	chkEnableSound->setChecked(gameConf.enable_sound);
 	scrSoundVolume = env->addScrollBar(true, rect<s32>(posX + 116, posY + 4, posX + 250, posY + 21), tabSystem, SCROLL_VOLUME);
@@ -568,14 +580,51 @@ bool Game::Initialize() {
 	//deck edit
 	wDeckEdit = env->addStaticText(L"", rect<s32>(309, 5, 605, 130), true, false, 0, -1, true);
 	wDeckEdit->setVisible(false);
-	stBanlist = env->addStaticText(dataManager.GetSysString(1300), rect<s32>(10, 9, 100, 29), false, false, wDeckEdit);
-	cbDBLFList = env->addComboBox(rect<s32>(80, 5, 220, 30), wDeckEdit, COMBOBOX_DBLFLIST);
-	cbDBLFList->setMaxSelectionRows(10);
+	btnManageDeck = env->addButton(rect<s32>(225, 5, 290, 30), wDeckEdit, BUTTON_MANAGE_DECK, dataManager.GetSysString(1328));
+	//deck manage
+	wDeckManage = env->addWindow(rect<s32>(310, 135, 800, 465), false, dataManager.GetSysString(1460), 0, WINDOW_DECK_MANAGE);
+	wDeckManage->setVisible(false);
+	lstCategories = env->addListBox(rect<s32>(10, 30, 140, 320), wDeckManage, LISTBOX_CATEGORIES, true);
+	lstDecks = env->addListBox(rect<s32>(150, 30, 340, 320), wDeckManage, LISTBOX_DECKS, true);
+	posY = 30;
+	btnNewCategory = env->addButton(rect<s32>(350, posY, 480, posY + 25), wDeckManage, BUTTON_NEW_CATEGORY, dataManager.GetSysString(1461));
+	posY += 35;
+	btnRenameCategory = env->addButton(rect<s32>(350, posY, 480, posY + 25), wDeckManage, BUTTON_RENAME_CATEGORY, dataManager.GetSysString(1462));
+	posY += 35;
+	btnDeleteCategory = env->addButton(rect<s32>(350, posY, 480, posY + 25), wDeckManage, BUTTON_DELETE_CATEGORY, dataManager.GetSysString(1463));
+	posY += 35;
+	btnNewDeck = env->addButton(rect<s32>(350, posY, 480, posY + 25), wDeckManage, BUTTON_NEW_DECK, dataManager.GetSysString(1464));
+	posY += 35;
+	btnRenameDeck = env->addButton(rect<s32>(350, posY, 480, posY + 25), wDeckManage, BUTTON_RENAME_DECK, dataManager.GetSysString(1465));
+	posY += 35;
+	btnDMDeleteDeck = env->addButton(rect<s32>(350, posY, 480, posY + 25), wDeckManage, BUTTON_DELETE_DECK_DM, dataManager.GetSysString(1466));
+	posY += 35;
+	btnMoveDeck = env->addButton(rect<s32>(350, posY, 480, posY + 25), wDeckManage, BUTTON_MOVE_DECK, dataManager.GetSysString(1467));
+	posY += 35;
+	btnCopyDeck = env->addButton(rect<s32>(350, posY, 480, posY + 25), wDeckManage, BUTTON_COPY_DECK, dataManager.GetSysString(1468));
+	//deck manage query
+	wDMQuery = env->addWindow(rect<s32>(400, 200, 710, 320), false, dataManager.GetSysString(1460));
+	wDMQuery->getCloseButton()->setVisible(false);
+	wDMQuery->setVisible(false);
+	stDMMessage = env->addStaticText(L"", rect<s32>(20, 25, 290, 45), false, false, wDMQuery);
+	stDMMessage2 = env->addStaticText(L"", rect<s32>(20, 50, 290, 70), false, false, wDMQuery, -1, true);
+	stDMMessage2->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
+	ebDMName = env->addEditBox(L"", rect<s32>(20, 50, 290, 70), true, wDMQuery, -1);
+	ebDMName->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
+	cbDMCategory = env->addComboBox(rect<s32>(20, 50, 290, 70), wDMQuery, -1);
+	stDMMessage2->setVisible(false);
+	ebDMName->setVisible(false);
+	cbDMCategory->setVisible(false);
+	cbDMCategory->setMaxSelectionRows(10);
+	btnDMOK = env->addButton(rect<s32>(70, 80, 140, 105), wDMQuery, BUTTON_DM_OK, dataManager.GetSysString(1211));
+	btnDMCancel = env->addButton(rect<s32>(170, 80, 240, 105), wDMQuery, BUTTON_DM_CANCEL, dataManager.GetSysString(1212));
+
+	stDBCategory = env->addStaticText(dataManager.GetSysString(1300), rect<s32>(10, 9, 100, 29), false, false, wDeckEdit);
+	cbDBCategory = env->addComboBox(rect<s32>(80, 5, 220, 30), wDeckEdit, COMBOBOX_DBCATEGORY);
+	cbDBCategory->setMaxSelectionRows(15);
 	stDeck = env->addStaticText(dataManager.GetSysString(1301), rect<s32>(10, 39, 100, 59), false, false, wDeckEdit);
 	cbDBDecks = env->addComboBox(rect<s32>(80, 35, 220, 60), wDeckEdit, COMBOBOX_DBDECKS);
 	cbDBDecks->setMaxSelectionRows(15);
-	for(unsigned int i = 0; i < deckManager._lfList.size(); ++i)
-		cbDBLFList->addItem(deckManager._lfList[i].listName.c_str());
 	btnSaveDeck = env->addButton(rect<s32>(225, 35, 290, 60), wDeckEdit, BUTTON_SAVE_DECK, dataManager.GetSysString(1302));
 	ebDeckname = env->addEditBox(L"", rect<s32>(80, 65, 220, 90), true, wDeckEdit, -1);
 	ebDeckname->setTextAlignment(irr::gui::EGUIA_CENTER, irr::gui::EGUIA_CENTER);
@@ -722,6 +771,12 @@ bool Game::Initialize() {
 		btnBotCancel = env->addButton(rect<s32>(459, 331, 569, 356), tabBot, BUTTON_CANCEL_SINGLEPLAY, dataManager.GetSysString(1210));
 		env->addStaticText(dataManager.GetSysString(1382), rect<s32>(360, 10, 550, 30), false, true, tabBot);
 		stBotInfo = env->addStaticText(L"", rect<s32>(360, 40, 560, 160), false, true, tabBot);
+		cbBotDeckCategory = env->addComboBox(rect<s32>(360, 95, 560, 120), tabBot, COMBOBOX_BOT_DECKCATEGORY);
+		cbBotDeckCategory->setMaxSelectionRows(6);
+		cbBotDeckCategory->setVisible(false);
+		cbBotDeck = env->addComboBox(rect<s32>(360, 130, 560, 155), tabBot);
+		cbBotDeck->setMaxSelectionRows(6);
+		cbBotDeck->setVisible(false);
 		cbBotRule = env->addComboBox(rect<s32>(360, 165, 560, 190), tabBot, COMBOBOX_BOT_RULE);
 		cbBotRule->addItem(dataManager.GetSysString(1262));
 		cbBotRule->addItem(dataManager.GetSysString(1263));
@@ -1047,9 +1102,44 @@ void Game::LoadExpansions() {
 		}
 	}
 }
-void Game::RefreshDeck(irr::gui::IGUIComboBox* cbDeck) {
+void Game::RefreshCategoryDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck, bool selectlastused) {
+	cbCategory->clear();
+	cbCategory->addItem(dataManager.GetSysString(1450));
+	cbCategory->addItem(dataManager.GetSysString(1451));
+	cbCategory->addItem(dataManager.GetSysString(1452));
+	cbCategory->addItem(dataManager.GetSysString(1453));
+	FileSystem::TraversalDir(L"./deck", [cbCategory](const wchar_t* name, bool isdir) {
+		if(isdir) {
+			cbCategory->addItem(name);
+		}
+	});
+	cbCategory->setSelected(2);
+	if(selectlastused) {
+		for(size_t i = 0; i < cbCategory->getItemCount(); ++i) {
+			if(!wcscmp(cbCategory->getItem(i), gameConf.lastcategory)) {
+				cbCategory->setSelected(i);
+				break;
+			}
+		}
+	}
+	RefreshDeck(cbCategory, cbDeck);
+	if(selectlastused) {
+		for(size_t i = 0; i < cbDeck->getItemCount(); ++i) {
+			if(!wcscmp(cbDeck->getItem(i), gameConf.lastdeck)) {
+				cbDeck->setSelected(i);
+				break;
+			}
+		}
+	}
+}
+void Game::RefreshDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck) {
+	wchar_t catepath[256];
+	deckManager.GetCategoryPath(catepath, cbCategory->getSelected(), cbCategory->getText());
+	RefreshDeck(catepath, cbDeck);
+}
+void Game::RefreshDeck(const wchar_t* deckpath, irr::gui::IGUIComboBox* cbDeck) {
 	cbDeck->clear();
-	FileSystem::TraversalDir(L"./deck", [cbDeck](const wchar_t* name, bool isdir) {
+	FileSystem::TraversalDir(deckpath, [cbDeck](const wchar_t* name, bool isdir) {
 		if(!isdir && wcsrchr(name, '.') && !mywcsncasecmp(wcsrchr(name, '.'), L".ydk", 4)) {
 			size_t len = wcslen(name);
 			wchar_t deckname[256];
@@ -1058,12 +1148,6 @@ void Game::RefreshDeck(irr::gui::IGUIComboBox* cbDeck) {
 			cbDeck->addItem(deckname);
 		}
 	});
-	for(size_t i = 0; i < cbDeck->getItemCount(); ++i) {
-		if(!wcscmp(cbDeck->getItem(i), gameConf.lastdeck)) {
-			cbDeck->setSelected(i);
-			break;
-		}
-	}
 }
 void Game::RefreshReplay() {
 	lstReplayList->clear();
@@ -1105,6 +1189,7 @@ void Game::RefreshBot() {
 				newinfo.support_master_rule_3 = !!strstr(linebuf, "SUPPORT_MASTER_RULE_3");
 				newinfo.support_new_master_rule = !!strstr(linebuf, "SUPPORT_NEW_MASTER_RULE");
 				newinfo.support_master_rule_2020 = !!strstr(linebuf, "SUPPORT_MASTER_RULE_2020");
+				newinfo.select_deckfile = !!strstr(linebuf, "SELECT_DECKFILE");
 				int rule = cbBotRule->getSelected() + 3;
 				if((rule == 3 && newinfo.support_master_rule_3)
 					|| (rule == 4 && newinfo.support_new_master_rule)
@@ -1117,11 +1202,17 @@ void Game::RefreshBot() {
 	}
 	lstBotList->clear();
 	stBotInfo->setText(L"");
+	cbBotDeckCategory->setVisible(false);
+	cbBotDeck->setVisible(false);
 	for(unsigned int i = 0; i < botInfo.size(); ++i) {
 		lstBotList->addItem(botInfo[i].name);
 	}
-	if(botInfo.size() == 0)
+	if(botInfo.size() == 0) {
 		SetStaticText(stBotInfo, 200, guiFont, dataManager.GetSysString(1385));
+	}
+	else {
+		RefreshCategoryDeck(cbBotDeckCategory, cbBotDeck);
+	}
 }
 void Game::LoadConfig() {
 	FILE* fp = fopen("system.conf", "r");
@@ -1138,12 +1229,14 @@ void Game::LoadConfig() {
 	gameConf.textfontsize = 14;
 	gameConf.nickname[0] = 0;
 	gameConf.gamename[0] = 0;
+	gameConf.lastcategory[0] = 0;
 	gameConf.lastdeck[0] = 0;
 	gameConf.numfont[0] = 0;
 	gameConf.textfont[0] = 0;
 	gameConf.lasthost[0] = 0;
 	gameConf.lastport[0] = 0;
 	gameConf.roompass[0] = 0;
+	gameConf.bot_deck_path[0] = 0;
 	//settings
 	gameConf.chkMAutoPos = 0;
 	gameConf.chkSTAutoPos = 1;
@@ -1152,6 +1245,8 @@ void Game::LoadConfig() {
 	gameConf.chkWaitChain = 0;
 	gameConf.chkIgnore1 = 0;
 	gameConf.chkIgnore2 = 0;
+	gameConf.use_lflist = 1;
+	gameConf.default_lflist = 0;
 	gameConf.default_rule = DEFAULT_DUEL_RULE;
 	gameConf.hide_setname = 0;
 	gameConf.hide_hint_button = 0;
@@ -1220,6 +1315,10 @@ void Game::LoadConfig() {
 			gameConf.chkIgnore1 = atoi(valbuf);
 		} else if(!strcmp(strbuf, "mute_spectators")) {
 			gameConf.chkIgnore2 = atoi(valbuf);
+		} else if(!strcmp(strbuf, "use_lflist")) {
+			gameConf.use_lflist = atoi(valbuf);
+		} else if(!strcmp(strbuf, "default_lflist")) {
+			gameConf.default_lflist = atoi(valbuf);
 		} else if(!strcmp(strbuf, "default_rule")) {
 			gameConf.default_rule = atoi(valbuf);
 			if(gameConf.default_rule <= 0)
@@ -1281,9 +1380,15 @@ void Game::LoadConfig() {
 			} else if (!strcmp(strbuf, "gamename")) {
 				BufferIO::DecodeUTF8(valbuf, wstr);
 				BufferIO::CopyWStr(wstr, gameConf.gamename, 20);
+			} else if (!strcmp(strbuf, "lastcategory")) {
+				BufferIO::DecodeUTF8(valbuf, wstr);
+				BufferIO::CopyWStr(wstr, gameConf.lastcategory, 64);
 			} else if (!strcmp(strbuf, "lastdeck")) {
 				BufferIO::DecodeUTF8(valbuf, wstr);
 				BufferIO::CopyWStr(wstr, gameConf.lastdeck, 64);
+			} else if(!strcmp(strbuf, "bot_deck_path")) {
+				BufferIO::DecodeUTF8(valbuf, wstr);
+				BufferIO::CopyWStr(wstr, gameConf.bot_deck_path, 64);
 			}
 		}
 	}
@@ -1302,6 +1407,8 @@ void Game::SaveConfig() {
 	fprintf(fp, "nickname = %s\n", linebuf);
 	BufferIO::EncodeUTF8(gameConf.gamename, linebuf);
 	fprintf(fp, "gamename = %s\n", linebuf);
+	BufferIO::EncodeUTF8(gameConf.lastcategory, linebuf);
+	fprintf(fp, "lastcategory = %s\n", linebuf);
 	BufferIO::EncodeUTF8(gameConf.lastdeck, linebuf);
 	fprintf(fp, "lastdeck = %s\n", linebuf);
 	BufferIO::EncodeUTF8(gameConf.textfont, linebuf);
@@ -1321,6 +1428,8 @@ void Game::SaveConfig() {
 	fprintf(fp, "waitchain = %d\n", (chkWaitChain->isChecked() ? 1 : 0));
 	fprintf(fp, "mute_opponent = %d\n", (chkIgnore1->isChecked() ? 1 : 0));
 	fprintf(fp, "mute_spectators = %d\n", (chkIgnore2->isChecked() ? 1 : 0));
+	fprintf(fp, "use_lflist = %d\n", gameConf.use_lflist);
+	fprintf(fp, "default_lflist = %d\n", gameConf.default_lflist);
 	fprintf(fp, "default_rule = %d\n", gameConf.default_rule == DEFAULT_DUEL_RULE ? 0 : gameConf.default_rule);
 	fprintf(fp, "hide_setname = %d\n", gameConf.hide_setname);
 	fprintf(fp, "hide_hint_button = %d\n", gameConf.hide_hint_button);
@@ -1335,6 +1444,8 @@ void Game::SaveConfig() {
 	fprintf(fp, "ignore_deck_changes = %d\n", (chkIgnoreDeckChanges->isChecked() ? 1 : 0));
 	fprintf(fp, "default_ot = %d\n", gameConf.defaultOT);
 	fprintf(fp, "enable_bot_mode = %d\n", gameConf.enable_bot_mode);
+	BufferIO::EncodeUTF8(gameConf.bot_deck_path, linebuf);
+	fprintf(fp, "bot_deck_path = %s\n", linebuf);
 	fprintf(fp, "quick_animation = %d\n", gameConf.quick_animation);
 	fprintf(fp, "auto_save_replay = %d\n", (chkAutoSaveReplay->isChecked() ? 1 : 0));
 	fprintf(fp, "draw_single_chain = %d\n", gameConf.draw_single_chain);
@@ -1639,7 +1750,6 @@ void Game::OnResize() {
 
 	wMainMenu->setRelativePosition(ResizeWin(370, 200, 650, 415));
 	wDeckEdit->setRelativePosition(Resize(309, 5, 605, 130));
-	cbDBLFList->setRelativePosition(Resize(80, 5, 220, 30));
 	cbDBDecks->setRelativePosition(Resize(80, 35, 220, 60));
 	btnClearDeck->setRelativePosition(Resize(115, 99, 165, 120));
 	btnSortDeck->setRelativePosition(Resize(60, 99, 110, 120));
@@ -1647,6 +1757,9 @@ void Game::OnResize() {
 	btnSaveDeck->setRelativePosition(Resize(225, 35, 290, 60));
 	btnSaveDeckAs->setRelativePosition(Resize(225, 65, 290, 90));
 	ebDeckname->setRelativePosition(Resize(80, 65, 220, 90));
+	cbDBCategory->setRelativePosition(Resize(80, 5, 220, 30));
+	btnManageDeck->setRelativePosition(Resize(225, 5, 290, 30));
+	wDeckManage->setRelativePosition(ResizeWin(310, 135, 800, 465));
 
 	wSort->setRelativePosition(Resize(930, 132, 1020, 156));
 	cbSortType->setRelativePosition(Resize(10, 2, 85, 22));
@@ -1676,7 +1789,7 @@ void Game::OnResize() {
 		btncatepos.LowerRightCorner.Y - btncatepos.getHeight() / 2 + 245));
 
 	wLinkMarks->setRelativePosition(ResizeWin(700, 30, 820, 150));
-	stBanlist->setRelativePosition(Resize(10, 9, 100, 29));
+	stDBCategory->setRelativePosition(Resize(10, 9, 100, 29));
 	stDeck->setRelativePosition(Resize(10, 39, 100, 59));
 	stCategory->setRelativePosition(Resize(10, 2 + 25 / 6, 70, 22 + 25 / 6));
 	stLimit->setRelativePosition(Resize(205, 2 + 25 / 6, 280, 22 + 25 / 6));
@@ -1713,6 +1826,7 @@ void Game::OnResize() {
 	wANAttribute->setRelativePosition(ResizeWin(500, 200, 830, 285));
 	wANRace->setRelativePosition(ResizeWin(480, 200, 850, 410));
 	wReplaySave->setRelativePosition(ResizeWin(510, 200, 820, 320));
+	wDMQuery->setRelativePosition(ResizeWin(400, 200, 710, 320));
 
 	stHintMsg->setRelativePosition(ResizeWin(660 - 160 * xScale, 60, 660 + 160 * xScale, 90));
 

gframe/game.h

@@ -21,10 +21,12 @@ struct Config {
 	wchar_t lastport[10];
 	wchar_t nickname[20];
 	wchar_t gamename[20];
+	wchar_t lastcategory[64];
 	wchar_t lastdeck[64];
 	wchar_t textfont[256];
 	wchar_t numfont[256];
 	wchar_t roompass[20];
+	wchar_t bot_deck_path[64];
 	//settings
 	int chkMAutoPos;
 	int chkSTAutoPos;
@@ -33,6 +35,8 @@ struct Config {
 	int chkWaitChain;
 	int chkIgnore1;
 	int chkIgnore2;
+	int use_lflist;
+	int default_lflist;
 	int default_rule;
 	int hide_setname;
 	int hide_hint_button;
@@ -93,6 +97,7 @@ struct BotInfo {
 	bool support_master_rule_3;
 	bool support_new_master_rule;
 	bool support_master_rule_2020;
+	bool select_deckfile;
 };
 
 struct FadingUnit {
@@ -116,7 +121,9 @@ public:
 	void InitStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, u32 cHeight, irr::gui::CGUITTFont* font, const wchar_t* text);
 	void SetStaticText(irr::gui::IGUIStaticText* pControl, u32 cWidth, irr::gui::CGUITTFont* font, const wchar_t* text, u32 pos = 0);
 	void LoadExpansions();
-	void RefreshDeck(irr::gui::IGUIComboBox* cbDeck);
+	void RefreshCategoryDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck, bool selectlastused = true);
+	void RefreshDeck(irr::gui::IGUIComboBox* cbCategory, irr::gui::IGUIComboBox* cbDeck);
+	void RefreshDeck(const wchar_t* deckpath, irr::gui::IGUIComboBox* cbDeck);
 	void RefreshReplay();
 	void RefreshSingleplay();
 	void RefreshBot();
@@ -293,6 +300,8 @@ public:
 	irr::gui::IGUICheckBox* chkAutoSearch;
 	irr::gui::IGUICheckBox* chkMultiKeywords;
 	irr::gui::IGUICheckBox* chkPreferExpansionScript;
+	irr::gui::IGUICheckBox* chkLFlist;
+	irr::gui::IGUIComboBox* cbLFlist;
 	irr::gui::IGUICheckBox* chkEnableSound;
 	irr::gui::IGUICheckBox* chkEnableMusic;
 	irr::gui::IGUIScrollBar* scrSoundVolume;
@@ -323,7 +332,7 @@ public:
 	irr::gui::IGUIButton* btnCreateHost;
 	//create host
 	irr::gui::IGUIWindow* wCreateHost;
-	irr::gui::IGUIComboBox* cbLFlist;
+	irr::gui::IGUIComboBox* cbHostLFlist;
 	irr::gui::IGUIComboBox* cbMatchMode;
 	irr::gui::IGUIComboBox* cbRule;
 	irr::gui::IGUIEditBox* ebTimeLimit;
@@ -344,6 +353,7 @@ public:
 	irr::gui::IGUIStaticText* stHostPrepDuelist[4];
 	irr::gui::IGUICheckBox* chkHostPrepReady[4];
 	irr::gui::IGUIButton* btnHostPrepKick[4];
+	irr::gui::IGUIComboBox* cbCategorySelect;
 	irr::gui::IGUIComboBox* cbDeckSelect;
 	irr::gui::IGUIStaticText* stHostPrepRule;
 	irr::gui::IGUIStaticText* stHostPrepOB;
@@ -366,6 +376,8 @@ public:
 	irr::gui::IGUIStaticText* stBotInfo;
 	irr::gui::IGUIButton* btnStartBot;
 	irr::gui::IGUIButton* btnBotCancel;
+	irr::gui::IGUIComboBox* cbBotDeckCategory;
+	irr::gui::IGUIComboBox* cbBotDeck;
 	irr::gui::IGUIComboBox* cbBotRule;
 	irr::gui::IGUICheckBox* chkBotHand;
 	irr::gui::IGUICheckBox* chkBotNoCheckDeck;
@@ -467,8 +479,9 @@ public:
 	irr::gui::IGUIButton* btnEP;
 	//deck edit
 	irr::gui::IGUIStaticText* wDeckEdit;
-	irr::gui::IGUIComboBox* cbDBLFList;
+	irr::gui::IGUIComboBox* cbDBCategory;
 	irr::gui::IGUIComboBox* cbDBDecks;
+	irr::gui::IGUIButton* btnManageDeck;
 	irr::gui::IGUIButton* btnClearDeck;
 	irr::gui::IGUIButton* btnSortDeck;
 	irr::gui::IGUIButton* btnShuffleDeck;
@@ -480,7 +493,7 @@ public:
 	irr::gui::IGUIButton* btnSideSort;
 	irr::gui::IGUIButton* btnSideReload;
 	irr::gui::IGUIEditBox* ebDeckname;
-	irr::gui::IGUIStaticText* stBanlist;
+	irr::gui::IGUIStaticText* stDBCategory;
 	irr::gui::IGUIStaticText* stDeck;
 	irr::gui::IGUIStaticText* stCategory;
 	irr::gui::IGUIStaticText* stLimit;
@@ -491,6 +504,25 @@ public:
 	irr::gui::IGUIStaticText* stStar;
 	irr::gui::IGUIStaticText* stSearch;
 	irr::gui::IGUIStaticText* stScale;
+	//deck manage
+	irr::gui::IGUIWindow* wDeckManage;
+	irr::gui::IGUIListBox* lstCategories;
+	irr::gui::IGUIListBox* lstDecks;
+	irr::gui::IGUIButton* btnNewCategory;
+	irr::gui::IGUIButton* btnRenameCategory;
+	irr::gui::IGUIButton* btnDeleteCategory;
+	irr::gui::IGUIButton* btnNewDeck;
+	irr::gui::IGUIButton* btnRenameDeck;
+	irr::gui::IGUIButton* btnDMDeleteDeck;
+	irr::gui::IGUIButton* btnMoveDeck;
+	irr::gui::IGUIButton* btnCopyDeck;
+	irr::gui::IGUIWindow* wDMQuery;
+	irr::gui::IGUIStaticText* stDMMessage;
+	irr::gui::IGUIStaticText* stDMMessage2;
+	irr::gui::IGUIEditBox* ebDMName;
+	irr::gui::IGUIComboBox* cbDMCategory;
+	irr::gui::IGUIButton* btnDMOK;
+	irr::gui::IGUIButton* btnDMCancel;
 	//filter
 	irr::gui::IGUIStaticText* wFilter;
 	irr::gui::IGUIScrollBar* scrFilter;
@@ -595,6 +627,7 @@ extern Game* mainGame;
 #define CHECKBOX_HP_READY			125
 #define BUTTON_HP_READY				126
 #define BUTTON_HP_NOTREADY			127
+#define COMBOBOX_HP_CATEGORY		128
 #define LISTBOX_REPLAY_LIST			130
 #define BUTTON_LOAD_REPLAY			131
 #define BUTTON_CANCEL_REPLAY		132
@@ -614,6 +647,7 @@ extern Game* mainGame;
 #define LISTBOX_BOT_LIST			153
 #define BUTTON_BOT_START			154
 #define COMBOBOX_BOT_RULE			155
+#define COMBOBOX_BOT_DECKCATEGORY	156
 #define EDITBOX_CHAT				199
 
 #define BUTTON_MSG_OK				200
@@ -692,7 +726,8 @@ extern Game* mainGame;
 #define BUTTON_SURRENDER_YES		297
 #define BUTTON_SURRENDER_NO			298
 
-#define COMBOBOX_DBLFLIST			301
+#define BUTTON_MANAGE_DECK			300
+#define COMBOBOX_DBCATEGORY			301
 #define COMBOBOX_DBDECKS			302
 #define BUTTON_CLEAR_DECK			303
 #define BUTTON_SAVE_DECK			304
@@ -717,6 +752,21 @@ extern Game* mainGame;
 #define BUTTON_MARKERS_OK			323
 #define COMBOBOX_SORTTYPE			324
 #define EDITBOX_INPUTS				325
+#define WINDOW_DECK_MANAGE			330
+#define BUTTON_NEW_CATEGORY			331
+#define BUTTON_RENAME_CATEGORY		332
+#define BUTTON_DELETE_CATEGORY		333
+#define BUTTON_NEW_DECK				334
+#define BUTTON_RENAME_DECK			335
+#define BUTTON_DELETE_DECK_DM		336
+#define BUTTON_MOVE_DECK			337
+#define BUTTON_COPY_DECK			338
+#define LISTBOX_CATEGORIES			339
+#define LISTBOX_DECKS				340
+#define BUTTON_DM_OK				341
+#define BUTTON_DM_CANCEL			342
+#define COMBOBOX_LFLIST				349
+
 #define BUTTON_CLEAR_LOG			350
 #define LISTBOX_LOG					351
 #define SCROLL_CARDTEXT				352
@@ -735,6 +785,7 @@ extern Game* mainGame;
 #define CHECKBOX_MULTI_KEYWORDS		372
 #define CHECKBOX_PREFER_EXPANSION	373
 #define CHECKBOX_DRAW_SINGLE_CHAIN	374
+#define CHECKBOX_LFLIST				375
 #define BUTTON_BIG_CARD_CLOSE		380
 #define BUTTON_BIG_CARD_ZOOM_IN		381
 #define BUTTON_BIG_CARD_ZOOM_OUT	382

gframe/gframe.cpp

@@ -111,6 +111,7 @@ int main(int argc, char* argv[]) {
 			keep_on_return = true;
 		} else if(!wcscmp(wargv[i], L"-d")) { // Deck
 			++i;
+			ygo::mainGame->gameConf.lastcategory[0] = 0;
 			if(i + 1 < wargc) { // select deck
 				wcscpy(ygo::mainGame->gameConf.lastdeck, wargv[i]);
 				continue;

gframe/menu_handler.cpp

@@ -12,6 +12,8 @@
 namespace ygo {
 
 void UpdateDeck() {
+	BufferIO::CopyWStr(mainGame->cbCategorySelect->getItem(mainGame->cbCategorySelect->getSelected()),
+		mainGame->gameConf.lastcategory, 64);
 	BufferIO::CopyWStr(mainGame->cbDeckSelect->getItem(mainGame->cbDeckSelect->getSelected()),
 		mainGame->gameConf.lastdeck, 64);
 	char deckbuf[1024];
@@ -143,6 +145,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				break;
 			}
 			case BUTTON_HP_DUELIST: {
+				mainGame->cbCategorySelect->setEnabled(true);
 				mainGame->cbDeckSelect->setEnabled(true);
 				DuelClient::SendPacketToServer(CTOS_HS_TODUELIST);
 				break;
@@ -164,17 +167,19 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				break;
 			}
 			case BUTTON_HP_READY: {
-				if(mainGame->cbDeckSelect->getSelected() == -1 ||
-					!deckManager.LoadDeck(mainGame->cbDeckSelect->getItem(mainGame->cbDeckSelect->getSelected()))) {
+				if(mainGame->cbCategorySelect->getSelected() == -1 || mainGame->cbDeckSelect->getSelected() == -1 ||
+					!deckManager.LoadDeck(mainGame->cbCategorySelect, mainGame->cbDeckSelect)) {
 					break;
 				}
 				UpdateDeck();
 				DuelClient::SendPacketToServer(CTOS_HS_READY);
+				mainGame->cbCategorySelect->setEnabled(false);
 				mainGame->cbDeckSelect->setEnabled(false);
 				break;
 			}
 			case BUTTON_HP_NOTREADY: {
 				DuelClient::SendPacketToServer(CTOS_HS_NOTREADY);
+				mainGame->cbCategorySelect->setEnabled(true);
 				mainGame->cbDeckSelect->setEnabled(true);
 				break;
 			}
@@ -293,9 +298,17 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				si.cb = sizeof(si);
 				ZeroMemory(&pi, sizeof(pi));
 				wchar_t cmd[MAX_PATH];
+				wchar_t arg1[512];
+				if(mainGame->botInfo[sel].select_deckfile) {
+					wchar_t botdeck[256];
+					deckManager.GetDeckFile(botdeck, mainGame->cbBotDeckCategory, mainGame->cbBotDeck);
+					myswprintf(arg1, L"%ls DeckFile='%ls'", mainGame->botInfo[sel].command, botdeck);
+				}
+				else
+					myswprintf(arg1, L"%ls", mainGame->botInfo[sel].command);
 				int flag = 0;
 				flag += (mainGame->chkBotHand->isChecked() ? 0x1 : 0);
-				myswprintf(cmd, L"Bot.exe \"%ls\" %d %d", mainGame->botInfo[sel].command, flag, mainGame->gameConf.serverport);
+				myswprintf(cmd, L"Bot.exe \"%ls\" %d %d", arg1, flag, mainGame->gameConf.serverport);
 				if(!CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi))
 				{
 					NetServer::StopServer();
@@ -304,8 +317,16 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 #else
 				if(fork() == 0) {
 					usleep(100000);
+					wchar_t warg1[512];
+					if(mainGame->botInfo[sel].select_deckfile) {
+						wchar_t botdeck[256];
+						deckManager.GetDeckFile(botdeck, mainGame->cbBotDeckCategory, mainGame->cbBotDeck);
+						myswprintf(warg1, L"%ls DeckFile='%ls'", mainGame->botInfo[sel].command, botdeck);
+					}
+					else
+						myswprintf(warg1, L"%ls", mainGame->botInfo[sel].command);
 					char arg1[512];
-					BufferIO::EncodeUTF8(mainGame->botInfo[sel].command, arg1);
+					BufferIO::EncodeUTF8(warg1, arg1);
 					int flag = 0;
 					flag += (mainGame->chkBotHand->isChecked() ? 0x1 : 0);
 					char arg2[8];
@@ -340,7 +361,7 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				break;
 			}
 			case BUTTON_DECK_EDIT: {
-				mainGame->RefreshDeck(mainGame->cbDBDecks);
+				mainGame->RefreshCategoryDeck(mainGame->cbDBCategory, mainGame->cbDBDecks);
 				if(open_file && deckManager.LoadDeck(open_file_name)) {
 #ifdef WIN32
 					wchar_t *dash = wcsrchr(open_file_name, L'\\');
@@ -353,18 +374,23 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 						wcsncpy(deck_name, dash + 1, dot - dash - 1);
 						deck_name[dot - dash - 1] = L'\0';
 						mainGame->ebDeckname->setText(deck_name);
+						mainGame->cbDBCategory->setSelected(-1);
 						mainGame->cbDBDecks->setSelected(-1);
+						mainGame->btnManageDeck->setEnabled(false);
+						mainGame->cbDBCategory->setEnabled(false);
+						mainGame->cbDBDecks->setEnabled(false);
 					} else {
 						for(size_t i = 0; i < mainGame->cbDBDecks->getItemCount(); ++i) {
 							if(!wcscmp(mainGame->cbDBDecks->getItem(i), open_file_name)) {
+								wcscpy(mainGame->gameConf.lastdeck, open_file_name);
 								mainGame->cbDBDecks->setSelected(i);
 								break;
 							}
 						}
 					}
 					open_file = false;
-				} else if(mainGame->cbDBDecks->getSelected() != -1) {
-					deckManager.LoadDeck(mainGame->cbDBDecks->getItem(mainGame->cbDBDecks->getSelected()));
+				} else if(mainGame->cbDBCategory->getSelected() != -1 && mainGame->cbDBDecks->getSelected() != -1) {
+					deckManager.LoadDeck(mainGame->cbDBCategory, mainGame->cbDBDecks);
 					mainGame->ebDeckname->setText(L"");
 				}
 				mainGame->HideElement(mainGame->wMainMenu);
@@ -514,6 +540,8 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				if(sel == -1)
 					break;
 				mainGame->SetStaticText(mainGame->stBotInfo, 200, mainGame->guiFont, mainGame->botInfo[sel].desc);
+				mainGame->cbBotDeckCategory->setVisible(mainGame->botInfo[sel].select_deckfile);
+				mainGame->cbBotDeck->setVisible(mainGame->botInfo[sel].select_deckfile);
 				break;
 			}
 			}
@@ -526,16 +554,18 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 					break;
 				mainGame->env->setFocus(mainGame->wHostPrepare);
 				if(static_cast<irr::gui::IGUICheckBox*>(caller)->isChecked()) {
-					if(mainGame->cbDeckSelect->getSelected() == -1 ||
-					        !deckManager.LoadDeck(mainGame->cbDeckSelect->getItem(mainGame->cbDeckSelect->getSelected()))) {
+					if(mainGame->cbCategorySelect->getSelected() == -1 || mainGame->cbDeckSelect->getSelected() == -1 ||
+						!deckManager.LoadDeck(mainGame->cbCategorySelect, mainGame->cbDeckSelect)) {
 						static_cast<irr::gui::IGUICheckBox*>(caller)->setChecked(false);
 						break;
 					}
 					UpdateDeck();
 					DuelClient::SendPacketToServer(CTOS_HS_READY);
+					mainGame->cbCategorySelect->setEnabled(false);
 					mainGame->cbDeckSelect->setEnabled(false);
 				} else {
 					DuelClient::SendPacketToServer(CTOS_HS_NOTREADY);
+					mainGame->cbCategorySelect->setEnabled(true);
 					mainGame->cbDeckSelect->setEnabled(true);
 				}
 				break;
@@ -549,6 +579,30 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				mainGame->RefreshBot();
 				break;
 			}
+			case COMBOBOX_HP_CATEGORY: {
+				int catesel = mainGame->cbCategorySelect->getSelected();
+				if(catesel == 3) {
+					catesel = 2;
+					mainGame->cbCategorySelect->setSelected(2);
+				}
+				if(catesel >= 0) {
+					mainGame->RefreshDeck(mainGame->cbCategorySelect, mainGame->cbDeckSelect);
+					mainGame->cbDeckSelect->setSelected(0);
+				}
+				break;
+			}
+			case COMBOBOX_BOT_DECKCATEGORY: {
+				int catesel = mainGame->cbBotDeckCategory->getSelected();
+				if(catesel == 3) {
+					catesel = 2;
+					mainGame->cbBotDeckCategory->setSelected(2);
+				}
+				if(catesel >= 0) {
+					mainGame->RefreshDeck(mainGame->cbBotDeckCategory, mainGame->cbBotDeck);
+					mainGame->cbBotDeck->setSelected(0);
+				}
+				break;
+			}
 			}
 			break;
 		}

gframe/myfilesystem.h

@@ -50,6 +50,37 @@ public:
 		return MakeDir(wdir);
 	}
 
+	static bool Rename(const wchar_t* woldname, const wchar_t* wnewname) {
+		return MoveFileW(woldname, wnewname);
+	}
+
+	static bool Rename(const char* oldname, const char* newname) {
+		wchar_t woldname[1024];
+		wchar_t wnewname[1024];
+		BufferIO::DecodeUTF8(oldname, woldname);
+		BufferIO::DecodeUTF8(newname, wnewname);
+		return Rename(woldname, wnewname);
+	}
+
+	static bool DeleteDir(const wchar_t* wdir) {
+		wchar_t pdir[256];
+		BufferIO::CopyWStr(wdir, pdir, 256);
+		pdir[wcslen(wdir) + 1] = 0;
+		SHFILEOPSTRUCTW lpFileOp;
+		lpFileOp.hwnd = NULL;
+		lpFileOp.wFunc = FO_DELETE;
+		lpFileOp.pFrom = pdir;
+		lpFileOp.pTo = 0;
+		lpFileOp.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT;
+		return SHFileOperationW(&lpFileOp) == 0;
+	}
+
+	static bool DeleteDir(const char* dir) {
+		wchar_t wdir[1024];
+		BufferIO::DecodeUTF8(dir, wdir);
+		return DeleteDir(wdir);
+	}
+
 	static void TraversalDir(const wchar_t* wpath, const std::function<void(const wchar_t*, bool)>& cb) {
 		wchar_t findstr[1024];
 		wcscpy(findstr, wpath);
@@ -59,7 +90,8 @@ public:
 		if(fh == INVALID_HANDLE_VALUE)
 			return;
 		do {
-			cb(fdataw.cFileName, (fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY));
+			if(mywcsncasecmp(fdataw.cFileName, L".", 1) && mywcsncasecmp(fdataw.cFileName, L"..", 2))
+				cb(fdataw.cFileName, (fdataw.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY));
 		} while(FindNextFileW(fh, &fdataw));
 		FindClose(fh);
 	}
@@ -111,6 +143,45 @@ public:
 		return MakeDir(dir);
 	}
 
+	static bool Rename(const wchar_t* woldname, const wchar_t* wnewname) {
+		char oldname[1024];
+		char newname[1024];
+		BufferIO::EncodeUTF8(woldname, oldname);
+		BufferIO::EncodeUTF8(wnewname, newname);
+		return Rename(oldname, newname);
+	}
+
+	static bool Rename(const char* oldname, const char* newname) {
+		return rename(oldname, newname) == 0;
+	}
+
+	static bool DeleteDir(const wchar_t* wdir) {
+		char dir[1024];
+		BufferIO::EncodeUTF8(wdir, dir);
+		return DeleteDir(dir);
+	}
+
+	static bool DeleteDir(const char* dir) {
+		bool success = true;
+		TraversalDir(dir, [dir, &success](const char *name, bool isdir) {
+			char full_path[256];
+			sprintf(full_path, "%s/%s", dir, name);
+			if (isdir)
+			{
+				if(!DeleteDir(full_path))
+					success = false;
+			}
+			else
+			{
+				if(unlink(full_path) != 0)
+					success = false;
+			}
+		});
+		if (rmdir(dir) != 0)
+			success = false;
+		return success;
+	}
+
 	struct file_unit {
 		std::string filename;
 		bool is_dir;
@@ -132,6 +203,8 @@ public:
 			stat(fname, &fileStat);
 			funit.filename = std::string(dirp->d_name);
 			funit.is_dir = S_ISDIR(fileStat.st_mode);
+			if(funit.is_dir && (strcmp(dirp->d_name, ".") == 0 || strcmp(dirp->d_name, "..") == 0))
+				continue;
 			file_list.push_back(funit);
 		}
 		closedir(dir);

gframe/single_duel.cpp

@@ -288,7 +288,8 @@ void SingleDuel::UpdateDeck(DuelPlayer* dp, void* pdata, unsigned int len) {
 	int mainc = BufferIO::ReadInt32(deckbuf);
 	int sidec = BufferIO::ReadInt32(deckbuf);
 	// verify data
-	if((unsigned)mainc + (unsigned)sidec > (len - 8) / 4) {
+	const unsigned int possibleMaxLength = (len - 8) / 4;
+	if((unsigned)mainc > possibleMaxLength || (unsigned)sidec > possibleMaxLength || (unsigned)mainc + (unsigned)sidec > possibleMaxLength) {
 		STOC_ErrorMsg scem;
 		scem.msg = ERRMSG_DECKERROR;
 		scem.code = 0;

gframe/single_duel.h

@@ -33,9 +33,9 @@ public:
 	void WaitforResponse(int playerid);
 	void RefreshMzone(int player, int flag = 0x881fff, int use_cache = 1);
 	void RefreshSzone(int player, int flag = 0x681fff, int use_cache = 1);
-	void RefreshHand(int player, int flag = 0x781fff, int use_cache = 1);
+	void RefreshHand(int player, int flag = 0x681fff, int use_cache = 1);
 	void RefreshGrave(int player, int flag = 0x81fff, int use_cache = 1);
-	void RefreshExtra(int player, int flag = 0x81fff, int use_cache = 1);
+	void RefreshExtra(int player, int flag = 0xe81fff, int use_cache = 1);
 	void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
 
 	static int MessageHandler(long fduel, int type);

gframe/tag_duel.cpp

@@ -263,7 +263,8 @@ void TagDuel::UpdateDeck(DuelPlayer* dp, void* pdata, unsigned int len) {
 	int mainc = BufferIO::ReadInt32(deckbuf);
 	int sidec = BufferIO::ReadInt32(deckbuf);
 	// verify data
-	if((unsigned)mainc + (unsigned)sidec > (len - 8) / 4) {
+	const unsigned int possibleMaxLength = (len - 8) / 4;
+	if((unsigned)mainc > possibleMaxLength || (unsigned)sidec > possibleMaxLength || (unsigned)mainc + (unsigned)sidec > possibleMaxLength) {
 		STOC_ErrorMsg scem;
 		scem.msg = ERRMSG_DECKERROR;
 		scem.code = 0;

gframe/tag_duel.h

@@ -33,9 +33,9 @@ public:
 	void WaitforResponse(int playerid);
 	void RefreshMzone(int player, int flag = 0x881fff, int use_cache = 1);
 	void RefreshSzone(int player, int flag = 0x681fff, int use_cache = 1);
-	void RefreshHand(int player, int flag = 0x781fff, int use_cache = 1);
+	void RefreshHand(int player, int flag = 0x681fff, int use_cache = 1);
 	void RefreshGrave(int player, int flag = 0x81fff, int use_cache = 1);
-	void RefreshExtra(int player, int flag = 0x81fff, int use_cache = 1);
+	void RefreshExtra(int player, int flag = 0xe81fff, int use_cache = 1);
 	void RefreshSingle(int player, int location, int sequence, int flag = 0xf81fff);
 
 	static int MessageHandler(long fduel, int type);

lflist.conf

-#[2021.1][2020.12 TCG][2020.10][2020.7][2020.4][2020.1][2019.10][2019.7][2019.4][2019.1][2018.10][2018.7][2018.4][2018.1][2017.10][2017.7][2017.4][2017.1][2016.10][2016.7][2016.4][2016.1][2015.10][2015.4][2015.1][2014.10][2014.7][2014.4][2014.2][2013.9][2020.9 TCG][2020.6 TCG][2020.4 TCG][2020.1 TCG][2019.10 TCG][2019.7 TCG][2019.4 TCG][2019.1 TCG][2018.12 TCG][2018.9 TCG][2018.5 TCG][2018.2 TCG][2017.11 TCG][2017.9 TCG][2017.6 TCG][2017.3 TCG][2016.8 TCG][2016.4 TCG][2015.11 TCG][2015.7 TCG][2015.4 TCG][2015.1 TCG][2014.10 TCG][2014.7 TCG][2014.4 TCG][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1]
+#[2021.4][2021.1][2021.3 TCG][2020.10][2020.7][2020.4][2020.1][2019.10][2019.7][2019.4][2019.1][2018.10][2018.7][2018.4][2018.1][2017.10][2017.7][2017.4][2017.1][2016.10][2016.7][2016.4][2016.1][2015.10][2015.4][2015.1][2014.10][2014.7][2014.4][2014.2][2013.9][2020.12 TCG][2020.9 TCG][2020.6 TCG][2020.4 TCG][2020.1 TCG][2019.10 TCG][2019.7 TCG][2019.4 TCG][2019.1 TCG][2018.12 TCG][2018.9 TCG][2018.5 TCG][2018.2 TCG][2017.11 TCG][2017.9 TCG][2017.6 TCG][2017.3 TCG][2016.8 TCG][2016.4 TCG][2015.11 TCG][2015.7 TCG][2015.4 TCG][2015.1 TCG][2014.10 TCG][2014.7 TCG][2014.4 TCG][2014.1.1 TCG][2013.10.11 TCG][2013.3.1][2012.9.1][2012.3.1][2011.9.1]
+!2021.4
+#forbidden
+91869203 0 --アマゾネスの射手
+20663556 0 --イレカエル
+44910027 0 --ヴィクトリー・ドラゴン
+51858306 0 --エクリプス・ワイバーン
+25862681 0 --エンシェント・フェアリー・ドラゴン
+53804307 0 --焔征竜－ブラスター
+07563579 0 --Emヒグルミ
+17330916 0 --EMモンキーボード
+34945480 0 --外神アザトート
+90411554 0 --巌征竜－レドックス
+08903700 0 --儀式魔人リリーサー
+11384280 0 --キャノン・ソルジャー
+17412721 0 --旧神ノーデン
+67441435 0 --グローアップ・バルブ
+34124316 0 --サイバーポッド
+88071625 0 --The tyrant NEPTUNE
+61665245 0 --サモン・ソーサレス
+52653092 0 --SNo.0 ホープ・ゼアル
+85115440 0 --十二獣ブルホーン
+59537380 0 --守護竜アガーペイン
+86148577 0 --守護竜エルピィ
+21377582 0 --真竜剣皇マスターP
+94677445 0 --星杯の神子イヴ
+16923472 0 --ゼンマイハンター
+15341821 0 --ダンディライオン
+37818794 0 --超魔導竜騎士－ドラグーン・オブ・レッドアイズ
+18326736 0 --星守の騎士 プトレマイオス
+79875176 0 --トゥーン・キャノン・ソルジャー
+75732622 0 --トーチ・ゴーレム
+22593417 0 --トポロジック・ガンブラー・ドラゴン
+39064822 0 --トロイメア・ゴブリン
+03679218 0 --トロイメア・マーメイド
+54719828 0 --No.16 色の支配者ショック・ルーラー
+58820923 0 --No.95 ギャラクシーアイズ・ダークマター・ドラゴン
+26400609 0 --瀑征竜－タイダル
+71525232 0 --破滅竜ガンドラX
+78706415 0 --ファイバーポッド
+93369354 0 --フィッシュボーグ－ガンナー
+23558733 0 --フェニキシアン・クラスター・アマリリス
+09929398 0 --BF－朧影のゴウフウ
+09047460 0 --BF－隠れ蓑のスチーム
+31178212 0 --マジェスペクター・ユニコーン
+63101919 0 --マジックテンペスター
+34206604 0 --魔導サイエンティスト
+04423206 0 --M.X－セイバー インヴォーカー
+14702066 0 --メガキャノン・ソルジャー
+96782886 0 --メンタルマスター
+03078576 0 --八汰烏
+34086406 0 --ラヴァルバル・チェイン
+85243784 0 --リンクロス
+57421866 0 --レベル・スティーラー
+41482598 0 --悪夢の蜃気楼
+44763025 0 --いたずら好きな双子悪魔
+17375316 0 --押収
+19613556 0 --大嵐
+74191942 0 --苦渋の選択
+42829885 0 --強引な番兵
+45986603 0 --強奪
+55144522 0 --強欲な壺
+04031928 0 --心変わり
+23557835 0 --次元融合
+31423101 0 --神剣－フェニックスブレード
+57953380 0 --生還の宝札
+54447022 0 --ソウル・チャージ
+60682203 0 --大寒波
+69243953 0 --蝶の短剣－エルマ
+79571449 0 --天使の施し
+70828912 0 --早すぎた埋葬
+42703248 0 --ハリケーン
+34906152 0 --マスドライバー
+46448938 0 --魔導書の神判
+46411259 0 --突然変異
+85602018 0 --遺言状
+27174286 0 --異次元からの帰還
+93016201 0 --王宮の弾圧
+03280747 0 --第六感
+64697231 0 --ダスト・シュート
+80604091 0 --血の代償
+35316708 0 --刻の封印
+32723153 0 --マジカル・エクスプロージョン
+17178486 0 --ライフチェンジャー
+28566710 0 --ラストバトル！
+#limit
+64034255 1 --A・ジェネクス・バードマン
+76794549 1 --アストログラフ・マジシャン
+01561110 1 --ABC-ドラゴン・バスター
+42790071 1 --オルターガイスト・マルチフェイカー
+30741503 1 --オルフェゴール・ガラテア
+57835716 1 --オルフェゴール・ディヴェル
+50588353 1 --水晶機巧－ハリファイバー
+12289247 1 --クロノグラフ・マジシャン
+49684352 1 --虹彩の魔術師
+74586817 1 --PSYフレームロード・Ω
+26889158 1 --転生炎獣ガゼル
+74997493 1 --鎖龍蛇－スカルデット
+69811710 1 --宵星の騎士ギルス
+48905153 1 --十二獣ドランシア
+78872731 1 --十二獣モルモラット
+06602300 1 --重爆撃禽 ボム・フェネクス
+28985331 1 --終末の騎士
+88581108 1 --真竜皇V.F.D.
+78080961 1 --SPYRAL－ジーニアス
+81275020 1 --SRベイゴマックス
+63288573 1 --閃刀姫－カガリ
+81122844 1 --発条空母ゼンマイティ
+82385847 1 --ダイナレスラー・パンクラトプス
+44335251 1 --魂喰いオヴィラプター
+73941492 1 --調弦の魔術師
+15291624 1 --超雷龍－サンダー・ドラゴン
+90953320 1 --TG ハイパー・ライブラリアン
+69015963 1 --デビル・フランケン
+16226786 1 --深淵の暗殺者
+69610326 1 --覇王眷竜ダークヴルム
+52687916 1 --氷結界の龍 トリシューラ
+33396948 1 --封印されしエクゾディア
+44519536 1 --封印されし者の左足
+07902349 1 --封印されし者の左腕
+08124921 1 --封印されし者の右足
+70903634 1 --封印されし者の右腕
+70369116 1 --捕食植物ヴェルテ・アナコンダ
+35272499 1 --捕食植物オフリス・スコーピオ
+24094258 1 --ヘビーメタルフォーゼ・エレクトラム
+33508719 1 --メタモルポット
+90809975 1 --餅カエル
+83107873 1 --雷鳥龍－サンダー・ドラゴン
+89399912 1 --嵐征竜－テンペスト
+92746535 1 --竜剣士ラスターP
+88264978 1 --レッドアイズ・ダークネスメタルドラゴン
+33782437 1 --一時休戦
+01845204 1 --簡易融合
+66957584 1 --インフェルニティガン
+81439173 1 --おろかな埋葬
+73680966 1 --終わりの始まり
+23701465 1 --原初の種
+12580477 1 --サンダー・ボルト
+83764718 1 --死者蘇生
+46060017 1 --十二獣の会局
+52340444 1 --閃刀機－ホーネットビット
+32807846 1 --増援
+72892473 1 --手札抹殺
+73628505 1 --テラ・フォーミング
+01984618 1 --天底の使徒
+13035077 1 --ドラゴニックD
+35371948 1 --トリックスター・ライトステージ
+18144506 1 --ハーピィの羽根帚
+75500286 1 --封印の黄金櫃
+07394770 1 --ブリリアント・フュージョン
+53208660 1 --ペンデュラム・コール
+73468603 1 --盆回し
+76375976 1 --魔鍾洞
+93600443 1 --マスク・チェンジ・セカンド
+15854426 1 --霞の谷の神風
+27970830 1 --六武の門
+02295440 1 --ワン・フォー・ワン
+05851097 1 --虚無空間
+61740673 1 --王宮の勅命
+21076084 1 --トリックスター・リンカーネイション
+89208725 1 --メタバース
+23002292 1 --レッド・リブート
+#semi limit
+40318957 2 --EMドクロバット・ジョーカー
+59297550 2 --ゼンマイマジシャン
+09411399 2 --D-HERO ディアボリックガイ
+05043010 2 --ファイアウォール・ドラゴン
+41386308 2 --マスマティシャン
+43694650 2 --未界域のジャッカロープ
+70711847 2 --未界域のネッシー
+29596581 2 --雷獣龍－サンダー・ドラゴン
+48686504 2 --ローンファイア・ブロッサム
+84731222 2 --希望の記憶
+67723438 2 --緊急テレポート
+52155219 2 --転生炎獣の炎陣
+73915051 2 --スケープ・ゴート
+54631665 2 --SPYRAL RESORT
+37520316 2 --精神操作
+98338152 2 --閃刀機－ウィドウアンカー
+63166095 2 --閃刀起動－エンゲージ
+48130397 2 --超融合
+11110587 2 --隣の芝刈り
+31434645 2 --呪われしエルドランド
+24224830 2 --墓穴の指名者
+47679935 2 --暴走魔法陣
+08949584 2 --ヒーローアライブ
+66399653 2 --ユニオン格納庫
+
 !2021.1
 #forbidden
+62472614 0 --疫病(tmp)
 91869203 0 --アマゾネスの射手
 20663556 0 --イレカエル
 44910027 0 --ヴィクトリー・ドラゴン
@@ -190,7 +378,7 @@
 08949584 2 --ヒーローアライブ
 01475311 2 --闇の誘惑
 
-!2020.12 TCG
+!2021.3 TCG
 #forbidden
 76794549 0 --Astrograph Sorcerer
 09929398 0 --Blackwing - Gofu the Vague Shadow
@@ -201,7 +389,6 @@
 15341821 0 --Dandylion
 05560911 0 --Destrudo the Lost Dragon's Frisson
 08903700 0 --Djinn Releaser of Rituals
-76218313 0 --Dragon Buster Destruction Sword
 51858306 0 --Eclipse Wyvern
 55623480 0 --Fairy Tail - Snow
 78706415 0 --Fiber Jar
@@ -233,7 +420,6 @@
 17412721 0 --Elder Entity Norden
 43387895 0 --Supreme King Dragon Starving Venom
 15291624 0 --Thunder Dragon Colossus
-05043010 0 --Firewall Dragon
 59537380 0 --Guardragon Agarpain
 24094258 0 --Heavymetalfoes Electrumite
 39064822 0 --Knightmare Goblin
@@ -241,6 +427,7 @@
 85243784 0 --Linkross
 61665245 0 --Summon Sorceress
 22593417 0 --Topologic Gumblar Dragon
+83152482 0 --Union Carrier
 25862681 0 --Ancient Fairy Dragon
 65536818 0 --Denglong, First of the Yang Zing
 94677445 0 --Ib the World Chalice Justiciar
@@ -251,9 +438,11 @@
 10389142 0 --Number 42: Galaxy Tomahawk
 63504681 0 --Number 86: Heroic Champion - Rhongomyniad
 58820923 0 --Number 95: Galaxy-Eyes Dark Matter Dragon
+52653092 0 --Number S0: Utopic ZEXAL
 34945480 0 --Outer Entity Azathot
 87327776 0 --Salamangreat Miragestallio
 18326736 0 --Tellarknight Ptolemaeus
+88581108 0 --True King of All Calamities
 81122844 0 --Wind-Up Carrier Zenmaity
 85115440 0 --Zoodiac Broadbull
 07394770 0 --Brilliant Fusion
@@ -276,9 +465,8 @@
 74191942 0 --Painful Choice
 55144522 0 --Pot of Greed
 70828912 0 --Premature Burial
-94220427 0 --Rank-Up-Magic Argent Chaos Force
 63166095 0 --Sky Striker Mobilize - Engage!
-63789924 0 --Smoke Grenade of the Thief	
+63789924 0 --Smoke Grenade of the Thief
 45986603 0 --Snatch Steal
 54447022 0 --Soul Charge
 46448938 0 --Spellbook of Judgment
@@ -324,9 +512,7 @@
 99234526 1 --White Dragon Wyverburster
 78872731 1 --Zoodiac Ratpier
 39512984 1 --Gem-Knight Master Diamond
-26692769 1 --The Phantom Knights of Rusty Bardiche
-70583986 1 --Dewloren, Tiger King of the Ice Barrier
-18239909 1 --Ignister Prominence, the Blasting Dracoslayer
+77235086 1 --Cyber Angel Benten
 74586817 1 --PSY-Framelord Omega
 90953320 1 --T.G. Hyper Librarian
 52687916 1 --Trishula, Dragon of the Ice Barrier
@@ -381,7 +567,6 @@
 17078030 1 --Wall of Revealing Light
 #semi limit
 09411399 2 --Destiny HERO - Malicious
-35125879 2 --True King's Return
 
 !2020.10
 #forbidden
@@ -4901,6 +5086,199 @@
 53582587 2 --激流葬
 29401950 2 --奈落の落とし穴
 
+!2020.12 TCG
+#forbidden
+76794549 0 --Astrograph Sorcerer
+09929398 0 --Blackwing - Gofu the Vague Shadow
+09047460 0 --Blackwing - Steam the Cloak
+53804307 0 --Blaster, Dragon Ruler of Infernos
+94689206 0 --Block Dragon
+34124316 0 --Cyber Jar
+15341821 0 --Dandylion
+05560911 0 --Destrudo the Lost Dragon's Frisson
+08903700 0 --Djinn Releaser of Rituals
+76218313 0 --Dragon Buster Destruction Sword
+51858306 0 --Eclipse Wyvern
+55623480 0 --Fairy Tail - Snow
+78706415 0 --Fiber Jar
+93369354 0 --Fishborg Blaster
+67441435 0 --Glow-Up Bulb
+75732622 0 --Grinder Golem
+09742784 0 --Jet Synchron
+57421866 0 --Level Eater
+83190280 0 --Lunalight Tiger
+34206604 0 --Magical Scientist
+31178212 0 --Majespecter Unicorn - Kirin
+21377582 0 --Master Peace, the True Dracoslaying King
+23434538 0 --Maxx "C"
+72291078 0 --Mecha Phantom Beast O-Lion
+96782886 0 --Mind Master
+57835716 0 --Orcust Harp Horror
+07563579 0 --Performage Plushfire
+17330916 0 --Performapal Monkeyboard
+40318957 0 --Performapal Skullcrobat Joker
+23558733 0 --Phoenixian Cluster Amaryllis
+90411554 0 --Redox, Dragon Ruler of Boulders
+05592689 0 --Samsara Lotus
+91258852 0 --SPYRAL Master Plan
+20663556 0 --Substitoad
+88071625 0 --The Tyrant Neptune
+26400609 0 --Tidal, Dragon Ruler of Waterfalls
+44910027 0 --Victory Dragon
+03078576 0 --Yata-Garasu
+17412721 0 --Elder Entity Norden
+43387895 0 --Supreme King Dragon Starving Venom
+15291624 0 --Thunder Dragon Colossus
+05043010 0 --Firewall Dragon
+59537380 0 --Guardragon Agarpain
+24094258 0 --Heavymetalfoes Electrumite
+39064822 0 --Knightmare Goblin
+03679218 0 --Knightmare Mermaid
+85243784 0 --Linkross
+61665245 0 --Summon Sorceress
+22593417 0 --Topologic Gumblar Dragon
+25862681 0 --Ancient Fairy Dragon
+65536818 0 --Denglong, First of the Yang Zing
+94677445 0 --Ib the World Chalice Justiciar
+63101919 0 --Tempest Magician
+34086406 0 --Lavalval Chain
+04423206 0 --M-X-Saber Invoker
+54719828 0 --Number 16: Shock Master
+10389142 0 --Number 42: Galaxy Tomahawk
+63504681 0 --Number 86: Heroic Champion - Rhongomyniad
+58820923 0 --Number 95: Galaxy-Eyes Dark Matter Dragon
+34945480 0 --Outer Entity Azathot
+87327776 0 --Salamangreat Miragestallio
+18326736 0 --Tellarknight Ptolemaeus
+81122844 0 --Wind-Up Carrier Zenmaity
+85115440 0 --Zoodiac Broadbull
+07394770 0 --Brilliant Fusion
+69243953 0 --Butterfly Dagger - Elma
+57953380 0 --Card of Safe Return
+04031928 0 --Change of Heart
+67616300 0 --Chicken Game
+60682203 0 --Cold Wave
+17375316 0 --Confiscation
+44763025 0 --Delinquent Duo
+23557835 0 --Dimension Fusion
+42703248 0 --Giant Trunade
+79571449 0 --Graceful Charity
+19613556 0 --Heavy Storm
+35059553 0 --Kaiser Colosseum
+85602018 0 --Last Will
+34906152 0 --Mass Driver
+46411259 0 --Metamorphosis
+41482598 0 --Mirage of Nightmare
+74191942 0 --Painful Choice
+55144522 0 --Pot of Greed
+70828912 0 --Premature Burial
+94220427 0 --Rank-Up-Magic Argent Chaos Force
+63166095 0 --Sky Striker Mobilize - Engage!
+63789924 0 --Smoke Grenade of the Thief
+45986603 0 --Snatch Steal
+54447022 0 --Soul Charge
+46448938 0 --Spellbook of Judgment
+11110587 0 --That Grass Looks Greener
+42829885 0 --The Forceful Sentry
+28566710 0 --Last Turn
+27174286 0 --Return from the Different Dimension
+93016201 0 --Royal Oppression
+57585212 0 --Self-Destruct Button
+03280747 0 --Sixth Sense
+35316708 0 --Time Seal
+64697231 0 --Trap Dustshoot
+80604091 0 --Ultimate Offering
+05851097 0 --Vanity's Emptiness
+#limit
+07902349 1 --Left Arm of the Forbidden One
+44519536 1 --Left Leg of the Forbidden One
+70903634 1 --Right Arm of the Forbidden One
+08124921 1 --Right Leg of the Forbidden One
+28985331 1 --Armageddon Knight
+61901281 1 --Black Dragon Collapserpent
+69015963 1 --Cyber-Stein
+43694650 1 --Danger!? Jackalope?
+70711847 1 --Danger! Nessie!
+99745551 1 --Danger!? Tsuchinoko?
+14536035 1 --Dark Grepher
+58984738 1 --Dinomight Knight, the True Dracofighter
+82385847 1 --Dinowrestler Pankratops
+49684352 1 --Double Iris Magician
+33396948 1 --Exodia the Forbidden One
+64034255 1 --Genex Ally Birdman
+99177923 1 --Infernity Archfiend
+33508719 1 --Morphing Jar
+16226786 1 --Night Assailant
+12958919 1 --Phantom Skyblaster
+88264978 1 --Red-Eyes Darkness Metal Dragon
+26889158 1 --Salamangreat Gazelle
+92559258 1 --Servant of Endymion
+81275020 1 --Speedroid Terrortop
+78080961 1 --SPYRAL Quik-Fix
+89399912 1 --Tempest, Dragon Ruler of Storms
+30539496 1 --True King Lithosagym, the Disaster
+99234526 1 --White Dragon Wyverburster
+78872731 1 --Zoodiac Ratpier
+39512984 1 --Gem-Knight Master Diamond
+26692769 1 --The Phantom Knights of Rusty Bardiche
+70583986 1 --Dewloren, Tiger King of the Ice Barrier
+18239909 1 --Ignister Prominence, the Blasting Dracoslayer
+74586817 1 --PSY-Framelord Omega
+90953320 1 --T.G. Hyper Librarian
+52687916 1 --Trishula, Dragon of the Ice Barrier
+27552504 1 --Beatrice, Lady of the Eternal
+00581014 1 --Daigusto Emeral
+48905153 1 --Zoodiac Drident
+08949584 1 --A Hero Lives
+24224830 1 --Called by the Grave
+72892473 1 --Card Destruction
+59750328 1 --Card of Demise
+91623717 1 --Chain Strike
+81674782 1 --Dimensional Fissure
+15854426 1 --Divine Wind of Mist Valley
+14733538 1 --Draco Face-Off
+13035077 1 --Dragonic Diagram
+67723438 1 --Emergency Teleport
+95308449 1 --Final Countdown
+81439173 1 --Foolish Burial
+27970830 1 --Gateway of the Six
+75500286 1 --Gold Sarcophagus
+18144506 1 --Harpie's Feather Duster
+66957584 1 --Infernity Launcher
+01845204 1 --Instant Fusion
+93946239 1 --Into the Void
+71650854 1 --Magical Mid-Breaker Field
+37520316 1 --Mind Control
+83764718 1 --Monster Reborn
+33782437 1 --One Day of Peace
+02295440 1 --One for One
+12580477 1 --Raigeki
+58577036 1 --Reasoning
+32807846 1 --Reinforcement of the Army
+52155219 1 --Salamangreat Circle
+73915051 1 --Scapegoat
+24940422 1 --Sekka's Light
+73468603 1 --Set Rotation
+52340444 1 --Sky Striker Mecha - Hornet Drones
+24010609 1 --Sky Striker Mecha Modules - Multirole
+71344451 1 --Slash Draw
+54631665 1 --SPYRAL Resort
+45305419 1 --Symbol of Heritage
+73628505 1 --Terraforming
+35371948 1 --Trickstar Light Stage
+70368879 1 --Upstart Goblin
+46060017 1 --Zoodiac Barrage
+61740673 1 --Imperial Order
+30241314 1 --Macro Cosmos
+32723153 1 --Magical Explosion
+89208725 1 --Metaverse
+23002292 1 --Red Reboot
+82732705 1 --Skill Drain
+17078030 1 --Wall of Revealing Light
+#semi limit
+09411399 2 --Destiny HERO - Malicious
+35125879 2 --True King's Return
+
 !2020.9 TCG
 #forbidden
 76794549 0 --Astrograph Sorcerer

ocgcore @ 0ce15251

-Subproject commit 9fd3931ae631015ca02013314f3ae07bdd8f2208
+Subproject commit 0ce152512c02c7a3289ae81610d284143860f07b

script @ 835acda1

-Subproject commit a12f29bf382defb21043e2b8de967f867477192b
+Subproject commit 835acda16b96904753359ad96b795de0d6534e21

strings.conf

@@ -336,6 +336,7 @@
 !system 1285 大
 !system 1286 特大
 !system 1287 只有连锁1也显示连锁动画
+!system 1288 禁限卡表
 !system 1290 禁用聊天功能
 !system 1291 忽略观战者发言
 !system 1292 忽略时点
@@ -346,7 +347,7 @@
 !system 1297 洗切手卡
 !system 1298 辅助功能
 !system 1299 加快动画效果
-!system 1300 禁限卡表：
+!system 1300 卡组分类：
 !system 1301 卡组列表：
 !system 1302 保存
 !system 1303 另存
@@ -373,6 +374,7 @@
 !system 1325 关键字：
 !system 1326 效果
 !system 1327 搜索
+!system 1328 管理
 !system 1329 系列：
 !system 1330 主卡组：
 !system 1331 额外卡组：
@@ -398,7 +400,7 @@
 !system 1351 投降
 !system 1352 主要信息：
 !system 1353 播放起始于回合：
-!system 1356 是否要放弃对卡组的修改？
+!system 1356 此操作将放弃对当前卡组的修改，是否继续？
 !system 1357 不提示保留对卡组的修改
 !system 1358 键入关键字后自动进行搜索
 !system 1359 是否确定投降？
@@ -461,6 +463,27 @@
 !system 1441 放大
 !system 1442 缩小
 !system 1443 原始尺寸
+!system 1450 卡包展示
+!system 1451 人机卡组
+!system 1452 未分类卡组
+!system 1453 --------
+!system 1460 卡组管理
+!system 1461 新建分类
+!system 1462 重命名分类
+!system 1463 删除分类
+!system 1464 新建卡组
+!system 1465 重命名卡组
+!system 1466 删除卡组
+!system 1467 移动到分类
+!system 1468 复制到分类
+!system 1469 请输入分类名：
+!system 1470 确实要删除此分类和分类下全部卡组吗？
+!system 1471 请输入卡组名：
+!system 1472 请选择要移动到的分类：
+!system 1473 请选择要复制到的分类：
+!system 1474 已存在同名分类
+!system 1475 已存在同名卡组
+!system 1476 删除失败
 !system 1500 决斗结束。
 !system 1501 录像结束。
 !system 1502 连接已断开。
@@ -603,6 +626,7 @@
 !counter 0x58 指示物（祢须三破鸣比）
 !counter 0x59 落魂指示物
 !counter 0x5a 指示物（岩战之试炼）
+!counter 0x5b 指示物（北极天熊北斗星）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1063,3 +1087,6 @@
 !setname 0x15e 降阶魔法	RDM
 !setname 0x15f 岩战	War Rock
 !setname 0x160 源质兽	Materiactor
+!setname 0x161 溟界
+!setname 0x162 七音服	ドレミコード
+!setname 0x163 北极天熊	ベアルクティ

system.conf

@@ -6,6 +6,7 @@ antialias = 2
 errorlog = 3
 nickname = Player
 gamename = Game
+lastcategory = 未分类卡组
 lastdeck = new
 textfont = c:/windows/fonts/simsun.ttc 14
 numfont = c:/windows/fonts/arialbd.ttf
@@ -19,6 +20,8 @@ autochain = 0
 waitchain = 0
 mute_opponent = 0
 mute_spectators = 0
+use_lflist = 1
+default_lflist = 0
 default_rule = 0
 hide_setname = 0
 hide_hint_button = 0
@@ -33,6 +36,7 @@ search_multiple_keywords = 1
 ignore_deck_changes = 0
 default_ot = 1
 enable_bot_mode = 0
+bot_deck_path = ./botdeck
 quick_animation = 0
 auto_save_replay = 0
 draw_single_chain = 0