Skip to content

Commit

Permalink
Adds new 4-door Hatchback vehicle. (#36584)
Browse files Browse the repository at this point in the history 
* Adds 4-door Hatchback, renames old Hatchback to City Car

* Adds car_hatch spawns at 50% car spawn rate, reduces car_mini spawns by 50%

* Fixes car_hatch item group spawns.

* Increase car_hatch fuel tank size to 40L (midpoint between city car and regular car)
  • Loading branch information
@martin509 @ZhilkinSerg
martin509 authored and ZhilkinSerg committed Dec 31, 2019
1 parent 327c276 commit 31e1e8b
Show file tree
Hide file tree
Showing 2 changed files with 118 additions and 15 deletions.
44 changes: 30 additions & 14 deletions data/json/vehicle_groups.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
"vehicles": [
[ "car", 2000 ],
[ "car_anmlcmpt", 250 ],
[ "car_hatch", 1000 ],
[ "electric_car", 500 ],
[ "car_sports", 300 ],
[ "car_sports_electric", 60 ],
[ "suv", 800 ],
[ "suv_electric", 200 ],
[ "suv_electric", 120 ],
[ "car_mini", 800 ],
[ "car_mini", 400 ],
[ "beetle", 500 ],
[ "bicycle", 400 ],
[ "bicycle_electric", 100 ],
Expand Down Expand Up @@ -75,12 +76,13 @@
"vehicles": [
[ "car", 7000 ],
[ "car_anmlcmpt", 600 ],
[ "car_hatch", 3500 ],
[ "electric_car", 1000 ],
[ "car_sports", 500 ],
[ "suv", 1000 ],
[ "suv_electric", 300 ],
[ "suv_electric", 150 ],
[ "car_mini", 1000 ],
[ "car_mini", 500 ],
[ "beetle", 500 ],
[ "pickup", 2000 ],
[ "flatbed_truck", 1000 ],
Expand All @@ -101,6 +103,7 @@
"vehicles": [
[ "car", 3000 ],
[ "car_anmlcmpt", 250 ],
[ "car_hatch", 1000 ],
[ "electric_car", 500 ],
[ "car_sports", 1000 ],
[ "car_sports_electric", 300 ],
Expand Down Expand Up @@ -143,7 +146,8 @@
"vehicles": [
[ "car", 1000 ],
[ "car_anmlcmpt", 150 ],
[ "car_mini", 500 ],
[ "car_hatch", 500 ],
[ "car_mini", 250 ],
[ "electric_car", 500 ],
[ "beetle", 300 ],
[ "car_sports", 100 ],
Expand Down Expand Up @@ -198,10 +202,11 @@
[ "semi_truck", 500 ],
[ "cube_van", 1000 ],
[ "flatbed_truck", 1000 ],
[ "car_mini", 750 ],
[ "car_mini", 375 ],
[ "beetle", 750 ],
[ "car", 1000 ],
[ "car_anmlcmpt", 100 ],
[ "car_hatch", 500 ],
[ "electric_car", 750 ],
[ "hippie_van", 750 ],
[ "golf_cart", 300 ],
Expand All @@ -224,7 +229,8 @@
"id": "garage",
"type": "vehicle_group",
"vehicles": [
[ "car", 10 ],
[ "car", 5 ],
[ "car_hatch", 2 ],
[ "car_chassis", 20 ],
[ "engine_crane", 40 ],
[ "motorcycle", 10 ],
Expand Down Expand Up @@ -299,6 +305,7 @@
"id": "junkyard_vehicles",
"vehicles": [
[ "car", 1500 ],
[ "car_hatch", 750 ],
[ "car_chassis", 2000 ],
[ "electric_car", 400 ],
[ "car_sports", 400 ],
Expand All @@ -307,7 +314,7 @@
[ "suv", 500 ],
[ "suv_electric", 200 ],
[ "suv_electric", 120 ],
[ "car_mini", 600 ],
[ "car_mini", 300 ],
[ "beetle", 500 ],
[ "bubble_car", 20 ],
[ "pickup", 600 ],
Expand All @@ -320,10 +327,11 @@
"id": "dumpsite_vehicles",
"vehicles": [
[ "car", 1000 ],
[ "car_hatch", 500 ],
[ "car_chassis", 1200 ],
[ "car_sports", 200 ],
[ "suv", 400 ],
[ "car_mini", 500 ],
[ "car_mini", 250 ],
[ "rv", 250 ],
[ "meth_lab", 50 ],
[ "beetle", 400 ],
Expand All @@ -340,13 +348,14 @@
"id": "campground_vehicles",
"vehicles": [
[ "car", 950 ],
[ "car_hatch", 475 ],
[ "car_anmlcmpt", 150 ],
[ "electric_car", 100 ],
[ "suv", 800 ],
[ "suv_electric", 100 ],
[ "suv_electric_rack", 100 ],
[ "bicycle_dirt", 50 ],
[ "car_mini", 200 ],
[ "car_mini", 100 ],
[ "beetle", 200 ],
[ "pickup", 700 ],
[ "hippie_van", 800 ],
Expand All @@ -358,6 +367,7 @@
"id": "forgotten_vehicles",
"vehicles": [
[ "car", 1000 ],
[ "car_hatch", 500 ],
[ "car_anmlcmpt", 100 ],
[ "suv", 400 ],
[ "rv", 200 ],
Expand All @@ -374,9 +384,10 @@
[ "bubble_car", 50 ],
[ "car_sports_electric", 100 ],
[ "cube_van", 1000 ],
[ "car_mini", 750 ],
[ "car_mini", 375 ],
[ "beetle", 750 ],
[ "car", 1000 ],
[ "car_hatch", 500 ],
[ "car_anmlcmpt", 150 ],
[ "electric_car", 750 ],
[ "hippie_van", 750 ],
Expand Down Expand Up @@ -473,10 +484,11 @@
"//": "for cs_car_dealership",
"vehicles": [
[ "car", 2000 ],
[ "car_hatch", 1000 ],
[ "electric_car", 500 ],
[ "suv", 800 ],
[ "suv_electric", 200 ],
[ "car_mini", 800 ],
[ "car_mini", 400 ],
[ "beetle", 500 ],
[ "motorcycle", 200 ],
[ "motorcycle_sidecart", 100 ],
Expand Down Expand Up @@ -504,9 +516,10 @@
[ "bubble_car", 200 ],
[ "4x4_car", 200 ],
[ "car_sports_electric", 100 ],
[ "car_mini", 750 ],
[ "car_mini", 375 ],
[ "beetle", 750 ],
[ "car", 1500 ],
[ "car_hatch", 750 ],
[ "suv", 800 ],
[ "suv_electric", 100 ],
[ "suv_electric_rack", 100 ],
Expand All @@ -532,10 +545,11 @@
"//": "for ws_regional_dump",
"vehicles": [
[ "car", 1000 ],
[ "car_hatch", 500 ],
[ "electric_car", 500 ],
[ "suv", 800 ],
[ "suv_electric", 200 ],
[ "car_mini", 800 ],
[ "car_mini", 400 ],
[ "beetle", 500 ],
[ "motorcycle", 200 ],
[ "motorcycle_sidecart", 100 ],
Expand Down Expand Up @@ -567,10 +581,11 @@
"id": "oa_vg_ts_vehicles",
"vehicles": [
[ "car", 2000 ],
[ "car_hatch", 1000 ],
[ "electric_car", 500 ],
[ "suv", 800 ],
[ "suv_electric", 200 ],
[ "car_mini", 800 ],
[ "car_mini", 400 ],
[ "beetle", 500 ],
[ "motorcycle", 200 ],
[ "motorcycle_cross", 50 ],
Expand All @@ -592,8 +607,9 @@
"type": "vehicle_group",
"vehicles": [
[ "car", 2000 ],
[ "car_hatch", 1000 ],
[ "electric_car", 500 ],
[ "car_mini", 500 ],
[ "car_mini", 250 ],
[ "suv", 800 ],
[ "suv_electric", 200 ],
[ "suv_electric", 50 ],
Expand Down
89 changes: 88 additions & 1 deletion data/json/vehicles/cars.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@
{
"id": "car_mini",
"type": "vehicle",
"name": "Hatchback",
"name": "City Car",
"blueprint": [
[ "o+-o" ],
[ "+#'|" ],
Expand Down Expand Up @@ -536,6 +536,93 @@
{ "x": -1, "y": 0, "chance": 5, "items": [ "mag_glam" ] }
]
},
{
"id": "car_hatch",
"type": "vehicle",
"name": "Hatchback",
"blueprint": [
[ "o++-o" ],
[ "+##'|" ],
[ "+##'|" ],
[ "o++-o" ]
],
"parts": [
{ "x": 0, "y": 0, "part": "frame_vertical_2" },
{ "x": 0, "y": 0, "part": "seat" },
{ "x": 0, "y": 0, "part": "seatbelt" },
{ "x": 0, "y": 0, "part": "controls" },
{ "x": 0, "y": 0, "part": "dashboard" },
{ "x": 0, "y": 0, "part": "vehicle_clock" },
{ "x": 0, "y": 0, "part": "vehicle_alarm" },
{ "x": 0, "y": 0, "part": "horn_car" },
{ "x": 0, "y": 0, "part": "roof" },
{ "x": 0, "y": 1, "part": "frame_vertical_2" },
{ "x": 0, "y": 1, "part": "seat" },
{ "x": 0, "y": 1, "part": "seatbelt" },
{ "x": 0, "y": 1, "part": "roof" },
{ "x": 0, "y": -1, "part": "frame_vertical" },
{ "x": 0, "y": -1, "part": "door" },
{ "x": 0, "y": 2, "part": "frame_vertical" },
{ "x": 0, "y": 2, "part": "door" },
{ "x": 1, "y": 0, "part": "frame_horizontal" },
{ "x": 1, "y": 0, "part": "windshield" },
{ "x": 1, "y": 1, "part": "frame_horizontal" },
{ "x": 1, "y": 1, "part": "windshield" },
{ "x": 1, "y": -1, "part": "frame_vertical" },
{ "x": 1, "y": -1, "part": "windshield" },
{ "x": 1, "y": 2, "part": "frame_vertical" },
{ "x": 1, "y": 2, "part": "windshield" },
{ "x": 2, "y": 0, "part": "frame_horizontal" },
{ "x": 2, "y": 0, "part": "halfboard_horizontal" },
{ "x": 2, "y": 0, "part": "engine_inline4" },
{ "x": 2, "y": 0, "part": "alternator_car" },
{ "x": 2, "y": 0, "part": "battery_car" },
{ "x": 2, "y": 1, "part": "frame_horizontal" },
{ "x": 2, "y": 1, "part": "halfboard_horizontal" },
{ "x": 2, "y": -1, "part": "frame_nw" },
{ "x": 2, "y": -1, "part": "halfboard_nw" },
{ "x": 2, "y": -1, "parts": [ "wheel_mount_medium_steerable", "wheel" ] },
{ "x": 2, "y": -1, "part": "headlight" },
{ "x": 2, "y": 2, "part": "frame_ne" },
{ "x": 2, "y": 2, "part": "halfboard_ne" },
{ "x": 2, "y": 2, "parts": [ "wheel_mount_medium_steerable", "wheel" ] },
{ "x": 2, "y": 2, "part": "headlight" },
{ "x": -1, "y": -1, "part": "frame_vertical" },
{ "x": -1, "y": -1, "part": "door" },
{ "x": -1, "y": 0, "part": "frame_vertical_2" },
{ "x": -1, "y": 0, "part": "seat" },
{ "x": -1, "y": 0, "part": "seatbelt" },
{ "x": -1, "y": 0, "part": "roof" },
{ "x": -1, "y": 1, "part": "frame_vertical_2" },
{ "x": -1, "y": 1, "part": "seat" },
{ "x": -1, "y": 1, "part": "seatbelt" },
{ "x": -1, "y": 1, "part": "roof" },
{ "x": -1, "y": 2, "part": "frame_vertical" },
{ "x": -1, "y": 2, "part": "door" },
{ "x": -2, "y": -1, "part": "frame_sw" },
{ "x": -2, "y": -1, "parts": [ "wheel_mount_medium", "wheel" ] },
{ "x": -2, "y": -1, "part": "tank_medium", "fuel": "gasoline" },
{ "x": -2, "y": -1, "part": "halfboard_sw" },
{ "x": -2, "y": 0, "part": "frame_horizontal" },
{ "x": -2, "y": 0, "part": "hatch" },
{ "x": -2, "y": 0, "part": "muffler" },
{ "x": -2, "y": 1, "part": "frame_horizontal" },
{ "x": -2, "y": 1, "part": "hatch" },
{ "x": -2, "y": 2, "part": "frame_se" },
{ "x": -2, "y": 2, "parts": [ "wheel_mount_medium", "wheel" ] },
{ "x": -2, "y": 2, "part": "tank_medium", "fuel": "gasoline" },
{ "x": -2, "y": 2, "part": "halfboard_se" }
],
"items": [
{ "x": 0, "y": 0, "chance": 14, "item_groups": [ "car_misc" ] },
{ "x": 0, "y": 0, "chance": 5, "item_groups": [ "snacks" ] },
{ "x": 0, "y": 1, "chance": 8, "item_groups": [ "car_misc" ] },
{ "x": 0, "y": 1, "chance": 2, "item_groups": [ "fast_food" ] },
{ "x": -2, "y": 0, "chance": 10, "items": [ "blanket" ] },
{ "x": -2, "y": 1, "chance": 15, "item_groups": [ "car_kit" ] },
{ "x": -2, "y": 1, "chance": 15, "items": [ "jack_small", "wheel" ] }
]
},
{
"id": "car_sports",
"type": "vehicle",
Expand Down

0 comments on commit 31e1e8b

Please sign in to comment.