MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes.

develop
expwnent 2012-12-17 18:05:57 -05:00
parent 515eb3b060
commit 957a4da474
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/diggingInvaders/diggingInvaders.cpp
Unescape Escape View File

@ -98,8 +98,8 @@ DFhackCExport command_result plugin_onupdate ( color_ostream &out )
} }
};*/ };*/
//cost is [path cost, dig cost, construct cost]. Minimize constructions, then minimize dig cost, then minimize path cost. //cost is [path cost, building destruction cost, dig cost, construct cost]. Minimize constructions, then minimize dig cost, then minimize path cost.
const size_t costDim = 3; const size_t costDim = 4;
struct Cost { struct Cost {
int32_t cost[costDim]; int32_t cost[costDim];
@ -347,7 +347,6 @@ command_result diggingInvadersFunc(color_ostream& out, std::vector<std::string>&
if ( building != NULL ) { if ( building != NULL ) {
out.print("%d\n", __LINE__); out.print("%d\n", __LINE__);
building->flags.bits.almost_deleted = true; building->flags.bits.almost_deleted = true;
//Buildings::deconstructImmediately(building);
out.print("%d\n", __LINE__); out.print("%d\n", __LINE__);
} else { } else {
df::map_block* block1 = Maps::getTileBlock(pt1); df::map_block* block1 = Maps::getTileBlock(pt1);
@ -451,7 +450,7 @@ vector<Edge>* getEdgeSet(color_ostream &out, df::coord point, int32_t xMax, int3
} }
if ( shape2 == df::enums::tiletype_shape::EMPTY ) { if ( shape2 == df::enums::tiletype_shape::EMPTY ) {
cost.cost[2] += 1; cost.cost[3] += 1;
} else { } else {
if ( point.z == neighbor.z ) { if ( point.z == neighbor.z ) {
if ( ENUM_ATTR(tiletype_shape, walkable, shape2) ) { if ( ENUM_ATTR(tiletype_shape, walkable, shape2) ) {
@ -474,7 +473,7 @@ vector<Edge>* getEdgeSet(color_ostream &out, df::coord point, int32_t xMax, int3
} }
//this is fine: only charge once for digging through a wall //this is fine: only charge once for digging through a wall
} else { } else {
cost.cost[1] += 20; cost.cost[2] += 1;
} }
} else { } else {
bool ascending = neighbor.z > point.z; bool ascending = neighbor.z > point.z;
@ -496,9 +495,9 @@ vector<Edge>* getEdgeSet(color_ostream &out, df::coord point, int32_t xMax, int3
} else { } else {
//bad! //bad!
if ( ENUM_ATTR(tiletype_shape, basic_shape, shape2) == df::enums::tiletype_shape_basic::Wall ) { if ( ENUM_ATTR(tiletype_shape, basic_shape, shape2) == df::enums::tiletype_shape_basic::Wall ) {
cost.cost[1] += 20;
} else if ( ENUM_ATTR(tiletype_shape, basic_shape, shape2) == df::enums::tiletype_shape_basic::Open ) {
cost.cost[2] += 1; cost.cost[2] += 1;
} else if ( ENUM_ATTR(tiletype_shape, basic_shape, shape2) == df::enums::tiletype_shape_basic::Open ) {
cost.cost[3] += 1;
} else { } else {
continue; continue;
} }