Merge pull request #2362 from IvanSavenko/banks_guard_preview

Implemented support for showing amount of guards in banks

config/gameConfig.json

@@ -321,6 +321,12 @@
 			"blackMarketRestockPeriod" : 0
 		},
 		
+		"banks" : 
+		{
+			// show guards composition when visiting creature banks
+			"showGuardsComposition" : true
+		},
+
 		"modules":
 		{
 			// if enabled, creatures may collect experience (WoG feature)

lib/GameSettings.cpp

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

lib/GameSettings.h

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

lib/mapObjects/CBank.cpp

@@ -17,6 +17,7 @@
 #include "../NetPacks.h"
 #include "../CGeneralTextHandler.h"
 #include "../CSoundBase.h"
+#include "../GameSettings.h"
 #include "../mapObjectConstructors/CObjectClassesHandler.h"
 #include "../mapObjectConstructors/CBankInstanceConstructor.h"
 #include "../IGameCallback.h"
@@ -131,6 +132,26 @@ void CBank::onHeroVisit(const CGHeroInstance * h) const
 	bd.text.appendLocalString(EMetaText::ADVOB_TXT, banktext);
 	if (banktext == 32)
 		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);
 }