From 0de650c12b904c4f34f667b51e19ec2796d7e5c9 Mon Sep 17 00:00:00 2001 From: curstwist <39442864+curstwist@users.noreply.github.com> Date: Sat, 28 Aug 2021 10:31:05 -0400 Subject: [PATCH] add start scenarios and ID spawns for lab --- .../itemgroups/Clothing_Gear/wallets.json | 7 +- data/json/itemgroups/Labs/labs_common.json | 2 - data/json/itemgroups/Labs/labs_mutagen.json | 8 +- data/json/items/generic.json | 28 +++++- data/json/items/id_cards.json | 78 +++++++++++++++- data/json/mapgen/fema/FEMA_le_03.json | 4 + .../lab/lab_modular/lab_1x1_security.json | 20 ++--- data/json/mapgen/map_extras/lab_extras.json | 8 ++ data/json/mapgen/nested/fema_nested.json | 1 + data/json/overmap/map_extras.json | 10 +++ .../lab_modular/lab_mutagen_6_floor.json | 2 +- data/json/professions.json | 2 +- data/json/scenarios.json | 46 +++------- data/json/start_locations.json | 6 ++ data/json/vehicles/trucks.json | 90 +++++++++++++++++++ data/json/vehicles/vans_busses.json | 1 + 16 files changed, 255 insertions(+), 58 deletions(-) create mode 100644 data/json/mapgen/map_extras/lab_extras.json diff --git a/data/json/itemgroups/Clothing_Gear/wallets.json b/data/json/itemgroups/Clothing_Gear/wallets.json index 92020cbd4f882..85463a128d3b2 100644 --- a/data/json/itemgroups/Clothing_Gear/wallets.json +++ b/data/json/itemgroups/Clothing_Gear/wallets.json @@ -150,12 +150,13 @@ "items": [ { "item": "cash_card", "prob": 100, "charges-min": 0, "charges-max": 50000 }, { "item": "id_science", "prob": 100 }, - { "item": "money_ten", "prob": 100, "count": [ 5, 10 ] }, + { "item": "id_science_visitor_1", "prob": 100 }, + { "item": "money_ten", "prob": 30, "count": [ 5, 10 ] }, { "item": "coin_quarter", "prob": 10, "count": [ 1, 2 ] }, { "item": "coin_nickel", "prob": 10, "count": [ 1, 2 ] }, { "group": "discount_cards", "prob": 40, "count": [ 1, 3 ] }, { "item": "condom", "prob": 10 }, - { "item": "labmap", "prob": 20 }, + { "item": "labmap", "prob": 30 }, [ "scorecard", 20 ] ] }, @@ -168,6 +169,7 @@ "items": [ { "item": "cash_card", "prob": 100, "charges-min": 0, "charges-max": 50000 }, { "item": "id_science", "prob": 100 }, + { "item": "id_science_visitor_1", "prob": 100 }, { "item": "money_ten", "prob": 100, "count": [ 5, 10 ] }, { "item": "coin_quarter", "prob": 10, "count": [ 1, 2 ] }, { "item": "coin_nickel", "prob": 10, "count": [ 1, 2 ] }, @@ -185,6 +187,7 @@ "container-item": "wallet_stylish", "items": [ { "item": "id_science", "prob": 100 }, + { "item": "id_science_visitor_1", "prob": 100 }, { "item": "cash_card", "prob": 100, "charges-min": 10000, "charges-max": 50000 }, { "item": "money_one", "prob": 100, "count": [ 10, 20 ] }, { "item": "money_ten", "prob": 100, "count": [ 5, 10 ] }, diff --git a/data/json/itemgroups/Labs/labs_common.json b/data/json/itemgroups/Labs/labs_common.json index b53f3a114edb4..54640e3d921c2 100644 --- a/data/json/itemgroups/Labs/labs_common.json +++ b/data/json/itemgroups/Labs/labs_common.json @@ -39,8 +39,6 @@ { "item": "id_science_maintenance_blue", "prob": 1 }, { "item": "id_science_security_yellow", "prob": 3 }, { "item": "id_science_security_magenta", "prob": 2 }, - { "item": "id_science_security_black", "prob": 1 }, - { "item": "id_science_mutagen_green", "prob": 3 }, { "item": "id_science_mutagen_pink", "prob": 2 }, { "item": "id_science_mutagen_cyan", "prob": 1 }, { "item": "id_science_medical_red", "prob": 7 }, diff --git a/data/json/itemgroups/Labs/labs_mutagen.json b/data/json/itemgroups/Labs/labs_mutagen.json index 5d39919bb7abf..4af485394a743 100644 --- a/data/json/itemgroups/Labs/labs_mutagen.json +++ b/data/json/itemgroups/Labs/labs_mutagen.json @@ -100,8 +100,14 @@ { "item": "id_science_maintenance_green", "prob": 150 }, { "item": "id_science_transport_1", "prob": 200 }, { "item": "id_science_security_yellow", "prob": 25 }, - { "item": "id_science_mutagen_green", "prob": 5 }, { "item": "id_science_medical_red", "prob": 50 } ] + }, + { + "type": "item_group", + "id": "lanyard_YS_badge", + "subtype": "collection", + "container-item": "lanyard", + "items": [ { "item": "id_science_security_yellow", "prob": 100 } ] } ] diff --git a/data/json/items/generic.json b/data/json/items/generic.json index e9c48bfab7a44..06667bfcaffdc 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -3310,7 +3310,19 @@ "scorecard", "robofac_test_data", "icon", - "labmap" + "labmap", + "id_science_visitor_1", + "id_science_transport_1", + "id_science_maintenance_green", + "id_science_maintenance_yellow", + "id_science_maintenance_blue", + "id_science_security_yellow", + "id_science_security_magenta", + "id_science_security_black", + "id_science_mutagen_green", + "id_science_mutagen_pink", + "id_science_mutagen_cyan", + "id_science_medical_red" ] }, { @@ -3379,7 +3391,19 @@ "scorecard", "robofac_test_data", "icon", - "labmap" + "labmap", + "id_science_visitor_1", + "id_science_transport_1", + "id_science_maintenance_green", + "id_science_maintenance_yellow", + "id_science_maintenance_blue", + "id_science_security_yellow", + "id_science_security_magenta", + "id_science_security_black", + "id_science_mutagen_green", + "id_science_mutagen_pink", + "id_science_mutagen_cyan", + "id_science_medical_red" ] }, { diff --git a/data/json/items/id_cards.json b/data/json/items/id_cards.json index a2aed3915475f..49722d9af725f 100644 --- a/data/json/items/id_cards.json +++ b/data/json/items/id_cards.json @@ -11,7 +11,7 @@ "price_postapoc": 250, "material": [ "plastic" ], "weight": "6 g", - "volume": "15 ml", + "volume": "5 ml", "to_hit": -3 }, { @@ -57,8 +57,43 @@ "price_postapoc": 250, "material": [ "plastic" ], "weight": "6 g", - "volume": "15 ml", - "to_hit": -3 + "volume": "5 ml", + "to_hit": -3, + "use_action": { + "type": "reveal_map", + "radius": 90, + "message": "You add the facilities to your map", + "terrain": [ + "hiway", + "road", + "bridge", + "lab_res_8_SWD_ground", + "lab_res_8_SED_ground", + "lab_res_8_SWU_ground", + "lab_res_8_SEU_ground", + "lab_CORE_2x1_SED_ground", + "lab_CORE_2x1_SWD_ground", + "lab_CORE_2x1_NED_ground", + "lab_CORE_2x1_NWD_ground", + "lab_CORE_2x1_WC_ground", + "lab_CORE_2x1_EC_ground", + "lab_security_z0", + "lab_security_z0N", + "lab_security_z0S", + "lab_surface_parking_blockA2", + "lab_surface_parking_blockE2", + "lab_surface_parking_blockA0", + "lab_surface_parking_blockB0", + "lab_surface_parking_blockC0", + "lab_surface_parking_blockD0", + "lab_surface_parking_blockE0", + "lab_surface_parking_blockA1", + "lab_surface_parking_blockB1", + "lab_surface_parking_blockC1", + "lab_surface_parking_blockD1", + "lab_surface_parking_blockE1" + ] + } }, { "type": "GENERIC", @@ -94,7 +129,42 @@ "copy-from": "id_science", "name": { "str": "transport freight employee badge" }, "description": "This is an employee badge for a freight hauler. The reverse side describes protocol for using it; this could grant one-time access to a transport freight card reader.", - "flags": [ "SCIENCE_CARD_TRANSPORT_1" ] + "flags": [ "SCIENCE_CARD_TRANSPORT_1" ], + "use_action": { + "type": "reveal_map", + "radius": 90, + "message": "You add the facilities to your map", + "terrain": [ + "hiway", + "road", + "bridge", + "lab_res_8_SWD_ground", + "lab_res_8_SED_ground", + "lab_res_8_SWU_ground", + "lab_res_8_SEU_ground", + "lab_CORE_2x1_SED_ground", + "lab_CORE_2x1_SWD_ground", + "lab_CORE_2x1_NED_ground", + "lab_CORE_2x1_NWD_ground", + "lab_CORE_2x1_WC_ground", + "lab_CORE_2x1_EC_ground", + "lab_security_z0", + "lab_security_z0N", + "lab_security_z0S", + "lab_surface_parking_blockA2", + "lab_surface_parking_blockE2", + "lab_surface_parking_blockA0", + "lab_surface_parking_blockB0", + "lab_surface_parking_blockC0", + "lab_surface_parking_blockD0", + "lab_surface_parking_blockE0", + "lab_surface_parking_blockA1", + "lab_surface_parking_blockB1", + "lab_surface_parking_blockC1", + "lab_surface_parking_blockD1", + "lab_surface_parking_blockE1" + ] + } }, { "type": "GENERIC", diff --git a/data/json/mapgen/fema/FEMA_le_03.json b/data/json/mapgen/fema/FEMA_le_03.json index cdb203531623c..f727943762f4a 100644 --- a/data/json/mapgen/fema/FEMA_le_03.json +++ b/data/json/mapgen/fema/FEMA_le_03.json @@ -42,6 +42,10 @@ "L": { "item": "surgery", "chance": 30 }, "X": { "item": "hospital_lab", "chance": 80 } }, + "place_loot": [ + { "item": "id_science_visitor_1", "x": 7, "y": [ 12, 17 ], "chance": 100 }, + { "item": "id_science_visitor_1", "x": 14, "y": [ 14, 17 ], "chance": 30 } + ], "item": { "B": { "item": "rag", "amount": [ 0, 5 ], "custom-flags": [ "FILTHY" ] } }, "monster": { "Z": { "monster": "mon_zombie_brute" }, "z": { "monster": "mon_zombie_scientist" } } } diff --git a/data/json/mapgen/lab/lab_modular/lab_1x1_security.json b/data/json/mapgen/lab/lab_modular/lab_1x1_security.json index cae46bd66afed..95291baa63990 100644 --- a/data/json/mapgen/lab/lab_modular/lab_1x1_security.json +++ b/data/json/mapgen/lab/lab_modular/lab_1x1_security.json @@ -117,8 +117,8 @@ "computers": { "6": { "name": "Security Public Relations Zone", - "security": 3, - "options": [ { "name": "UNLOCK ENTRANCE", "action": "unlock_disarm", "security": 3 } ], + "security": 5, + "options": [ { "name": "UNLOCK ENTRANCE", "action": "unlock_disarm", "security": 5 } ], "failures": [ { "action": "damage" }, { "action": "manhacks" } ] } } @@ -214,10 +214,8 @@ "terrain": { "¥": "t_card_science_security_yellow", "ƶ": "t_card_science_security_magenta" }, "place_loot": [ { "item": "id_science_maintenance_yellow", "x": 11, "y": 11, "chance": 30 }, - { "item": "id_science_mutagen_green", "x": 11, "y": 11, "chance": 30 }, { "item": "id_science_medical_red", "x": 11, "y": 11, "chance": 30 }, { "item": "id_science_maintenance_yellow", "x": 11, "y": 12, "chance": 30 }, - { "item": "id_science_mutagen_green", "x": 11, "y": 12, "chance": 30 }, { "item": "id_science_medical_red", "x": 11, "y": 12, "chance": 30 } ], "place_signs": [ @@ -461,10 +459,10 @@ "fill_ter": "t_linoleum_gray", "rows": [ "||||||||||||||||||||||||", - "|@@∞|,|∞@@|`````¥```````", - "|r,,+,+,hr|`````=```````", + "|@@∞|,|∞@@|`````|```````", + "|r,,+,+,hr|`````#```````", "|rh,|,|,,r|``|##|```î```", - "|||||ê|||||``|><|``````|", + "|||||ê|||||``|`<|``````|", "|@@∞|,|∞@@|``|||||||||||", "|r,,+,+,hr|``|||||||||||", "|rh,|,|,,r|``||qqqqqqq||", @@ -472,17 +470,17 @@ "|9,S|ê,,,,|``||,,≠≠≠≠≠||", "|9,,|,hfh,|``||,,,ê,,,||", "|||+|,hfh,#``=,,,≠≠≠≠≠||", - "|t+,#,hfh,#``=,,,,,,,,||", + "|t+,#,hfh,#``=,,,,,ɜ,,||", "|||,|,hfh,|`6||qqq,,qq||", "|t+,|ê,,,,|``|||||=¥||||", "|||||,|||||``||,$,êA,Q||", "|@@∞|,|∞@@|``||,$,NN,Q||", "|r,,+,+,,r|``|||||||||||", "|rh,|,|,hr|``|||||||||||", - "|||||ê|||||``|><|``````|", + "|||||ê|||||``|`<|``````|", "|@@∞|,|∞@@|``|##|``î````", - "|r,,+,+,,r|`````=```````", - "|rh,|,|,hr|`````¥```````", + "|r,,+,+,,r|`````#```````", + "|rh,|,|,hr|`````|```````", "||||||||||||||||||||||||" ], "palettes": [ "lab_common_palette", "lab_security_palette" ], diff --git a/data/json/mapgen/map_extras/lab_extras.json b/data/json/mapgen/map_extras/lab_extras.json new file mode 100644 index 0000000000000..566e9ecec0335 --- /dev/null +++ b/data/json/mapgen/map_extras/lab_extras.json @@ -0,0 +1,8 @@ +[ + { + "type": "mapgen", + "method": "json", + "update_mapgen_id": "mx_lab_concourse_area_spawn", + "object": { "place_loot": [ { "group": "lanyard_YS_badge", "x": 4, "y": [ 5, 18 ], "chance": 100 } ] } + } +] diff --git a/data/json/mapgen/nested/fema_nested.json b/data/json/mapgen/nested/fema_nested.json index 06f84779388b9..6880b7793ef74 100644 --- a/data/json/mapgen/nested/fema_nested.json +++ b/data/json/mapgen/nested/fema_nested.json @@ -492,6 +492,7 @@ ], "C": { "item": "dissection", "chance": 90, "repeat": [ 0, 3 ] } }, + "place_loot": [ { "item": "id_science_visitor_1", "x": 8, "y": [ 8, 15 ], "chance": 100 } ], "monsters": { ",": { "monster": "GROUP_LAB_FEMA", "chance": 1, "density": 0.001 } } } } diff --git a/data/json/overmap/map_extras.json b/data/json/overmap/map_extras.json index c439e6ffd74d1..7d38fded6f45f 100644 --- a/data/json/overmap/map_extras.json +++ b/data/json/overmap/map_extras.json @@ -159,6 +159,16 @@ "color": "light_gray", "autonote": true }, + { + "id": "mx_lab_concourse_area", + "type": "map_extra", + "name": { "str": "Start location concourse area" }, + "description": "There is a lanyard with an ID badge nearby.", + "generator": { "generator_method": "update_mapgen", "generator_id": "mx_lab_concourse_area_spawn" }, + "sym": "F", + "color": "light_gray", + "autonote": true + }, { "id": "mx_house_spider", "type": "map_extra", diff --git a/data/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json b/data/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json index 5bb0f8e145089..1b8e45e4680ab 100644 --- a/data/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json +++ b/data/json/overmap/overmap_special/lab_modular/lab_mutagen_6_floor.json @@ -130,6 +130,6 @@ "connections": [ { "point": [ -4, 0, 0 ], "connection": "local_road", "terrain": "road", "existing": false } ], "city_distance": [ 3, -1 ], "city_sizes": [ 1, 16 ], - "occurrences": [ 0, 0 ] + "occurrences": [ 1, 3 ] } ] diff --git a/data/json/professions.json b/data/json/professions.json index 2f2293414ce78..0028061ae5b98 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -1798,7 +1798,7 @@ "description": "You once ruled the road in your big rig. When the riots hit, you hopped in and drove it to safety. Now it's just you and your truck against the world.", "points": 5, "skills": [ { "level": 1, "name": "mechanics" }, { "level": 4, "name": "driving" } ], - "vehicle": "semi_truck", + "vehicle": "semi_truck_scenario", "items": { "both": { "items": [ "tank_top", "socks", "boots_steel", "pants", "multitool", "wristwatch", "gloves_work", "hat_ball" ], diff --git a/data/json/scenarios.json b/data/json/scenarios.json index db8ce8a5d97a3..dc668abe83492 100644 --- a/data/json/scenarios.json +++ b/data/json/scenarios.json @@ -137,40 +137,6 @@ ], "missions": [ "MISSION_INFECTED_START_FIND_ANTIBIOTICS" ] }, - { - "type": "scenario", - "id": "hunted_start", - "name": "Challenge - Hunted", - "points": -2, - "forced_traits": [ "HAS_NEMESIS" ], - "description": "Since the start of the Cataclysm, something has been hunting you relentlessly. You can outrun it, but it always seems to find you eventually. The only escape is for one of you to die.", - "allowed_locs": [ - "sloc_house", - "sloc_house_boarded", - "sloc_school", - "sloc_grocery_store", - "sloc_gun_store", - "sloc_garage", - "sloc_pawn_shop", - "sloc_bank", - "sloc_military_surplus", - "sloc_furniture_store", - "sloc_library", - "sloc_bookstore", - "sloc_zoo_giftshop", - "sloc_zoo_cages", - "sloc_golfcourse_mid_course", - "sloc_golfcourse_clubhouse", - "sloc_church", - "sloc_cemetery", - "sloc_apartments_rooftop", - "sloc_apartments_rooftop2", - "sloc_hospital" - ], - "start_name": "In Town", - "flags": [ "CHALLENGE", "LONE_START" ], - "missions": [ "MISSION_KILL_NEMESIS" ] - }, { "type": "scenario", "id": "fungal_start", @@ -328,6 +294,18 @@ "allowed_locs": [ "sloc_lab_random", "sloc_lab_escape_cells", "sloc_lab_finale", "sloc_ice_lab_stairs", "sloc_ice_lab_finale" ], "flags": [ "CHALLENGE", "CITY_START", "LONE_START" ] }, + { + "type": "scenario", + "id": "lab_cargo_staff_1", + "name": "Challenge - Trans-Coast Logistics Concourse", + "points": -6, + "description": "You were deemed essential and required stay behind during the facility's evacuation. Find a way to escape and you better find that lanyard you misplaced before the automated defenses notice you don't have one.", + "start_name": "Locked Lab", + "professions": [ "security" ], + "allowed_locs": [ "sloc_lab_concourse_area" ], + "map_extra": "mx_lab_concourse_area", + "flags": [ "CHALLENGE", "LONE_START" ] + }, { "type": "scenario", "id": "bordered", diff --git a/data/json/start_locations.json b/data/json/start_locations.json index 8148499ea4027..ac0686fc85260 100644 --- a/data/json/start_locations.json +++ b/data/json/start_locations.json @@ -290,6 +290,12 @@ "name": "Deep-frozen science lab", "terrain": [ "ice_lab_finale" ] }, + { + "type": "start_location", + "id": "sloc_lab_concourse_area", + "name": "Cargo area Trans-Coast Logistics", + "terrain": [ { "om_terrain": "lab_CORE_2x1_1DN", "om_terrain_match_type": "TYPE" } ] + }, { "type": "start_location", "id": "sloc_mall_loading_area", diff --git a/data/json/vehicles/trucks.json b/data/json/vehicles/trucks.json index 29af4935f2f38..6a54d4c32ec29 100644 --- a/data/json/vehicles/trucks.json +++ b/data/json/vehicles/trucks.json @@ -223,6 +223,8 @@ ], "items": [ { "x": 0, "y": 0, "chance": 20, "items": [ "hat_ball" ] }, + { "x": 0, "y": 1, "chance": 25, "items": [ "id_science_transport_1" ] }, + { "x": -2, "y": 1, "chance": 25, "items": [ "id_science_transport_1" ] }, { "x": 0, "y": 0, "chance": 10, "items": [ "cig" ] }, { "x": 0, "y": 0, "chance": 5, "items": [ "choco_coffee_beans" ] }, { "x": 0, "y": 1, "chance": 5, "items": [ "colamdew" ] }, @@ -231,6 +233,94 @@ { "x": -4, "y": 2, "chance": 10, "item_groups": [ "car_kit" ] } ] }, + { + "id": "semi_truck_scenario", + "//": "semi trailer for the Trucker scenario start, includes spawn for a lab entrance card.", + "type": "vehicle", + "name": "Semi Truck", + "blueprint": [ + [ " o " ], + [ "OO ---+O-" ], + [ "OO=|#|#'H" ], + [ "++-|o|o'>" ], + [ "OO=|#|#'H" ], + [ "OO ---+O-" ], + [ " o " ] + ], + "parts": [ + { "x": 0, "y": 0, "parts": [ "hdframe_cross", "seat_windshield", "seatbelt", "roof", "controls" ] }, + { "x": 0, "y": 0, "parts": [ "stereo", "dashboard", "vehicle_alarm", "horn_big" ] }, + { "x": 0, "y": -1, "parts": [ "hdframe_vertical_left", "door_front_left" ] }, + { "x": 0, "y": 1, "parts": [ "hdframe_cross", "box", "roof" ] }, + { "x": 0, "y": 2, "parts": [ "hdframe_cross", "seat_windshield", "seatbelt", "roof" ] }, + { "x": 0, "y": 3, "parts": [ "hdframe_vertical_right", "door_front_right" ] }, + { "x": 1, "y": -1, "parts": [ "hdframe_vertical_T_left", "windshield_wheel_left" ] }, + { "x": 1, "y": -1, "parts": [ "wheel_mount_medium_steerable", "wheel_wide" ] }, + { "x": 1, "y": -2, "part": "wing_mirror_left" }, + { "x": 1, "y": 0, "parts": [ "hdframe_horizontal_2", "windshield_cover_left" ] }, + { "x": 1, "y": 1, "parts": [ "hdframe_horizontal_2", "windshield_horizontal_front" ] }, + { "x": 1, "y": 2, "parts": [ "hdframe_horizontal_2", "windshield_cover_right" ] }, + { "x": 1, "y": 3, "parts": [ "hdframe_vertical_T_right", "windshield_wheel_right" ] }, + { "x": 1, "y": 3, "parts": [ "wheel_mount_medium_steerable", "wheel_wide" ] }, + { "x": 1, "y": 4, "part": "wing_mirror_right" }, + { "x": 2, "y": -1, "parts": [ "hdframe_nw", "halfboard_nw" ] }, + { "x": 2, "y": -1, "part": "headlight" }, + { "x": 2, "y": 0, "parts": [ "hdframe_horizontal_2", "halfboard_cover_left" ] }, + { "x": 2, "y": 1, "parts": [ "hdframe_cover", "halfboard_horizontal_front" ] }, + { "x": 2, "y": 1, "parts": [ "diesel_engine_v8", "alternator_truck", "battery_car" ] }, + { "x": 2, "y": 2, "parts": [ "hdframe_horizontal_2", "halfboard_cover_right" ] }, + { "x": 2, "y": 3, "parts": [ "hdframe_ne", "halfboard_ne" ] }, + { "x": 2, "y": 3, "part": "headlight" }, + { "x": -1, "y": -1, "parts": [ "hdframe_vertical_left", "board_nw", "roof" ] }, + { "x": -1, "y": -1, "part": "tank", "fuel": "diesel" }, + { "x": -1, "y": 0, "parts": [ "hdframe_cross", "board_horizontal_front", "roof" ] }, + { "x": -1, "y": 1, "parts": [ "hdframe_cross", "door_internal_front", "roof" ] }, + { "x": -1, "y": 2, "parts": [ "hdframe_cross", "board_horizontal_front", "roof" ] }, + { "x": -1, "y": 3, "parts": [ "hdframe_vertical_right", "board_ne", "roof" ] }, + { "x": -1, "y": 3, "part": "tank", "fuel": "diesel" }, + { "x": -2, "y": -1, "parts": [ "hdframe_vertical_left", "board_vertical_left", "roof" ] }, + { "x": -2, "y": -1, "part": "tank", "fuel": "diesel" }, + { "x": -2, "y": 0, "parts": [ "hdframe_cross", "bed", "roof" ] }, + { "x": -2, "y": 1, "parts": [ "hdframe_cross", "box", "roof" ] }, + { "x": -2, "y": 2, "parts": [ "hdframe_cross", "bed", "roof" ] }, + { "x": -2, "y": 3, "parts": [ "hdframe_vertical_right", "board_vertical_right", "roof" ] }, + { "x": -2, "y": 3, "part": "tank", "fuel": "diesel" }, + { "x": -3, "y": -1, "parts": [ "hdframe_sw", "board_sw" ] }, + { "x": -3, "y": 0, "parts": [ "hdframe_horizontal_2", "board_horizontal_rear" ] }, + { "x": -3, "y": 1, "parts": [ "hdframe_cross", "board_horizontal_rear" ] }, + { "x": -3, "y": 2, "parts": [ "hdframe_horizontal_2", "board_horizontal_rear", "beeper" ] }, + { "x": -3, "y": 3, "parts": [ "hdframe_se", "board_se" ] }, + { "x": -4, "y": 0, "parts": [ "hdframe_vertical_left", "trunk" ] }, + { "x": -4, "y": 1, "part": "hdframe_vertical" }, + { "x": -4, "y": 2, "parts": [ "hdframe_vertical_right", "trunk" ] }, + { "x": -5, "y": 0, "parts": [ "hdframe_horizontal", "wheel_mount_medium", "wheel_wide" ] }, + { "x": -5, "y": -1, "parts": [ "hdframe_vertical_T_left", "wheel_mount_medium" ] }, + { "x": -5, "y": -1, "part": "wheel_wide" }, + { "x": -5, "y": 1, "part": "hdframe_cross" }, + { "x": -5, "y": 2, "parts": [ "hdframe_horizontal", "wheel_mount_medium", "wheel_wide" ] }, + { "x": -5, "y": 3, "parts": [ "hdframe_vertical_T_right", "wheel_mount_medium" ] }, + { "x": -5, "y": 3, "part": "wheel_wide" }, + { "x": -6, "y": 0, "parts": [ "hdframe_horizontal_rear", "wheel_mount_medium" ] }, + { "x": -6, "y": -1, "parts": [ "hdframe_vertical_T_left", "wheel_mount_medium" ] }, + { "x": -6, "y": -1, "part": "wheel_wide" }, + { "x": -6, "y": 0, "part": "wheel_wide" }, + { "x": -6, "y": 1, "part": "hdframe_cross" }, + { "x": -6, "y": 2, "parts": [ "hdframe_horizontal_rear", "wheel_mount_medium" ] }, + { "x": -6, "y": 2, "part": "wheel_wide" }, + { "x": -6, "y": 3, "parts": [ "hdframe_vertical_T_right", "wheel_mount_medium" ] }, + { "x": -6, "y": 3, "part": "wheel_wide" } + ], + "items": [ + { "x": 0, "y": 0, "chance": 20, "items": [ "hat_ball" ] }, + { "x": 0, "y": 0, "chance": 10, "items": [ "cig" ] }, + { "x": 0, "y": 0, "chance": 5, "items": [ "choco_coffee_beans" ] }, + { "x": 0, "y": 1, "chance": 5, "items": [ "colamdew" ] }, + { "x": 0, "y": 1, "chance": 100, "items": [ "id_science_transport_1" ] }, + { "x": -4, "y": 0, "chance": 12, "item_groups": [ "car_kit" ] }, + { "x": -4, "y": 0, "chance": 5, "item_groups": [ "fuel_diesel" ] }, + { "x": -4, "y": 2, "chance": 10, "item_groups": [ "car_kit" ] } + ] + }, { "id": "truck_trailer", "type": "vehicle", diff --git a/data/json/vehicles/vans_busses.json b/data/json/vehicles/vans_busses.json index 77fc443d8f4e5..3cfd79b1856c9 100644 --- a/data/json/vehicles/vans_busses.json +++ b/data/json/vehicles/vans_busses.json @@ -1790,6 +1790,7 @@ ], "items": [ { "x": -1, "y": 0, "chance": 7, "item_groups": [ "contraband" ] }, + { "x": 0, "y": 0, "chance": 20, "items": [ "id_science_transport_1" ] }, { "x": -1, "y": 2, "chance": 6, "item_groups": [ "contraband" ] }, { "x": -2, "y": 0, "chance": 5, "item_groups": [ "contraband" ] }, { "x": -2, "y": 2, "chance": 11, "item_groups": [ "contraband" ] },