diff --git a/data/json/npcs/missiondef.json b/data/json/npcs/missiondef.json index 7c90839d932af..4dbf650846dba 100644 --- a/data/json/npcs/missiondef.json +++ b/data/json/npcs/missiondef.json @@ -127,7 +127,7 @@ "offer": "We have the flag but now we need to locate US troops to see what we can do to help. I haven't seen any but I'm figurin' one of those choppers that were flyin' round during th' outbreak would have a good idea. If you can get me a black box from one of the wrecks I'll look into where we might open 'er at.", "accepted": "Fuck yeah, America!", "rejected": "Do you have any better ideas?", - "advice": "Survivors were talking about them crashing but I don't know where. If I were a pilot I'd avoid crash landing in a city or forest though.", + "advice": "Survivors were talkin' 'bout seeing 'em falling out of the sky but I don't know where. If I were a pilot I'd avoid crash landing in a city or forest though. Black boxes are housed in the tail to survive the crash so check there when you do find one. Now get to it!", "inquire": "How 'bout that black box?", "success": "America, fuck yeah!", "success_lie": "What?! I oughta whip your ass.", diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json index 350a02c991ee2..7cf54b5207000 100644 --- a/data/json/vehicleparts/vehicle_parts.json +++ b/data/json/vehicleparts/vehicle_parts.json @@ -588,11 +588,7 @@ "install": { "skills": [ [ "mechanics", 2 ] ], "qualities": [ { "id": "SCREW", "level": 3 }, { "id": "WRENCH", "level": 3 } ] }, "removal": { "skills": [ [ "mechanics", 2 ] ], "using": [ [ "vehicle_screw", 1 ] ] } }, - "breaks_into": [ - { "item": "steel_lump", "count": [ 0, 2 ] }, - { "item": "steel_chunk", "count": [ 1, 3 ] }, - { "item": "e_scrap", "count": [ 1, 2 ] } - ], + "breaks_into": [ { "item": "black_box" } ], "damage_reduction": { "all": 80 }, "variants": [ { "symbols": ";", "symbols_broken": "*" } ] }, diff --git a/data/json/vehicles/helicopters.json b/data/json/vehicles/helicopters.json index e702d0f2f96b1..3f3e93e06e70e 100644 --- a/data/json/vehicles/helicopters.json +++ b/data/json/vehicles/helicopters.json @@ -584,10 +584,27 @@ "id": "helicopter_apache_1a", "type": "vehicle", "name": "AH-64 Apache", + "blueprint": [ + " ┌^┐ ", + " │#│ ", + " +─+ ", + " │#│ ", + " ┌─┐ ", + "t──│X│──t", + " └─│││─┘ ", + " └│││┘ ", + " └─┘ ", + " │ ", + " │ ", + " │ ", + " │ ", + " │┃│ ", + " └ ┘ " + ], "parts": [ { "x": 0, "y": 0, "parts": [ "frame#vertical_right", "plating_military", "windshield#vertical_right" ] }, { "x": 0, "y": -1, "parts": [ "frame#vertical_2", "seat", "dashboard" ] }, - { "x": 0, "y": -1, "parts": [ "controls_electronic", "black_box", "plating_military" ] }, + { "x": 0, "y": -1, "parts": [ "controls_electronic", "plating_military" ] }, { "x": 0, "y": -1, "parts": [ "roof", "seatbelt_heavyduty" ] }, { "x": 0, "y": -2, "parts": [ "frame#vertical_right", "plating_military", "windshield#vertical_left" ] }, { "x": 1, "y": 0, "parts": [ "frame#vertical_right", "plating_military", "door#front_right" ] }, @@ -596,7 +613,7 @@ { "x": 1, "y": -2, "parts": [ "frame#vertical_left", "plating_military", "door#nw" ] }, { "x": 2, "y": 0, "parts": [ "frame#ne", "plating_military", "windshield#vertical_right" ] }, { "x": 2, "y": -1, "parts": [ "frame#vertical_right", "seat", "roof", "dashboard", "controls" ] }, - { "x": 2, "y": -1, "parts": [ "black_box", "seatbelt_heavyduty", "plating_military" ] }, + { "x": 2, "y": -1, "parts": [ "seatbelt_heavyduty", "plating_military" ] }, { "x": 2, "y": -2, "parts": [ "frame#vertical_left", "plating_military", "windshield#vertical_left" ] }, { "x": 3, @@ -658,7 +675,7 @@ { "x": -7, "y": -1, "parts": [ "frame#vertical", "halfboard#vertical", "plating_military" ] }, { "x": -8, "y": -1, "parts": [ "frame#vertical", "halfboard#vertical", "plating_military" ] }, { "x": -9, "y": -1, "parts": [ "frame#vertical", "halfboard#vertical", "plating_military" ] }, - { "x": -10, "y": -1, "parts": [ "frame#vertical_2", "halfboard#vertical_2" ] }, + { "x": -10, "y": -1, "parts": [ "frame#vertical_2", "black_box", "halfboard#vertical_2" ] }, { "x": -10, "y": 0, "parts": [ "frame#vertical", "halfboard#vertical", "plating_military" ] }, { "x": -10, "y": -1, "parts": [ "plating_military" ] }, { "x": -10, "y": -2, "parts": [ "frame#vertical", "halfboard#vertical", "plating_military" ] }, @@ -691,10 +708,22 @@ "id": "helicopter_apache_1b", "type": "vehicle", "name": "AH-64 Apache", + "blueprint": [ + " ┌^┐ ", + " │#│ ", + " +─+ ", + " │#│ ", + " ┌─┐ ", + "t──│X│┐ ", + " └││││─┘", + " └│││┘ ", + " └─ ", + " │ " + ], "parts": [ { "x": 0, "y": 0, "parts": [ "frame#vertical_right", "plating_military", "windshield#vertical_right" ] }, { "x": 0, "y": -1, "parts": [ "frame#vertical_2", "seat", "dashboard" ] }, - { "x": 0, "y": -1, "parts": [ "controls_electronic", "black_box", "plating_military" ] }, + { "x": 0, "y": -1, "parts": [ "controls_electronic", "plating_military" ] }, { "x": 0, "y": -1, "parts": [ "roof", "seatbelt_heavyduty" ] }, { "x": 0, "y": -2, "parts": [ "frame#vertical_right", "plating_military", "windshield#vertical_left" ] }, { "x": 1, "y": 0, "parts": [ "frame#vertical_right", "plating_military", "door#front_right" ] }, @@ -703,7 +732,7 @@ { "x": 1, "y": -2, "parts": [ "frame#vertical_left", "plating_military", "door#nw" ] }, { "x": 2, "y": 0, "parts": [ "frame#ne", "plating_military", "windshield#vertical_right" ] }, { "x": 2, "y": -1, "parts": [ "frame#vertical_right", "seat", "roof", "dashboard", "controls" ] }, - { "x": 2, "y": -1, "parts": [ "black_box", "seatbelt_heavyduty", "plating_military" ] }, + { "x": 2, "y": -1, "parts": [ "seatbelt_heavyduty", "plating_military" ] }, { "x": 2, "y": -2, "parts": [ "frame#vertical_left", "plating_military", "windshield#vertical_left" ] }, { "x": 3, @@ -751,7 +780,7 @@ { "x": -4, "y": 1, "parts": [ "frame#se", "board#se" ] }, { "x": -5, "y": -1, "parts": [ "frame#horizontal", "plating_military", "board#horizontal" ] }, { "x": -5, "y": -2, "parts": [ "frame#sw", "board#sw", "plating_military" ] }, - { "x": -6, "y": -1, "parts": [ "frame#vertical" ] } + { "x": -6, "y": -1, "parts": [ "frame#vertical", "black_box" ] } ], "items": [ { "x": -1, "y": -1, "chance": 7, "items": [ "bandages" ] }, @@ -781,10 +810,25 @@ "id": "helicopter_apache_1c", "type": "vehicle", "name": "AH-64 Apache", + "blueprint": [ + " │ ", + " │─ ", + " │#│ ", + " ┌─┐ ", + "t──┘X│──t", + " └─│││─┘ ", + " └│││┘ ", + " └─┘ ", + " │ ", + " │ ", + " │ ", + " │ ", + " │┃│ ", + " └ " + ], "parts": [ { "x": 0, "y": 0, "parts": [ "frame#vertical", "plating_military", "windshield#vertical_left" ] }, { "x": 0, "y": 1, "parts": [ "frame#cross", "seat", "controls_electronic", "seatbelt" ] }, - { "x": 0, "y": 1, "parts": [ "black_box" ] }, { "x": 0, "y": 2, "parts": [ "frame#vertical" ] }, { "x": 1, "y": 0, "parts": [ "frame#vertical" ] }, { "x": 1, "y": 1, "parts": [ "frame#cross", "windshield#horizontal_rear" ] }, @@ -794,7 +838,7 @@ { "x": -1, "y": 1, "parts": [ "stowboard#horizontal_rear" ] }, { "x": -1, "y": 2, "parts": [ "frame#vertical", "plating_military", "board#ne" ] }, { "x": -2, "y": 0, "parts": [ "frame#se" ] }, - { "x": -2, "y": -1, "parts": [ "frame#nw", "heavy_duty_military_rotor" ] }, + { "x": -2, "y": -1, "parts": [ "frame#nw" ] }, { "x": -2, "y": -2, "parts": [ "frame#horizontal", "plating_military", "board#horizontal" ] }, { "x": -2, "y": -3, "parts": [ "frame#horizontal_2", "turret_mount" ] }, { @@ -803,7 +847,7 @@ "parts": [ { "part": "turret_m134", "ammo": 80, "ammo_types": [ "762_51", "762_51_m993" ], "ammo_qty": [ 0, 500 ] } ] }, { "x": -2, "y": 1, "parts": [ "xlframe#horizontal", "board#vertical", "storage_battery" ] }, - { "x": -2, "y": 1, "parts": [ "plating_military" ] }, + { "x": -2, "y": 1, "parts": [ "plating_military", "heavy_duty_military_rotor" ] }, { "x": -2, "y": 2, "parts": [ "frame#sw", "board#vertical", "plating_military" ] }, { "x": -2, "y": 3, "parts": [ "frame#ne", "board#horizontal" ] }, { "x": -2, "y": 4, "parts": [ "frame#horizontal", "plating_military", "board#horizontal" ] }, @@ -834,7 +878,7 @@ { "x": -7, "y": 1, "parts": [ "frame#vertical", "halfboard#vertical", "plating_military" ] }, { "x": -8, "y": 1, "parts": [ "frame#vertical", "halfboard#vertical", "plating_military" ] }, { "x": -9, "y": 1, "parts": [ "frame#vertical", "halfboard#vertical", "plating_military" ] }, - { "x": -10, "y": 1, "parts": [ "frame#vertical_2", "halfboard#vertical_2" ] }, + { "x": -10, "y": 1, "parts": [ "frame#vertical_2", "black_box", "halfboard#vertical_2" ] }, { "x": -10, "y": 0, "parts": [ "frame#vertical", "halfboard#vertical", "plating_military" ] }, { "x": -10, "y": 1, "parts": [ "plating_military" ] }, { "x": -10, "y": 2, "parts": [ "frame#vertical", "halfboard#vertical", "plating_military" ] }, @@ -862,6 +906,29 @@ "id": "helicopter_osprey_2a", "type": "vehicle", "name": "V-22 Osprey", + "blueprint": [ + " ┌───┐ ", + " ┌───┐ ", + " │#─#│ ", + " │┃┃┃│ ", + " ┌──o──┐ ", + " +━━━━━+ ", + "│^│ │┐#━#┌│ │^│", + "│^│───└│#━#│┘───│^│", + "└X┘────│#━#│────└X┘", + "└ ┘ └─│#━#│─┘ └ ┘", + " └│#━#│┘ ", + " │#━#│ ", + " │#━#│ ", + " │#━#│ ", + " │#━#│ ", + " └+++┘ ", + " ┃┃┃ ", + " │││ ", + " └│┘ ", + " ^─│─^ ", + " ^───^ " + ], "parts": [ { "x": 0, "y": 0, "parts": [ "frame#cross", "stowboard#horizontal_front", "plating_steel", "roof" ] }, { "x": 0, "y": 0, "parts": [ "cam_control" ] }, @@ -869,7 +936,7 @@ { "x": 0, "y": -1, "parts": [ "dashboard", "seatbelt" ] }, { "x": 0, "y": 1, "parts": [ "frame#cross", "seat", "plating_steel", "roof", "controls" ] }, { "x": 0, "y": -2, "parts": [ "frame#cross", "windshield#vertical_left", "plating_steel" ] }, - { "x": 0, "y": 1, "parts": [ "black_box", "dashboard", "seatbelt" ] }, + { "x": 0, "y": 1, "parts": [ "dashboard", "seatbelt" ] }, { "x": 0, "y": 2, "parts": [ "frame#cross", "windshield#vertical_right", "plating_steel" ] }, { "x": 1, "y": 0, "parts": [ "frame#horizontal_2", "windshield#horizontal_front" ] }, { "x": 1, "y": -1, "parts": [ "frame#horizontal_2", "windshield#horizontal_front" ] }, @@ -1038,7 +1105,7 @@ { "x": -16, "y": 0, "parts": [ "frame#vertical", "halfboard#vertical" ] }, { "x": -16, "y": -1, "parts": [ "frame#sw", "halfboard#sw" ] }, { "x": -16, "y": 1, "parts": [ "frame#se", "halfboard#se" ] }, - { "x": -17, "y": 0, "parts": [ "frame#vertical", "halfboard#vertical" ] }, + { "x": -17, "y": 0, "parts": [ "frame#vertical", "black_box", "halfboard#vertical" ] }, { "x": -17, "y": -1, "parts": [ "frame#horizontal", "halfboard#horizontal" ] }, { "x": -17, "y": -2, "parts": [ "frame#nw", "halfboard#cover" ] }, { "x": -17, "y": 1, "parts": [ "frame#horizontal", "halfboard#horizontal" ] }, @@ -1085,6 +1152,26 @@ "id": "helicopter_osprey_2b", "type": "vehicle", "name": "V-22 Osprey", + "blueprint": [ + " ┌───┐ ", + " ┌───┐ ", + " │#─#│ ", + " │┃┃┃│ ", + " ┌──o──┐ ", + " +━━━━━+ ", + " │┐#━#┌│ ", + "│^│───└│#━#│┘───", + "└X┘────│#━#│─── ", + "└ ┘ └─│#━#│─┘ ", + " └│#━#│┘ ", + " │#━#│ ", + " │#━#│ ", + " │#━#┼ ", + " │#━#│ ", + " └+++┘ ", + " ┃┃┃ ", + " ││ " + ], "parts": [ { "x": 0, "y": 0, "parts": [ "frame#cross", "stowboard#horizontal_front", "plating_steel", "roof" ] }, { "x": 0, "y": 0, "parts": [ "cam_control" ] }, @@ -1092,7 +1179,7 @@ { "x": 0, "y": -1, "parts": [ "dashboard", "seatbelt" ] }, { "x": 0, "y": 1, "parts": [ "frame#cross", "seat", "plating_steel", "roof", "controls" ] }, { "x": 0, "y": -2, "parts": [ "frame#cross", "windshield#vertical_left", "plating_steel" ] }, - { "x": 0, "y": 1, "parts": [ "black_box", "dashboard", "seatbelt" ] }, + { "x": 0, "y": 1, "parts": [ "dashboard", "seatbelt" ] }, { "x": 0, "y": 2, "parts": [ "frame#cross", "windshield#vertical_right", "plating_steel" ] }, { "x": 1, "y": 0, "parts": [ "frame#horizontal_2", "windshield#horizontal_front" ] }, { "x": 1, "y": -1, "parts": [ "frame#horizontal_2", "windshield#horizontal_front" ] }, @@ -1235,7 +1322,7 @@ { "x": -14, "y": 0, "parts": [ "frame#vertical", "aisle#horizontal" ] }, { "x": -14, "y": -1, "parts": [ "frame#vertical", "aisle#horizontal" ] }, { "x": -14, "y": 1, "parts": [ "frame#vertical", "aisle#horizontal" ] }, - { "x": -15, "y": 0, "parts": [ "frame#vertical" ] }, + { "x": -15, "y": 0, "parts": [ "frame#vertical", "black_box" ] }, { "x": -15, "y": -1, "parts": [ "frame#vertical" ] } ], "items": [ @@ -1290,12 +1377,33 @@ "id": "helicopter_osprey_2c", "type": "vehicle", "name": "V-22 Osprey", + "blueprint": [ + " │┼━#│ ", + " ││━━━│ ", + " ┼+──┐ ", + " │┼━━━━+ ", + " │┐#━#┌│ ", + "──└│#━#│┘───", + " ─│#━#│────", + " ─│#━#│─┘ ", + " └│#━#│┘ ", + " │#━┼│ ", + " │#━#│ ", + " │┼━#│ ", + " │#━#│ ", + " └+++┘ ", + " ┃┃┃ ", + " │││ ", + " └│┘ ", + " ^─│─^ ", + " ^───^ " + ], "parts": [ { "x": 0, "y": 0, "parts": [ "frame#cross", "aisle#vertical", "plating_steel" ] }, { "x": 0, "y": -1, "parts": [ "frame#cross" ] }, { "x": 0, "y": -2, "parts": [ "frame#vertical" ] }, { "x": 0, "y": 1, "parts": [ "frame#cross", "seat", "plating_steel", "controls" ] }, - { "x": 0, "y": 1, "parts": [ "dashboard", "black_box" ] }, + { "x": 0, "y": 1, "parts": [ "dashboard" ] }, { "x": 0, "y": 2, "parts": [ "frame#vertical" ] }, { "x": -1, "y": 0, "parts": [ "frame#cross", "medium_storage_battery", "roof" ] }, { "x": -1, "y": 0, "parts": [ "aisle#vertical", "plating_steel" ] }, @@ -1401,7 +1509,7 @@ { "x": -16, "y": 0, "parts": [ "frame#vertical", "halfboard#vertical" ] }, { "x": -16, "y": -1, "parts": [ "frame#sw", "halfboard#sw" ] }, { "x": -16, "y": 1, "parts": [ "frame#se", "halfboard#se" ] }, - { "x": -17, "y": 0, "parts": [ "frame#vertical", "halfboard#vertical" ] }, + { "x": -17, "y": 0, "parts": [ "frame#vertical", "black_box", "halfboard#vertical" ] }, { "x": -17, "y": -1, "parts": [ "frame#horizontal", "halfboard#horizontal" ] }, { "x": -17, "y": -2, "parts": [ "frame#nw", "halfboard#cover" ] }, { "x": -17, "y": 1, "parts": [ "frame#horizontal", "halfboard#horizontal" ] }, @@ -1454,9 +1562,24 @@ "id": "helicopter_blackhawk_3a", "type": "vehicle", "name": "UH-60 Blackhawk", + "blueprint": [ + " ┌─┐ ", + "┌───┐", + "│#━#│", + "│─+─│", + "+━━━+", + "+#━#+", + "│#X#│", + "│#━#│", + "└┐=┌┘", + " └─┘ ", + " │ ", + " │ ", + " ┌│┐ " + ], "parts": [ { "x": 0, "y": 0, "parts": [ "frame#cross", "seat", "controls", "dashboard" ] }, - { "x": 0, "y": 0, "parts": [ "black_box", "roof", "seatbelt" ] }, + { "x": 0, "y": 0, "parts": [ "roof", "seatbelt" ] }, { "x": 0, "y": -1, "parts": [ "frame#vertical_left", "windshield#vertical_left" ] }, { "x": 0, "y": 1, "parts": [ "frame#cross", "medium_storage_battery", "roof" ] }, { "x": 0, "y": 1, "parts": [ "aisle#vertical" ] }, @@ -1518,7 +1641,7 @@ { "x": -8, "y": 1, "parts": [ "frame#vertical", "halfboard#vertical" ] }, { "x": -9, "y": 1, "parts": [ "frame#vertical", "halfboard#vertical" ] }, { "x": -10, "y": 1, "parts": [ "frame#vertical", "halfboard#vertical" ] }, - { "x": -10, "y": 0, "parts": [ "frame#cover", "halfboard#nw" ] }, + { "x": -10, "y": 0, "parts": [ "frame#cover", "black_box", "halfboard#nw" ] }, { "x": -10, "y": 2, "parts": [ "frame#cover", "halfboard#ne" ] } ], "items": [ @@ -1569,9 +1692,22 @@ "id": "helicopter_blackhawk_3b", "type": "vehicle", "name": "UH-60 Blackhawk", + "blueprint": [ + " ┌─┐ ", + "┌───┐", + "│#━#│", + "│─+─│", + "+━━━+", + "+#━#+", + "│#X#│", + "│#━#│", + "└┐=┌┘", + " └─┘ ", + " │ " + ], "parts": [ { "x": 0, "y": 0, "parts": [ "frame#cross", "seat", "controls", "dashboard" ] }, - { "x": 0, "y": 0, "parts": [ "black_box", "roof", "seatbelt" ] }, + { "x": 0, "y": 0, "parts": [ "roof", "seatbelt" ] }, { "x": 0, "y": -1, "parts": [ "frame#vertical_left", "windshield#vertical_left" ] }, { "x": 0, "y": 1, "parts": [ "frame#cross", "medium_storage_battery", "roof" ] }, { "x": 0, "y": 1, "parts": [ "aisle#vertical" ] }, @@ -1627,7 +1763,7 @@ { "x": -6, "y": 1, "parts": [ "frame#vertical_2", "cargo_space", "roof" ] }, { "x": -6, "y": 2, "parts": [ "frame#nw", "board#nw", "roof" ] }, { "x": -6, "y": 3, "parts": [ "frame#se", "board#se", "roof" ] }, - { "x": -7, "y": 0, "parts": [ "frame#sw", "board#sw", "roof" ] }, + { "x": -7, "y": 0, "parts": [ "frame#sw", "black_box", "board#sw", "roof" ] }, { "x": -7, "y": 1, "parts": [ "frame#horizontal", "board#horizontal_rear", "roof" ] }, { "x": -7, "y": 2, "parts": [ "frame#se", "board#se", "roof" ] }, { "x": -8, "y": 1, "parts": [ "frame#vertical" ] } @@ -1682,9 +1818,23 @@ "id": "helicopter_blackhawk_3c", "type": "vehicle", "name": "UH-60 Blackhawk", + "blueprint": [ + "┌ ┐", + "│#━#│", + "│┼+─│", + "│┼━━+", + "│┼━#+", + "│#X#│", + "│#━#│", + "└┐=┌┘", + " └─┘ ", + " │ ", + " │ ", + " ┌│┐ " + ], "parts": [ { "x": 0, "y": 0, "parts": [ "frame#cross", "seat", "controls", "dashboard" ] }, - { "x": 0, "y": 0, "parts": [ "black_box", "roof", "seatbelt" ] }, + { "x": 0, "y": 0, "parts": [ "roof", "seatbelt" ] }, { "x": 0, "y": -1, "parts": [ "frame#vertical_left" ] }, { "x": 0, "y": 1, "parts": [ "frame#cross", "medium_storage_battery", "roof" ] }, { "x": 0, "y": 1, "parts": [ "aisle#vertical" ] }, @@ -1738,7 +1888,7 @@ { "x": -8, "y": 1, "parts": [ "frame#vertical", "halfboard#vertical" ] }, { "x": -9, "y": 1, "parts": [ "frame#vertical", "halfboard#vertical" ] }, { "x": -10, "y": 1, "parts": [ "frame#vertical", "halfboard#vertical" ] }, - { "x": -10, "y": 0, "parts": [ "frame#cover", "halfboard#nw" ] }, + { "x": -10, "y": 0, "parts": [ "frame#cover", "black_box", "halfboard#nw" ] }, { "x": -10, "y": 2, "parts": [ "frame#cover", "halfboard#ne" ] } ], "items": [