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

don't dig the undiggable

develop
myk002 2021-06-18 23:28:38 -07:00
parent 89210a503e
commit 662f2cc616
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/dig-now.cpp
Unescape Escape View File

@ -284,15 +284,32 @@ struct dug_tile_info {
} }
}; };
static bool is_tree(df::tiletype tt) { static bool is_diggable(MapExtras::MapCache &map, const DFCoord &pos,
df::tiletype tt) {
df::tiletype_material mat = tileMaterial(tt); df::tiletype_material mat = tileMaterial(tt);
switch (mat) { switch (mat) {
case df::tiletype_material::CONSTRUCTION:
case df::tiletype_material::POOL:
case df::tiletype_material::RIVER:
case df::tiletype_material::TREE: case df::tiletype_material::TREE:
case df::tiletype_material::ROOT: case df::tiletype_material::ROOT:
return true; case df::tiletype_material::LAVA_STONE:
default: case df::tiletype_material::MAGMA:
case df::tiletype_material::HFS:
case df::tiletype_material::UNDERWORLD_GATE:
return false; return false;
default:
break;
} }
if (mat == df::tiletype_material::FEATURE) {
// adamantine is the only is diggable feature
t_feature feature;
return map.BlockAtTile(pos)->GetLocalFeature(&feature)
&& feature.type == feature_type::deep_special_tube;
}
return true;
} }
static bool dig_tile(color_ostream &out, MapExtras::MapCache &map, static bool dig_tile(color_ostream &out, MapExtras::MapCache &map,
@ -300,8 +317,7 @@ static bool dig_tile(color_ostream &out, MapExtras::MapCache &map,
std::vector<dug_tile_info> &dug_tiles) { std::vector<dug_tile_info> &dug_tiles) {
df::tiletype tt = map.tiletypeAt(pos); df::tiletype tt = map.tiletypeAt(pos);
// TODO: handle trees, roots, and log generation if (!is_diggable(map, pos, tt))
if (is_tree(tt))
return false; return false;
df::tiletype target_type = df::tiletype::Void; df::tiletype target_type = df::tiletype::Void;