games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Generate all treasures of certain value beforehand and try to place them all, don't interrupt at first failure.

Browse Source
This commit is contained in:
Tomasz Zieliński
2023-06-08 19:51:21 +02:00
parent 66b6fba51f
commit 52d33fc7a6
3 changed files with 137 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/rmg/RmgObject.cpp
View File

@@ -161,17 +161,21 @@ const CGObjectInstance & Object::Instance::object() const
return dObject;
}
Object::Object(CGObjectInstance & object, const int3 & position)
Object::Object(CGObjectInstance & object, const int3 & position):
guarded(false)
{
addInstance(object, position);
}
Object::Object(CGObjectInstance & object)
Object::Object(CGObjectInstance & object):
guarded(false)
{
addInstance(object);
}
Object::Object(const Object & object): dStrength(object.dStrength)
Object::Object(const Object & object):
dStrength(object.dStrength),
guarded(false)
{
for(const auto & i : object.dInstances)
addInstance(const_cast<CGObjectInstance &>(i.object()), i.getPosition());
@@ -197,7 +201,9 @@ std::list<const Object::Instance*> Object::instances() const
void Object::addInstance(Instance & object)
{
//assert(object.dParent == *this);
setGuardedIfMonster(object);
dInstances.push_back(object);
dFullAreaCache.clear();
dAccessibleAreaCache.clear();
dAccessibleAreaFullCache.clear();
@@ -206,6 +212,8 @@ void Object::addInstance(Instance & object)
Object::Instance & Object::addInstance(CGObjectInstance & object)
{
dInstances.emplace_back(*this, object);
setGuardedIfMonster(dInstances.back());
dFullAreaCache.clear();
dAccessibleAreaCache.clear();
dAccessibleAreaFullCache.clear();
@@ -215,6 +223,8 @@ Object::Instance & Object::addInstance(CGObjectInstance & object)
Object::Instance & Object::addInstance(CGObjectInstance & object, const int3 & position)
{
dInstances.emplace_back(*this, object, position);
setGuardedIfMonster(dInstances.back());
dFullAreaCache.clear();
dAccessibleAreaCache.clear();
dAccessibleAreaFullCache.clear();
@@ -302,6 +312,19 @@ const int3 Object::getVisibleTop() const
return topTile;
}
bool rmg::Object::isGuarded() const
{
return guarded;
}
void rmg::Object::setGuardedIfMonster(const Instance& object)
{
if (object.object().ID == Obj::MONSTER)
{
guarded = true;
}
}
void Object::Instance::finalize(RmgMap & map)
{
if(!map.isOnMap(getPosition(true)))