Skip to content

Commit

Permalink
Add some additional diesel and electric vehicles (cataclysmbnteam#1378)
Browse files Browse the repository at this point in the history 
* Add some additional diesel and electric vehicles

* Suggestions per feedback

* Fix a whoops

* Update helicopters.json
  • Loading branch information
@chaosvolt
chaosvolt authored Mar 5, 2022
1 parent 50326cd commit 732d14c
Show file tree
Hide file tree
Showing 4 changed files with 523 additions and 84 deletions.
156 changes: 99 additions & 57 deletions data/json/vehicle_groups.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,14 @@
[ "ambulance", 900 ],
[ "fire_truck", 300 ],
[ "fire_engine", 200 ],
[ "flatbed_truck", 800 ],
[ "pickup", 800 ],
[ "flatbed_truck", 640 ],
[ "flatbed_truck_diesel", 160 ],
[ "pickup", 640 ],
[ "pickup_diesel", 160 ],
[ "road_roller", 200 ],
[ "autosweeper", 200 ],
[ "hippie_van", 1000 ],
[ "hippie_van", 900 ],
[ "hippie_van_electric", 100 ],
[ "cube_van_cheap", 400 ],
[ "cube_van", 300 ],
[ "security_van", 500 ],
Expand Down Expand Up @@ -94,11 +97,14 @@
[ "suv_electric", 150 ],
[ "car_mini", 500 ],
[ "beetle", 500 ],
[ "pickup", 2000 ],
[ "flatbed_truck", 1000 ],
[ "pickup", 1600 ],
[ "pickup_diesel", 400 ],
[ "flatbed_truck", 800 ],
[ "flatbed_truck_diesel", 200 ],
[ "cube_van", 500 ],
[ "cube_van_cheap", 500 ],
[ "hippie_van", 500 ],
[ "hippie_van", 450 ],
[ "hippie_van_electric", 50 ],
[ "4x4_car", 500 ]
]
},
Expand All @@ -117,8 +123,10 @@
[ "electric_car", 500 ],
[ "car_sports", 1000 ],
[ "car_sports_electric", 300 ],
[ "pickup", 600 ],
[ "flatbed_truck", 500 ],
[ "pickup", 480 ],
[ "pickup_diesel", 120 ],
[ "flatbed_truck", 400 ],
[ "flatbed_truck_diesel", 100 ],
[ "semi_truck", 600 ],
[ "humvee", 600 ],
[ "humvee_gl", 150 ],
Expand All @@ -130,7 +138,8 @@
[ "police_k9tpt", 1 ],
[ "car_fbi", 300 ],
[ "truck_swat", 200 ],
[ "hippie_van", 1000 ],
[ "hippie_van", 900 ],
[ "hippie_van_electric", 100 ],
[ "rara_x", 800 ],
[ "apc", 300 ],
[ "apc-gl", 100 ],
Expand Down Expand Up @@ -175,7 +184,8 @@
[ "suv", 500 ],
[ "suv_electric", 200 ],
[ "suv_electric", 120 ],
[ "pickup", 300 ],
[ "pickup", 240 ],
[ "pickup_diesel", 60 ],
[ "portable_generator", 50 ],
[ "bicycle", 200 ],
[ "bicycle_dirt", 150 ],
Expand All @@ -189,7 +199,8 @@
"id": "dirtlot",
"vehicles": [
[ "quad_bike", 100 ],
[ "pickup", 300 ],
[ "pickup", 240 ],
[ "pickup_diesel", 60 ],
[ "bicycle_dirt", 100 ],
[ "motorcycle_cross", 75 ],
[ "motorcycle_enduro", 150 ]
Expand Down Expand Up @@ -220,14 +231,16 @@
[ "truck_trailer", 500 ],
[ "semi_truck", 500 ],
[ "cube_van", 1000 ],
[ "flatbed_truck", 1000 ],
[ "flatbed_truck", 800 ],
[ "flatbed_truck_diesel", 200 ],
[ "car_mini", 375 ],
[ "beetle", 750 ],
[ "car", 1000 ],
[ "car_anmlcmpt", 100 ],
[ "car_hatch", 500 ],
[ "electric_car", 750 ],
[ "hippie_van", 750 ],
[ "hippie_van", 675 ],
[ "hippie_van_electric", 75 ],
[ "golf_cart", 300 ],
[ "scooter", 300 ],
[ "bicycle", 1000 ],
Expand Down Expand Up @@ -272,8 +285,9 @@
[ "car_chassis", 15 ],
[ "car_sports_atomic", 1 ],
[ "car_racing_electric", 1 ],
[ "electric_car", 19 ],
[ "electric_car", 14 ],
[ "engine_crane", 15 ],
[ "hippie_van_electric", 5 ],
[ "portable_generator", 10 ],
[ "rara_x", 2 ],
[ "suv_electric", 12 ],
Expand Down Expand Up @@ -314,8 +328,10 @@
"vehicles": [
[ "autosweeper", 20 ],
[ "excavator", 120 ],
[ "flatbed_truck", 40 ],
[ "pickup", 20 ],
[ "flatbed_truck", 32 ],
[ "flatbed_truck_diesel", 8 ],
[ "pickup", 16 ],
[ "pickup_diesel", 4 ],
[ "road_roller", 80 ],
[ "tatra_truck", 20 ],
[ "trencher", 40 ]
Expand Down Expand Up @@ -355,7 +371,8 @@
[ "suv_electric", 120 ],
[ "car_mini", 300 ],
[ "beetle", 500 ],
[ "pickup", 600 ],
[ "pickup", 480 ],
[ "pickup_diesel", 120 ],
[ "hippie_van", 700 ],
[ "4x4_car", 500 ]
]
Expand All @@ -374,9 +391,11 @@
[ "meth_lab", 50 ],
[ "beetle", 400 ],
[ "schoolbus", 100 ],
[ "flatbed_truck", 200 ],
[ "flatbed_truck", 160 ],
[ "flatbed_truck_diesel", 40 ],
[ "cube_van_cheap", 400 ],
[ "pickup", 500 ],
[ "pickup", 400 ],
[ "pickup_diesel", 100 ],
[ "hippie_van", 350 ],
[ "4x4_car", 500 ]
]
Expand All @@ -397,8 +416,10 @@
[ "motorcycle_enduro", 150 ],
[ "car_mini", 100 ],
[ "beetle", 200 ],
[ "pickup", 700 ],
[ "hippie_van", 800 ],
[ "pickup", 560 ],
[ "pickup_diesel", 140 ],
[ "hippie_van", 720 ],
[ "hippie_van_electric", 80 ],
[ "4x4_car", 800 ]
]
},
Expand All @@ -413,7 +434,8 @@
[ "rv", 200 ],
[ "car_sports", 300 ],
[ "cube_van_cheap", 200 ],
[ "pickup", 500 ],
[ "pickup", 400 ],
[ "pickup_diesel", 100 ],
[ "hippie_van", 300 ]
]
},
Expand All @@ -429,7 +451,8 @@
[ "car_hatch", 500 ],
[ "car_anmlcmpt", 150 ],
[ "electric_car", 750 ],
[ "hippie_van", 750 ],
[ "hippie_van", 675 ],
[ "hippie_van_electric", 75 ],
[ "motorcycle", 500 ],
[ "superbike", 50 ],
[ "motorcycle_sidecart", 300 ]
Expand All @@ -449,15 +472,17 @@
"type": "vehicle_group",
"id": "crashed_helicopters",
"vehicles": [
[ "helicopter_apache_1a", 100 ],
[ "helicopter_apache_1b", 400 ],
[ "helicopter_apache_1c", 200 ],
[ "helicopter_osprey_2a", 100 ],
[ "helicopter_osprey_2b", 400 ],
[ "helicopter_osprey_2c", 200 ],
[ "helicopter_blackhawk_3a", 100 ],
[ "helicopter_blackhawk_3b", 400 ],
[ "helicopter_blackhawk_3c", 200 ],
[ "helicopter_apache_1a", 95 ],
[ "helicopter_apache_1b", 380 ],
[ "helicopter_apache_1c", 190 ],
[ "helicopter_atomic", 15 ],
[ "helicopter_atomic_wreck", 90 ],
[ "helicopter_osprey_2a", 95 ],
[ "helicopter_osprey_2b", 380 ],
[ "helicopter_osprey_2c", 190 ],
[ "helicopter_blackhawk_3a", 95 ],
[ "helicopter_blackhawk_3b", 380 ],
[ "helicopter_blackhawk_3c", 190 ],
[ "2seater2_Wreck", 400 ],
[ "SmallFlier3_Wreck", 400 ],
[ "Smallflier1_Wreck", 400 ],
Expand Down Expand Up @@ -492,15 +517,17 @@
[ "Medevac2", 200 ],
[ "Medevac1_Wreck", 200 ],
[ "Medevac2_Wreck", 200 ],
[ "helicopter_apache_1a", 200 ],
[ "helicopter_apache_1b", 400 ],
[ "helicopter_apache_1c", 200 ],
[ "helicopter_osprey_2a", 100 ],
[ "helicopter_osprey_2b", 400 ],
[ "helicopter_osprey_2c", 200 ],
[ "helicopter_blackhawk_3a", 100 ],
[ "helicopter_blackhawk_3b", 400 ],
[ "helicopter_blackhawk_3c", 200 ]
[ "helicopter_apache_1a", 95 ],
[ "helicopter_apache_1b", 380 ],
[ "helicopter_apache_1c", 190 ],
[ "helicopter_atomic", 15 ],
[ "helicopter_atomic_wreck", 90 ],
[ "helicopter_osprey_2a", 95 ],
[ "helicopter_osprey_2b", 380 ],
[ "helicopter_osprey_2c", 190 ],
[ "helicopter_blackhawk_3a", 95 ],
[ "helicopter_blackhawk_3b", 380 ],
[ "helicopter_blackhawk_3c", 190 ]
]
},
{
Expand Down Expand Up @@ -578,9 +605,11 @@
[ "truck_trailer", 200 ],
[ "cube_van", 400 ],
[ "cube_van_cheap", 500 ],
[ "flatbed_truck", 300 ],
[ "flatbed_truck", 240 ],
[ "flatbed_truck_diesel", 60 ],
[ "tatra_truck", 200 ],
[ "pickup", 100 ]
[ "pickup", 80 ],
[ "pickup_diesel", 20 ]
]
},
{
Expand All @@ -599,8 +628,10 @@
[ "motorcycle_sidecart", 100 ],
[ "scooter", 200 ],
[ "scooter_electric", 300 ],
[ "pickup", 800 ],
[ "hippie_van", 1000 ]
[ "pickup", 640 ],
[ "pickup_diesel", 160 ],
[ "hippie_van", 900 ],
[ "hippie_van_electric", 100 ]
]
},
{
Expand All @@ -612,7 +643,7 @@
"id": "VETS",
"type": "vehicle_group",
"//": "for veterinarian",
"vehicles": [ [ "car", 300 ], [ "pickup", 100 ], [ "suv", 50 ] ]
"vehicles": [ [ "car", 300 ], [ "pickup", 80 ], [ "pickup_diesel", 20 ], [ "suv", 50 ] ]
},
{
"type": "vehicle_group",
Expand All @@ -627,10 +658,12 @@
[ "suv", 800 ],
[ "suv_electric", 100 ],
[ "suv_electric_rack", 100 ],
[ "pickup", 50 ],
[ "pickup", 40 ],
[ "pickup_diesel", 10 ],
[ "car_anmlcmpt", 150 ],
[ "electric_car", 750 ],
[ "hippie_van", 750 ],
[ "hippie_van", 675 ],
[ "hippie_van_electric", 75 ],
[ "motorcycle", 500 ],
[ "motorcycle_enduro", 50 ],
[ "superbike", 50 ],
Expand Down Expand Up @@ -660,15 +693,18 @@
[ "motorcycle_sidecart", 100 ],
[ "scooter", 200 ],
[ "scooter_electric", 300 ],
[ "pickup", 800 ],
[ "hippie_van", 800 ],
[ "pickup", 640 ],
[ "pickup_diesel", 160 ],
[ "hippie_van", 720 ],
[ "hippie_van_electric", 80 ],
[ "schoolbus", 800 ],
[ "lux_rv", 800 ],
[ "meth_lab", 800 ],
[ "road_roller", 800 ],
[ "truck_trailer", 800 ],
[ "semi_truck", 800 ],
[ "flatbed_truck", 800 ],
[ "flatbed_truck", 640 ],
[ "flatbed_truck_diesel", 160 ],
[ "semi_truck", 800 ],
[ "military_cargo_truck", 800 ],
[ "humvee_gl", 800 ],
Expand Down Expand Up @@ -698,8 +734,10 @@
[ "motorcycle_sidecart", 100 ],
[ "scooter", 200 ],
[ "scooter_electric", 300 ],
[ "pickup", 800 ],
[ "hippie_van", 1000 ]
[ "pickup", 640 ],
[ "pickup_diesel", 160 ],
[ "hippie_van", 900 ],
[ "hippie_van_electric", 100 ]
]
},
{
Expand All @@ -718,10 +756,12 @@
[ "suv", 800 ],
[ "suv_electric", 200 ],
[ "suv_electric", 50 ],
[ "flatbed_truck", 1500 ],
[ "flatbed_truck", 1200 ],
[ "flatbed_truck_diesel", 300 ],
[ "cube_van_cheap", 1500 ],
[ "cube_van", 1200 ],
[ "pickup", 1000 ],
[ "pickup", 800 ],
[ "pickup_diesel", 200 ],
[ "policecar", 400 ],
[ "ambulance", 300 ],
[ "fire_truck", 150 ]
Expand All @@ -744,8 +784,10 @@
[ "motorcycle_sidecart", 100 ],
[ "scooter", 100 ],
[ "scooter_electric", 150 ],
[ "pickup", 800 ],
[ "hippie_van", 200 ],
[ "pickup", 640 ],
[ "pickup_diesel", 160 ],
[ "hippie_van", 180 ],
[ "hippie_van_electric", 200 ],
[ "rv", 50 ]
]
},
Expand Down
Loading

0 comments on commit 732d14c

Please sign in to comment.