From 4a3e9e2be09bdf094f8743511aa1596445f54338 Mon Sep 17 00:00:00 2001 From: Mark Langsdorf Date: Thu, 13 Aug 2020 11:52:00 -0500 Subject: [PATCH] vehicles: convert the bus to use parts and use variants for better visuals Convert the standard "bus" vehicle to use "parts" arrays instead of long lists of "part", and use some of the new directional part variants to make the bus look better under tiles. --- data/json/vehicles/vans_busses.json | 260 ++++++++-------------------- 1 file changed, 75 insertions(+), 185 deletions(-) diff --git a/data/json/vehicles/vans_busses.json b/data/json/vehicles/vans_busses.json index 5aab23a4f0e5a..98f2e64e8dc25 100644 --- a/data/json/vehicles/vans_busses.json +++ b/data/json/vehicles/vans_busses.json @@ -2346,199 +2346,89 @@ [ " o" ] ], "parts": [ - { "x": 0, "y": 1, "part": "frame_vertical_2" }, - { "x": 0, "y": 1, "part": "aisle_vertical" }, - { "x": 0, "y": 1, "part": "roof" }, - { "x": 0, "y": 2, "part": "frame_vertical_2" }, - { "x": 0, "y": 2, "part": "aisle_horizontal" }, - { "x": 0, "y": 2, "part": "roof" }, - { "x": 0, "y": 3, "part": "frame_vertical" }, - { "x": 0, "y": 3, "part": "door" }, - { "x": 0, "y": 0, "part": "frame_vertical_2" }, - { "x": 0, "y": 0, "part": "seat" }, - { "x": 0, "y": 0, "part": "controls" }, - { "x": 0, "y": 0, "part": "dashboard" }, - { "x": 0, "y": 0, "part": "vehicle_clock" }, - { "x": 0, "y": 0, "part": "vehicle_alarm" }, + { "x": 0, "y": 1, "parts": [ "frame_vertical_2", "aisle_vertical", "roof" ] }, + { "x": 0, "y": 2, "parts": [ "frame_vertical_2", "aisle_horizontal", "roof" ] }, + { "x": 0, "y": 3, "parts": [ "frame_vertical", "door" ] }, + { "x": 0, "y": 0, "parts": [ "frame_vertical_2", "seat", "roof" ] }, + { "x": 0, "y": 0, "parts": [ "controls", "dashboard", "vehicle_clock", "vehicle_alarm" ] }, { "x": 0, "y": 0, "part": "horn_car" }, - { "x": 0, "y": 0, "part": "roof" }, - { "x": 0, "y": -1, "part": "frame_vertical" }, - { "x": 0, "y": -1, "part": "windshield" }, - { "x": 1, "y": -1, "part": "frame_horizontal" }, - { "x": 1, "y": -1, "part": "windshield" }, - { "x": 1, "y": 0, "part": "frame_horizontal" }, - { "x": 1, "y": 0, "part": "windshield" }, - { "x": 1, "y": -2, "part": "wing_mirror" }, - { "x": 1, "y": 1, "part": "frame_horizontal" }, - { "x": 1, "y": 1, "part": "windshield" }, + { "x": 0, "y": -1, "parts": [ "frame_vertical", "windshield_vertical_left" ] }, + { "x": 1, "y": -1, "parts": [ "frame_horizontal", "windshield_nw_edge" ] }, + { "x": 1, "y": 0, "parts": [ "frame_horizontal", "windshield_horizontal_front" ] }, + { "x": 1, "y": 1, "parts": [ "frame_horizontal", "windshield_horizontal_front" ] }, { "x": 1, "y": 1, "part": "inboard_mirror" }, - { "x": 1, "y": 2, "part": "frame_horizontal" }, - { "x": 1, "y": 2, "part": "windshield" }, - { "x": 1, "y": 3, "part": "frame_horizontal" }, - { "x": 1, "y": 3, "part": "windshield" }, - { "x": 1, "y": 4, "part": "wing_mirror" }, - { "x": 2, "y": -1, "part": "frame_nw" }, - { "x": 2, "y": -1, "part": "halfboard_nw" }, + { "x": 1, "y": 2, "parts": [ "frame_horizontal", "windshield_horizontal_front" ] }, + { "x": 1, "y": 3, "parts": [ "frame_horizontal", "windshield_ne_edge" ] }, + { "x": 1, "y": -2, "part": "wing_mirror_left" }, + { "x": 1, "y": 4, "part": "wing_mirror_right" }, + { "x": 2, "y": -1, "parts": [ "frame_nw", "halfboard_nw" ] }, { "x": 2, "y": -1, "parts": [ "wheel_mount_medium_steerable", "wheel_wide" ] }, - { "x": 2, "y": 0, "part": "frame_horizontal_2" }, - { "x": 2, "y": 0, "part": "halfboard_horizontal_2" }, - { "x": 2, "y": 0, "part": "headlight" }, - { "x": 2, "y": 1, "part": "frame_cover" }, - { "x": 2, "y": 1, "part": "halfboard_cover" }, - { "x": 2, "y": 1, "part": "diesel_engine_v6" }, - { "x": 2, "y": 1, "part": "alternator_truck" }, - { "x": 2, "y": 1, "part": "battery_car" }, - { "x": 2, "y": 2, "part": "frame_horizontal_2" }, - { "x": 2, "y": 2, "part": "halfboard_horizontal_2" }, - { "x": 2, "y": 2, "part": "headlight" }, - { "x": 2, "y": 3, "part": "frame_ne" }, - { "x": 2, "y": 3, "part": "halfboard_ne" }, + { "x": 2, "y": 0, "parts": [ "frame_horizontal_2", "halfboard_horizontal_2", "headlight" ] }, + { "x": 2, "y": 1, "parts": [ "frame_cover", "halfboard_cover" ] }, + { "x": 2, "y": 1, "parts": [ "diesel_engine_v6", "alternator_truck", "battery_car" ] }, + { "x": 2, "y": 2, "parts": [ "frame_horizontal_2", "halfboard_horizontal_2", "headlight" ] }, + { "x": 2, "y": 3, "parts": [ "frame_ne", "halfboard_ne" ] }, { "x": 2, "y": 3, "parts": [ "wheel_mount_medium_steerable", "wheel_wide" ] }, - { "x": -1, "y": -1, "part": "frame_vertical" }, - { "x": -1, "y": -1, "part": "board_vertical" }, - { "x": -1, "y": 0, "part": "frame_horizontal_2" }, - { "x": -1, "y": 0, "part": "board_horizontal" }, - { "x": -1, "y": 0, "part": "roof" }, - { "x": -1, "y": 1, "part": "frame_vertical_2" }, - { "x": -1, "y": 1, "part": "aisle_vertical" }, - { "x": -1, "y": 1, "part": "roof" }, - { "x": -1, "y": 2, "part": "frame_horizontal_2" }, - { "x": -1, "y": 2, "part": "seat" }, - { "x": -1, "y": 2, "part": "roof" }, - { "x": -1, "y": 3, "part": "frame_vertical" }, - { "x": -1, "y": 3, "part": "windshield" }, + { "x": -1, "y": -1, "parts": [ "frame_vertical", "board_vertical" ] }, + { "x": -1, "y": 0, "parts": [ "frame_horizontal_2", "board_horizontal", "roof" ] }, + { "x": -1, "y": 1, "parts": [ "frame_vertical_2", "aisle_vertical", "roof" ] }, + { "x": -1, "y": 2, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -1, "y": 3, "parts": [ "frame_vertical", "windshield_vertical_right" ] }, { "x": -1, "y": 3, "part": "tank", "fuel": "diesel" }, - { "x": -2, "y": -1, "part": "frame_vertical" }, - { "x": -2, "y": -1, "part": "windshield" }, - { "x": -2, "y": 0, "part": "frame_horizontal_2" }, - { "x": -2, "y": 0, "part": "seat" }, - { "x": -2, "y": 0, "part": "roof" }, - { "x": -2, "y": 1, "part": "frame_vertical_2" }, - { "x": -2, "y": 1, "part": "trunk_floor" }, - { "x": -2, "y": 1, "part": "roof" }, - { "x": -2, "y": 2, "part": "frame_horizontal_2" }, - { "x": -2, "y": 2, "part": "seat" }, - { "x": -2, "y": 2, "part": "roof" }, - { "x": -2, "y": 3, "part": "frame_vertical" }, - { "x": -2, "y": 3, "part": "windshield" }, + { "x": -2, "y": -1, "parts": [ "frame_vertical", "windshield_vertical_left" ] }, + { "x": -2, "y": 0, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -2, "y": 1, "parts": [ "frame_vertical_2", "trunk_floor", "roof" ] }, + { "x": -2, "y": 2, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -2, "y": 3, "parts": [ "frame_vertical", "windshield_vertical_right" ] }, { "x": -2, "y": 3, "part": "tank", "fuel": "diesel" }, - { "x": -3, "y": -1, "part": "frame_vertical" }, - { "x": -3, "y": -1, "part": "windshield" }, - { "x": -3, "y": 0, "part": "frame_horizontal_2" }, - { "x": -3, "y": 0, "part": "seat" }, - { "x": -3, "y": 0, "part": "roof" }, - { "x": -3, "y": 1, "part": "frame_vertical_2" }, - { "x": -3, "y": 1, "part": "aisle_vertical" }, - { "x": -3, "y": 1, "part": "roof" }, - { "x": -3, "y": 2, "part": "frame_horizontal_2" }, - { "x": -3, "y": 2, "part": "seat" }, - { "x": -3, "y": 2, "part": "roof" }, - { "x": -3, "y": 3, "part": "frame_vertical" }, - { "x": -3, "y": 3, "part": "windshield" }, - { "x": -4, "y": -1, "part": "frame_vertical" }, - { "x": -4, "y": -1, "part": "windshield" }, - { "x": -4, "y": 0, "part": "frame_horizontal_2" }, - { "x": -4, "y": 0, "part": "seat" }, - { "x": -4, "y": 0, "part": "roof" }, - { "x": -4, "y": 1, "part": "frame_vertical_2" }, - { "x": -4, "y": 1, "part": "aisle_vertical" }, - { "x": -4, "y": 1, "part": "roof" }, - { "x": -4, "y": 2, "part": "frame_horizontal_2" }, - { "x": -4, "y": 2, "part": "seat" }, - { "x": -4, "y": 2, "part": "roof" }, - { "x": -4, "y": 3, "part": "frame_vertical" }, - { "x": -4, "y": 3, "part": "windshield" }, - { "x": -5, "y": -1, "part": "frame_vertical" }, - { "x": -5, "y": -1, "part": "windshield" }, - { "x": -5, "y": 0, "part": "frame_horizontal_2" }, - { "x": -5, "y": 0, "part": "seat" }, - { "x": -5, "y": 0, "part": "roof" }, - { "x": -5, "y": 1, "part": "frame_vertical_2" }, - { "x": -5, "y": 1, "part": "aisle_vertical" }, - { "x": -5, "y": 1, "part": "roof" }, - { "x": -5, "y": 2, "part": "frame_horizontal_2" }, - { "x": -5, "y": 2, "part": "seat" }, - { "x": -5, "y": 2, "part": "roof" }, - { "x": -5, "y": 3, "part": "frame_vertical" }, - { "x": -5, "y": 3, "part": "windshield" }, - { "x": -6, "y": -1, "part": "frame_horizontal" }, + { "x": -3, "y": -1, "parts": [ "frame_vertical", "windshield_vertical_left" ] }, + { "x": -3, "y": 0, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -3, "y": 1, "parts": [ "frame_vertical_2", "aisle_vertical", "roof" ] }, + { "x": -3, "y": 2, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -3, "y": 3, "parts": [ "frame_vertical", "windshield_vertical_right" ] }, + { "x": -4, "y": -1, "parts": [ "frame_vertical", "windshield_vertical_left" ] }, + { "x": -4, "y": 0, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -4, "y": 1, "parts": [ "frame_vertical_2", "aisle_vertical", "roof" ] }, + { "x": -4, "y": 2, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -4, "y": 3, "parts": [ "frame_vertical", "windshield_vertical_right" ] }, + { "x": -5, "y": -1, "parts": [ "frame_vertical", "windshield_vertical_left" ] }, + { "x": -5, "y": 0, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -5, "y": 1, "parts": [ "frame_vertical_2", "aisle_vertical", "roof" ] }, + { "x": -5, "y": 2, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -5, "y": 3, "parts": [ "frame_vertical", "windshield_vertical_right" ] }, + { "x": -6, "y": -1, "parts": [ "frame_vertical", "windshield_vertical_left" ] }, { "x": -6, "y": -1, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, - { "x": -6, "y": -1, "part": "windshield" }, - { "x": -6, "y": 0, "part": "frame_horizontal_2" }, - { "x": -6, "y": 0, "part": "seat" }, - { "x": -6, "y": 0, "part": "roof" }, - { "x": -6, "y": 1, "part": "frame_vertical_2" }, - { "x": -6, "y": 1, "part": "aisle_vertical" }, - { "x": -6, "y": 1, "part": "roof" }, - { "x": -6, "y": 2, "part": "frame_horizontal_2" }, - { "x": -6, "y": 2, "part": "seat" }, - { "x": -6, "y": 2, "part": "roof" }, - { "x": -6, "y": 3, "part": "frame_horizontal" }, + { "x": -6, "y": 0, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -6, "y": 1, "parts": [ "frame_vertical_2", "aisle_vertical", "roof" ] }, + { "x": -6, "y": 2, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -6, "y": 3, "parts": [ "frame_vertical", "windshield_vertical_right" ] }, { "x": -6, "y": 3, "parts": [ "wheel_mount_medium", "wheel_wide" ] }, - { "x": -6, "y": 3, "part": "windshield" }, - { "x": -7, "y": -1, "part": "frame_vertical" }, - { "x": -7, "y": -1, "part": "windshield" }, - { "x": -7, "y": 0, "part": "frame_horizontal_2" }, - { "x": -7, "y": 0, "part": "seat" }, - { "x": -7, "y": 0, "part": "roof" }, - { "x": -7, "y": 1, "part": "frame_vertical_2" }, - { "x": -7, "y": 1, "part": "aisle_vertical" }, - { "x": -7, "y": 1, "part": "roof" }, - { "x": -7, "y": 2, "part": "frame_horizontal_2" }, - { "x": -7, "y": 2, "part": "aisle_vertical" }, - { "x": -7, "y": 2, "part": "roof" }, - { "x": -7, "y": 3, "part": "frame_vertical" }, - { "x": -7, "y": 3, "part": "door" }, - { "x": -8, "y": -1, "part": "frame_vertical" }, - { "x": -8, "y": -1, "part": "windshield" }, - { "x": -8, "y": 0, "part": "frame_horizontal_2" }, - { "x": -8, "y": 0, "part": "seat" }, - { "x": -8, "y": 0, "part": "roof" }, - { "x": -8, "y": 1, "part": "frame_vertical_2" }, - { "x": -8, "y": 1, "part": "trunk_floor" }, - { "x": -8, "y": 1, "part": "roof" }, - { "x": -8, "y": 2, "part": "frame_horizontal_2" }, - { "x": -8, "y": 2, "part": "seat" }, - { "x": -8, "y": 2, "part": "roof" }, - { "x": -8, "y": 3, "part": "frame_vertical" }, - { "x": -8, "y": 3, "part": "windshield" }, - { "x": -9, "y": -1, "part": "frame_vertical" }, - { "x": -9, "y": -1, "part": "windshield" }, - { "x": -9, "y": 0, "part": "frame_horizontal_2" }, - { "x": -9, "y": 0, "part": "seat" }, - { "x": -9, "y": 0, "part": "roof" }, - { "x": -9, "y": 1, "part": "frame_vertical_2" }, - { "x": -9, "y": 1, "part": "aisle_vertical" }, - { "x": -9, "y": 1, "part": "roof" }, - { "x": -9, "y": 2, "part": "frame_horizontal_2" }, - { "x": -9, "y": 2, "part": "seat" }, - { "x": -9, "y": 2, "part": "roof" }, - { "x": -9, "y": 3, "part": "frame_vertical" }, - { "x": -9, "y": 3, "part": "windshield" }, - { "x": -10, "y": -1, "part": "frame_vertical" }, - { "x": -10, "y": -1, "part": "windshield" }, - { "x": -10, "y": 0, "part": "frame_horizontal_2" }, - { "x": -10, "y": 0, "part": "seat" }, - { "x": -10, "y": 0, "part": "roof" }, - { "x": -10, "y": 1, "part": "frame_vertical_2" }, - { "x": -10, "y": 1, "part": "seat" }, - { "x": -10, "y": 1, "part": "roof" }, - { "x": -10, "y": 2, "part": "frame_horizontal_2" }, - { "x": -10, "y": 2, "part": "seat" }, - { "x": -10, "y": 2, "part": "roof" }, - { "x": -10, "y": 3, "part": "frame_vertical" }, - { "x": -10, "y": 3, "part": "windshield" }, - { "x": -11, "y": -1, "part": "frame_horizontal" }, - { "x": -11, "y": -1, "part": "board_sw" }, - { "x": -11, "y": 0, "part": "frame_horizontal" }, - { "x": -11, "y": 0, "part": "windshield" }, - { "x": -11, "y": 1, "part": "frame_vertical" }, - { "x": -11, "y": 1, "part": "windshield" }, - { "x": -11, "y": 2, "part": "frame_horizontal" }, - { "x": -11, "y": 2, "part": "windshield" }, - { "x": -11, "y": 3, "part": "frame_horizontal" }, - { "x": -11, "y": 3, "part": "beeper" }, - { "x": -11, "y": 3, "part": "board_se" } + { "x": -7, "y": -1, "parts": [ "frame_vertical", "windshield_vertical_left" ] }, + { "x": -7, "y": 0, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -7, "y": 1, "parts": [ "frame_vertical_2", "aisle_vertical", "roof" ] }, + { "x": -7, "y": 2, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -7, "y": 3, "parts": [ "frame_vertical", "windshield_vertical_right" ] }, + { "x": -8, "y": -1, "parts": [ "frame_vertical", "windshield_vertical_left" ] }, + { "x": -8, "y": 0, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -8, "y": 1, "parts": [ "frame_vertical_2", "trunk_floor", "roof" ] }, + { "x": -8, "y": 2, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -8, "y": 3, "parts": [ "frame_vertical", "windshield_vertical_right" ] }, + { "x": -9, "y": -1, "parts": [ "frame_vertical", "windshield_vertical_left" ] }, + { "x": -9, "y": 0, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -9, "y": 1, "parts": [ "frame_vertical_2", "aisle_vertical", "roof" ] }, + { "x": -9, "y": 2, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -9, "y": 3, "parts": [ "frame_vertical", "windshield_vertical_right" ] }, + { "x": -10, "y": -1, "parts": [ "frame_vertical", "windshield_vertical_left" ] }, + { "x": -10, "y": 0, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -10, "y": 1, "parts": [ "frame_vertical_2", "seat", "roof" ] }, + { "x": -10, "y": 2, "parts": [ "frame_horizontal_2", "seat", "roof" ] }, + { "x": -10, "y": 3, "parts": [ "frame_vertical", "windshield_vertical_right" ] }, + { "x": -11, "y": -1, "parts": [ "frame_horizontal", "board_sw" ] }, + { "x": -11, "y": 0, "parts": [ "frame_horizontal", "windshield_horizontal_rear" ] }, + { "x": -11, "y": 1, "parts": [ "frame_horizontal", "windshield_horizontal_rear" ] }, + { "x": -11, "y": 2, "parts": [ "frame_horizontal", "windshield_horizontal_rear" ] }, + { "x": -11, "y": 3, "parts": [ "frame_horizontal", "board_se" ] }, + { "x": -11, "y": 3, "part": "beeper" } ], "items": [ { "x": -1, "y": 2, "chance": 35, "item_groups": [ "bus_common" ] },