games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Merge pull request #3602 from Laserlicht/campaignExtraButton

Browse Source 
Campaign extra options button
This commit is contained in:
Ivan Savenko 2024-02-11 12:27:14 +02:00 committed by GitHub
commit a3462acac3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/lobby/CBonusSelection.cpp
View File

@ -15,6 +15,7 @@
#include <vcmi/spells/Service.h>
#include "CSelectionBase.h"
#include "ExtraOptionsTab.h"
#include "../CGameInfo.h"
#include "../CMusicHandler.h"
@ -86,7 +87,7 @@ CBonusSelection::CBonusSelection()
labelMapDescription = std::make_shared<CLabel>(481, 253, FONT_SMALL, ETextAlignment::TOPLEFT, Colors::YELLOW, CGI->generaltexth->allTexts[496]);
mapDescription = std::make_shared<CTextBox>("", Rect(480, 278, 292, 108), 1);
labelChooseBonus = std::make_shared<CLabel>(511, 432, FONT_SMALL, ETextAlignment::TOPLEFT, Colors::WHITE, CGI->generaltexth->allTexts[71]);
labelChooseBonus = std::make_shared<CLabel>(475, 432, FONT_SMALL, ETextAlignment::TOPLEFT, Colors::WHITE, CGI->generaltexth->allTexts[71]);
groupBonuses = std::make_shared<CToggleGroup>(std::bind(&IServerAPI::setCampaignBonus, CSH, _1));
flagbox = std::make_shared<CFlagBox>(Rect(486, 407, 335, 23));
@ -94,17 +95,17 @@ CBonusSelection::CBonusSelection()
std::vector<std::string> difficulty;
std::string difficultyString = CGI->generaltexth->allTexts[492];
boost::split(difficulty, difficultyString, boost::is_any_of(" "));
labelDifficulty = std::make_shared<CLabel>(689, 432, FONT_MEDIUM, ETextAlignment::TOPLEFT, Colors::WHITE, difficulty.back());
labelDifficulty = std::make_shared<CLabel>(724, settings["general"]["enableUiEnhancements"].Bool() ? 457 : 432, FONT_MEDIUM, ETextAlignment::TOPCENTER, Colors::WHITE, difficulty.back());
for(size_t b = 0; b < difficultyIcons.size(); ++b)
{
difficultyIcons[b] = std::make_shared<CAnimImage>(AnimationPath::builtinTODO("GSPBUT" + std::to_string(b + 3) + ".DEF"), 0, 0, 709, 455);
difficultyIcons[b] = std::make_shared<CAnimImage>(AnimationPath::builtinTODO("GSPBUT" + std::to_string(b + 3) + ".DEF"), 0, 0, 709, settings["general"]["enableUiEnhancements"].Bool() ? 480 : 455);
}
if(getCampaign()->playerSelectedDifficulty())
{
buttonDifficultyLeft = std::make_shared<CButton>(Point(694, 508), AnimationPath::builtin("SCNRBLF.DEF"), CButton::tooltip(), std::bind(&CBonusSelection::decreaseDifficulty, this));
buttonDifficultyRight = std::make_shared<CButton>(Point(738, 508), AnimationPath::builtin("SCNRBRT.DEF"), CButton::tooltip(), std::bind(&CBonusSelection::increaseDifficulty, this));
buttonDifficultyLeft = std::make_shared<CButton>(settings["general"]["enableUiEnhancements"].Bool() ? Point(693, 495) : Point(694, 508), AnimationPath::builtin("SCNRBLF.DEF"), CButton::tooltip(), std::bind(&CBonusSelection::decreaseDifficulty, this));
buttonDifficultyRight = std::make_shared<CButton>(settings["general"]["enableUiEnhancements"].Bool() ? Point(739, 495) : Point(738, 508), AnimationPath::builtin("SCNRBRT.DEF"), CButton::tooltip(), std::bind(&CBonusSelection::increaseDifficulty, this));
}
for(auto scenarioID : getCampaign()->allScenarios())
@ -117,6 +118,16 @@ CBonusSelection::CBonusSelection()
if (!getCampaign()->getMusic().empty())
CCS->musich->playMusic( getCampaign()->getMusic(), true, false);
if(settings["general"]["enableUiEnhancements"].Bool())
{
tabExtraOptions = std::make_shared<ExtraOptionsTab>();
tabExtraOptions->recActions = UPDATE | SHOWALL | LCLICK | RCLICK_POPUP;
tabExtraOptions->recreate(true);
tabExtraOptions->setEnabled(false);
buttonExtraOptions = std::make_shared<CButton>(Point(643, 431), AnimationPath::builtin("GSPBUT2.DEF"), CGI->generaltexth->zelp[46], [this]{ tabExtraOptions->setEnabled(!tabExtraOptions->isActive()); GH.windows().totalRedraw(); }, EShortcut::NONE);
buttonExtraOptions->addTextOverlay(CGI->generaltexth->translate("vcmi.optionsTab.extraOptions.hover"), FONT_SMALL, Colors::WHITE);
}
}
void CBonusSelection::createBonusesIcons()

4
client/lobby/CBonusSelection.h
View File

@ -27,6 +27,7 @@ class CAnimImage;
class CLabel;
class CFlagBox;
class ISelectionScreenInfo;
class ExtraOptionsTab;
/// Campaign screen where you can choose one out of three starting bonuses
class CBonusSelection : public CWindowObject
@ -82,4 +83,7 @@ public:
std::shared_ptr<CButton> buttonDifficultyLeft;
std::shared_ptr<CButton> buttonDifficultyRight;
std::shared_ptr<CAnimImage> iconsMapSizes;
std::shared_ptr<ExtraOptionsTab> tabExtraOptions;
std::shared_ptr<CButton> buttonExtraOptions;
};

9
client/lobby/OptionsTabBase.cpp
View File

@ -12,6 +12,7 @@
#include "CSelectionBase.h"
#include "../widgets/ComboBox.h"
#include "../widgets/Images.h"
#include "../widgets/Slider.h"
#include "../widgets/TextControls.h"
#include "../CServerHandler.h"
@ -295,7 +296,7 @@ OptionsTabBase::OptionsTabBase(const JsonPath & configPath)
}
}
void OptionsTabBase::recreate()
void OptionsTabBase::recreate(bool campaign)
{
auto const & generateSimturnsDurationText = [](int days) -> std::string
{
@ -417,4 +418,10 @@ void OptionsTabBase::recreate()
buttonUnlimitedReplay->setSelectedSilent(SEL->getStartInfo()->extraOptionsInfo.unlimitedReplay);
buttonUnlimitedReplay->block(SEL->screenType == ESelectionScreen::loadGame);
}
if(auto textureCampaignOverdraw = widget<CFilledTexture>("textureCampaignOverdraw"))
{
if(!campaign)
textureCampaignOverdraw->disable();
}
}

2
client/lobby/OptionsTabBase.h
View File

@ -28,5 +28,5 @@ class OptionsTabBase : public InterfaceObjectConfigurable
public:
OptionsTabBase(const JsonPath & configPath);
void recreate();
void recreate(bool campaign = false);
};

7
config/widgets/extraOptionsTab.json
View File

@ -9,6 +9,13 @@
"image": "ADVOPTBK",
"position": {"x": 0, "y": 6}
},
{
"name": "textureCampaignOverdraw",
"type": "texture",
"color" : "blue",
"image": "DIBOXBCK",
"rect": {"x": 391, "y": 14, "w": 82, "h": 569}
},
{
"name": "labelTitle",
"type": "label",