add skatepark, fix items falling from skater inventory

Co-Authored-By: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com>
cataclysmbnteam · Dec 28, 2024 · 2a2fa9a · 2a2fa9a
1 parent ad6c6ff
commit 2a2fa9a
Show file tree

Hide file tree

Showing 6 changed files with 194 additions and 59 deletions.
diff --git a/data/json/furniture_and_terrain/terrain-zlevel-transitions.json b/data/json/furniture_and_terrain/terrain-zlevel-transitions.json
@@ -415,5 +415,48 @@
     "looks_like": "t_railroad_track",
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "RAIL", "ROAD" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_concrete_ramp_down_high",
+    "name": "concrete ramp down (high end)",
+    "connects_to": "PAVEMENT",
+    "description": "The upper end of a concrete ramp leading down.",
+    "symbol": ">",
+    "color": "light_gray",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD", "Z_TRANSPARENT" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_concrete_ramp_down_low",
+    "name": "concrete ramp down (low end)",
+    "connects_to": "WALL",
+    "description": "The lower end of a concrete ramp leading down.",
+    "symbol": ">",
+    "color": "light_gray",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD", "RAMP_DOWN", "Z_TRANSPARENT" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_concrete_ramp_up_high",
+    "name": "concrete ramp up (high end)",
+    "connects_to": "WALL",
+    "description": "The upper end of a concrete ramp leading up.",
+    "symbol": "<",
+    "color": "light_gray",
+    "move_cost": 2,
+    "flags": [ "ROAD", "RAMP_UP" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_concrete_ramp_up_low",
+    "name": "concrete ramp up (low end)",
+    "description": "The lower end of a concrete ramp leading up.",
+    "symbol": "<",
+    "color": "light_gray",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD" ]
   }
 ]
