|
@@ -591,8 +591,40 @@ TGoalVec Explore::getAllPossibleSubgoals()
|
|
|
case Obj::REDWOOD_OBSERVATORY:
|
|
|
case Obj::PILLAR_OF_FIRE:
|
|
|
case Obj::CARTOGRAPHER:
|
|
|
- case Obj::SUBTERRANEAN_GATE: //TODO: check ai->knownSubterraneanGates
|
|
|
objs.push_back (obj);
|
|
|
+ break;
|
|
|
+ case Obj::MONOLITH_ONE_WAY_ENTRANCE:
|
|
|
+ case Obj::MONOLITH_TWO_WAY:
|
|
|
+ case Obj::SUBTERRANEAN_GATE:
|
|
|
+ auto tObj = dynamic_cast<const CGTeleport *>(obj);
|
|
|
+ if(tObj)
|
|
|
+ {
|
|
|
+ assert(ai->knownTeleportChannels.find(tObj->channel) != ai->knownTeleportChannels.end());
|
|
|
+ if(TeleportChannel::IMPASSABLE != ai->knownTeleportChannels[tObj->channel]->passability)
|
|
|
+ objs.push_back (obj);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ switch (obj->ID.num)
|
|
|
+ {
|
|
|
+ case Obj::MONOLITH_TWO_WAY:
|
|
|
+ case Obj::SUBTERRANEAN_GATE:
|
|
|
+ {
|
|
|
+ auto tObj = dynamic_cast<const CGTeleport *>(obj);
|
|
|
+ if(TeleportChannel::IMPASSABLE == ai->knownTeleportChannels[tObj->channel]->passability)
|
|
|
+ break;
|
|
|
+
|
|
|
+ for(auto exit : ai->knownTeleportChannels[tObj->channel]->exits)
|
|
|
+ {
|
|
|
+ if(!cb->getObj(exit))
|
|
|
+ { // Always attempt to visit two-way teleports if one of channel exits is not visible
|
|
|
+ objs.push_back(obj);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|