|
|
@ -7,7 +7,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
#include "modules/Buildings.h"
|
|
|
|
#include "modules/Buildings.h"
|
|
|
|
#include "modules/EventManager.h"
|
|
|
|
#include "modules/EventManager.h"
|
|
|
|
|
|
|
|
#include "modules/Maps.h"
|
|
|
|
#include "modules/MapCache.h"
|
|
|
|
#include "modules/MapCache.h"
|
|
|
|
|
|
|
|
#include "modules/Units.h"
|
|
|
|
#include "modules/World.h"
|
|
|
|
#include "modules/World.h"
|
|
|
|
|
|
|
|
|
|
|
|
#include "df/building.h"
|
|
|
|
#include "df/building.h"
|
|
|
@ -26,6 +28,14 @@ using namespace std;
|
|
|
|
using namespace DFHack;
|
|
|
|
using namespace DFHack;
|
|
|
|
using namespace df::enums;
|
|
|
|
using namespace df::enums;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
///////////////////////
|
|
|
|
|
|
|
|
color_ostream* glob_out;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
|
|
|
#define DEBUG_PRINT(str) \
|
|
|
|
|
|
|
|
out.print("%s, line %d" STR, __FILE__, __LINE__);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
command_result diggingInvadersFunc(color_ostream &out, std::vector <std::string> & parameters);
|
|
|
|
command_result diggingInvadersFunc(color_ostream &out, std::vector <std::string> & parameters);
|
|
|
|
|
|
|
|
|
|
|
|
DFHACK_PLUGIN("diggingInvaders");
|
|
|
|
DFHACK_PLUGIN("diggingInvaders");
|
|
|
@ -89,8 +99,26 @@ public:
|
|
|
|
df::coord p1;
|
|
|
|
df::coord p1;
|
|
|
|
df::coord p2;
|
|
|
|
df::coord p2;
|
|
|
|
int32_t cost;
|
|
|
|
int32_t cost;
|
|
|
|
Edge(df::coord p1In, df::coord p2In, int32_t costIn): p1(p1In), p2(p2In), cost(costIn) {
|
|
|
|
Edge(df::coord p1In, df::coord p2In, int32_t costIn): cost(costIn) {
|
|
|
|
|
|
|
|
if ( p2In < p1In ) {
|
|
|
|
|
|
|
|
p1 = p2In;
|
|
|
|
|
|
|
|
p2 = p1In;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
p1 = p1In;
|
|
|
|
|
|
|
|
p2 = p2In;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool operator==(const Edge& e) const {
|
|
|
|
|
|
|
|
return (p1 == e.p1 && p2 == e.p2);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bool operator<(const Edge& e) const {
|
|
|
|
|
|
|
|
if ( p1 != e.p1 )
|
|
|
|
|
|
|
|
return p1 < e.p1;
|
|
|
|
|
|
|
|
if ( p2 != e.p2 )
|
|
|
|
|
|
|
|
return p2 < e.p2;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*bool operator<(const Edge e) const {
|
|
|
|
/*bool operator<(const Edge e) const {
|
|
|
@ -104,7 +132,7 @@ public:
|
|
|
|
}*/
|
|
|
|
}*/
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
vector<Edge>* getEdgeSet(color_ostream &out, df::coord point, MapExtras::MapCache& cache, int32_t xMax, int32_t yMax, int32_t zMax);
|
|
|
|
vector<Edge>* getEdgeSet(color_ostream &out, df::coord point, int32_t xMax, int32_t yMax, int32_t zMax);
|
|
|
|
df::coord getRoot(df::coord point, map<df::coord, df::coord>& rootMap);
|
|
|
|
df::coord getRoot(df::coord point, map<df::coord, df::coord>& rootMap);
|
|
|
|
|
|
|
|
|
|
|
|
class PointComp {
|
|
|
|
class PointComp {
|
|
|
@ -115,6 +143,7 @@ public:
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int32_t operator()(df::coord p1, df::coord p2) {
|
|
|
|
int32_t operator()(df::coord p1, df::coord p2) {
|
|
|
|
|
|
|
|
if ( p1 == p2 ) return 0;
|
|
|
|
map<df::coord, int32_t>::iterator i1 = pointCost->find(p1);
|
|
|
|
map<df::coord, int32_t>::iterator i1 = pointCost->find(p1);
|
|
|
|
map<df::coord, int32_t>::iterator i2 = pointCost->find(p2);
|
|
|
|
map<df::coord, int32_t>::iterator i2 = pointCost->find(p2);
|
|
|
|
if ( i1 == pointCost->end() && i2 == pointCost->end() )
|
|
|
|
if ( i1 == pointCost->end() && i2 == pointCost->end() )
|
|
|
@ -131,348 +160,220 @@ public:
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
command_result diggingInvadersFunc(color_ostream &out, std::vector <std::string> & parameters)
|
|
|
|
bool important(df::coord pos, map<df::coord, set<Edge> >& edges, df::coord prev, set<df::coord>& importantPoints, set<Edge>& importantEdges);
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
|
|
command_result diggingInvadersFunc(color_ostream& out, std::vector<std::string>& parameters) {
|
|
|
|
if (!parameters.empty())
|
|
|
|
if (!parameters.empty())
|
|
|
|
return CR_WRONG_USAGE;
|
|
|
|
return CR_WRONG_USAGE;
|
|
|
|
CoreSuspender suspend;
|
|
|
|
CoreSuspender suspend;
|
|
|
|
|
|
|
|
|
|
|
|
//eventually we're going to want a path from each surviving invader to each dwarf, but for now, let's just do from each dwarf to each dwarf
|
|
|
|
map<df::coord, set<Edge> > edgeSet;
|
|
|
|
int32_t race_id = df::global::ui->race_id;
|
|
|
|
set<df::coord> roots;
|
|
|
|
int32_t civ_id = df::global::ui->civ_id;
|
|
|
|
set<df::coord> importantPoints;
|
|
|
|
|
|
|
|
map<df::coord, df::coord> rootMap;
|
|
|
|
uint32_t xMax, yMax, zMax;
|
|
|
|
uint32_t xMax, yMax, zMax;
|
|
|
|
Maps::getSize(xMax,yMax,zMax);
|
|
|
|
Maps::getSize(xMax,yMax,zMax);
|
|
|
|
xMax *= 16;
|
|
|
|
xMax *= 16;
|
|
|
|
yMax *= 16;
|
|
|
|
yMax *= 16;
|
|
|
|
MapExtras::MapCache cache;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//TODO: consider whether to pursue hidden dwarf diplomats and merchants
|
|
|
|
//find all locals and invaders
|
|
|
|
vector<df::unit*> locals;
|
|
|
|
|
|
|
|
vector<df::unit*> invaders;
|
|
|
|
|
|
|
|
map<df::coord, int32_t> dwarfCount;
|
|
|
|
|
|
|
|
//map<df::coord, set<Edge>*> edgeSet;
|
|
|
|
|
|
|
|
map<df::coord, df::coord> rootMap;
|
|
|
|
|
|
|
|
map<df::coord, df::coord> parentMap;
|
|
|
|
|
|
|
|
map<df::coord, int32_t> pointCost;
|
|
|
|
|
|
|
|
PointComp comp(&pointCost);
|
|
|
|
|
|
|
|
set<df::coord, PointComp> fringe(comp);
|
|
|
|
|
|
|
|
for ( size_t a = 0; a < df::global::world->units.active.size(); a++ ) {
|
|
|
|
for ( size_t a = 0; a < df::global::world->units.active.size(); a++ ) {
|
|
|
|
df::unit* unit = df::global::world->units.active[a];
|
|
|
|
df::unit* unit = df::global::world->units.active[a];
|
|
|
|
bool isInvader = false;
|
|
|
|
if ( unit->flags1.bits.dead )
|
|
|
|
if ( df::global::ui->invasions.next_id > 0 && unit->invasion_id+1 == df::global::ui->invasions.next_id ) {
|
|
|
|
continue;
|
|
|
|
invaders.push_back(unit);
|
|
|
|
if ( !Units::isCitizen(unit) && !unit->flags1.bits.active_invader )
|
|
|
|
//dwarfCount[unit->pos]++;
|
|
|
|
continue;
|
|
|
|
isInvader = true;
|
|
|
|
if ( unit->flags2.bits.resident ) {
|
|
|
|
|
|
|
|
out.print("resident\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ( (!isInvader && (unit->race != race_id || unit->civ_id != civ_id)) || unit->flags1.bits.dead )
|
|
|
|
if ( roots.find(unit->pos) != roots.end() )
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
|
|
if ( !isInvader )
|
|
|
|
roots.insert(unit->pos);
|
|
|
|
locals.push_back(unit);
|
|
|
|
importantPoints.insert(unit->pos);
|
|
|
|
dwarfCount[unit->pos]++;
|
|
|
|
vector<Edge>* neighbors = getEdgeSet(out, unit->pos, xMax, yMax, zMax);
|
|
|
|
//edgeSet[unit->pos] = getEdgeSet(unit->pos, cache, xMax, yMax, zMax);
|
|
|
|
set<Edge>& rootEdges = edgeSet[unit->pos];
|
|
|
|
rootMap[unit->pos] = unit->pos;
|
|
|
|
for ( auto i = neighbors->begin(); i != neighbors->end(); i++ ) {
|
|
|
|
parentMap[unit->pos] = unit->pos;
|
|
|
|
Edge edge = *i;
|
|
|
|
pointCost[unit->pos] = 0;
|
|
|
|
rootEdges.insert(edge);
|
|
|
|
fringe.insert(unit->pos);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//TODO: if only one connectivity group, return
|
|
|
|
|
|
|
|
if ( invaders.size() == 0 ) {
|
|
|
|
|
|
|
|
return CR_OK; //no invaders, no problem!
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
set<df::coord> importantPoints;
|
|
|
|
|
|
|
|
int32_t a=0;
|
|
|
|
|
|
|
|
int32_t dwarvesFound = 1;
|
|
|
|
|
|
|
|
while(dwarvesFound < invaders.size()+locals.size() && fringe.size() > 0) {
|
|
|
|
|
|
|
|
df::coord point = *fringe.begin();
|
|
|
|
|
|
|
|
//out.print("%d: (%d,%d,%d); dwarvesFound = %d\n", a++, (int32_t)point.x, (int32_t)point.y, (int32_t)point.z, dwarvesFound);
|
|
|
|
|
|
|
|
//if ( a > 10000 ) break;
|
|
|
|
|
|
|
|
fringe.erase(fringe.begin());
|
|
|
|
|
|
|
|
//dwarfCount[getRoot(point, rootMap)] += dwarfCount[point];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ( getRoot(point, rootMap) != point && dwarfCount[point] != 0 ) {
|
|
|
|
|
|
|
|
dwarfCount[getRoot(point, rootMap)] += dwarfCount[point];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
delete neighbors;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int32_t costSoFar = pointCost[point];
|
|
|
|
set<Edge> importantEdges;
|
|
|
|
vector<Edge>* neighbors = getEdgeSet(out, point, cache, xMax, yMax, zMax);
|
|
|
|
|
|
|
|
for ( size_t a = 0; a < neighbors->size(); a++ ) {
|
|
|
|
int32_t dumb = 0;
|
|
|
|
df::coord neighbor = (*neighbors)[a].p2;
|
|
|
|
while(roots.size() > 1) {
|
|
|
|
int32_t neighborCost;
|
|
|
|
if ( dumb >= 1000 )
|
|
|
|
if ( pointCost.find(neighbor) == pointCost.end() )
|
|
|
|
break;
|
|
|
|
neighborCost = -1;
|
|
|
|
dumb++;
|
|
|
|
else
|
|
|
|
set<df::coord> toDelete;
|
|
|
|
neighborCost = pointCost[neighbor];
|
|
|
|
int32_t firstSize = edgeSet[*roots.begin()].size();
|
|
|
|
if ( neighborCost == -1 || neighborCost > costSoFar + (*neighbors)[a].cost ) {
|
|
|
|
//out.print("%s, %d: root size = %d, first size = %d\n", __FILE__, __LINE__, roots.size(), firstSize);
|
|
|
|
fringe.erase(neighbor);
|
|
|
|
for ( auto i = roots.begin(); i != roots.end(); i++ ) {
|
|
|
|
pointCost[neighbor] = costSoFar + (*neighbors)[a].cost;
|
|
|
|
df::coord root = *i;
|
|
|
|
parentMap[neighbor] = point;
|
|
|
|
//out.print(" (%d,%d,%d)\n", root.x, root.y, root.z);
|
|
|
|
//if ( getRoot(neighbor, rootMap) == neighbor )
|
|
|
|
if ( toDelete.find(root) != toDelete.end() )
|
|
|
|
rootMap[neighbor] = rootMap[point];
|
|
|
|
continue;
|
|
|
|
fringe.insert(neighbor);
|
|
|
|
if ( edgeSet[root].empty() ) {
|
|
|
|
|
|
|
|
out.print("%s, %d: Error: no edges: %d, %d, %d\n", __FILE__, __LINE__, root.x, root.y, root.z);
|
|
|
|
|
|
|
|
return CR_FAILURE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
df::coord pointRoot = getRoot(point, rootMap);
|
|
|
|
set<Edge>& myEdges = edgeSet[root];
|
|
|
|
df::coord neighborRoot = getRoot(neighbor, rootMap);
|
|
|
|
Edge edge = *myEdges.begin();
|
|
|
|
//check for unified sections of the map
|
|
|
|
myEdges.erase(myEdges.begin());
|
|
|
|
if ( neighborRoot != neighbor && neighborRoot != pointRoot ) {
|
|
|
|
if ( edgeSet[root].size() != myEdges.size() ) {
|
|
|
|
//dwarvesFound++;
|
|
|
|
out.print("DOOOOOM! %s, %d\n", __FILE__, __LINE__);
|
|
|
|
dwarfCount[pointRoot] += dwarfCount[neighborRoot];
|
|
|
|
return CR_FAILURE;
|
|
|
|
dwarfCount[neighborRoot] = 0;
|
|
|
|
}
|
|
|
|
dwarvesFound = max(dwarvesFound, dwarfCount[pointRoot]);
|
|
|
|
if ( getRoot(edge.p1, rootMap) != root && getRoot(edge.p2, rootMap) != root ) {
|
|
|
|
rootMap[neighborRoot] = rootMap[pointRoot];
|
|
|
|
out.print("%s, %d: Invalid edge.\n", __FILE__, __LINE__);
|
|
|
|
|
|
|
|
return CR_FAILURE;
|
|
|
|
df::coord temp = point;
|
|
|
|
}
|
|
|
|
while(true) {
|
|
|
|
|
|
|
|
importantPoints.insert(temp);
|
|
|
|
df::coord other = edge.p1;
|
|
|
|
if ( parentMap[temp] != temp )
|
|
|
|
if ( getRoot(other, rootMap) == root )
|
|
|
|
temp = parentMap[temp];
|
|
|
|
other = edge.p2;
|
|
|
|
else break;
|
|
|
|
if ( getRoot(other, rootMap) == root ) {
|
|
|
|
}
|
|
|
|
//out.print("%s, %d: Error: self edge: %d, %d, %d\n", __FILE__, __LINE__, root.x, root.y, root.z);
|
|
|
|
temp = neighbor;
|
|
|
|
/*vector<Edge> badEdges;
|
|
|
|
while(true) {
|
|
|
|
for ( auto j = myEdges.begin(); j != myEdges.end(); j++ ) {
|
|
|
|
importantPoints.insert(temp);
|
|
|
|
Edge e = *j;
|
|
|
|
if ( parentMap[temp] != temp )
|
|
|
|
if ( getRoot(e.p1, rootMap) == getRoot(e.p2, rootMap) )
|
|
|
|
temp = parentMap[temp];
|
|
|
|
badEdges.push_back(e);
|
|
|
|
else break;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for ( size_t j = 0; j < badEdges.size(); j++ ) {
|
|
|
|
|
|
|
|
myEdges.erase(badEdges[j]);
|
|
|
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
delete neighbors;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
out.print("dwarves found: %d\n", dwarvesFound);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
out.print("Important points:\n");
|
|
|
|
importantEdges.insert(edge);
|
|
|
|
for ( set<df::coord>::iterator i = importantPoints.begin(); i != importantPoints.end(); i++ ) {
|
|
|
|
|
|
|
|
df::coord point = *i;
|
|
|
|
|
|
|
|
out.print(" (%d, %d, %d)\n", (int32_t)point.x, (int32_t)point.y, (int32_t)point.z);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//dig out all the important points
|
|
|
|
df::coord otherRoot = getRoot(other,rootMap);
|
|
|
|
for ( set<df::coord>::iterator i = importantPoints.begin(); i != importantPoints.end(); i++ ) {
|
|
|
|
rootMap[otherRoot] = root;
|
|
|
|
df::coord point = *i;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//deal with buildings, hatches, and doors
|
|
|
|
//merge his stuff with my stuff
|
|
|
|
{
|
|
|
|
if ( edgeSet.find(other) == edgeSet.end() ) {
|
|
|
|
df::map_block* block = cache.BlockAt(df::coord((point.x)/16, (point.y)/16, point.z))->getRaw();
|
|
|
|
set<Edge>& hisEdges = edgeSet[other];
|
|
|
|
/*if ( block == NULL ) {
|
|
|
|
vector<Edge>* neighbors = getEdgeSet(out, other, xMax, yMax, zMax);
|
|
|
|
continue;
|
|
|
|
for ( auto i = neighbors->begin(); i != neighbors->end(); i++ ) {
|
|
|
|
}*/
|
|
|
|
Edge edge = *i;
|
|
|
|
df::tiletype type = cache.tiletypeAt(point);
|
|
|
|
hisEdges.insert(edge);
|
|
|
|
df::tiletype_shape shape = tileShape(type);
|
|
|
|
|
|
|
|
df::tiletype_shape_basic basic = ENUM_ATTR(tiletype_shape, basic_shape, shape);
|
|
|
|
|
|
|
|
df::tile_building_occ building_occ = block->occupancy[point.x%16][point.y%16].bits.building;
|
|
|
|
|
|
|
|
int32_t z = point.z;
|
|
|
|
|
|
|
|
if ( basic == df::tiletype_shape_basic::Ramp && building_occ == df::tile_building_occ::None ) {
|
|
|
|
|
|
|
|
df::map_block* block2 = cache.BlockAt(df::coord(point.x/16, point.y/16, point.z+1))->getRaw();
|
|
|
|
|
|
|
|
if ( block2 != NULL ) {
|
|
|
|
|
|
|
|
building_occ = block2->occupancy[point.x%16][point.y%16].bits.building;
|
|
|
|
|
|
|
|
z = z+1;
|
|
|
|
|
|
|
|
if ( building_occ != df::tile_building_occ::None ) {
|
|
|
|
|
|
|
|
//if it doesn't block pathing, don't destroy it
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
delete neighbors;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( building_occ != df::tile_building_occ::None ) {
|
|
|
|
set<Edge>& hisEdges = edgeSet[other];
|
|
|
|
//find the building there
|
|
|
|
|
|
|
|
bool foundIt = false;
|
|
|
|
for ( auto j = hisEdges.begin(); j != hisEdges.end(); j++ ) {
|
|
|
|
for( size_t a = 0; a < df::global::world->buildings.all.size(); a++ ) {
|
|
|
|
Edge e = *j;
|
|
|
|
df::building* building = df::global::world->buildings.all[a];
|
|
|
|
if ( getRoot(e.p1, rootMap) == getRoot(e.p2, rootMap) )
|
|
|
|
if ( z != building->z )
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
df::coord farPt = e.p1;
|
|
|
|
if ( building->x1 < point.x || building->x2 > point.x )
|
|
|
|
if ( farPt == other )
|
|
|
|
continue;
|
|
|
|
farPt = e.p2;
|
|
|
|
if ( building->y1 < point.y || building->y2 > point.y )
|
|
|
|
myEdges.insert(e);
|
|
|
|
continue;
|
|
|
|
//myEdges.insert(Edge(root, farPt, e.cost));
|
|
|
|
//found it!
|
|
|
|
|
|
|
|
foundIt = true;
|
|
|
|
|
|
|
|
//destroy it
|
|
|
|
|
|
|
|
out.print("deconstructImmediately...\n");
|
|
|
|
|
|
|
|
DFHack::Buildings::deconstructImmediately(building);
|
|
|
|
|
|
|
|
out.print("done\n");
|
|
|
|
|
|
|
|
building = NULL;
|
|
|
|
|
|
|
|
//building->deconstructItems(false, false);
|
|
|
|
|
|
|
|
//building->removeUses(false, false);
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( !foundIt ) {
|
|
|
|
|
|
|
|
out.print("Error: could not find building at (%d,%d,%d).\n", point.x, point.y, point.z);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//hisEdges.clear();
|
|
|
|
|
|
|
|
edgeSet.erase(otherRoot);
|
|
|
|
|
|
|
|
toDelete.insert(otherRoot);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for ( auto j = toDelete.begin(); j != toDelete.end(); j++ ) {
|
|
|
|
df::tiletype type = cache.tiletypeAt(point);
|
|
|
|
df::coord bob = *j;
|
|
|
|
df::tiletype_shape shape = tileShape(type);
|
|
|
|
roots.erase(bob);
|
|
|
|
if ( shape == df::tiletype_shape::STAIR_UPDOWN )
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
df::tiletype_shape_basic basicShape = ENUM_ATTR(tiletype_shape, basic_shape, shape);
|
|
|
|
|
|
|
|
bool uppyDowny;
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
//only needs to change if we need uppy-downiness
|
|
|
|
|
|
|
|
df::coord up = df::coord(point.x, point.y, point.z+1);
|
|
|
|
|
|
|
|
df::coord down = df::coord(point.x, point.y, point.z-1);
|
|
|
|
|
|
|
|
uppyDowny = !(importantPoints.find(up) == importantPoints.end() && importantPoints.find(down) == importantPoints.end());
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( (basicShape == df::tiletype_shape_basic::Floor || basicShape == df::tiletype_shape_basic::Ramp) && !uppyDowny ) {
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
edgeSet.clear();
|
|
|
|
|
|
|
|
for ( auto i = importantEdges.begin(); i != importantEdges.end(); i++ ) {
|
|
|
|
|
|
|
|
Edge e = *i;
|
|
|
|
|
|
|
|
edgeSet[e.p1].insert(e);
|
|
|
|
|
|
|
|
edgeSet[e.p2].insert(e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//now we find the edges used along the paths between any two roots
|
|
|
|
|
|
|
|
importantEdges.clear();
|
|
|
|
|
|
|
|
glob_out = &out;
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
important(*importantPoints.begin(), edgeSet, df::coord(-1,-1,-1), importantPoints, importantEdges);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//NOW we filter to see edges that require digging/constructing
|
|
|
|
|
|
|
|
map<df::coord, int32_t> actionable;
|
|
|
|
|
|
|
|
for ( auto a = importantEdges.begin(); a != importantEdges.end(); a++ ) {
|
|
|
|
|
|
|
|
Edge e = *a;
|
|
|
|
|
|
|
|
if ( Maps::canWalkBetween(e.p1, e.p2) )
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
|
|
|
|
actionable[e.p1]++;
|
|
|
|
|
|
|
|
if( actionable[e.p1] == 0 ) {
|
|
|
|
|
|
|
|
out.print("fuck\n");
|
|
|
|
|
|
|
|
return CR_FAILURE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
actionable[e.p2]++;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ( uppyDowny ) {
|
|
|
|
for ( auto a = actionable.begin(); a != actionable.end(); a++ ) {
|
|
|
|
cache.setTiletypeAt(point, df::tiletype::StoneStairUD);
|
|
|
|
df::coord pos = (*a).first;
|
|
|
|
} else {
|
|
|
|
if ( (*a).second < 2 )
|
|
|
|
cache.setTiletypeAt(point, df::tiletype::StoneFloor1);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
out.print("Requires action: (%d,%d,%d): %d\n", pos.x,pos.y,pos.z, (*a).second);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
cache.WriteAll();
|
|
|
|
/*for ( auto a = importantPoints.begin(); a != importantPoints.end(); a++ ) {
|
|
|
|
|
|
|
|
df::coord pos = (*a);
|
|
|
|
|
|
|
|
out.print("Important point: (%d,%d,%d)\n", pos.x,pos.y,pos.z);
|
|
|
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
|
|
return CR_OK;
|
|
|
|
return CR_OK;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
vector<Edge>* getEdgeSet(color_ostream &out, df::coord point, MapExtras::MapCache& cache, int32_t xMax, int32_t yMax, int32_t zMax) {
|
|
|
|
bool important(df::coord pos, map<df::coord, set<Edge> >& edges, df::coord prev, set<df::coord>& importantPoints, set<Edge>& importantEdges) {
|
|
|
|
vector<df::coord> candidates;
|
|
|
|
//glob_out->print("oh my glob; (%d,%d,%d)\n", pos.x,pos.y,pos.z);
|
|
|
|
for ( int32_t dx = -1; dx <= 1; dx++ ) {
|
|
|
|
set<Edge>& myEdges = edges[pos];
|
|
|
|
if ( point.x + dx < 0 ) continue;
|
|
|
|
bool result = importantPoints.find(pos) != importantPoints.end();
|
|
|
|
for ( int32_t dy = -1; dy <= 1; dy++ ) {
|
|
|
|
for ( auto i = myEdges.begin(); i != myEdges.end(); i++ ) {
|
|
|
|
if ( point.y + dy < 0 ) continue;
|
|
|
|
Edge e = *i;
|
|
|
|
if ( dx == 0 && dy == 0)
|
|
|
|
df::coord other = e.p1;
|
|
|
|
continue;
|
|
|
|
if ( other == pos )
|
|
|
|
candidates.push_back(df::coord(point.x+dx,point.y+dy,point.z));
|
|
|
|
other = e.p2;
|
|
|
|
}
|
|
|
|
if ( other == prev )
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
for ( int32_t dz = -1; dz <= 1; dz++ ) {
|
|
|
|
if ( important(other, edges, pos, importantPoints, importantEdges) ) {
|
|
|
|
if ( point.z + dz < 0 ) continue;
|
|
|
|
result = true;
|
|
|
|
if ( dz == 0 ) continue;
|
|
|
|
importantEdges.insert(e);
|
|
|
|
candidates.push_back(df::coord(point.x, point.y, point.z+dz));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
int32_t connectivityType;
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
df::map_block* block = cache.BlockAt(df::coord(point.x/16, point.y/16, point.z))->getRaw();
|
|
|
|
|
|
|
|
if ( block == NULL ) {
|
|
|
|
|
|
|
|
return new vector<Edge>;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
connectivityType = block->walkable[point.x%16][point.y%16];
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ( connectivityType == 0 )
|
|
|
|
return result;
|
|
|
|
return new vector<Edge>;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
vector<Edge>* getEdgeSet(color_ostream &out, df::coord point, int32_t xMax, int32_t yMax, int32_t zMax) {
|
|
|
|
|
|
|
|
vector<Edge>* result = new vector<Edge>;
|
|
|
|
|
|
|
|
|
|
|
|
for ( int32_t dx = -1; dx <= 1; dx++ ) {
|
|
|
|
for ( int32_t dx = -1; dx <= 1; dx++ ) {
|
|
|
|
if ( point.x + dx < 0 )
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for ( int32_t dy = -1; dy <= 1; dy++ ) {
|
|
|
|
for ( int32_t dy = -1; dy <= 1; dy++ ) {
|
|
|
|
if ( point.y + dy < 0 )
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for ( int32_t dz = -1; dz <= 1; dz++ ) {
|
|
|
|
for ( int32_t dz = -1; dz <= 1; dz++ ) {
|
|
|
|
if ( dz == 0 ) continue;
|
|
|
|
df::coord neighbor(point.x+dx, point.y+dy, point.z+dz);
|
|
|
|
if ( point.z + dz < 0 )
|
|
|
|
if ( neighbor.x < 0 || neighbor.x >= xMax || neighbor.y < 0 || neighbor.y >= yMax || neighbor.z < 0 || neighbor.z >= zMax )
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if ( dx == 0 && dy == 0 )
|
|
|
|
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
df::map_block* block = cache.BlockAt(df::coord((point.x+dx)/16, (point.y+dy)/16, point.z+dz))->getRaw();
|
|
|
|
if ( dz != 0 && (point.x == 0 || point.y == 0 || point.z == 0 || point.x == xMax-1 || point.y == yMax-1 || point.z == zMax-1 || neighbor.x == 0 || neighbor.y == 0 || neighbor.z == 0 || neighbor.x == xMax-1 || neighbor.y == yMax-1 || neighbor.z == zMax-1) )
|
|
|
|
if ( block == NULL ) {
|
|
|
|
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if ( dx == 0 && dy == 0 && dz == 0 )
|
|
|
|
if ( block->walkable[(point.x+dx)%16][(point.y+dy)%16] != connectivityType ) {
|
|
|
|
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
int32_t cost = 0;
|
|
|
|
candidates.push_back(df::coord(point.x+dx, point.y+dy, point.z+dz));
|
|
|
|
if ( dz != 0 ) cost++;
|
|
|
|
}
|
|
|
|
if ( Maps::canWalkBetween(point, neighbor) ) {
|
|
|
|
}
|
|
|
|
Edge edge(point, neighbor, cost+1);
|
|
|
|
}
|
|
|
|
result->push_back(edge);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
//TODO: ramps, buildings
|
|
|
|
Edge edge(point, neighbor, cost+100);
|
|
|
|
|
|
|
|
result->push_back(edge);
|
|
|
|
vector<Edge>* result = new vector<Edge>;
|
|
|
|
|
|
|
|
df::tiletype_shape_basic basePointBasicShape;
|
|
|
|
|
|
|
|
bool basePointIsWall;
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
df::tiletype type = cache.tiletypeAt(point);
|
|
|
|
|
|
|
|
df::tiletype_shape shape = tileShape(type);
|
|
|
|
|
|
|
|
if ( shape == df::tiletype_shape::EMPTY )
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
basePointBasicShape = ENUM_ATTR(tiletype_shape, basic_shape, shape);
|
|
|
|
|
|
|
|
//TODO: worry about up stairs vs down stairs vs updown stairs
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ( basePointBasicShape == df::tiletype_shape_basic::Wall && cache.hasConstructionAt(point) )
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*if ( point.z < zMax-1 ) {
|
|
|
|
|
|
|
|
//ramps part 1: going up
|
|
|
|
|
|
|
|
//if I'm a ramp, and there's a wall in some direction, and there's nothing above me, and that tile is open, I can go there.
|
|
|
|
|
|
|
|
df::tiletype_shape_basic upBasicShape;
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
df::tiletype type = cache.tiletypeAt(df::coord(point.x, point.y, point.z+1));
|
|
|
|
|
|
|
|
df::tiletype_shape shape = tileShape(type);
|
|
|
|
|
|
|
|
upBasicShape = ENUM_ATTR(tiletype_shape, basic_shape, shape);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( upBasicShape == df::tiletype_shape_basic::Ramp ) {
|
|
|
|
|
|
|
|
for ( int32_t dx = -1; dx <= 1; dx++ ) {
|
|
|
|
|
|
|
|
for ( int32_t dy = -1; dy <= 1; dy++ ) {
|
|
|
|
|
|
|
|
if ( dx == 0 && dy == 0 )
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
df::tiletype type = cache.tiletypeAt(df::coord(point.x+dx, point.y+dy, point.z+1));
|
|
|
|
|
|
|
|
df::tiletype_shape shape = tileShape(type);
|
|
|
|
|
|
|
|
df::tiletype_shape_basic basicShape = ENUM_ATTR(tiletype_shape, basic_shape, shape);
|
|
|
|
|
|
|
|
if ( basicShape == df::tiletype_shape_basic::Floor ||
|
|
|
|
|
|
|
|
basicShape == df::tiletype_shape_basic::Stair ||
|
|
|
|
|
|
|
|
basicShape == df::tiletype_shape_basic::Ramp ) {
|
|
|
|
|
|
|
|
candidates.push_back(df::coord(point.x+dx, point.y+dy, point.z+1));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ( point.z >= 1 ) {
|
|
|
|
|
|
|
|
//ramps part 2: going down
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for ( size_t a = 0; a < candidates.size(); a++ ) {
|
|
|
|
|
|
|
|
if ( candidates[a].x <= 1 || candidates[a].x >= xMax-1
|
|
|
|
|
|
|
|
|| candidates[a].y <= 1 || candidates[a].y >= yMax-1
|
|
|
|
|
|
|
|
|| candidates[a].z <= 1 || candidates[a].z >= zMax-1
|
|
|
|
|
|
|
|
) {
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
df::tiletype type = cache.tiletypeAt(candidates[a]);
|
|
|
|
|
|
|
|
df::tiletype_shape shape = tileShape(type); //what namespace?
|
|
|
|
|
|
|
|
if ( shape == df::tiletype_shape::EMPTY )
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
df::tiletype_shape_basic basicShape = ENUM_ATTR(tiletype_shape, basic_shape, shape);
|
|
|
|
|
|
|
|
if ( basicShape == df::tiletype_shape_basic::Wall && cache.hasConstructionAt(candidates[a]) ) {
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//if it's a forbidden door, continue
|
|
|
|
|
|
|
|
df::map_block* block = cache.BlockAt(df::coord(candidates[a].x/16, candidates[a].y/16, candidates[a].z))->getRaw();
|
|
|
|
|
|
|
|
if ( block == NULL ) {
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
df::tile_building_occ building_occ = block->occupancy[candidates[a].x%16][candidates[a].y%16].bits.building;
|
|
|
|
|
|
|
|
if ( building_occ == df::tile_building_occ::Obstacle )
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if ( building_occ == df::tile_building_occ::Impassable )
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if ( building_occ == df::tile_building_occ::Well )
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if ( building_occ == df::tile_building_occ::Dynamic ) {
|
|
|
|
|
|
|
|
//continue; //TODO: check df.map.xml.walkable
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int32_t cost = 1;
|
|
|
|
|
|
|
|
if ( basePointIsWall || basicShape == df::tiletype_shape_basic::Wall ) {
|
|
|
|
|
|
|
|
cost += 1000000; //TODO: fancy cost
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
//if ( candidates[a] < point ) {
|
|
|
|
|
|
|
|
// result->push_back(Edge(candidates[a], point, cost));
|
|
|
|
|
|
|
|
//} else {
|
|
|
|
|
|
|
|
result->push_back(Edge(point, candidates[a], cost));
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|