games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-21 00:19:29 +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-16 17:20:56 +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

9
lib/mapObjects/CGResource.cpp
View File

@ -13,6 +13,7 @@
#include "../callback/IGameInfoCallback.h"
#include "../callback/IGameEventCallback.h"
#include "../callback/IGameRandomizer.h"
#include "../mapObjectConstructors/CommonConstructors.h"
#include "../texts/CGeneralTextHandler.h"
#include "../networkPacks/PacksForClient.h"
@ -52,24 +53,24 @@ std::string CGResource::getHoverText(PlayerColor player) const
return LIBRARY->generaltexth->restypes[resourceID().getNum()];
}
void CGResource::pickRandomObject(vstd::RNG & rand)
void CGResource::pickRandomObject(IGameRandomizer & gameRandomizer)
{
assert(ID == Obj::RESOURCE || ID == Obj::RANDOM_RESOURCE);
if (ID == Obj::RANDOM_RESOURCE)
{
ID = Obj::RESOURCE;
subID = rand.nextInt(EGameResID::WOOD, EGameResID::GOLD);
subID = gameRandomizer.getDefault().nextInt(EGameResID::WOOD, EGameResID::GOLD);
setType(ID, subID);
amount *= getAmountMultiplier();
}
}
void CGResource::initObj(vstd::RNG & rand)
void CGResource::initObj(IGameRandomizer & gameRandomizer)
{
blockVisit = true;
getResourceHandler()->randomizeObject(this, rand);
getResourceHandler()->randomizeObject(this, gameRandomizer);
}
void CGResource::onHeroVisit(IGameEventCallback & gameEvents, const CGHeroInstance * h) const