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

Possible tweak for underground.

Browse Source
This commit is contained in:
DjWarmonger
2014-09-22 15:27:42 +02:00
parent b96ab55c4d
commit 3e36d0d88b
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lib/rmg/CRmgTemplateZone.cpp
View File

@ -1115,6 +1115,27 @@ void CRmgTemplateZone::createTreasures(CMapGenerator* gen)
void CRmgTemplateZone::createObstacles(CMapGenerator* gen)
{
//tighten obstacles to improve visuals
for (auto tile : tileinfo)
{
if (!gen->isPossible(tile)) //only possible tiles can change
continue;
int blockedNeighbours = 0;
int freeNeighbours = 0;
gen->foreach_neighbour(tile, [gen, &blockedNeighbours, &freeNeighbours](int3 &pos)
{
if (gen->isBlocked(pos))
blockedNeighbours++;
if (gen->isFree(pos))
freeNeighbours++;
});
if (blockedNeighbours > 4)
gen->setOccupied(tile, ETileType::BLOCKED);
else if (freeNeighbours > 4)
gen->setOccupied(tile, ETileType::FREE);
}
if (pos.z) //underground
{
std::vector<int3> rockTiles;
@ -1137,15 +1158,15 @@ void CRmgTemplateZone::createObstacles(CMapGenerator* gen)
}
gen->editManager->getTerrainSelection().setSelection(rockTiles);
gen->editManager->drawTerrain(ETerrainType::ROCK, &gen->rand);
//for (auto tile : rockTiles)
//{
// gen->setOccupied (tile, ETileType::USED);
// gen->foreach_neighbour (tile, [gen](int3 &pos)
// {
// if (!gen->isUsed(pos))
// gen->setOccupied (pos, ETileType::BLOCKED);
// });
//}
for (auto tile : rockTiles)
{
gen->setOccupied (tile, ETileType::USED); //don't place obstacles in a rock
//gen->foreach_neighbour (tile, [gen](int3 &pos)
//{
// if (!gen->isUsed(pos))
// gen->setOccupied (pos, ETileType::BLOCKED);
//});
}
}
typedef std::vector<ObjectTemplate> obstacleVector;
//obstacleVector possibleObstacles;
@ -1195,27 +1216,6 @@ void CRmgTemplateZone::createObstacles(CMapGenerator* gen)
return false;
};
//tighten obstacles to improve visuals
for (auto tile : tileinfo)
{
if (!gen->isPossible(tile)) //only possible tiles can change
continue;
int blockedNeighbours = 0;
int freeNeighbours = 0;
gen->foreach_neighbour(tile, [gen, &blockedNeighbours, &freeNeighbours](int3 &pos)
{
if (gen->isBlocked(pos))
blockedNeighbours++;
if (gen->isFree(pos))
freeNeighbours++;
});
if (blockedNeighbours > 4)
gen->setOccupied(tile, ETileType::BLOCKED);
else if (freeNeighbours > 4)
gen->setOccupied(tile, ETileType::FREE);
}
//reverse order, since obstacles begin in bottom-right corner, while the map coordinates begin in top-left
for (auto tile : boost::adaptors::reverse(tileinfo))
{