Moved mass grave terrain and special to map extra (#37271)

CleverRaven · Apr 2, 2020 · 9c95a8c · 9c95a8c
1 parent 9e84042
commit 9c95a8c
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 38 deletions.
diff --git a/data/json/mapgen/mass_grave.json → data/json/mapgen/map_extras/mass_grave.json b/data/json/mapgen/mass_grave.json → data/json/mapgen/map_extras/mass_grave.json
@@ -7,9 +7,8 @@
   {
     "type": "mapgen",
     "method": "json",
-    "om_terrain": [ "mass_grave" ],
+    "update_mapgen_id": "mx_mass_grave",
     "object": {
-      "fill_ter": "t_dirt",
       "rows": [
         "                        ",
         " cccccccccccccccccccccc ",

diff --git a/data/json/obsolete_terrains.json b/data/json/obsolete_terrains.json
@@ -297,6 +297,10 @@
       "house_base_south",
       "house_base_east",
       "house_base_west",
+      "mass_grave_north",
+      "mass_grave_south",
+      "mass_grave_east",
+      "mass_grave_west",
       "house",
       "house_north",
       "house_south",

diff --git a/data/json/overmap/map_extras.json b/data/json/overmap/map_extras.json
@@ -387,5 +387,15 @@
     "name": "Prison Bus",
     "description": "A prison bus.",
     "generator": { "generator_method": "update_mapgen", "generator_id": "mx_prison_bus" }
+  },
+  {
+    "id": "mx_mass_grave",
+    "type": "map_extra",
+    "name": "Mass Grave",
+    "description": "A mass grave.",
+    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_mass_grave" },
+    "sym": "X",
+    "color": "yellow",
+    "autonote": true
   }
 ]
diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
@@ -4054,16 +4054,6 @@
     "occurrences": [ 0, 5 ],
     "flags": [ "CLASSIC", "WILDERNESS" ]
   },
-  {
-    "type": "overmap_special",
-    "id": "Mass Grave",
-    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "mass_grave_north" } ],
-    "locations": [ "wilderness" ],
-    "city_distance": [ 20, -1 ],
-    "city_sizes": [ 0, 20 ],
-    "occurrences": [ 0, 10 ],
-    "flags": [ "CLASSIC" ]
-  },
   {
     "id": "Railroad Station",
     "type": "overmap_special",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain.json b/data/json/overmap/overmap_terrain/overmap_terrain.json
@@ -892,13 +892,6 @@
     "see_cost": 5,
     "flags": [ "RISK_LOW", "SOURCE_SAFETY", "SOURCE_FOOD" ]
   },
-  {
-    "type": "overmap_terrain",
-    "id": "mass_grave",
-    "name": "mass grave",
-    "sym": "X",
-    "color": "yellow"
-  },
   {
     "type": "overmap_terrain",
     "id": "ws_giant_sinkhole_1",

diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
@@ -388,7 +388,8 @@
           "mx_point_dead_vegetation": 500,
           "mx_point_burned_ground": 500,
           "mx_casings": 30,
-          "mx_corpses": 30
+          "mx_corpses": 30,
+          "mx_mass_grave": 5
         }
       },
       "forest_thick": {
@@ -416,7 +417,8 @@
           "mx_point_dead_vegetation": 500,
           "mx_point_burned_ground": 500,
           "mx_casings": 30,
-          "mx_corpses": 30
+          "mx_corpses": 30,
+          "mx_mass_grave": 5
         }
       },
       "forest_water": {
@@ -443,7 +445,8 @@
           "mx_point_burned_ground": 500,
           "mx_casings": 30,
           "mx_corpses": 30,
-          "mx_nest_dermatik": 10
+          "mx_nest_dermatik": 10,
+          "mx_mass_grave": 5
         }
       },
       "field": {
@@ -466,7 +469,8 @@
           "mx_point_burned_ground": 50,
           "mx_casings": 20,
           "mx_corpses": 3,
-          "mx_nest_wasp": 2
+          "mx_nest_wasp": 2,
+          "mx_mass_grave": 5
         }
       },
       "road": {

diff --git a/data/mods/Graphical_Overmap/go_overmap_terrain.json b/data/mods/Graphical_Overmap/go_overmap_terrain.json
@@ -642,13 +642,6 @@
     "copy-from": "bandit_garage_2",
     "sym": "\u00E8"
   },
-  {
-    "type": "overmap_terrain",
-    "id": "mass_grave",
-    "copy-from": "mass_grave",
-    "sym": "\u00C4",
-    "color": "red"
-  },
   {
     "type": "overmap_terrain",
     "id": "ws_giant_sinkhole_1",

diff --git a/data/mods/alt_map_key/overmap_terrain.json b/data/mods/alt_map_key/overmap_terrain.json
@@ -8054,14 +8054,6 @@
     "sym": "#",
     "color": "blue"
   },
-  {
-    "type": "overmap_terrain",
-    "id": "mass_grave",
-    "copy-from": "mass_grave",
-    "name": "mass grave",
-    "sym": "m",
-    "color": "red"
-  },
   {
     "type": "overmap_terrain",
     "id": "recyclecenter",

diff --git a/src/savegame.cpp b/src/savegame.cpp
@@ -848,6 +848,8 @@ void overmap::convert_terrain( const std::unordered_map<tripoint, std::string> &
             ter_set( pos, oter_id( "house_w_1_east" ) );
         } else if( old == "house_base_west" || old == "house_west" ) {
             ter_set( pos, oter_id( "house_w_1_west" ) );
+        } else if( old.compare( 0, 10, "mass_grave" ) == 0 ) {
+            ter_set( pos, oter_id( "field" ) );
         }
 
         for( const auto &conv : nearby ) {