Skip to content

Commit

Permalink
Vehicle part variants tidy (CleverRaven#65823)
Browse files Browse the repository at this point in the history
* Print variant in part name if debug_mode is on

* Windshields copy-from

* Doors copy-from

* Seats copy-from

* Remove slightly redundant values in seats

* Remove flag with no effect

* Remove redundant variant from forklift

* Aisles copy-from

* Pull loose doors to doors.json

* Convert _rear wheels to symbols

* Remove rarely/unused vpart variants

* Add missing symbols
  • Loading branch information
irwiss authored May 24, 2023
1 parent 4dc67b5 commit 81746f6
Show file tree
Hide file tree
Showing 13 changed files with 243 additions and 628 deletions.
304 changes: 137 additions & 167 deletions data/json/vehicleparts/doors.json

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion data/json/vehicleparts/engineering.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@
"item": "frame",
"location": "structure",
"symbol": "|",
"symbols": { "horizontal_front": "|" },
"broken_symbol": "x",
"categories": [ "utility" ],
"color": "light_gray",
Expand Down
9 changes: 9 additions & 0 deletions data/json/vehicleparts/frames.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,18 @@
"cover": "^",
"cross": "c",
"horizontal": "h",
"horizontal_front": "h",
"horizontal_rear": "h",
"horizontal_2": "=",
"horizontal_2_front": "=",
"vertical": "j",
"vertical_left": "j",
"vertical_right": "j",
"vertical_T_left": "j",
"vertical_T_right": "j",
"vertical_2": "H",
"vertical_2_left": "H",
"vertical_2_right": "H",
"ne": "u",
"nw": "y",
"se": "n",
Expand Down
262 changes: 67 additions & 195 deletions data/json/vehicleparts/seats.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"type": "item_group"
},
{
"abstract": "seat_abstract",
"id": "seat",
"breaks_into": "ig_vp_seat",
"broken_color": "red",
"broken_symbol": "*",
Expand Down Expand Up @@ -51,50 +51,51 @@
},
"size": "25 L",
"symbol": "#",
"symbols": { "vertical": "#", "vertical_left": "#", "vertical_right": "#", "left": "#", "right": "#", "rear": "#" },
"type": "vehicle_part"
},
{
"abstract": "seat_leather_abstract",
"copy-from": "seat",
"id": "seat_swivel_chair",
"type": "vehicle_part"
},
{
"copy-from": "seat",
"id": "seat_windshield",
"type": "vehicle_part"
},
{
"id": "seat_leather",
"breaks_into": "ig_vp_seat_leather",
"copy-from": "seat",
"item": "seat_leather",
"looks_like": "seat",
"name": { "str": "leather seat" },
"type": "vehicle_part"
},
{
"abstract": "reclining_seat_abstract",
"breaks_into": "ig_vp_seat",
"broken_color": "red",
"broken_symbol": "*",
"categories": [ "operations", "passengers" ],
"color": "red",
"copy-from": "seat_leather",
"id": "seat_windshield_leather",
"type": "vehicle_part"
},
{
"id": "reclining_seat",
"copy-from": "seat",
"comfort": 3,
"damage_modifier": 60,
"damage_reduction": { "all": 3, "bash": 5 },
"description": "A place to sit, and the backrest reclines to make it an uncomfortable bed.",
"durability": 100,
"flags": [ "BED", "SEAT", "BOARDABLE", "BELTABLE", "CARGO" ],
"floor_bedding_warmth": 350,
"item": "seat",
"location": "center",
"looks_like": "seat",
"name": { "str": "reclining seat" },
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"repair": {
"skills": [ [ "mechanics", 2 ] ],
"time": "30 m",
"using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 8 ] ]
}
},
"size": "6250 ml",
"symbol": "#",
"extend": { "flags": [ "BED" ] },
"type": "vehicle_part"
},
{
"copy-from": "reclining_seat",
"id": "reclining_seat_windshield",
"type": "vehicle_part"
},
{
"abstract": "reclining_seat_leather_abstract",
"id": "reclining_seat_leather",
"breaks_into": "ig_vp_seat_leather",
"copy-from": "reclining_seat",
"item": "seat_leather",
Expand All @@ -103,64 +104,40 @@
"type": "vehicle_part"
},
{
"abstract": "seat_back_abstract",
"breaks_into": "ig_vp_seat",
"broken_color": "red",
"broken_symbol": "*",
"categories": [ "operations", "passengers" ],
"color": "red",
"copy-from": "reclining_seat_leather",
"id": "reclining_seat_windshield_leather",
"type": "vehicle_part"
},
{
"id": "seat_back",
"copy-from": "seat",
"comfort": 4,
"damage_modifier": 60,
"damage_reduction": { "all": 3, "bash": 5 },
"description": "A benchlike seat. Mostly found in the second row, also known as the back or rear seat.",
"durability": 300,
"flags": [ "BED", "SEAT", "BOARDABLE", "BELTABLE", "CARGO" ],
"floor_bedding_warmth": 500,
"item": "seat",
"location": "center",
"looks_like": "seat",
"name": { "str": "back seat" },
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "15 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"repair": {
"skills": [ [ "mechanics", 2 ] ],
"time": "30 m",
"using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 8 ] ]
}
},
"size": "30 L",
"symbols": { "vertical": "#", "vertical_left": "#", "vertical_right": "#", "left": "#", "right": "#" },
"extend": { "flags": [ "BED" ] },
"type": "vehicle_part"
},
{
"abstract": "seat_back_leather_abstract",
"breaks_into": "ig_vp_seat_leather",
"id": "seat_back_leather",
"copy-from": "seat_back",
"breaks_into": "ig_vp_seat_leather",
"item": "seat_leather",
"looks_like": "seat_leather",
"name": { "str": "leather back seat" },
"type": "vehicle_part"
},
{
"type": "vehicle_part",
"abstract": "saddle_abstract",
"id": "saddle",
"copy-from": "seat",
"name": { "str": "saddle" },
"categories": [ "operations", "passengers" ],
"symbol": "#",
"looks_like": "seat",
"color": "red",
"broken_symbol": "*",
"broken_color": "red",
"damage_modifier": 20,
"damage_reduction": { "all": 3, "bash": 5 },
"durability": 80,
"description": "A padded wedge that you straddle, like a bicycle or motorcycle.",
"folded_volume": "1250 ml",
"comfort": 1,
"floor_bedding_warmth": 200,
"item": "saddle",
"location": "center",
"requirements": {
"install": { "skills": [ [ "mechanics", 1 ] ], "time": "200 s", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 1 ] ], "time": "200 s", "using": [ [ "vehicle_wrench_2", 1 ] ] },
Expand All @@ -170,162 +147,57 @@
"using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 4 ] ]
}
},
"flags": [ "SEAT", "BOARDABLE", "NONBELTABLE" ],
"breaks_into": [ { "item": "leather", "prob": 50 }, { "item": "scrap", "count": [ 1, 2 ] } ]
"breaks_into": [ { "item": "leather", "prob": 50 }, { "item": "scrap", "count": [ 1, 2 ] } ],
"size": "0 ml",
"extend": { "flags": [ "NONBELTABLE" ] },
"delete": { "flags": [ "BELTABLE", "CARGO" ] }
},
{
"copy-from": "saddle",
"id": "saddle_pedal",
"type": "vehicle_part"
},
{
"copy-from": "saddle",
"id": "saddle_motor",
"type": "vehicle_part"
},
{
"copy-from": "saddle",
"id": "saddle_scooter",
"type": "vehicle_part"
},
{
"type": "vehicle_part",
"abstract": "folding_seat_abstract",
"id": "folding_seat",
"copy-from": "saddle",
"name": { "str": "foldable seat" },
"categories": [ "operations", "passengers" ],
"symbol": "#",
"looks_like": "seat",
"color": "red",
"broken_symbol": "*",
"broken_color": "red",
"damage_modifier": 10,
"damage_reduction": { "all": 3, "bash": 5 },
"comfort": 0,
"floor_bedding_warmth": 0,
"durability": 20,
"description": "A crude seat, too uncomfortable to sleep in.",
"item": "sheet",
"folded_volume": "2500 ml",
"location": "anywhere",
"requirements": {
"install": { "skills": [ [ "mechanics", 2 ] ], "time": "200 s", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "200 s", "using": [ [ "vehicle_wrench_2", 1 ] ] },
"repair": {
"skills": [ [ "mechanics", 3 ] ],
"time": "20 s",
"using": [ [ "repair_welding_standard", 1 ], [ "sewing_standard", 3 ] ]
}
},
"flags": [ "SEAT", "BOARDABLE", "NONBELTABLE" ],
"breaks_into": [ { "item": "cotton_patchwork", "count": [ 1, 6 ] } ]
},
{
"abstract": "metal_bench_abstract",
"id": "metal_bench",
"copy-from": "seat",
"breaks_into": "ig_vp_prison_bench",
"broken_color": "dark_gray",
"broken_symbol": "*",
"categories": [ "operations", "passengers" ],
"color": "dark_gray",
"comfort": 0,
"damage_modifier": 60,
"damage_reduction": { "all": 3, "bash": 5 },
"floor_bedding_warmth": 0,
"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", 5 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": "vehicle_weld_removal" },
"repair": { "skills": [ [ "mechanics", 2 ] ], "time": "60 m", "using": [ [ "repair_welding_standard", 3 ] ] }
},
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "seat_abstract",
"id": "seat",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "seat_abstract",
"id": "seat_swivel_chair",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "seat_abstract",
"id": "seat_windshield",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "seat_leather_abstract",
"id": "seat_leather",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "seat_leather_abstract",
"id": "seat_windshield_leather",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "reclining_seat_abstract",
"id": "reclining_seat",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "reclining_seat_abstract",
"id": "reclining_seat_windshield",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "reclining_seat_leather_abstract",
"id": "reclining_seat_leather",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "reclining_seat_leather_abstract",
"id": "reclining_seat_windshield_leather",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "seat_back_abstract",
"id": "seat_back",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "seat_back_leather_abstract",
"id": "seat_back_leather",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "saddle_abstract",
"id": "saddle",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "saddle_abstract",
"id": "saddle_pedal",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "saddle_abstract",
"id": "saddle_motor",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "saddle_abstract",
"id": "saddle_scooter",
"type": "vehicle_part"
},
{
"copy-from": "folding_seat_abstract",
"id": "folding_seat",
"symbol": "#",
"type": "vehicle_part"
},
{
"copy-from": "metal_bench_abstract",
"id": "metal_bench",
"symbol": "#",
"size": "0 ml",
"delete": { "flags": [ "CARGO" ] },
"type": "vehicle_part"
}
]
Loading

0 comments on commit 81746f6

Please sign in to comment.