games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

remove allresources

Browse Source
This commit is contained in:
Laserlicht
2025-09-14 15:29:14 +02:00
parent ded1a70dd7
commit 75f965c93a
15 changed files with 29 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/processors/NewTurnProcessor.cpp
View File

@@ -21,6 +21,7 @@
#include "../../lib/constants/StringConstants.h"
#include "../../lib/entities/building/CBuilding.h"
#include "../../lib/entities/faction/CTownHandler.h"
#include "../../lib/entities/ResourceTypeHandler.h"
#include "../../lib/gameState/CGameState.h"
#include "../../lib/gameState/SThievesGuildInfo.h"
#include "../../lib/mapObjects/CGHeroInstance.h"
@@ -58,7 +59,7 @@ void NewTurnProcessor::handleTimeEvents(PlayerColor color)
if (!event.resources.empty())
{
gameHandler->giveResources(color, event.resources);
for (GameResID i : GameResID::ALL_RESOURCES())
for (GameResID i : LIBRARY->resourceTypeHandler->getAllObjects())
if (event.resources[i])
iw.components.emplace_back(ComponentType::RESOURCE, i, event.resources[i]);
}
@@ -94,7 +95,7 @@ void NewTurnProcessor::handleTownEvents(const CGTownInstance * town)
{
gameHandler->giveResources(player, event.resources);
for (GameResID i : GameResID::ALL_RESOURCES())
for (GameResID i : LIBRARY->resourceTypeHandler->getAllObjects())
if (event.resources[i])
iw.components.emplace_back(ComponentType::RESOURCE, i, event.resources[i]);
}
@@ -256,7 +257,7 @@ ResourceSet NewTurnProcessor::generatePlayerIncome(PlayerColor playerID, bool ne
const JsonNode & difficultyConfig = weeklyBonusesConfig[difficultyName];
// Distribute weekly bonuses over 7 days, depending on the current day of the week
for (GameResID i : GameResID::ALL_RESOURCES())
for (GameResID i : LIBRARY->resourceTypeHandler->getAllObjects())
{
const std::string & name = GameConstants::RESOURCE_NAMES[i.getNum()];
int64_t weeklyBonus = difficultyConfig[name].Integer();