Merge pull request #5523 from quietust/dignow

dig-now - properly handle UNDIGGABLE tiles

Author: ab9rf

docs/changelog.txt

@@ -58,6 +58,7 @@ Template for new versions:
 
 ## Fixes
 - several fixes related to changes in file system handling in DF 52.01
+- `dig-now`: don't allow UNDIGGABLE stones to be excavated
 
 ## Misc Improvements
 - `autoclothing`: added a ``clear`` option to unset previously set orders

plugins/dig-now.cpp

@@ -450,12 +450,10 @@ static bool is_diggable(MapExtras::MapCache &map, const DFCoord &pos,
         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;
-    }
+    MaterialInfo mi;
+    mi.decode(map.baseMaterialAt(pos));
+    if (mi.material != nullptr && mi.material->flags.is_set(df::material_flags::UNDIGGABLE))
+        return false;
 
     return true;
 }