Skip to content

Commit

Permalink
Fix: heavy duty vehicles using correct door variants. (cataclysmbntea…
Browse files Browse the repository at this point in the history
…m#891)

* done, tested

* Update trains.json

* Update trains.json
  • Loading branch information
SzQ1 authored Sep 16, 2021
1 parent ea8a7cf commit 31c2adc
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion data/json/vehicles/cars.json
Original file line number Diff line number Diff line change
Expand Up @@ -1396,7 +1396,7 @@
{ "x": 0, "y": 1, "part": "kitchen_unit" },
{ "x": 0, "y": 1, "part": "roof" },
{ "x": 0, "y": -1, "part": "frame_vertical" },
{ "x": 0, "y": -1, "part": "hddoor" },
{ "x": 0, "y": -1, "part": "hddoor_left" },
{ "x": 0, "y": 2, "part": "frame_vertical" },
{ "x": 0, "y": 2, "part": "halfboard_vertical" },
{ "x": -1, "y": 0, "part": "frame_vertical_2" },
Expand Down
6 changes: 3 additions & 3 deletions data/json/vehicles/emergency.json
Original file line number Diff line number Diff line change
Expand Up @@ -1244,10 +1244,10 @@
{ "x": 0, "y": 2, "part": "light_red" },
{ "x": 0, "y": 2, "part": "hdroof" },
{ "x": 0, "y": -1, "part": "hdframe_vertical" },
{ "x": 0, "y": -1, "part": "hddoor" },
{ "x": 0, "y": -1, "part": "hddoor_left" },
{ "x": 0, "y": -1, "part": "plating_steel" },
{ "x": 0, "y": 3, "part": "hdframe_vertical" },
{ "x": 0, "y": 3, "part": "hddoor" },
{ "x": 0, "y": 3, "part": "hddoor_right" },
{ "x": 0, "y": 3, "part": "plating_steel" },
{ "x": 1, "y": 1, "part": "hdframe_horizontal" },
{ "x": 1, "y": 1, "part": "reinforced_windshield" },
Expand Down Expand Up @@ -1325,7 +1325,7 @@
{ "x": -2, "y": -1, "part": "hdroof" },
{ "x": -2, "y": -1, "part": "plating_steel" },
{ "x": -2, "y": 3, "part": "hdframe_vertical" },
{ "x": -2, "y": 3, "part": "hddoor_opaque" },
{ "x": -2, "y": 3, "part": "hddoor_opaque_right" },
{ "x": -2, "y": 3, "part": "hdroof" },
{ "x": -2, "y": 3, "part": "plating_steel" },
{ "x": -3, "y": 0, "part": "hdframe_horizontal" },
Expand Down
28 changes: 14 additions & 14 deletions data/json/vehicles/military.json
Original file line number Diff line number Diff line change
Expand Up @@ -349,15 +349,15 @@
{ "y": 1, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
{ "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield", "headlight_reinforced" ] },
{ "y": -1, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
{ "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor_right" ] },
{ "y": 2, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "jp8", "part": "tank" } ] },
{ "y": 2, "x": 0, "parts": [ "seat", "seatbelt" ] },
{ "y": 1, "x": 0, "parts": [ "hdframe_vertical_2", "box", "recharge_station", "hdroof" ] },
{ "y": 0, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "jp8", "part": "tank" } ] },
{ "y": 0, "x": 0, "parts": [ "controls", "dashboard", "vehicle_clock", "horn_big" ] },
{ "y": 0, "x": 0, "parts": [ "seat", "seatbelt" ] },
{ "y": -1, "x": 0, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": 3, "x": -1, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": -1, "x": 0, "parts": [ "hdframe_vertical", "hddoor_left" ] },
{ "y": 3, "x": -1, "parts": [ "hdframe_vertical", "hddoor_right" ] },
{ "y": 2, "x": -1, "parts": [ "hdframe_horizontal_2", "seat", "seatbelt", "hdroof" ] },
{ "y": 1, "x": -1, "parts": [ "hdframe_horizontal_2", "aisle_horizontal", "hdroof" ] },
{
Expand All @@ -366,7 +366,7 @@
"parts": [ "turret_mount", { "ammo_types": [ "762_51" ], "part": "mounted_m240", "ammo": 60, "ammo_qty": [ 10, 100 ] } ]
},
{ "y": 0, "x": -1, "parts": [ "hdframe_horizontal_2", "seat", "seatbelt", "hdroof" ] },
{ "y": -1, "x": -1, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": -1, "x": -1, "parts": [ "hdframe_vertical", "hddoor_left" ] },
{ "y": 3, "x": -2, "parts": [ "hdframe_vertical", "hdboard_vertical", "plating_military" ] },
{ "y": 2, "x": -2, "parts": [ "hdframe_horizontal_2", "trunk", "hdroof" ] },
{ "y": 1, "x": -2, "parts": [ "hdframe_horizontal_2", "trunk", "hdroof" ] },
Expand Down Expand Up @@ -423,15 +423,15 @@
{ "y": 1, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
{ "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield", "headlight_reinforced" ] },
{ "y": -1, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
{ "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor_right" ] },
{ "y": 2, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "jp8", "part": "tank" } ] },
{ "y": 2, "x": 0, "parts": [ "seat", "seatbelt" ] },
{ "y": 1, "x": 0, "parts": [ "hdframe_vertical_2", "box", "recharge_station", "hdroof" ] },
{ "y": 0, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "jp8", "part": "tank" } ] },
{ "y": 0, "x": 0, "parts": [ "controls", "dashboard", "vehicle_clock", "horn_big" ] },
{ "y": 0, "x": 0, "parts": [ "seat", "seatbelt" ] },
{ "y": -1, "x": 0, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": 3, "x": -1, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": -1, "x": 0, "parts": [ "hdframe_vertical", "hddoor_left" ] },
{ "y": 3, "x": -1, "parts": [ "hdframe_vertical", "hddoor_right" ] },
{ "y": 2, "x": -1, "parts": [ "hdframe_horizontal_2", "seat", "seatbelt", "hdroof" ] },
{ "y": 1, "x": -1, "parts": [ "hdframe_horizontal_2", "aisle_horizontal", "hdroof" ] },
{
Expand All @@ -440,7 +440,7 @@
"parts": [ "turret_mount", { "ammo_types": [ "40x53mm_m430a1" ], "part": "mounted_mk19", "ammo": 60, "ammo_qty": [ 1, 25 ] } ]
},
{ "y": 0, "x": -1, "parts": [ "hdframe_horizontal_2", "seat", "seatbelt", "hdroof" ] },
{ "y": -1, "x": -1, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": -1, "x": -1, "parts": [ "hdframe_vertical", "hddoor_left" ] },
{ "y": 3, "x": -2, "parts": [ "hdframe_vertical", "hdboard_vertical", "plating_military" ] },
{ "y": 2, "x": -2, "parts": [ "hdframe_horizontal_2", "trunk", "hdroof" ] },
{ "y": 1, "x": -2, "parts": [ "hdframe_horizontal_2", "trunk", "hdroof" ] },
Expand Down Expand Up @@ -497,15 +497,15 @@
{ "y": 1, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
{ "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield", "headlight_reinforced" ] },
{ "y": -1, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
{ "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor_right" ] },
{ "y": 2, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "diesel", "part": "tank" } ] },
{ "y": 2, "x": 0, "parts": [ "seat", "seatbelt" ] },
{ "y": 1, "x": 0, "parts": [ "hdframe_vertical_2", "box", "recharge_station", "hdroof" ] },
{ "y": 0, "x": 0, "parts": [ "hdframe_vertical_2", "hdroof", { "fuel": "diesel", "part": "tank" } ] },
{ "y": 0, "x": 0, "parts": [ "controls", "dashboard", "vehicle_clock", "horn_big" ] },
{ "y": 0, "x": 0, "parts": [ "seat", "seatbelt" ] },
{ "y": -1, "x": 0, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": 3, "x": -1, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": -1, "x": 0, "parts": [ "hdframe_vertical", "hddoor_left" ] },
{ "y": 3, "x": -1, "parts": [ "hdframe_vertical", "hddoor_right" ] },
{ "y": 2, "x": -1, "parts": [ "hdframe_horizontal_2", "seat", "seatbelt", "hdroof" ] },
{ "y": 1, "x": -1, "parts": [ "hdframe_horizontal_2", "aisle_horizontal", "hdroof" ] },
{
Expand All @@ -514,7 +514,7 @@
"parts": [ "turret_mount", { "ammo_types": [ "atgm_heat" ], "part": "tow_launcher", "ammo": 60, "ammo_qty": [ 1, 1 ] } ]
},
{ "y": 0, "x": -1, "parts": [ "hdframe_horizontal_2", "seat", "seatbelt", "hdroof" ] },
{ "y": -1, "x": -1, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": -1, "x": -1, "parts": [ "hdframe_vertical", "hddoor_left" ] },
{ "y": 3, "x": -2, "parts": [ "hdframe_vertical", "hdboard_vertical", "plating_military" ] },
{ "y": 2, "x": -2, "parts": [ "hdframe_horizontal_2", "trunk", "hdroof" ] },
{ "y": 1, "x": -2, "parts": [ "hdframe_horizontal_2", "trunk", "hdroof" ] },
Expand Down Expand Up @@ -574,15 +574,15 @@
{ "y": 1, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
{ "y": 0, "x": 1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
{ "y": -1, "x": 1, "parts": [ "hdframe_vertical", "reinforced_windshield" ] },
{ "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": 3, "x": 0, "parts": [ "hdframe_vertical", "hddoor_left" ] },
{ "y": 2, "x": 0, "parts": [ "hdframe_vertical_2", { "fuel": "jp8", "part": "tank" }, "hdroof" ] },
{ "y": 2, "x": 0, "parts": [ "seat", "seatbelt" ] },
{ "y": 1, "x": 0, "parts": [ "hdframe_vertical_2", { "fuel": "jp8", "part": "tank" }, "hdroof" ] },
{ "y": 1, "x": 0, "parts": [ "seat", "seatbelt" ] },
{ "y": 0, "x": 0, "parts": [ "hdframe_vertical_2", { "fuel": "jp8", "part": "tank" }, "hdroof" ] },
{ "y": 0, "x": 0, "parts": [ "seat", "seatbelt" ] },
{ "y": 0, "x": 0, "parts": [ "controls", "dashboard", "vehicle_clock", "horn_big" ] },
{ "y": -1, "x": 0, "parts": [ "hdframe_vertical", "hddoor" ] },
{ "y": -1, "x": 0, "parts": [ "hdframe_vertical", "hddoor_right" ] },
{ "y": 3, "x": -1, "parts": [ "hdframe_vertical", "hdhalfboard_se", "muffler", "plating_military" ] },
{ "y": 2, "x": -1, "parts": [ "hdframe_horizontal", "reinforced_windshield" ] },
{ "y": 1, "x": -1, "parts": [ "hdframe_vertical_2", "reinforced_windshield" ] },
Expand Down
4 changes: 2 additions & 2 deletions data/json/vehicles/trucks.json
Original file line number Diff line number Diff line change
Expand Up @@ -677,9 +677,9 @@
{ "x": 0, "y": 2, "part": "seatbelt" },
{ "x": 0, "y": 2, "part": "hdroof" },
{ "x": 0, "y": -1, "part": "hdframe_vertical" },
{ "x": 0, "y": -1, "part": "hddoor" },
{ "x": 0, "y": -1, "part": "hddoor_left" },
{ "x": 0, "y": 3, "part": "hdframe_vertical" },
{ "x": 0, "y": 3, "part": "hddoor" },
{ "x": 0, "y": 3, "part": "hddoor_right" },
{ "x": -2, "y": 1, "part": "hdframe_horizontal" },
{ "x": -2, "y": 1, "part": "wooden_aisle_vertical" },
{ "x": -2, "y": 1, "part": "roof_cloth" },
Expand Down
14 changes: 7 additions & 7 deletions data/json/vehicles/vans_busses.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
{ "x": 0, "y": 0, "part": "hdroof" },
{ "x": 0, "y": 0, "part": "tank", "fuel": "diesel" },
{ "x": 0, "y": 3, "part": "hdframe_vertical" },
{ "x": 0, "y": 3, "part": "hddoor" },
{ "x": 0, "y": 3, "part": "hddoor_right" },
{ "x": 0, "y": 3, "part": "plating_steel" },
{ "x": 0, "y": -1, "part": "hdframe_vertical" },
{ "x": 0, "y": -1, "part": "hddoor" },
{ "x": 0, "y": -1, "part": "hddoor_left" },
{ "x": 0, "y": -1, "part": "plating_steel" },
{ "x": 1, "y": 1, "part": "hdframe_horizontal" },
{ "x": 1, "y": 1, "part": "reinforced_windshield" },
Expand Down Expand Up @@ -89,14 +89,14 @@
{ "x": -1, "y": 2, "part": "seatbelt" },
{ "x": -1, "y": 2, "part": "hdroof" },
{ "x": -1, "y": 3, "part": "hdframe_vertical" },
{ "x": -1, "y": 3, "part": "hddoor" },
{ "x": -1, "y": 3, "part": "hddoor_right" },
{ "x": -1, "y": 3, "part": "plating_steel" },
{ "x": -1, "y": 0, "part": "hdframe_horizontal_2" },
{ "x": -1, "y": 0, "part": "seat" },
{ "x": -1, "y": 0, "part": "seatbelt" },
{ "x": -1, "y": 0, "part": "hdroof" },
{ "x": -1, "y": -1, "part": "hdframe_vertical" },
{ "x": -1, "y": -1, "part": "hddoor" },
{ "x": -1, "y": -1, "part": "hddoor_left" },
{ "x": -1, "y": -1, "part": "plating_steel" },
{ "x": -2, "y": 1, "part": "hdframe_horizontal_2" },
{ "x": -2, "y": 1, "part": "aisle_horizontal" },
Expand Down Expand Up @@ -2823,10 +2823,10 @@
{ "x": 0, "y": 2, "part": "seatbelt" },
{ "x": 0, "y": 2, "part": "hdroof" },
{ "x": 0, "y": -1, "part": "hdframe_vertical" },
{ "x": 0, "y": -1, "part": "hddoor" },
{ "x": 0, "y": -1, "part": "hddoor_left" },
{ "x": 0, "y": -1, "part": "plating_steel" },
{ "x": 0, "y": 3, "part": "hdframe_vertical" },
{ "x": 0, "y": 3, "part": "hddoor" },
{ "x": 0, "y": 3, "part": "hddoor_right" },
{ "x": 0, "y": 3, "part": "plating_steel" },
{ "x": 1, "y": 1, "part": "hdframe_horizontal" },
{ "x": 1, "y": 1, "part": "reinforced_windshield" },
Expand Down Expand Up @@ -2898,7 +2898,7 @@
{ "x": -2, "y": -1, "part": "hdroof" },
{ "x": -2, "y": -1, "part": "plating_steel" },
{ "x": -2, "y": 3, "part": "hdframe_vertical" },
{ "x": -2, "y": 3, "part": "hddoor_opaque" },
{ "x": -2, "y": 3, "part": "hddoor_opaque_right" },
{ "x": -2, "y": 3, "part": "hdroof" },
{ "x": -2, "y": 3, "part": "plating_steel" },
{ "x": -3, "y": 0, "part": "hdframe_horizontal" },
Expand Down

0 comments on commit 31c2adc

Please sign in to comment.