diff --git a/data/json/mapgen/park_skate.json b/data/json/mapgen/park_skate.json
@@ -1,71 +1,153 @@
 [
+  {
+    "id": "skate_park",
+    "type": "item_group",
+    "subtype": "distribution",
+    "entries": [
+      { "group": "trash", "prob": 6 },
+      { "item": "roller_blades", "prob": 1 },
+      { "item": "folding_skateboard", "prob": 1 },
+      { "item": "rollerskates", "prob": 1 },
+      { "item": "knee_pads", "prob": 1 },
+      { "item": "elbow_pads", "prob": 1 },
+      { "item": "helmet_bike", "prob": 1 }
+    ]
+  },
   {
     "type": "mapgen",
     "method": "json",
     "om_terrain": [ "skate_park" ],
     "weight": 100,
     "object": {
+      "fill_ter": "t_region_groundcover_urban",
       "rows": [
-        "sssssssssssssssssssssss'",
-        "ssssssssssssssssssssssss",
-        "||||||||||ss||||||||||||",
-        "|.##u...u|ss|..u.#.u...|",
-        "|........|ss|..........|",
-        ".....S...|ss|||.........",
-        ".........|sspppppppppp..",
-        "........u|ssp________p..",
-        "...#.....|ssp________p..",
-        ".........|sspppppppppp..",
-        "......ss.|ss__________..",
-        ".Su..s__s|ss__------__..",
-        "....s____sss__________..",
-        "...s__00__ss__________..",
-        "...s__00__ssr_____l___..",
-        "...#s____sssr________w..",
-        ".....s__s.ssr________w..",
-        "......ss..sscrr____www..",
-        "..#.......ss__________..",
-        ".....____&ss__________..",
-        "....._____ss__________..",
-        ".....u____..__________..",
-        "........................",
-        "...........#............"
+        "|||||||||||| ... |||||||",
+        "|            ...       |",
+        "|   7     ......... 7  |",
+        "|     ----.........    |",
+        "| 7 ---............ b  |",
+        "|   -.............. b  |",
+        "|  --..............    |",
+        "|  -............... !  |",
+        "|  -........----...    |",
+        "|  -................-- |",
+        "|  │.................- |",
+        "|  │.................- |",
+        "|  │................-- |",
+        "|  │...............    |",
+        "|   ..    -...│.... !  |",
+        "|   ..    -........    |",
+        "| 7 ..    -........--- |",
+        "|   ..    -..........- |",
+        "|   .................- |",
+        "| & ............-....- |",
+        "|         ......-....- |",
+        "| ! bbbbb ......------ |",
+        "|                      |",
+        "||||||||||||||||||||||||"
       ],
       "terrain": {
-        "#": "t_underbrush_harvested_autumn",
-        "&": "t_pavement",
-        "-": "t_railing_v",
-        ".": "t_grass",
-        "0": "t_pit_shallow",
-        "S": "t_shrub",
-        "_": "t_pavement",
-        "'": "t_sidewalk",
-        "c": "t_chainfence_posts",
-        "l": "t_little_column",
-        "p": "t_pavement_y",
-        "r": "t_railing_h",
-        "s": "t_sidewalk",
-        "u": "t_underbrush",
-        "w": "t_wall",
-        "|": "t_chainfence_v"
+        "│": "t_concrete_wall",
+        "|": "t_chainfence",
+        "7": "t_region_tree_shade",
+        ".": "t_concrete",
+        " ": "t_region_groundcover_urban",
+        "-": "t_concrete_railing"
       },
-      "furniture": { "'": "f_street_light", "&": "f_trashcan" },
-      "place_items": [ { "item": "snacks", "x": 10, "y": 19, "chance": 5 } ],
-      "place_item": [
-        { "item": "folding_skateboard", "x": 7, "y": 15, "chance": 8 },
-        { "item": "folding_skateboard", "x": 19, "y": 10, "chance": 8 },
-        { "item": "roller_blades", "x": [ 15, 19 ], "y": [ 14, 18 ], "chance": 5 }
+      "furniture": { "&": "f_trashcan", "!": "f_street_light", "b": "f_metal_bench" },
+      "items": { ".": { "item": "skate_park", "chance": 2 }, "&": { "item": "trash", "chance": 30, "repeat": [ 1, 3 ] } },
+      "nested": { "│": { "chunks": [ [ "shelter_graffiti", 5 ], [ "general_graffiti", 20 ], [ "null", 5 ] ] } },
+      "place_monster": [ { "group": "GROUP_SCHOOL", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 33, "repeat": [ 1, 5 ] } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "skate_park_up" ],
+    "weight": 100,
+    "object": {
+      "fill_ter": "t_concrete",
+      "rows": [
+        "|||||||||||..|||||||||||",
+        "|........&.............|",
+        "|.!.............----.!.|",
+        "|..................-...|",
+        "|..<<<<<<<<<.......---.|",
+        "|.<<///////<<........-.|",
+        "|.<//     //<.-......-.|",
+        "|.</ ///// /<.-......-.|",
+        "|.</ /<<</ /<.-........|",
+        "|.</ /<.</ /<.-........|",
+        "|.</ /<<</ /<..........|",
+        "|.</ ///// /<<.........|",
+        "|.</       //<<<<<.....|",
+        "|.</        /////<<....|",
+        "|.</            //<....|",
+        "|.<//            /<..b.|",
+        "|.<</            /<..b.|",
+        "|.-<//           /<..b.|",
+        "|.-<</           /<..b.|",
+        "|.--<//         //<....|",
+        "|...<<///////////<<....|",
+        "|.!..<<<<<<<<<<<<<...!.|",
+        "|......................|",
+        "||||||||||||||||||||||||"
       ],
-      "place_monsters": [
-        { "monster": "GROUP_SCHOOL", "x": [ 11, 15 ], "y": [ 10, 15 ], "chance": 2, "repeat": 2 },
-        { "monster": "GROUP_PARK_ANIMAL", "x": [ 4, 19 ], "y": [ 13, 18 ], "repeat": 3 }
+      "terrain": {
+        "|": "t_chainfence",
+        ".": "t_concrete",
+        " ": "t_open_air",
+        "-": "t_concrete_railing",
+        "<": "t_concrete_ramp_down_high",
+        "/": "t_concrete_ramp_down_low"
+      },
+      "furniture": { "&": "f_trashcan", "!": "f_street_light", "b": "f_metal_bench" },
+      "items": { ".": { "item": "skate_park", "chance": 2 }, "&": { "item": "trash", "chance": 30, "repeat": [ 1, 3 ] } },
+      "place_monster": [ { "group": "GROUP_SCHOOL", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 33, "repeat": [ 1, 5 ] } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "skate_park_down" ],
+    "weight": 100,
+    "object": {
+      "fill_ter": "t_concrete",
+      "rows": [
+        "########################",
+        "########################",
+        "########################",
+        "##│││││││││││###########",
+        "#││<<<<<<<<<││##########",
+        "#│<<///////<<│##########",
+        "#│<//.....//<│##########",
+        "#│</./////./<│##########",
+        "#│</./<<</./<│##########",
+        "#│</./<│</./<│##########",
+        "#│</./<<</./<││#########",
+        "#│</./////./<<│││││#####",
+        "#│</.......//<<<<<││####",
+        "#│</......../////<<│####",
+        "#│</............//<│####",
+        "#│<//............/<│####",
+        "#│<</............/<│####",
+        "#││<//.........../<│####",
+        "##│<</.........../<│####",
+        "##││<//.........//<│####",
+        "###│<<///////////<<│####",
+        "###││<<<<<<<<<<<<<││####",
+        "####│││││││││││││││#####",
+        "########################"
       ],
-      "place_vehicles": [
-        { "vehicle": "bicycle", "x": 10, "y": 7, "chance": 3, "status": 0, "rotation": 270 },
-        { "vehicle": "bicycle", "x": 17, "y": 8, "chance": 2, "status": 0, "rotation": 180 },
-        { "vehicle": "scooter", "x": 16, "y": 12, "chance": 5 },
-        { "vehicle": "bicycle", "x": 16, "y": 19, "chance": 7 }
-      ]
+      "terrain": {
+        "#": "t_dirt",
+        "│": "t_concrete_wall",
+        ".": "t_concrete",
+        "<": "t_concrete_ramp_up_high",
+        "/": "t_concrete_ramp_up_low"
+      },
+      "nested": { "│": { "chunks": [ [ "shelter_graffiti", 5 ], [ "general_graffiti", 20 ], [ "null", 5 ] ] } },
+      "items": { ".": { "item": "skate_park", "chance": 2 } }
     }
   }
 ]
diff --git a/data/json/overmap/multitile_city_buildings.json b/data/json/overmap/multitile_city_buildings.json
@@ -4188,5 +4188,14 @@
     ],
     "locations": [ "land" ],
     "flags": [ "CLASSIC" ]
+  },
+  {
+    "type": "city_building",
+    "id": "skate_park_ramp",
+    "locations": [ "land" ],
+    "overmaps": [
+      { "point": [ 0, 0, 0 ], "overmap": "skate_park_up_north" },
+      { "point": [ 0, 0, -1 ], "overmap": "skate_park_down_north" }
+    ]
   }
 ]
diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json b/data/json/overmap/overmap_terrain/overmap_terrain_recreational.json
@@ -87,7 +87,7 @@
     "color": "i_blue"
   },
   {
-    "id": "skate_park",
+    "id": [ "skate_park", "skate_park_up", "skate_park_down" ],
     "type": "overmap_terrain",
     "copy-from": "generic_city_building",
     "name": "skate park",

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -4365,11 +4365,11 @@
           "gloves_fingerless",
           "helmet_skid",
           "sneakers",
-          "folding_skateboard",
           "wristwatch",
           "smart_phone",
           "sports_drink"
-        ]
+        ],
+        "entries": [ { "item": "folding_skateboard", "custom-flags": [ "auto_wield" ] } ]
       },
       "male": [ "briefs" ],
       "female": [ "boy_shorts" ]

diff --git a/data/json/regional_map_settings.json b/data/json/regional_map_settings.json
@@ -778,7 +778,8 @@
         "pool_4": 20,
         "pool_5": 20,
         "pool_6": 20,
-        "skate_park": 100,
+        "skate_park_ramp": 50,
+        "skate_park": 50,
         "small_wooded_trail": 300,
         "pavilion": 100,
         "pavilion_1": 100,