games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2026-06-19 22:57:37 +02:00
Code Issues Releases Activity

Extract library entity randomization logic to separate class

Browse Source
This commit is contained in:
Ivan Savenko
2025-05-19 18:51:42 +03:00
parent 184e841b16
commit 54a46b77a9
55 changed files with 605 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/processors/NewTurnProcessor.cpp
+3 -2
View File
@@ -11,6 +11,7 @@
#include "NewTurnProcessor.h"
#include "HeroPoolProcessor.h"
#include "RandomizationProcessor.h"
#include "../CGameHandler.h"
@@ -524,7 +525,7 @@ std::tuple<EWeekType, CreatureID> NewTurnProcessor::pickWeekType(bool newMonth)
{
if (gameHandler->getSettings().getBoolean(EGameSettings::CREATURES_ALLOW_ALL_FOR_DOUBLE_MONTH))
{
CreatureID creatureID = LIBRARY->creh->pickRandomMonster(gameHandler->getRandomGenerator());
CreatureID creatureID = gameHandler->randomizationProcessor->rollCreature();
return { EWeekType::DOUBLE_GROWTH, creatureID};
}
else if (LIBRARY->creh->doubledCreatures.size())
@@ -551,7 +552,7 @@ std::tuple<EWeekType, CreatureID> NewTurnProcessor::pickWeekType(bool newMonth)
std::pair<int, CreatureID> newMonster(54, CreatureID());
do
{
newMonster.second = LIBRARY->creh->pickRandomMonster(gameHandler->getRandomGenerator());
newMonster.second = gameHandler->randomizationProcessor->rollCreature();
} while (newMonster.second.toEntity(LIBRARY)->getFactionID().toFaction()->town == nullptr); // find first non neutral creature
return { EWeekType::BONUS_GROWTH, newMonster.second};