games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Nicer treasure piles.

Browse Source
This commit is contained in:
DjWarmonger 2014-09-22 13:36:55 +02:00
parent 035d028d5c
commit 0f4608ae01
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/rmg/CRmgTemplateZone.cpp
View File

@ -673,13 +673,10 @@ bool CRmgTemplateZone::createTreasurePile (CMapGenerator* gen, int3 &pos)
}
ui32 desiredValue = gen->rand.nextInt(minValue, maxValue);
//quantize value to let objects with value equal to max spawn too
ui32 diff = maxValue - minValue;
float quant = (float)diff / 4.f;
desiredValue = (boost::math::round((float)(desiredValue - minValue) / quant)) * quant + minValue;
int currentValue = 0;
CGObjectInstance * object = nullptr;
while (currentValue < minValue) //we don't want to spawn worthless items for greater piles when their value gets low, so abort earlier
while (currentValue < desiredValue)
{
treasures[info.nextTreasurePos] = nullptr;
@ -703,7 +700,7 @@ bool CRmgTemplateZone::createTreasurePile (CMapGenerator* gen, int3 &pos)
break;
}
ObjectInfo oi = getRandomObject(gen, info, desiredValue - currentValue);
ObjectInfo oi = getRandomObject(gen, info, desiredValue, maxValue, currentValue);
if (!oi.value) //0 value indicates no object
{
vstd::erase_if_present(treasures, info.nextTreasurePos);
@ -1505,7 +1502,7 @@ bool CRmgTemplateZone::guardObject(CMapGenerator* gen, CGObjectInstance* object,
return true;
}
ObjectInfo CRmgTemplateZone::getRandomObject (CMapGenerator* gen, CTreasurePileInfo &info, ui32 remaining)
ObjectInfo CRmgTemplateZone::getRandomObject(CMapGenerator* gen, CTreasurePileInfo &info, ui32 desiredValue, ui32 maxValue, ui32 currentValue)
{
//int objectsVisitableFromBottom = 0; //for debug
@ -1513,12 +1510,13 @@ ObjectInfo CRmgTemplateZone::getRandomObject (CMapGenerator* gen, CTreasurePileI
ui32 total = 0;
//calculate actual treasure value range based on remaining value
ui32 minValue = 0.25f * remaining;
ui32 maxVal = maxValue - currentValue;
ui32 minValue = 0.25f * (desiredValue - currentValue);
//roulette wheel
for (ObjectInfo &oi : possibleObjects) //copy constructor turned out to be costly
{
if (oi.value >= minValue && oi.value <= remaining && oi.maxPerZone > 0)
if (oi.value >= minValue && oi.value <= maxVal && oi.maxPerZone > 0)
{
int3 newVisitableOffset = oi.templ.getVisitableOffset(); //visitablePos assumes object will be shifter by visitableOffset
int3 newVisitablePos = info.nextTreasurePos;

2
lib/rmg/CRmgTemplateZone.h
View File

@ -173,7 +173,7 @@ public:
std::vector<CTreasureInfo> getTreasureInfo();
std::set<int3>* getFreePaths();
ObjectInfo getRandomObject (CMapGenerator* gen, CTreasurePileInfo &info, ui32 remaining);
ObjectInfo getRandomObject (CMapGenerator* gen, CTreasurePileInfo &info, ui32 desiredValue, ui32 maxValue, ui32 currentValue);
void placeAndGuardObject(CMapGenerator* gen, CGObjectInstance* object, const int3 &pos, si32 str, bool zoneGuard = false);