From 161437f17897220568ac7655fdad07dd853c8a0c Mon Sep 17 00:00:00 2001 From: Crystal Date: Mon, 6 Apr 2015 17:57:48 +0100 Subject: [PATCH] Add ability bans to tier gui, make pokemon section smaller --- src/Server/tierwindow.cpp | 5 ++++- src/Server/tierwindow.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Server/tierwindow.cpp b/src/Server/tierwindow.cpp index d22171d83f..4d599cf662 100644 --- a/src/Server/tierwindow.cpp +++ b/src/Server/tierwindow.cpp @@ -157,9 +157,10 @@ void TierWindow::openTierEdit(Tier *t) helper->addConfigHelper(new ConfigSpin("Minimum generation Pokemon obtained", t->minGen, -1, 6)); helper->addConfigHelper(new ConfigCheck("Ban pokemon/moves/items (uncheck to restrict the choice to them instead)", t->banPokes)); helper->addConfigHelper(new ConfigSpin("Max number of pokemon", t->numberOfPokemons, 1, 6)); - helper->addConfigHelper(new ConfigText("Pokemon", pokemons)); + helper->addConfigHelper(new ConfigLine("Pokemon", pokemons)); helper->addConfigHelper(new ConfigLine("Moves", moves)); helper->addConfigHelper(new ConfigLine("Items", items)); + helper->addConfigHelper(new ConfigLine("Abilities", abilities)); helper->addConfigHelper(new ConfigSpin("Max number of restricted pokemon", t->maxRestrictedPokes, 0, 6)); helper->addConfigHelper(new ConfigLine("Restricted Pokemon", restrPokemons)); helper->addConfigHelper(new ConfigSpin("Pokemon's max level", t->maxLevel, 1, 100)); @@ -167,6 +168,7 @@ void TierWindow::openTierEdit(Tier *t) pokemons = t->getBannedPokes(); moves = t->getBannedMoves(); items = t->getBannedItems(); + abilities = t->getBannedAbilities(); restrPokemons = t->getRestrictedPokes(); helper->addConfigHelper(new ConfigCombo("Battle Mode in Find Battle", t->mode, QStringList() << "Singles" << "Doubles" << "Triples" @@ -262,6 +264,7 @@ void TierWindow::updateTier() currentTier->importBannedItems(items); currentTier->importBannedPokes(pokemons); currentTier->importBannedMoves(moves); + currentTier->importBannedAbilities(abilities); currentTier->importRestrictedPokes(restrPokemons); int clRes = 0; diff --git a/src/Server/tierwindow.h b/src/Server/tierwindow.h index 5df674383d..193c05f050 100644 --- a/src/Server/tierwindow.h +++ b/src/Server/tierwindow.h @@ -45,7 +45,7 @@ private slots: void clearCurrentEdit(); /* Data used to configure categories / tiers */ QString parent; - QString pokemons, restrPokemons, moves, items; + QString pokemons, restrPokemons, moves, items, abilities; TierCategory *currentTierCat; Tier *currentTier; Type currentType;