Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tokens

Browse Source 
cant buy and/or add tokens in deck editor and shop...
also adjust filter menu
This commit is contained in:
Anthony Calosa
2017-02-26 21:21:11 +08:00
parent 0f82b6efba
commit 17b6996ae4
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/mtg/src/GameStateDeckViewer.cpp
View File

@@ -235,6 +235,7 @@ void GameStateDeckViewer::End()
void GameStateDeckViewer::addRemove(MTGCard * card) void GameStateDeckViewer::addRemove(MTGCard * card)
{ {
if (!card) return; 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()->Remove(card, 1, (mView->deck() == myDeck)))
{ {
if (mView->deck() == myCollection) if (mView->deck() == myCollection)

2
projects/mtg/src/GameStateShop.cpp
View File

@@ -271,7 +271,7 @@ void GameStateShop::cancelBooster(int)
void GameStateShop::purchaseCard(int controlId) void GameStateShop::purchaseCard(int controlId)
{ {
MTGCard * c = srcCards->getCard(controlId - BOOSTER_SLOTS); 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; return;
myCollection->Add(c); myCollection->Add(c);
int price = mPrices[controlId]; int price = mPrices[controlId];

8
projects/mtg/src/WGui.cpp
View File

@@ -1770,12 +1770,14 @@ void WGuiFilters::buildList()
{ {
list = NEW WGuiList(""); list = NEW WGuiList("");
WGuiButton * l = NEW WGuiButton(NEW WGuiItem("Add Filter"), -102, -10, this); 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); WGuiButton * mid = NEW WGuiButton(NEW WGuiItem("Clear"), -102, -66, this);
WGuiSplit * sub = NEW WGuiSplit(mid, r); //WGuiSplit * sub = NEW WGuiSplit(mid, r);
WGuiSplit * wgs = NEW WGuiSplit(l, sub); //WGuiSplit * wgs = NEW WGuiSplit(l, sub);
WGuiSplit * wgs = NEW WGuiSplit(mid, r);
subMenu = NULL; subMenu = NULL;
list->Add(NEW WGuiHeader(displayValue)); list->Add(NEW WGuiHeader(displayValue));
list->Add(l);
list->Add(wgs); list->Add(wgs);
list->Entering(JGE_BTN_NONE); list->Entering(JGE_BTN_NONE);
} }