Merge pull request #44933 from Night-Pryanik/jsonify-parking-lot

Jsonify parking lot
CleverRaven · Oct 27, 2020 · 415056f · 415056f
2 parents 913676c + 38d2053
commit 415056f
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 45 deletions.
diff --git a/data/json/mapgen/parking_lot.json b/data/json/mapgen/parking_lot.json
@@ -134,5 +134,41 @@
       "terrain": { ".": [ [ "t_grass", 6 ], [ "t_dirt", 5 ] ], "_": "t_pavement", "-": "t_pavement_y", ",": "t_concrete" },
       "furniture": { "Y": "f_street_light" }
     }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "s_lot" ],
+    "object": {
+      "rows": [
+        "........................",
+        "........................",
+        "........................",
+        "######............######",
+        "........................",
+        ".....................>..",
+        "..<.....................",
+        "........................",
+        "######............######",
+        "........................",
+        ".....................>..",
+        "..<.....................",
+        "........................",
+        "######............######",
+        "........................",
+        ".....................>..",
+        "..<.....................",
+        "........................",
+        "######............######",
+        "........................",
+        ".....................>..",
+        "..<.....................",
+        "........................",
+        "######............######"
+      ],
+      "terrain": { ".": "t_pavement", ">": "t_pavement", "<": "t_pavement", "#": "t_pavement_y" },
+      "items": { ".": { "item": "road", "chance": 1 } },
+      "vehicles": { ">": { "vehicle": "parkinglot", "chance": 10 }, "<": { "vehicle": "parkinglot", "chance": 10, "rotation": 180 } }
+    }
   }
 ]
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -3855,5 +3855,11 @@
       { "point": [ 0, 0, 1 ], "overmap": "s_diner_2ndfloor_north" },
       { "point": [ 0, 0, 2 ], "overmap": "s_diner_roof_north" }
     ]
+  },
+  {
+    "type": "city_building",
+    "id": "s_lot",
+    "locations": [ "land" ],
+    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_lot_north" } ]
   }
 ]
diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json
@@ -1033,7 +1033,7 @@
   {
     "type": "overmap_special",
     "id": "Mine Entrance",
-    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_lot" }, { "point": [ 0, 1, 0 ], "overmap": "mine_entrance" } ],
+    "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "s_lot_north" }, { "point": [ 0, 1, 0 ], "overmap": "mine_entrance" } ],
     "connections": [ { "point": [ 0, -1, 0 ], "terrain": "road", "connection": "local_road", "from": [ 0, 0, 0 ] } ],
     "locations": [ "wilderness" ],
     "city_distance": [ 15, -1 ],

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json b/data/json/overmap/overmap_terrain/overmap_terrain_hardcoded.json
@@ -66,18 +66,6 @@
     "mapgen": [ { "method": "builtin", "name": "forest" } ],
     "flags": [ "NO_ROTATE", "SOURCE_FORAGE", "RISK_HIGH" ]
   },
-  {
-    "type": "overmap_terrain",
-    "id": "s_lot",
-    "name": "parking lot",
-    "sym": "O",
-    "color": "dark_gray",
-    "see_cost": 1,
-    "extras": "build",
-    "mondensity": 2,
-    "mapgen": [ { "method": "builtin", "name": "parking_lot" } ],
-    "flags": [ "SIDEWALK", "NO_ROTATE" ]
-  },
   {
     "type": "overmap_terrain",
     "id": "temple",

diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_transportation.json b/data/json/overmap/overmap_terrain/overmap_terrain_transportation.json
@@ -461,5 +461,13 @@
     "color": "dark_gray",
     "see_cost": 5,
     "extras": "build"
+  },
+  {
+    "type": "overmap_terrain",
+    "id": "s_lot",
+    "copy-from": "generic_city_building",
+    "name": "parking lot",
+    "sym": "O",
+    "color": "dark_gray"
   }
 ]
diff --git a/data/mods/Aftershock/maps/overmap_specials.json b/data/mods/Aftershock/maps/overmap_specials.json
@@ -27,7 +27,7 @@
       { "point": [ 0, 2, 0 ], "overmap": "park_north" },
       { "point": [ 1, 2, 0 ], "overmap": "office_cubical_north" },
       { "point": [ -1, 2, 0 ], "overmap": "pwr_sub_s_north" },
-      { "point": [ -1, 0, 0 ], "overmap": "s_lot" }
+      { "point": [ -1, 0, 0 ], "overmap": "s_lot_north" }
     ],
     "locations": [ "wilderness", "swamp" ],
     "city_distance": [ -1, 6 ],

diff --git a/src/mapgen_functions.cpp b/src/mapgen_functions.cpp
@@ -115,7 +115,6 @@ building_gen_pointer get_mapgen_cfunction( const std::string &ident )
             { "river_curved_not", &mapgen_river_curved_not },
             { "river_straight",   &mapgen_river_straight },
             { "river_curved",     &mapgen_river_curved },
-            { "parking_lot",      &mapgen_parking_lot },
             { "spider_pit", mapgen_spider_pit },
             { "cavern", &mapgen_cavern },
             { "open_air", &mapgen_open_air },
@@ -1842,35 +1841,6 @@ void mapgen_river_curved( mapgendata &dat )
     }
 }
 
-void mapgen_parking_lot( mapgendata &dat )
-{
-    map *const m = &dat.m;
-    for( int i = 0; i < SEEX * 2; i++ ) {
-        for( int j = 0; j < SEEY * 2; j++ ) {
-            if( ( j == 5 || j == 9 || j == 13 || j == 17 || j == 21 ) &&
-                ( ( i > 1 && i < 8 ) || ( i > 14 && i < SEEX * 2 - 2 ) ) ) {
-                m->ter_set( point( i, j ), t_pavement_y );
-            } else if( ( j < 2 && i > 7 && i < 17 ) || ( j >= 2 && j < SEEY * 2 - 2 && i > 1 &&
-                       i < SEEX * 2 - 2 ) ) {
-                m->ter_set( point( i, j ), t_pavement );
-            } else {
-                m->ter_set( point( i, j ), dat.groundcover() );
-            }
-        }
-    }
-
-    VehicleSpawn::apply( vspawn_id( "default_parkinglot" ), *m, "parkinglot" );
-
-    m->place_items( item_group_id( "road" ), 8, point_zero, point( SEEX * 2 - 1, SEEY * 2 - 1 ),
-                    false, dat.when() );
-    for( int i = 1; i < 4; i++ ) {
-        const std::string &id = dat.t_nesw[i].id().str();
-        if( id.size() > 5 && id.find( "road_" ) == 0 ) {
-            m->rotate( i );
-        }
-    }
-}
-
 void mapgen_cavern( mapgendata &dat )
 {
     map *const m = &dat.m;

diff --git a/src/mapgen_functions.h b/src/mapgen_functions.h
@@ -52,7 +52,6 @@ void mapgen_highway( mapgendata &dat );
 void mapgen_river_curved_not( mapgendata &dat );
 void mapgen_river_straight( mapgendata &dat );
 void mapgen_river_curved( mapgendata &dat );
-void mapgen_parking_lot( mapgendata &dat );
 void mapgen_cave( mapgendata &dat );
 void mapgen_cave_rat( mapgendata &dat );
 void mapgen_cavern( mapgendata &dat );