Merge pull request #4242 from MagistrumT-T/dig-now-unusable-ramp-fix

Make `dig-now` remove ramps for all dig modes.
DFHack · Feb 2, 2024 · 92087ab · 92087ab
2 parents fd20fdc + 5d0fe6f
commit 92087ab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -29,7 +29,7 @@ Template for new versions:
 ## New Features
 
 ## Fixes
-- `dig-now`: now properly changes newly exposed areas to light/outside when digging around the surface.
+- `dig-now`: now properly removes ramps rendered unusable by digging and changes newly exposed areas to light/outside when digging around the surface.
 ## Misc Improvements
 
 ## Documentation

diff --git a/plugins/dig-now.cpp b/plugins/dig-now.cpp
@@ -344,7 +344,11 @@ static void clean_ramp(MapExtras::MapCache &map, const DFCoord &pos) {
     if (is_wall(map, DFCoord(pos.x-1, pos.y, pos.z)) ||
             is_wall(map, DFCoord(pos.x+1, pos.y, pos.z)) ||
             is_wall(map, DFCoord(pos.x, pos.y-1, pos.z)) ||
-            is_wall(map, DFCoord(pos.x, pos.y+1, pos.z)))
+            is_wall(map, DFCoord(pos.x, pos.y+1, pos.z)) ||
+            is_wall(map, DFCoord(pos.x-1, pos.y-1, pos.z)) ||
+            is_wall(map, DFCoord(pos.x-1, pos.y+1, pos.z)) ||
+            is_wall(map, DFCoord(pos.x+1, pos.y-1, pos.z)) ||
+            is_wall(map, DFCoord(pos.x+1, pos.y+1, pos.z)))
         return;
 
     remove_ramp_top(map, DFCoord(pos.x, pos.y, pos.z+1));
@@ -359,6 +363,10 @@ static void clean_ramps(MapExtras::MapCache &map, const DFCoord &pos) {
     clean_ramp(map, DFCoord(pos.x+1, pos.y, pos.z));
     clean_ramp(map, DFCoord(pos.x, pos.y-1, pos.z));
     clean_ramp(map, DFCoord(pos.x, pos.y+1, pos.z));
+    clean_ramp(map, DFCoord(pos.x-1, pos.y-1, pos.z));
+    clean_ramp(map, DFCoord(pos.x-1, pos.y+1, pos.z));
+    clean_ramp(map, DFCoord(pos.x+1, pos.y-1, pos.z));
+    clean_ramp(map, DFCoord(pos.x+1, pos.y+1, pos.z));
 }
 
 // destroys any colonies located at pos
@@ -489,6 +497,7 @@ static bool dig_tile(color_ostream &out, MapExtras::MapCache &map,
                     if (td_below == df::tile_dig_designation::Default) {
                         dig_tile(out, map, pos_below, td_below, dug_tiles);
                     }
+                    clean_ramps(map, pos);
                     propagate_vertical_flags(map, pos);
                     return true;
                 }
@@ -552,6 +561,7 @@ static bool dig_tile(color_ostream &out, MapExtras::MapCache &map,
     TRACE(general).print("dig_tile: digging the designation tile at (" COORD ")\n",COORDARGS(pos));
     dig_type(map, pos, target_type);
 
+    clean_ramps(map, pos);
     return true;
 }