feat(content,port): add SEAT_REQUIRES_BALANCE and skateboard vehicl…

…e/profession (#5849) * basic port of DDA skateboard adds seat_requires_balance tag which allows falling off of vehicle seats with this flag. initial json changes, still needs a few more things ported * add spawn location of skateboard vehicle. added items for vehicle parts, and fixed engine "power" to be more reasonable * add skateboard item, separate skater professions CDDA66813, and fix for part install/uninstall CDDA67123 * fixed error * fixes so build works * fold_up changes (changed wheelchair name as well), add skater profession, item, and fix misc json * fixed character.cpp and added skateboard to mapgen and npc item lists * add parking garage spawn and increase skate park spawns. adds co-authors. run json linter Co-Authored-By: Bruce Linck <balinck@gmail.com> Co-Authored-By: KittyTac <52408044+KittyTac@users.noreply.github.com> Co-Authored-By: casswedson <casswedson@users.noreply.github.com> * recipes for skateboard crafting, more spawn locations near roller_blades * vehicle_use can_be_folded checks and profession parity between skaters * add documentation to json_flags for SEAT_REQUIRES_BALANCE * add skatepark, fix items falling from skater inventory Co-Authored-By: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> * style(autofix.ci): automated formatting --------- Co-authored-by: Bruce Linck <balinck@gmail.com> Co-authored-by: KittyTac <52408044+KittyTac@users.noreply.github.com> Co-authored-by: casswedson <casswedson@users.noreply.github.com> Co-authored-by: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
cataclysmbnteam · Jan 3, 2025 · 3592b65 · 3592b65
1 parent 7c55574
commit 3592b65
Show file tree

Hide file tree

Showing 29 changed files with 535 additions and 75 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/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1865,6 +1865,7 @@
       [ "helmet_football", 5 ],
       [ "mouthpiece", 5 ],
       [ "roller_blades", 20 ],
+      [ "folding_skateboard", 10 ],
       [ "rollerskates", 10 ],
       [ "rollerskates", 10 ],
       [ "roller_shoes_off", 10 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -462,6 +462,7 @@
       [ "boots_hiking", 10 ],
       [ "roller_blades", 20 ],
       [ "rollerskates", 10 ],
+      [ "folding_skateboard", 10 ],
       [ "roller_shoes_off", 10 ],
       [ "runner_bag", 5 ],
       [ "gloves_tactical", 1 ],
@@ -843,6 +844,7 @@
       { "group": "kids_books", "prob": 215 },
       { "item": "novel_pulp", "prob": 30 },
       { "item": "folding_bicycle", "prob": 3 },
+      { "item": "folding_skateboard", "prob": 3 },
       { "item": "sunglasses", "prob": 25 },
       { "item": "cowboy_hat", "prob": 25 },
       { "item": "mp3", "prob": 35 },
@@ -1088,7 +1090,11 @@
           { "item": "small_storage_battery", "prob": 10 },
           { "item": "alternator_bicycle", "prob": 10 },
           { "item": "folding_bicycle", "prob": 10 },
-          { "item": "roller_blades", "prob": 10 }
+          { "item": "roller_blades", "prob": 10 },
+          { "item": "folding_skateboard", "prob": 10 },
+          { "item": "wheel_skateboard", "prob": 5 },
+          { "item": "wheel_mount_skateboard", "prob": 5 },
+          { "item": "frame_wood_deck", "prob": 5 }
         ]
       },
       {

diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
@@ -103,6 +103,7 @@
       [ "magic_8_ball", 30 ],
       [ "novel_pulp", 20 ],
       [ "folding_bicycle", 5 ],
+      [ "folding_skateboard", 5 ],
       [ "sunglasses", 25 ],
       [ "wolfsuit", 5 ],
       [ "dinosuit", 5 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -812,6 +812,7 @@
       [ "hockey_stick", 45 ],
       [ "golf_club", 80 ],
       [ "roller_blades", 20 ],
+      [ "folding_skateboard", 10 ],
       [ "rollerskates", 10 ],
       [ "longbow", 5 ],
       [ "compositebow", 5 ],

diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json
@@ -77,6 +77,7 @@
       [ "knee_pads", 40 ],
       [ "roller_blades", 20 ],
       [ "rollerskates", 10 ],
+      [ "folding_skateboard", 10 ],
       [ "manual_throw", 12 ],
       {
         "item": "protein_powder",

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -112,6 +112,7 @@
       { "item": "bubblewrap", "prob": 50 },
       { "item": "binoculars", "prob": 20 },
       { "item": "roller_blades", "prob": 20 },
+      { "item": "folding_skateboard", "prob": 10 },
       { "item": "duct_tape", "prob": 100 },
       { "item": "lawnmower", "prob": 25 },
       { "item": "trash_can_empty", "prob": 25 },
@@ -801,6 +802,7 @@
       { "item": "mask_hockey", "prob": 5 },
       { "item": "hockey_stick", "prob": 10 },
       { "item": "roller_blades", "prob": 20 },
+      { "item": "folding_skateboard", "prob": 10 },
       { "item": "roller_shoes_off", "prob": 10 },
       { "item": "jersey", "prob": 40 },
       { "item": "hairpin", "prob": 20 },

diff --git a/data/json/items/tool/deployable.json b/data/json/items/tool/deployable.json
@@ -140,6 +140,29 @@
     },
     "flags": [ "ALLOWS_REMOTE_USE" ]
   },
+  {
+    "id": "folding_skateboard",
+    "type": "TOOL",
+    "category": "tools",
+    "name": { "str": "skateboard" },
+    "description": "This is a skateboard.",
+    "weight": "2898 g",
+    "volume": "3750 ml",
+    "price": "350 USD",
+    "price_postapoc": "20 USD",
+    "to_hit": -5,
+    "bashing": 10,
+    "material": "aluminum",
+    "symbol": "0",
+    "color": "light_gray",
+    "use_action": {
+      "type": "unfold_vehicle",
+      "vehicle_name": "skateboard",
+      "unfold_msg": "You lay the skateboard down on the ground.",
+      "moves": 0
+    },
+    "flags": [ "ALLOWS_REMOTE_USE" ]
+  },
   {
     "id": "generic_folded_vehicle",
     "type": "TOOL",

diff --git a/data/json/items/vehicle/frames.json b/data/json/items/vehicle/frames.json
@@ -120,5 +120,20 @@
     "price": "35 USD",
     "price_postapoc": "1 USD",
     "copy-from": "foldframe"
+  },
+  {
+    "type": "GENERIC",
+    "id": "frame_wood_deck",
+    "name": { "str": "skateboard deck" },
+    "symbol": "]",
+    "description": "A small skateboard frame made of thin layers of wood glued together.",
+    "weight": "1500 g",
+    "to_hit": -5,
+    "color": "brown",
+    "material": [ "wood" ],
+    "volume": "8750 ml",
+    "price": 1000,
+    "price_postapoc": 50,
+    "copy-from": "foldframe"
   }
 ]
diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json
@@ -160,6 +160,39 @@
     "diameter": 4,
     "width": 1
   },
+  {
+    "id": "wheel_skateboard",
+    "category": "veh_parts",
+    "type": "WHEEL",
+    "name": { "str": "set of skateboard wheels", "str_pl": "sets of skateboard wheels" },
+    "description": "A set of skateboard wheels.",
+    "weight": "1500 g",
+    "volume": "1250 ml",
+    "price": "20 USD",
+    "price_postapoc": "1 USD",
+    "bashing": 6,
+    "to_hit": -1,
+    "material": [ "steel", "plastic" ],
+    "symbol": "]",
+    "color": "dark_gray",
+    "diameter": 2,
+    "width": 1
+  },
+  {
+    "id": "wheel_mount_skateboard",
+    "type": "GENERIC",
+    "category": "veh_parts",
+    "name": { "str": "pair of skateboard trucks", "str_pl": "pairs of skateboard trucks" },
+    "description": "A pair metal skateboard trucks, for attaching wheels to.",
+    "weight": "600 g",
+    "volume": "250 ml",
+    "price": 200,
+    "price_postapoc": 20,
+    "to_hit": -2,
+    "material": [ "steel" ],
+    "symbol": "]",
+    "color": "dark_gray"
+  },
   {
     "id": "wheel_10",
     "category": "veh_parts",