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

Move timed events to NewTurnProcessor

Browse Source
This commit is contained in:
Ivan Savenko
2024-08-26 16:02:38 +00:00
parent ce1e0b8875
commit 37658478fa
4 changed files with 87 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
server/CGameHandler.cpp
View File

@@ -3062,89 +3062,6 @@ bool CGameHandler::queryReply(QueryID qid, std::optional<int32_t> answer, Player
return true;
}
void CGameHandler::handleTimeEvents(PlayerColor color)
{
for (auto const & event : gs->map->events)
{
if (!event.occursToday(gs->day))
continue;
if (!event.affectsPlayer(color, getPlayerState(color)->isHuman()))
continue;
InfoWindow iw;
iw.player = color;
iw.text = event.message;
//give resources
if (!event.resources.empty())
{
giveResources(color, event.resources);
for (GameResID i : GameResID::ALL_RESOURCES())
if (event.resources[i])
iw.components.emplace_back(ComponentType::RESOURCE, i, event.resources[i]);
}
sendAndApply(&iw); //show dialog
}
}
void CGameHandler::handleTownEvents(const CGTownInstance * town)
{
for (auto const & event : town->events)
{
if (!event.occursToday(gs->day))
continue;
PlayerColor player = town->getOwner();
if (!event.affectsPlayer(player, getPlayerState(player)->isHuman()))
continue;
// dialog
InfoWindow iw;
iw.player = player;
iw.text = event.message;
if (event.resources.nonZero())
{
giveResources(player, event.resources);
for (GameResID i : GameResID::ALL_RESOURCES())
if (event.resources[i])
iw.components.emplace_back(ComponentType::RESOURCE, i, event.resources[i]);
}
for (auto & i : event.buildings)
{
// Only perform action if:
// 1. Building exists in town (don't attempt to build Lvl 5 guild in Fortress
// 2. Building was not built yet
// othervice, silently ignore / skip it
if (town->town->buildings.count(i) && !town->hasBuilt(i))
{
buildStructure(town->id, i, true);
iw.components.emplace_back(ComponentType::BUILDING, BuildingTypeUniqueID(town->getFaction(), i));
}
}
if (!event.creatures.empty())
{
SetAvailableCreatures sac;
sac.tid = town->id;
sac.creatures = town->creatures;
for (si32 i=0;i<event.creatures.size();i++) //creature growths
{
if (!town->creatures.at(i).second.empty() && event.creatures.at(i) > 0)//there is dwelling
{
sac.creatures[i].first += event.creatures.at(i);
iw.components.emplace_back(ComponentType::CREATURE, town->creatures.at(i).second.back(), event.creatures.at(i));
}
}
}
sendAndApply(&iw); //show dialog
}
}
bool CGameHandler::complain(const std::string &problem)
{
#ifndef ENABLE_GOLDMASTER

2
server/CGameHandler.h
View File

@@ -229,8 +229,6 @@ public:
void onNewTurn();
void addStatistics(StatisticDataSet &stat) const;
void handleTimeEvents(PlayerColor player);
void handleTownEvents(const CGTownInstance *town);
bool complain(const std::string &problem); //sends message to all clients, prints on the logs and return true
void objectVisited( const CGObjectInstance * obj, const CGHeroInstance * h );
void objectVisitEnded(const CObjectVisitQuery &query);

87
server/processors/NewTurnProcessor.cpp
View File

@@ -37,13 +37,96 @@ NewTurnProcessor::NewTurnProcessor(CGameHandler * gameHandler)
{
}
void NewTurnProcessor::handleTimeEvents(PlayerColor color)
{
for (auto const & event : gameHandler->gameState()->map->events)
{
if (!event.occursToday(gameHandler->gameState()->day))
continue;
if (!event.affectsPlayer(color, gameHandler->getPlayerState(color)->isHuman()))
continue;
InfoWindow iw;
iw.player = color;
iw.text = event.message;
//give resources
if (!event.resources.empty())
{
gameHandler->giveResources(color, event.resources);
for (GameResID i : GameResID::ALL_RESOURCES())
if (event.resources[i])
iw.components.emplace_back(ComponentType::RESOURCE, i, event.resources[i]);
}
gameHandler->sendAndApply(&iw); //show dialog
}
}
void NewTurnProcessor::handleTownEvents(const CGTownInstance * town)
{
for (auto const & event : town->events)
{
if (!event.occursToday(gameHandler->gameState()->day))
continue;
PlayerColor player = town->getOwner();
if (!event.affectsPlayer(player, gameHandler->getPlayerState(player)->isHuman()))
continue;
// dialog
InfoWindow iw;
iw.player = player;
iw.text = event.message;
if (event.resources.nonZero())
{
gameHandler->giveResources(player, event.resources);
for (GameResID i : GameResID::ALL_RESOURCES())
if (event.resources[i])
iw.components.emplace_back(ComponentType::RESOURCE, i, event.resources[i]);
}
for (auto & i : event.buildings)
{
// Only perform action if:
// 1. Building exists in town (don't attempt to build Lvl 5 guild in Fortress
// 2. Building was not built yet
// othervice, silently ignore / skip it
if (town->town->buildings.count(i) && !town->hasBuilt(i))
{
gameHandler->buildStructure(town->id, i, true);
iw.components.emplace_back(ComponentType::BUILDING, BuildingTypeUniqueID(town->getFaction(), i));
}
}
if (!event.creatures.empty())
{
SetAvailableCreatures sac;
sac.tid = town->id;
sac.creatures = town->creatures;
for (si32 i=0;i<event.creatures.size();i++) //creature growths
{
if (!town->creatures.at(i).second.empty() && event.creatures.at(i) > 0)//there is dwelling
{
sac.creatures[i].first += event.creatures.at(i);
iw.components.emplace_back(ComponentType::CREATURE, town->creatures.at(i).second.back(), event.creatures.at(i));
}
}
}
gameHandler->sendAndApply(&iw); //show dialog
}
}
void NewTurnProcessor::onPlayerTurnStarted(PlayerColor which)
{
const auto * playerState = gameHandler->gameState()->getPlayerState(which);
gameHandler->handleTimeEvents(which);
handleTimeEvents(which);
for (const auto * t : playerState->getTowns())
gameHandler->handleTownEvents(t);
handleTownEvents(t);
for (const auto * t : playerState->getTowns())
{

2
server/processors/NewTurnProcessor.h
View File

@@ -39,6 +39,8 @@ class NewTurnProcessor : boost::noncopyable
std::tuple<EWeekType, CreatureID> pickWeekType(bool newMonth);
NewTurn generateNewTurnPack();
void handleTimeEvents(PlayerColor player);
void handleTownEvents(const CGTownInstance *town);
public:
NewTurnProcessor(CGameHandler * gameHandler);