games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge pull request #2362 from IvanSavenko/banks_guard_preview

Browse Source 
Implemented support for showing amount of guards in banks
This commit is contained in:
Ivan Savenko
2023-07-21 15:44:11 +03:00
committed by GitHub
parent 3f4e88c396 5660884ee5
commit 3c6839722a
4 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/gameConfig.json
View File

@@ -320,6 +320,12 @@
// period between restocking of "Black Market" object found on adventure map // period between restocking of "Black Market" object found on adventure map
"blackMarketRestockPeriod" : 0 "blackMarketRestockPeriod" : 0
}, },
"banks" :
{
// show guards composition when visiting creature banks
"showGuardsComposition" : true
},
"modules": "modules":
{ {

1
lib/GameSettings.cpp
View File

@@ -81,6 +81,7 @@ void GameSettings::load(const JsonNode & input)
{EGameSettings::MAP_FORMAT_IN_THE_WAKE_OF_GODS, "mapFormat", "inTheWakeOfGods" }, {EGameSettings::MAP_FORMAT_IN_THE_WAKE_OF_GODS, "mapFormat", "inTheWakeOfGods" },
{EGameSettings::MAP_FORMAT_JSON_VCMI, "mapFormat", "jsonVCMI" }, {EGameSettings::MAP_FORMAT_JSON_VCMI, "mapFormat", "jsonVCMI" },
{EGameSettings::MARKETS_BLACK_MARKET_RESTOCK_PERIOD, "markets", "blackMarketRestockPeriod" }, {EGameSettings::MARKETS_BLACK_MARKET_RESTOCK_PERIOD, "markets", "blackMarketRestockPeriod" },
{EGameSettings::BANKS_SHOW_GUARDS_COMPOSITION, "banks", "showGuardsComposition" },
{EGameSettings::MODULE_COMMANDERS, "modules", "commanders" }, {EGameSettings::MODULE_COMMANDERS, "modules", "commanders" },
{EGameSettings::MODULE_STACK_ARTIFACT, "modules", "stackArtifact" }, {EGameSettings::MODULE_STACK_ARTIFACT, "modules", "stackArtifact" },
{EGameSettings::MODULE_STACK_EXPERIENCE, "modules", "stackExperience" }, {EGameSettings::MODULE_STACK_EXPERIENCE, "modules", "stackExperience" },

1
lib/GameSettings.h
View File

@@ -39,6 +39,7 @@ enum class EGameSettings
HEROES_STARTING_STACKS_CHANCES, HEROES_STARTING_STACKS_CHANCES,
HEROES_BACKPACK_CAP, HEROES_BACKPACK_CAP,
MARKETS_BLACK_MARKET_RESTOCK_PERIOD, MARKETS_BLACK_MARKET_RESTOCK_PERIOD,
BANKS_SHOW_GUARDS_COMPOSITION,
MODULE_COMMANDERS, MODULE_COMMANDERS,
MODULE_STACK_ARTIFACT, MODULE_STACK_ARTIFACT,
MODULE_STACK_EXPERIENCE, MODULE_STACK_EXPERIENCE,

21
lib/mapObjects/CBank.cpp
View File

@@ -17,6 +17,7 @@
#include "../NetPacks.h" #include "../NetPacks.h"
#include "../CGeneralTextHandler.h" #include "../CGeneralTextHandler.h"
#include "../CSoundBase.h" #include "../CSoundBase.h"
#include "../GameSettings.h"
#include "../mapObjectConstructors/CObjectClassesHandler.h" #include "../mapObjectConstructors/CObjectClassesHandler.h"
#include "../mapObjectConstructors/CBankInstanceConstructor.h" #include "../mapObjectConstructors/CBankInstanceConstructor.h"
#include "../IGameCallback.h" #include "../IGameCallback.h"
@@ -131,6 +132,26 @@ void CBank::onHeroVisit(const CGHeroInstance * h) const
bd.text.appendLocalString(EMetaText::ADVOB_TXT, banktext); bd.text.appendLocalString(EMetaText::ADVOB_TXT, banktext);
if (banktext == 32) if (banktext == 32)
bd.text.replaceRawString(getObjectName()); bd.text.replaceRawString(getObjectName());
if (VLC->settings()->getBoolean(EGameSettings::BANKS_SHOW_GUARDS_COMPOSITION))
{
std::map<CreatureID, int> guardsAmounts;
for (auto const & slot : Slots())
if (slot.second)
guardsAmounts[slot.second->getCreatureID()] += slot.second->getCount();
for (auto const & guard : guardsAmounts)
{
Component comp;
comp.id = Component::EComponentType::CREATURE;
comp.subtype = guard.first.getNum();
comp.val = guard.second;
bd.components.push_back(comp);
}
}
cb->showBlockingDialog(&bd); cb->showBlockingDialog(&bd);
} }