From edc7baf95e071c58015342eaad461ba8186f6239 Mon Sep 17 00:00:00 2001 From: fae Date: Wed, 15 Sep 2021 03:58:41 +0100 Subject: [PATCH 1/3] Added a new prisoner transport van based on images I found of american sweatboxes online. --- data/json/vehicleparts/seats.json | 32 ++++++++++ data/json/vehicles/vans_busses.json | 91 +++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/data/json/vehicleparts/seats.json b/data/json/vehicleparts/seats.json index 19c8ae1e261eb..6de74e56f4ebe 100644 --- a/data/json/vehicleparts/seats.json +++ b/data/json/vehicleparts/seats.json @@ -183,6 +183,32 @@ "flags": [ "SEAT", "BOARDABLE", "FOLDABLE", "NONBELTABLE" ], "breaks_into": [ { "item": "rag", "count": [ 1, 6 ] } ] }, + { + "abstract": "metal_bench_abstract", + "breaks_into": "ig_vp_steel_plate", + "broken_color": "dark_gray", + "broken_symbol": "*", + "categories": [ "operations", "passengers" ], + "color": "dark_gray", + "comfort": 0, + "damage_modifier": 60, + "damage_reduction": { "all": 3, "bash": 5 }, + "description": "A steel bench with ankle and wrist restraints built in. It looks very uncomfortable.", + "durability": 450, + "flags": [ "SEAT", "BOARDABLE", "BELTABLE" ], + "item": "steel_plate", + "location": "center", + "looks_like": "seat", + "name": { "str": "steel bench" }, + "requirements": { + "install": { "skills": [ [ "mechanics", 1 ] ], "time": "60 m", "using": [ [ "welding_standard", 10 ] ] }, + "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": "vehicle_weld_removal" }, + "repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "welding_standard", 20 ] ] } + }, + "size": 25, + "symbol": "#", + "type": "vehicle_part" + }, { "copy-from": "seat_abstract", "id": "seat", @@ -247,5 +273,11 @@ "id": "folding_seat", "symbol": "#", "type": "vehicle_part" + }, + { + "copy-from": "metal_bench_abstract", + "id": "metal_bench", + "symbol": "#", + "type": "vehicle_part" } ] diff --git a/data/json/vehicles/vans_busses.json b/data/json/vehicles/vans_busses.json index 73a71d27ed38c..a6d681239680f 100644 --- a/data/json/vehicles/vans_busses.json +++ b/data/json/vehicles/vans_busses.json @@ -1850,5 +1850,96 @@ { "x": -5, "y": 1, "chance": 12, "item_groups": [ "fuel_gasoline" ] }, { "x": -5, "y": 2, "chance": 12, "item_groups": [ "fuel_gasoline" ] } ] + }, + { + "id": "prisoner_van_1", + "type": "vehicle", + "name": "Prisoner Van", + "blueprint": [ + [ " o " ], + [ "O----+-O" ], + [ "+===|#'|" ], + [ "|---|o'>" ], + [ "+===|#'|" ], + [ "O--+-+-O" ], + [ " o " ] + ], + "parts": [ + { "x": 0, "y": 0, "parts": [ "hdframe_cross", "seat", "seatbelt", "hdroof", "controls", "cam_control" ] }, + { "x": 0, "y": 0, "parts": [ "stereo", "dashboard", "vehicle_alarm", "vehicle_clock" ] }, + { "x": 0, "y": 0, "part": "horn_car" }, + { "x": 0, "y": -1, "parts": [ "hdframe_vertical_left", "hddoor_left", "hdroof" ] }, + { "x": 0, "y": -1, "part": "plating_steel" }, + { "x": 0, "y": 1, "parts": [ "hdframe_cross", "hdroof", "box" ] }, + { "x": 0, "y": 2, "parts": [ "hdframe_cross", "seat", "seatbelt", "cam_control", "hdroof" ] }, + { "x": 0, "y": 3, "parts": [ "hdframe_vertical_right", "hddoor_right", "hdroof" ] }, + { "x": 0, "y": 3, "part": "plating_steel" }, + { "x": 1, "y": -1, "parts": [ "hdframe_nw", "reinforced_windshield_nw", "plating_steel" ] }, + { "x": 1, "y": -2, "part": "wing_mirror_left" }, + { "x": 1, "y": 0, "part": "hdframe_horizontal_front" }, + { "x": 1, "y": 0, "parts": [ "reinforced_windshield_horizontal_front", "wide_headlight" ] }, + { "x": 1, "y": 0, "part": "plating_steel" }, + { "x": 1, "y": 1, "part": "hdframe_horizontal_front" }, + { "x": 1, "y": 1, "parts": [ "reinforced_windshield_horizontal_front", "plating_steel" ] }, + { "x": 1, "y": 1, "parts": [ "diesel_engine_v6", "alternator_truck", "battery_car" ] }, + { "x": 1, "y": 1, "part": "storage_battery" }, + { "x": 1, "y": 2, "part": "hdframe_horizontal_front" }, + { "x": 1, "y": 2, "parts": [ "reinforced_windshield_horizontal_front", "wide_headlight" ] }, + { "x": 1, "y": 2, "part": "plating_steel" }, + { "x": 1, "y": 3, "parts": [ "hdframe_ne", "reinforced_windshield_ne", "plating_steel" ] }, + { "x": 1, "y": 4, "part": "wing_mirror_right" }, + { "x": 2, "y": -1, "parts": [ "hdframe_nw", "hdhalfboard_nw", "plating_steel" ] }, + { "x": 2, "y": -1, "parts": [ "wheel_mount_medium_steerable", "wheel_wide" ] }, + { "x": 2, "y": 0, "parts": [ "hdframe_horizontal_front", "hdhalfboard_horizontal_front" ] }, + { "x": 2, "y": 0, "parts": [ "plating_steel", "headlight_reinforced" ] }, + { "x": 2, "y": 1, "parts": [ "hdframe_horizontal_front", "hdhalfboard_horizontal_front" ] }, + { "x": 2, "y": 1, "part": "plating_steel" }, + { "x": 2, "y": 2, "parts": [ "hdframe_horizontal_front", "hdhalfboard_horizontal_front" ] }, + { "x": 2, "y": 2, "parts": [ "plating_steel", "headlight_reinforced" ] }, + { "x": 2, "y": 3, "parts": [ "hdframe_ne", "hdhalfboard_ne", "plating_steel" ] }, + { "x": 2, "y": 3, "parts": [ "wheel_mount_medium_steerable", "wheel_wide" ] }, + { "x": -1, "y": -1, "parts": [ "hdframe_vertical_left", "hdboard_nw", "hdroof" ] }, + { "x": -1, "y": -1, "parts": [ "plating_steel", { "part": "tank", "fuel": "diesel" } ] }, + { "x": -1, "y": 0, "parts": [ "hdframe_cross", "hdboard_horizontal_front", "hdroof", "omnicam" ] }, + { "x": -1, "y": 0, "part": "plating_steel" }, + { "x": -1, "y": 1, "parts": [ "hdframe_cross", "hdboard_horizontal_front", "hdroof" ] }, + { "x": -1, "y": 1, "part": "plating_steel" }, + { "x": -1, "y": 2, "parts": [ "hdframe_cross", "hdboard_horizontal_front", "hdroof", "omnicam" ] }, + { "x": -1, "y": 2, "part": "plating_steel" }, + { "x": -1, "y": 3, "parts": [ "hdframe_vertical_right", "hdboard_ne", "hdroof" ] }, + { "x": -1, "y": 3, "parts": [ "plating_steel", { "part": "tank", "fuel": "diesel" } ] }, + { "x": -2, "y": -1, "parts": [ "hdframe_vertical_left", "hdboard_vertical_left", "hdroof" ] }, + { "x": -2, "y": -1, "part": "plating_steel" }, + { "x": -2, "y": 0, "parts": [ "hdframe_cross", "metal_bench", "seatbelt", "aisle_lights", "hdroof" ] }, + { "x": -2, "y": 1, "parts": [ "hdframe_cross", "hdroof", "hdboard_vertical_right", "plating_steel" ] }, + { "x": -2, "y": 2, "parts": [ "hdframe_cross", "hdroof", "metal_bench", "seatbelt", "aisle_lights" ] }, + { "x": -2, "y": 3, "parts": [ "hdframe_vertical_right", "hdboard_vertical_right", "hdroof" ] }, + { "x": -2, "y": 3, "part": "plating_steel" }, + { "x": -3, "y": -1, "parts": [ "hdframe_vertical_left", "hdboard_vertical_left", "hdroof" ] }, + { "x": -3, "y": -1, "part": "plating_steel" }, + { "x": -3, "y": 0, "parts": [ "hdframe_cross", "metal_bench", "seatbelt", "hdroof", "aisle_lights" ] }, + { "x": -3, "y": 1, "parts": [ "hdframe_cross", "hdroof", "hdboard_vertical_right", "plating_steel" ] }, + { "x": -3, "y": 2, "parts": [ "hdframe_cross", "hdroof", "metal_bench", "seatbelt", "aisle_lights" ] }, + { "x": -3, "y": 3, "parts": [ "hdframe_vertical_right", "hdboard_vertical_right" ] }, + { "x": -3, "y": 3, "parts": [ "hdroof", "plating_steel" ] }, + { "x": -4, "y": -1, "parts": [ "hdframe_vertical_left", "hdboard_vertical_left", "hdroof" ] }, + { "x": -4, "y": -1, "part": "plating_steel" }, + { "x": -4, "y": 0, "parts": [ "hdframe_cross", "metal_bench", "seatbelt", "aisle_lights", "hdroof" ] }, + { "x": -4, "y": 1, "parts": [ "hdframe_cross", "hdroof", "hdboard_vertical_right", "plating_steel" ] }, + { "x": -4, "y": 2, "parts": [ "hdframe_cross", "hdroof", "metal_bench", "seatbelt", "aisle_lights" ] }, + { "x": -4, "y": 3, "parts": [ "hdframe_vertical_right", "hdboard_vertical_right" ] }, + { "x": -4, "y": 3, "parts": [ "hdroof", "plating_steel" ] }, + { "x": -5, "y": -1, "parts": [ "hdframe_sw", "hdboard_sw", "hdroof", "plating_steel" ] }, + { "x": -5, "y": -1, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, + { "x": -5, "y": 0, "parts": [ "hdframe_horizontal", "hddoor_opaque_rear", "hdroof" ] }, + { "x": -5, "y": 0, "part": "plating_steel" }, + { "x": -5, "y": 1, "parts": [ "hdframe_horizontal", "hdboard_horizontal_rear", "hdroof" ] }, + { "x": -5, "y": 1, "part": "plating_steel" }, + { "x": -5, "y": 2, "parts": [ "hdframe_horizontal", "hddoor_opaque_rear", "beeper" ] }, + { "x": -5, "y": 2, "parts": [ "hdroof", "muffler", "plating_steel" ] }, + { "x": -5, "y": 3, "parts": [ "hdframe_se", "hdboard_se", "hdroof", "plating_steel" ] }, + { "x": -5, "y": 3, "parts": [ "wheel_mount_medium", "wheel_wide" ] } + ], + "items": [ { "x": 0, "y": 1, "chance": 70, "magazine": 100, "ammo": 50, "item_groups": [ "guns_cop" ] } ] } ] From 27727ff1a1e2b640b3fc4090b709f953d959ff73 Mon Sep 17 00:00:00 2001 From: fae Date: Wed, 15 Sep 2021 15:32:38 +0100 Subject: [PATCH 2/3] Added prisoner van in to vehicle groups. Didn't add in to any maps as i find that a real PITA. --- data/json/vehicle_groups.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json index d8ae1c1bb27de..ab5cf70510fd0 100644 --- a/data/json/vehicle_groups.json +++ b/data/json/vehicle_groups.json @@ -31,6 +31,7 @@ [ "policesuv_k9", 5 ], [ "police_k9tpt", 1 ], [ "truck_swat", 200 ], + [ "prisoner_van_1", 50 ], [ "ambulance", 900 ], [ "fire_truck", 300 ], [ "fire_engine", 200 ], From edd22edc5589c2efdbea9c06b858591cc1f8862d Mon Sep 17 00:00:00 2001 From: fae Date: Wed, 15 Sep 2021 19:58:09 +0100 Subject: [PATCH 3/3] Removed storage batteries as per Specings(IRC) feedback. --- data/json/vehicles/vans_busses.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/json/vehicles/vans_busses.json b/data/json/vehicles/vans_busses.json index a6d681239680f..b7d1ba6a3888c 100644 --- a/data/json/vehicles/vans_busses.json +++ b/data/json/vehicles/vans_busses.json @@ -1694,7 +1694,6 @@ { "x": 1, "y": 1, "part": "hdframe_horizontal_front" }, { "x": 1, "y": 1, "parts": [ "reinforced_windshield_horizontal_front", "plating_steel" ] }, { "x": 1, "y": 1, "parts": [ "diesel_engine_v6", "alternator_truck", "battery_car" ] }, - { "x": 1, "y": 1, "part": "storage_battery" }, { "x": 1, "y": 2, "part": "hdframe_horizontal_front" }, { "x": 1, "y": 2, "parts": [ "reinforced_windshield_horizontal_front", "wide_headlight" ] }, { "x": 1, "y": 2, "part": "plating_steel" }, @@ -1882,7 +1881,6 @@ { "x": 1, "y": 1, "part": "hdframe_horizontal_front" }, { "x": 1, "y": 1, "parts": [ "reinforced_windshield_horizontal_front", "plating_steel" ] }, { "x": 1, "y": 1, "parts": [ "diesel_engine_v6", "alternator_truck", "battery_car" ] }, - { "x": 1, "y": 1, "part": "storage_battery" }, { "x": 1, "y": 2, "part": "hdframe_horizontal_front" }, { "x": 1, "y": 2, "parts": [ "reinforced_windshield_horizontal_front", "wide_headlight" ] }, { "x": 1, "y": 2, "part": "plating_steel" },