games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-12 02:28:11 +02:00
Code Issues Releases Activity

Fixed fractalized paths inside zones.

Browse Source
This commit is contained in:
DjWarmonger 2015-01-16 09:40:11 +01:00
parent fe180335de
commit b7386250e9
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/rmg/CRmgTemplateZone.cpp
View File

@ -120,6 +120,11 @@ void CTileInfo::setOccupied(ETileType::ETileType value)
occupied = value;
}
ETileType::ETileType CTileInfo::getTileType() const
{
return occupied;
}
ETerrainType CTileInfo::getTerrainType() const
{
return terrain;
@ -413,7 +418,7 @@ void CRmgTemplateZone::fractalize(CMapGenerator* gen)
int totalDensity = 0;
for (auto ti : treasureInfo)
totalDensity =+ ti.density;
const float minDistance = totalDensity * 4; //squared
const float minDistance = 10 * 10; //squared
for (auto tile : tileinfo)
{
@ -484,10 +489,13 @@ void CRmgTemplateZone::fractalize(CMapGenerator* gen)
//now block most distant tiles away from passages
float blockDistance = minDistance * 0.6f;
float blockDistance = minDistance * 0.25f;
for (auto tile : possibleTiles)
for (auto tile : tileinfo)
{
if (!gen->isPossible(tile))
continue;
bool closeTileFound = false;
for (auto clearTile : freePaths)
@ -504,7 +512,8 @@ void CRmgTemplateZone::fractalize(CMapGenerator* gen)
gen->setOccupied(tile, ETileType::BLOCKED);
}
if (0) //enable to debug
#define PRINT_FRACTALIZED_MAP false
if (PRINT_FRACTALIZED_MAP) //enable to debug
{
std::ofstream out(boost::to_string(boost::format("zone %d") % id));
int levels = gen->map->twoLevel ? 2 : 1;
@ -516,12 +525,26 @@ void CRmgTemplateZone::fractalize(CMapGenerator* gen)
{
for (int i=0; i<width; i++)
{
out << (int)vstd::contains(freePaths, int3(i,j,k));
char t = '?';
switch (gen->getTile(int3(i, j, k)).getTileType())
{
case ETileType::FREE:
t = ' '; break;
case ETileType::BLOCKED:
t = '#'; break;
case ETileType::POSSIBLE:
t = '-'; break;
case ETileType::USED:
t = 'O'; break;
}
out << t;
}
out << std::endl;
}
out << std::endl;
}
out << std::endl;
}
//logGlobal->infoStream() << boost::format ("Zone %d subdivided fractally") %id;

1
lib/rmg/CRmgTemplateZone.h
View File

@ -49,6 +49,7 @@ public:
bool isUsed() const;
void setOccupied(ETileType::ETileType value);
ETerrainType getTerrainType() const;
ETileType::ETileType getTileType() const;
void setTerrainType(ETerrainType value);
private: