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

gframe/client_field.cpp

@@ -62,6 +62,13 @@ void ClientField::Clear() {
 	extra_p_count[0] = 0;
 	extra_p_count[1] = 0;
 	chains.clear();
+	activatable_cards.clear();
+	summonable_cards.clear();
+	spsummonable_cards.clear();
+	msetable_cards.clear();
+	ssetable_cards.clear();
+	reposable_cards.clear();
+	attackable_cards.clear();
 	disabled_field = 0;
 	deck_act = false;
 	grave_act = false;

gframe/deck_con.cpp

@@ -189,7 +189,12 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				mainGame->HideElement(mainGame->wQuery);
 				if(!mainGame->is_building || mainGame->is_siding)
 					break;
-				if(is_deleting) {
+				if(is_clearing) {
+					deckManager.current_deck.main.clear();
+					deckManager.current_deck.extra.clear();
+					deckManager.current_deck.side.clear();
+				}
+				else if(is_deleting) {
 					int sel = mainGame->cbDBDecks->getSelected();
 					if (deckManager.DeleteDeck(deckManager.current_deck, mainGame->cbDBDecks->getItem(sel))) {
 						mainGame->cbDBDecks->removeItem(sel);
@@ -202,14 +207,9 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 						mainGame->stACMessage->setText(dataManager.GetSysString(1338));
 						mainGame->PopupElement(mainGame->wACMessage, 20);
 					}
-					is_deleting = false;
-				}
-				if(is_clearing) {
-					deckManager.current_deck.main.clear();
-					deckManager.current_deck.extra.clear();
-					deckManager.current_deck.side.clear();
-					is_clearing = false;
 				}
+				is_clearing = false;
+				is_deleting = false;
 				break;
 			}
 			case BUTTON_NO: {

gframe/menu_handler.cpp

@@ -246,6 +246,8 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				mainGame->deckBuilder.result_string[1] = 0;
 				mainGame->deckBuilder.results.clear();
 				mainGame->deckBuilder.is_draging = false;
+				mainGame->deckBuilder.is_deleting = false;
+				mainGame->deckBuilder.is_clearing = false;
 				mainGame->device->setEventReceiver(&mainGame->deckBuilder);
 				for(int i = 0; i < 32; ++i)
 					mainGame->chkCategory[i]->setChecked(false);

ocgcore @ 42c1de39

-Subproject commit ad00a8e3ce4f8015c2ef0e27caae6568682a5334
+Subproject commit 42c1de39dc2562d7485a962cef4cf494e36b900d

script @ 7362fd18

-Subproject commit c75936f93ccea5a0739b46f8ccecd23ee4b5abd6
+Subproject commit 7362fd18381b3fadd0682ae97388dee3cfc79794

strings.conf

@@ -765,3 +765,8 @@
 #!setname 0xec	魔界	魔界
 !setname 0x10ec 魔界剧团	魔界劇団
 !setname 0x20ec 魔界台本	魔界台本
+!setname 0xed 地底恐魔	Subterror
+!setname 0x10ed 地底恐魔 巨魔	Subterror Behemoth
+!setname 0xee 秘旋谍	SPYRAL
+!setname 0x10ee 秘旋谍装备	SPYRAL GEAR
+!setname 0xef 堕天使