games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Merge pull request #1698 from vcmi/object_placement_tweaks

Browse Source 
No objections, works fine for me as well.
This commit is contained in:
DjWarmonger
2023-03-25 18:13:15 +01:00
committed by GitHub
parent 61ed22f553 e1ced317a1
commit 114e7d196b
2 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/rmg/ConnectionsPlacer.cpp
View File

@@ -101,15 +101,20 @@ void ConnectionsPlacer::selfSideDirectConnection(const rmg::ZoneConnection & con
guardPos = zone.areaPossible().nearest(borderPos); guardPos = zone.areaPossible().nearest(borderPos);
assert(borderPos != guardPos); assert(borderPos != guardPos);
auto safetyGap = rmg::Area({guardPos}); float dist = map.getTile(guardPos).getNearestObjectDistance();
if (dist >= 3) //Don't place guards at adjacent tiles
{
auto safetyGap = rmg::Area({ guardPos });
safetyGap.unite(safetyGap.getBorderOutside()); safetyGap.unite(safetyGap.getBorderOutside());
safetyGap.intersect(zone.areaPossible()); safetyGap.intersect(zone.areaPossible());
if(!safetyGap.empty()) if (!safetyGap.empty())
{ {
safetyGap.intersect(otherZone->areaPossible()); safetyGap.intersect(otherZone->areaPossible());
if(safetyGap.empty()) if (safetyGap.empty())
break; //successfull position break; //successfull position
} }
}
//failed position //failed position
directConnectionIterator->second.erase(borderPos); directConnectionIterator->second.erase(borderPos);
@@ -150,6 +155,8 @@ void ConnectionsPlacer::selfSideDirectConnection(const rmg::ZoneConnection & con
rmg::Object monster(*monsterType); rmg::Object monster(*monsterType);
monster.setPosition(guardPos); monster.setPosition(guardPos);
manager.placeObject(monster, false, true); manager.placeObject(monster, false, true);
//Place objects away from the monster in the other zone, too
otherZone->getModificator<ObjectManager>()->updateDistances(monster);
} }
else else
{ {
@@ -225,8 +232,10 @@ void ConnectionsPlacer::selfSideIndirectConnection(const rmg::ZoneConnection & c
rmg::Path path1 = manager.placeAndConnectObject(commonArea, rmgGate1, [this, minDist, &path2, &rmgGate1, &zShift, guarded2, &managerOther, &rmgGate2 ](const int3 & tile) rmg::Path path1 = manager.placeAndConnectObject(commonArea, rmgGate1, [this, minDist, &path2, &rmgGate1, &zShift, guarded2, &managerOther, &rmgGate2 ](const int3 & tile)
{ {
auto ti = map.getTile(tile); auto ti = map.getTile(tile);
auto otherTi = map.getTile(tile - zShift);
float dist = ti.getNearestObjectDistance(); float dist = ti.getNearestObjectDistance();
if(dist < minDist) float otherDist = otherTi.getNearestObjectDistance();
if(dist < minDist || otherDist < minDist)
return -1.f; return -1.f;
rmg::Area toPlace(rmgGate1.getArea() + rmgGate1.getAccessibleArea()); rmg::Area toPlace(rmgGate1.getArea() + rmgGate1.getAccessibleArea());
@@ -234,8 +243,8 @@ void ConnectionsPlacer::selfSideIndirectConnection(const rmg::ZoneConnection & c
path2 = managerOther.placeAndConnectObject(toPlace, rmgGate2, minDist, guarded2, true, ObjectManager::OptimizeType::NONE); path2 = managerOther.placeAndConnectObject(toPlace, rmgGate2, minDist, guarded2, true, ObjectManager::OptimizeType::NONE);
return path2.valid() ? 1.f : -1.f; return path2.valid() ? (dist + otherDist) : -1.f;
}, guarded1, true, ObjectManager::OptimizeType::NONE); }, guarded1, true, ObjectManager::OptimizeType::DISTANCE);
if(path1.valid() && path2.valid()) if(path1.valid() && path2.valid())
{ {

9
lib/rmg/WaterProxy.cpp
View File

@@ -219,8 +219,12 @@ bool WaterProxy::placeBoat(Zone & land, const Lake & lake, RouteInfo & info)
auto waterAvailable = zone.areaPossible() + zone.freePaths(); auto waterAvailable = zone.areaPossible() + zone.freePaths();
rmg::Area coast = lake.neighbourZones.at(land.getId()); //having land tiles rmg::Area coast = lake.neighbourZones.at(land.getId()); //having land tiles
coast.intersect(land.areaPossible() + land.freePaths()); //having only available land tiles coast.intersect(land.areaPossible() + land.freePaths()); //having only available land tiles
auto boardingPositions = coast.getSubarea([&waterAvailable](const int3 & tile) //tiles where boarding is possible auto boardingPositions = coast.getSubarea([&waterAvailable, this](const int3 & tile) //tiles where boarding is possible
{ {
//We don't want place boat right to any land object, especiallly the zone guard
if (map.getTile(tile).getNearestObjectDistance() <= 3)
return false;
rmg::Area a({tile}); rmg::Area a({tile});
a = a.getBorderOutside(); a = a.getBorderOutside();
a.intersect(waterAvailable); a.intersect(waterAvailable);
@@ -241,7 +245,7 @@ bool WaterProxy::placeBoat(Zone & land, const Lake & lake, RouteInfo & info)
} }
//try to place boat at water, create paths on water and land //try to place boat at water, create paths on water and land
auto path = manager->placeAndConnectObject(shipPositions, rmgObject, 2, false, true, ObjectManager::OptimizeType::NONE); auto path = manager->placeAndConnectObject(shipPositions, rmgObject, 4, false, true, ObjectManager::OptimizeType::NONE);
auto landPath = land.searchPath(boardingPosition, false); auto landPath = land.searchPath(boardingPosition, false);
if(!path.valid() || !landPath.valid()) if(!path.valid() || !landPath.valid())
{ {
@@ -257,6 +261,7 @@ bool WaterProxy::placeBoat(Zone & land, const Lake & lake, RouteInfo & info)
zone.connectPath(path); zone.connectPath(path);
land.connectPath(landPath); land.connectPath(landPath);
manager->placeObject(rmgObject, false, true); manager->placeObject(rmgObject, false, true);
land.getModificator<ObjectManager>()->updateDistances(rmgObject); //Keep land objects away from the boat
break; break;
} }