From 17b6996ae450f2e9864b99f296bdaba8ca2545df Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Sun, 26 Feb 2017 21:21:11 +0800 Subject: [PATCH] tokens cant buy and/or add tokens in deck editor and shop... also adjust filter menu --- projects/mtg/src/GameStateDeckViewer.cpp | 1 + projects/mtg/src/GameStateShop.cpp | 2 +- projects/mtg/src/WGui.cpp | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp index 733ff97a3..891ae15fd 100644 --- a/projects/mtg/src/GameStateDeckViewer.cpp +++ b/projects/mtg/src/GameStateDeckViewer.cpp @@ -235,6 +235,7 @@ void GameStateDeckViewer::End() void GameStateDeckViewer::addRemove(MTGCard * card) { if (!card) return; + if ((card->getRarity() == Constants::RARITY_T) || (card->getId() < 1)) return; if (mView->deck()->Remove(card, 1, (mView->deck() == myDeck))) { if (mView->deck() == myCollection) diff --git a/projects/mtg/src/GameStateShop.cpp b/projects/mtg/src/GameStateShop.cpp index 956ff7810..38a180a60 100644 --- a/projects/mtg/src/GameStateShop.cpp +++ b/projects/mtg/src/GameStateShop.cpp @@ -271,7 +271,7 @@ void GameStateShop::cancelBooster(int) void GameStateShop::purchaseCard(int controlId) { MTGCard * c = srcCards->getCard(controlId - BOOSTER_SLOTS); - if (!c || !c->data || playerdata->credits - mPrices[controlId] < 0) + if (!c || !c->data || playerdata->credits - mPrices[controlId] < 0 || (c && c->getRarity() != Constants::RARITY_T))//cant buy tokens.... return; myCollection->Add(c); int price = mPrices[controlId]; diff --git a/projects/mtg/src/WGui.cpp b/projects/mtg/src/WGui.cpp index edbf74ffd..5a0e83639 100644 --- a/projects/mtg/src/WGui.cpp +++ b/projects/mtg/src/WGui.cpp @@ -1770,12 +1770,14 @@ void WGuiFilters::buildList() { list = NEW WGuiList(""); WGuiButton * l = NEW WGuiButton(NEW WGuiItem("Add Filter"), -102, -10, this); - WGuiButton * r = NEW WGuiButton(NEW WGuiItem("Done"), -102, -11, this); + WGuiButton * r = NEW WGuiButton(NEW WGuiItem("Search"), -102, -11, this); WGuiButton * mid = NEW WGuiButton(NEW WGuiItem("Clear"), -102, -66, this); - WGuiSplit * sub = NEW WGuiSplit(mid, r); - WGuiSplit * wgs = NEW WGuiSplit(l, sub); + //WGuiSplit * sub = NEW WGuiSplit(mid, r); + //WGuiSplit * wgs = NEW WGuiSplit(l, sub); + WGuiSplit * wgs = NEW WGuiSplit(mid, r); subMenu = NULL; list->Add(NEW WGuiHeader(displayValue)); + list->Add(l); list->Add(wgs); list->Entering(JGE_BTN_NONE); }