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

Do not let monsters or treasures spawn near already placed monsters.

Browse Source
This commit is contained in:
DjWarmonger 2014-07-09 22:09:06 +02:00
parent 6c0a396094
commit 966873181f
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rmg/CMapGenerator.cpp
View File

@ -259,7 +259,7 @@ void CMapGenerator::createConnections()
if (guardPos.valid())
{
setOccupied (guardPos, ETileType::FREE); //just in case monster is too weak to spawn
zoneA->addMonster (this, guardPos, connection.getGuardStrength());
zoneA->addMonster (this, guardPos, connection.getGuardStrength(), false);
//zones can make paths only in their own area
zoneA->crunchPath (this, guardPos, posA, zoneA->getId(), zoneA->getFreePaths()); //make connection towards our zone center
zoneB->crunchPath (this, guardPos, posB, zoneB->getId(), zoneB->getFreePaths()); //make connection towards other zone center

23
lib/rmg/CRmgTemplateZone.cpp
View File

@ -567,7 +567,7 @@ void CRmgTemplateZone::addRequiredObject(CGObjectInstance * obj, si32 strength)
requiredObjects.push_back(std::make_pair(obj, strength));
}
bool CRmgTemplateZone::addMonster(CMapGenerator* gen, int3 &pos, si32 strength)
bool CRmgTemplateZone::addMonster(CMapGenerator* gen, int3 &pos, si32 strength, bool clearSurroundingTiles)
{
//precalculate actual (randomized) monster strength based on this post
//http://forum.vcmi.eu/viewtopic.php?p=12426#12426
@ -620,6 +620,17 @@ bool CRmgTemplateZone::addMonster(CMapGenerator* gen, int3 &pos, si32 strength)
guard->putStack(SlotID(0), hlp);
placeObject(gen, guard, pos);
if (clearSurroundingTiles)
{
//do not spawn anything near monster
gen->foreach_neighbour (pos, [gen](int3 pos)
{
if (gen->isPossible(pos))
gen->setOccupied(pos, ETileType::FREE);
});
}
return true;
}
@ -819,13 +830,19 @@ bool CRmgTemplateZone::createTreasurePile (CMapGenerator* gen, int3 &pos)
int3 visitableOffset = treasure.second->getVisitableOffset();
placeObject(gen, treasure.second, treasure.first + visitableOffset);
}
if (addMonster(gen, guardPos, currentValue))
if (addMonster(gen, guardPos, currentValue, false))
{//block only if the object is guarded
for (auto tile : boundary)
{
if (gen->isPossible(tile))
gen->setOccupied (tile, ETileType::BLOCKED);
}
//do not spawn anything near monster
gen->foreach_neighbour (guardPos, [gen](int3 pos)
{
if (gen->isPossible(pos))
gen->setOccupied(pos, ETileType::FREE);
});
}
}
else //we couldn't make a connection to this location, block it
@ -1401,7 +1418,7 @@ bool CRmgTemplateZone::guardObject(CMapGenerator* gen, CGObjectInstance* object,
return false;
}
if (addMonster (gen, guardTile, str)) //do not place obstacles around unguarded object
if (addMonster (gen, guardTile, str, false)) //do not place obstacles around unguarded object
{
for (auto pos : tiles)
{

2
lib/rmg/CRmgTemplateZone.h
View File

@ -145,7 +145,7 @@ public:
void discardDistantTiles (CMapGenerator* gen, float distance);
void addRequiredObject(CGObjectInstance * obj, si32 guardStrength=0);
bool addMonster(CMapGenerator* gen, int3 &pos, si32 strength);
bool addMonster(CMapGenerator* gen, int3 &pos, si32 strength, bool clearSurroundingTiles = true);
bool createTreasurePile (CMapGenerator* gen, int3 &pos);
bool fill (CMapGenerator* gen);
bool placeMines (CMapGenerator* gen);