Fix procedural mine mapgen overwriting exit location (#1808)

* Fix off-by-one ladder to manhole exit in mine shaft * Prevent old mine overmapgen from overwriting exit location
cataclysmbnteam · Aug 28, 2022 · b5088e4 · b5088e4
1 parent 56d1f1d
commit b5088e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/data/json/mapgen/mine/mine_shaft.json b/data/json/mapgen/mine/mine_shaft.json
@@ -6,6 +6,7 @@
     "object": {
       "fill_ter": "t_rock",
       "rows": [
+        "                                                ",
         "                      <#                        ",
         "                       #                        ",
         "                       #                        ",
@@ -17,7 +18,6 @@
         "                       #                        ",
         "                       #                        ",
         "                       #                        ",
-        "                       #                        ",
         "                     #>#                        ",
         "                 ....###..                      ",
         "                 ....   ..                      ",

diff --git a/src/overmap.cpp b/src/overmap.cpp
@@ -3692,6 +3692,14 @@ void overmap::build_mine( const tripoint_om_omt &origin, int s )
         s = 2;
     }
     tripoint_om_omt p = origin;
+    // Don't overwrite existing mapgen
+    while( ter( p ) != empty_rock ) {
+        if( one_in( 2 ) ) {
+            p.x() += rng( 0, 1 ) * 2 - 1;
+        } else {
+            p.y() += rng( 0, 1 ) * 2 - 1;
+        }
+    }
     while( built < s ) {
         ter_set( p, mine );
         std::vector<tripoint_om_omt> next;