Add an I4 diesel engine (#60999)

* Update combustion.json * Update cars.json * Update vehicle_groups.json * Update engine.json * Update supplies.json * Update locations.json
CleverRaven · Sep 15, 2022 · ca61b82 · ca61b82
1 parent 4e0d16f
commit ca61b82
Show file tree

Hide file tree

Showing 6 changed files with 180 additions and 0 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1479,6 +1479,7 @@
       [ "v2_combustion", 10 ],
       [ "i4_combustion", 10 ],
       [ "v6_combustion", 10 ],
+      [ "i4_diesel", 10 ],
       [ "v6_diesel", 10 ],
       [ "v8_combustion", 10 ],
       [ "1cyl_combustion_small", 10 ],

diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
@@ -551,6 +551,7 @@
       [ "v2_combustion", 10 ],
       [ "i4_combustion", 10 ],
       [ "v6_combustion", 10 ],
+      [ "i4_diesel", 10 ],
       [ "v6_diesel", 10 ],
       [ "steam_triple_small", 1 ],
       [ "steam_triple_medium", 1 ],

diff --git a/data/json/items/vehicle/engine.json b/data/json/items/vehicle/engine.json
@@ -108,6 +108,18 @@
     "price_postapoc": 1250,
     "displacement": 160
   },
+  {
+    "id": "i4_diesel",
+    "copy-from": "engine_diesel",
+    "type": "ENGINE",
+    "name": { "str": "I4 diesel engine" },
+    "description": "A small, yet powerful 4-cylinder diesel engine, commonly called straight-4.",
+    "weight": "120 kg",
+    "volume": "166 L",
+    "price": 16000,
+    "price_postapoc": 1250,
+    "displacement": 160
+  },
   {
     "id": "i6_diesel",
     "copy-from": "engine_diesel",

diff --git a/data/json/vehicle_groups.json b/data/json/vehicle_groups.json
@@ -4,8 +4,10 @@
     "id": "city_vehicles",
     "vehicles": [
       [ "car", 2000 ],
+      [ "car_diesel", 1000 ],
       [ "car_anmlcmpt", 250 ],
       [ "car_hatch", 1000 ],
+      [ "car_hatch_diesel", 500 ],
       [ "car_luxury", 400 ],
       [ "electric_car", 500 ],
       [ "car_sports", 300 ],
@@ -105,8 +107,10 @@
     "id": "city_pileup",
     "vehicles": [
       [ "car", 7000 ],
+      [ "car_diesel", 3500 ],
       [ "car_anmlcmpt", 600 ],
       [ "car_hatch", 3500 ],
+      [ "car_hatch_diesel", 1400 ],
       [ "car_luxury", 1400 ],
       [ "electric_car", 1000 ],
       [ "car_sports", 500 ],
@@ -139,8 +143,10 @@
     "id": "highway",
     "vehicles": [
       [ "car", 3000 ],
+      [ "car_diesel", 1500 ],
       [ "car_anmlcmpt", 250 ],
       [ "car_hatch", 1000 ],
+      [ "car_hatch_diesel", 500 ],
       [ "car_luxury", 600 ],
       [ "electric_car", 500 ],
       [ "car_hybrid", 500 ],
@@ -192,9 +198,11 @@
     "//": "Do not add vehicles over 8 tiles long or 4 wide. This is for indoor garages/spaces",
     "vehicles": [
       [ "car", 1000 ],
+      [ "car_diesel", 500 ],
       [ "car_rack", 700 ],
       [ "car_anmlcmpt", 150 ],
       [ "car_hatch", 500 ],
+      [ "car_hatch_diesel", 250 ],
       [ "car_hatch_rack", 500 ],
       [ "car_luxury", 300 ],
       [ "car_mini", 250 ],
@@ -232,6 +240,7 @@
     "//": "Do not add vehicles over 5 tiles long or 4 wide. This is for compact car garages/spaces",
     "vehicles": [
       [ "car_hatch", 500 ],
+      [ "car_hatch_diesel", 250 ],
       [ "car_hatch_rack", 500 ],
       [ "car_mini", 250 ],
       [ "beetle", 300 ],
@@ -289,8 +298,10 @@
       [ "car_mini", 375 ],
       [ "beetle", 750 ],
       [ "car", 1000 ],
+      [ "car_diesel", 500 ],
       [ "car_anmlcmpt", 100 ],
       [ "car_hatch", 500 ],
+      [ "car_hatch_diesel", 250 ],
       [ "car_luxury", 200 ],
       [ "electric_car", 750 ],
       [ "car_hybrid", 500 ],
@@ -323,7 +334,9 @@
     "type": "vehicle_group",
     "vehicles": [
       [ "car", 5 ],
+      [ "car_diesel", 2 ],
       [ "car_hatch", 2 ],
+      [ "car_hatch_diesel", 1 ],
       [ "car_chassis", 20 ],
       [ "engine_crane", 40 ],
       [ "motorcycle", 10 ],
@@ -400,7 +413,9 @@
     "id": "junkyard_vehicles",
     "vehicles": [
       [ "car", 1500 ],
+      [ "car_diesel", 750 ],
       [ "car_hatch", 750 ],
+      [ "car_hatch_diesel", 400 ],
       [ "car_luxury", 100 ],
       [ "car_chassis", 2000 ],
       [ "electric_car", 400 ],
@@ -426,7 +441,9 @@
     "id": "dumpsite_vehicles",
     "vehicles": [
       [ "car", 1000 ],
+      [ "car_diesel", 500 ],
       [ "car_hatch", 500 ],
+      [ "car_hatch_diesel", 250 ],
       [ "car_luxury", 100 ],
       [ "car_chassis", 1200 ],
       [ "car_sports", 200 ],
@@ -449,7 +466,9 @@
     "id": "campground_vehicles",
     "vehicles": [
       [ "car", 950 ],
+      [ "car_diesel", 475 ],
       [ "car_hatch", 475 ],
+      [ "car_hatch_diesel", 225 ],
       [ "car_anmlcmpt", 150 ],
       [ "electric_car", 100 ],
       [ "car_hybrid", 100 ],
@@ -476,7 +495,9 @@
     "id": "forgotten_vehicles",
     "vehicles": [
       [ "car", 1000 ],
+      [ "car_diesel", 500 ],
       [ "car_hatch", 500 ],
+      [ "car_hatch_diesel", 250 ],
       [ "car_luxury", 100 ],
       [ "car_anmlcmpt", 100 ],
       [ "suv", 400 ],
@@ -499,7 +520,9 @@
       [ "car_mini", 375 ],
       [ "beetle", 750 ],
       [ "car", 1000 ],
+      [ "car_diesel", 500 ],
       [ "car_hatch", 500 ],
+      [ "car_hatch_diesel", 250 ],
       [ "car_luxury", 200 ],
       [ "car_anmlcmpt", 150 ],
       [ "electric_car", 750 ],
@@ -670,7 +693,9 @@
     "//": "for cs_car_dealership",
     "vehicles": [
       [ "car", 2000 ],
+      [ "car_diesel", 1000 ],
       [ "car_hatch", 1000 ],
+      [ "car_hatch_diesel", 500 ],
       [ "car_luxury", 1000 ],
       [ "electric_car", 500 ],
       [ "car_hybrid", 500 ],
@@ -707,7 +732,9 @@
       [ "car_hybrid", 200 ],
       [ "beetle", 750 ],
       [ "car", 1500 ],
+      [ "car_diesel", 750 ],
       [ "car_hatch", 750 ],
+      [ "car_hatch_diesel", 400 ],
       [ "car_luxury", 500 ],
       [ "suv", 800 ],
       [ "suv_electric", 100 ],
@@ -736,7 +763,9 @@
       [ "car_hybrid", 200 ],
       [ "beetle", 750 ],
       [ "car", 1500 ],
+      [ "car_diesel", 750 ],
       [ "car_hatch", 750 ],
+      [ "car_hatch_diesel", 400 ],
       [ "car_luxury", 500 ],
       [ "car_anmlcmpt", 150 ],
       [ "electric_car", 750 ],
@@ -758,7 +787,9 @@
     "//": "for ws_regional_dump",
     "vehicles": [
       [ "car", 1000 ],
+      [ "car_diesel", 500 ],
       [ "car_hatch", 500 ],
+      [ "car_hatch_diesel", 250 ],
       [ "car_luxury", 100 ],
       [ "electric_car", 500 ],
       [ "car_hybrid", 400 ],
@@ -797,8 +828,10 @@
     "id": "oa_vg_ts_vehicles",
     "vehicles": [
       [ "car", 2000 ],
+      [ "car_diesel", 1000 ],
       [ "car_luxury", 200 ],
       [ "car_hatch", 1000 ],
+      [ "car_hatch_diesel", 500 ],
       [ "electric_car", 500 ],
       [ "car_hybrid", 400 ],
       [ "suv", 800 ],
@@ -825,8 +858,10 @@
     "type": "vehicle_group",
     "vehicles": [
       [ "car", 2000 ],
+      [ "car_diesel", 1000 ],
       [ "car_luxury", 400 ],
       [ "car_hatch", 1000 ],
+      [ "car_hatch_diesel", 500 ],
       [ "electric_car", 500 ],
       [ "car_hybrid", 400 ],
       [ "car_mini", 250 ],
@@ -848,6 +883,7 @@
     "id": "dealership",
     "vehicles": [
       [ "car", 500 ],
+      [ "car_diesel", 250 ],
       [ "car_luxury", 500 ],
       [ "electric_car", 100 ],
       [ "car_hybrid", 100 ],

diff --git a/data/json/vehicleparts/combustion.json b/data/json/vehicleparts/combustion.json
@@ -82,6 +82,32 @@
     },
     "damage_reduction": { "all": 100 }
   },
+  {
+    "id": "diesel_engine_inline4",
+    "copy-from": "diesel_engine",
+    "type": "vehicle_part",
+    "item": "i4_diesel",
+    "description": "A four-cylinder gasoline engine, commonly found in small passenger cars and light trucks.",
+    "durability": 300,
+    "epower": -200,
+    "power": 93250,
+    "energy_consumption": "266000 J",
+    "breaks_into": [
+      { "item": "steel_lump", "count": [ 20, 30 ] },
+      { "item": "steel_chunk", "count": [ 20, 30 ] },
+      { "item": "scrap", "count": [ 20, 30 ] }
+    ],
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 3 ] ], "time": "60 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_wrench_2", 1 ] ] },
+      "repair": {
+        "skills": [ [ "mechanics", 4 ] ],
+        "time": "60 m",
+        "using": [ [ "repair_welding_standard", 3 ], [ "repair_welding_alloys", 1 ], [ "vehicle_wrench_2", 1 ], [ "vehicle_screw", 1 ] ]
+      }
+    },
+    "damage_reduction": { "all": 50 }
+  },
   {
     "id": "diesel_engine_v6",
     "copy-from": "diesel_engine",

diff --git a/data/json/vehicles/cars.json b/data/json/vehicles/cars.json
@@ -207,6 +207,60 @@
       { "x": -2, "y": 1, "chance": 40, "item_groups": [ "spare_tire_kit_small_jack" ] }
     ]
   },
+  {
+    "id": "car_diesel",
+    "type": "vehicle",
+    "name": "Car",
+    "blueprint": [
+      [ "-o++o-" ],
+      [ "+=##'|" ],
+      [ "+=##'|" ],
+      [ "-o++o-" ]
+    ],
+    "parts": [
+      { "x": 0, "y": 0, "parts": [ "frame_vertical_2", "reclining_seat_windshield", "seatbelt" ] },
+      { "x": 0, "y": 0, "parts": [ "controls", "dashboard", "vehicle_clock", "vehicle_alarm" ] },
+      { "x": 0, "y": 0, "parts": [ "stereo", "horn_car", "roof" ] },
+      { "x": 0, "y": -1, "parts": [ "frame_vertical_left", "door_nw" ] },
+      { "x": 0, "y": 1, "parts": [ "frame_vertical_2", "reclining_seat_windshield", "seatbelt", "roof" ] },
+      { "x": 0, "y": 2, "parts": [ "frame_vertical_right", "door_ne" ] },
+      { "x": 1, "y": -1, "parts": [ "frame_vertical_T_left", "windshield_wheel_left" ] },
+      { "x": 1, "y": -1, "parts": [ "wheel_mount_medium_steerable", "wheel" ] },
+      { "x": 1, "y": 0, "parts": [ "frame_horizontal", "windshield_cover_left" ] },
+      { "x": 1, "y": 1, "parts": [ "frame_horizontal", "windshield_cover_right" ] },
+      { "x": 1, "y": 2, "parts": [ "frame_vertical_T_right", "windshield_wheel_right" ] },
+      { "x": 1, "y": 2, "parts": [ "wheel_mount_medium_steerable", "wheel" ] },
+      { "x": 2, "y": -1, "parts": [ "frame_nw", "halfboard_nw", "headlight" ] },
+      { "x": 2, "y": 0, "parts": [ "frame_horizontal_front", "halfboard_cover_left" ] },
+      { "x": 2, "y": 0, "parts": [ "diesel_engine_inline4", "alternator_car", "battery_car" ] },
+      { "x": 2, "y": 1, "parts": [ "frame_horizontal_front", "halfboard_cover_right" ] },
+      { "x": 2, "y": 2, "parts": [ "frame_ne", "halfboard_ne", "headlight" ] },
+      { "x": -1, "y": -1, "parts": [ "frame_vertical_left", "door_sw" ] },
+      { "x": -1, "y": 0, "parts": [ "frame_vertical_2", "seat_back_left", "seatbelt", "roof" ] },
+      { "x": -1, "y": 1, "parts": [ "frame_vertical_2", "seat_back_right", "seatbelt", "roof" ] },
+      { "x": -1, "y": 2, "parts": [ "frame_vertical_right", "door_se" ] },
+      { "x": -2, "y": -1, "parts": [ "frame_vertical_left", "halfboard_wheel_left" ] },
+      { "x": -2, "y": -1, "parts": [ "wheel_mount_medium", "wheel" ] },
+      { "x": -2, "y": -1, "part": "tank", "fuel": "diesel" },
+      { "x": -2, "y": 0, "parts": [ "frame_vertical", "trunk", "muffler", "roof" ] },
+      { "x": -2, "y": 1, "parts": [ "frame_vertical", "trunk", "roof" ] },
+      { "x": -2, "y": 2, "parts": [ "frame_vertical_right", "halfboard_wheel_right" ] },
+      { "x": -2, "y": 2, "parts": [ "wheel_mount_medium", "wheel" ] },
+      { "x": -3, "y": -1, "parts": [ "frame_horizontal_rear", "halfboard_sw" ] },
+      { "x": -3, "y": 0, "parts": [ "frame_horizontal_rear", "door_trunk" ] },
+      { "x": -3, "y": 1, "parts": [ "frame_horizontal_rear", "door_trunk" ] },
+      { "x": -3, "y": 2, "parts": [ "frame_horizontal_rear", "halfboard_se" ] }
+    ],
+    "items": [
+      { "x": 0, "y": 0, "chance": 14, "item_groups": [ "car_misc" ] },
+      { "x": 0, "y": 0, "chance": 5, "item_groups": [ "snacks" ] },
+      { "x": 0, "y": 1, "chance": 8, "item_groups": [ "car_misc" ] },
+      { "x": 0, "y": 1, "chance": 2, "item_groups": [ "fast_food" ] },
+      { "x": -2, "y": 0, "chance": 7, "item_groups": [ "car_kit" ] },
+      { "x": -2, "y": 1, "chance": 10, "item_groups": [ "car_kit" ] },
+      { "x": -2, "y": 1, "chance": 40, "item_groups": [ "spare_tire_kit_small_jack" ] }
+    ]
+  },
   {
     "id": "car_rack",
     "type": "vehicle",
@@ -610,6 +664,56 @@
       { "x": -2, "y": 1, "chance": 10, "item_groups": [ "car_kit" ] }
     ]
   },
+  {
+    "id": "car_hatch_diesel",
+    "type": "vehicle",
+    "name": "Hatchback",
+    "blueprint": [
+      [ "o++o-" ],
+      [ "+##'|" ],
+      [ "+##'|" ],
+      [ "o++o-" ]
+    ],
+    "parts": [
+      { "x": 0, "y": 0, "parts": [ "frame_cross", "seat_windshield", "seatbelt", "controls", "stereo" ] },
+      { "x": 0, "y": 0, "parts": [ "dashboard", "vehicle_clock", "vehicle_alarm", "horn_car" ] },
+      { "x": 0, "y": 0, "part": "roof" },
+      { "x": 0, "y": -1, "parts": [ "frame_vertical_left", "door_nw" ] },
+      { "x": 0, "y": 1, "parts": [ "frame_cross", "seat_windshield", "seatbelt", "roof" ] },
+      { "x": 0, "y": 2, "parts": [ "frame_vertical_right", "door_ne" ] },
+      { "x": 1, "y": -1, "parts": [ "frame_vertical_T_left", "windshield_wheel_left" ] },
+      { "x": 1, "y": -1, "parts": [ "wheel_mount_medium_steerable", "wheel" ] },
+      { "x": 1, "y": 0, "parts": [ "frame_horizontal_2", "windshield_cover_left" ] },
+      { "x": 1, "y": 1, "parts": [ "frame_horizontal_2", "windshield_cover_right" ] },
+      { "x": 1, "y": 2, "parts": [ "frame_vertical_T_right", "windshield_wheel_right" ] },
+      { "x": 1, "y": 2, "parts": [ "wheel_mount_medium_steerable", "wheel" ] },
+      { "x": 2, "y": -1, "parts": [ "frame_nw", "halfboard_nw", "headlight" ] },
+      { "x": 2, "y": 0, "parts": [ "frame_horizontal_front", "halfboard_cover_left" ] },
+      { "x": 2, "y": 0, "parts": [ "diesel_engine_inline4", "alternator_car", "battery_car" ] },
+      { "x": 2, "y": 1, "parts": [ "frame_horizontal_front", "halfboard_cover_right" ] },
+      { "x": 2, "y": 2, "parts": [ "frame_ne", "halfboard_ne", "headlight" ] },
+      { "x": -1, "y": -1, "parts": [ "frame_vertical_left", "door_sw" ] },
+      { "x": -1, "y": 0, "parts": [ "frame_cross", "seat_back_left", "seatbelt", "roof" ] },
+      { "x": -1, "y": 1, "parts": [ "frame_cross", "seat_back_right", "seatbelt", "roof" ] },
+      { "x": -1, "y": 2, "parts": [ "frame_vertical_right", "door_se" ] },
+      { "x": -2, "y": -1, "parts": [ "frame_sw", "wheel_mount_medium", "wheel" ] },
+      { "x": -2, "y": -1, "part": "tank_medium", "fuel": "diesel" },
+      { "x": -2, "y": -1, "part": "halfboard_hatch_wheel_left" },
+      { "x": -2, "y": 0, "parts": [ "frame_horizontal_rear", "hatch", "muffler" ] },
+      { "x": -2, "y": 1, "parts": [ "frame_horizontal_rear", "hatch" ] },
+      { "x": -2, "y": 2, "parts": [ "frame_se", "wheel_mount_medium", "wheel" ] },
+      { "x": -2, "y": 2, "part": "tank_medium", "fuel": "gasoline" },
+      { "x": -2, "y": 2, "part": "halfboard_hatch_wheel_right" }
+    ],
+    "items": [
+      { "x": 0, "y": 0, "chance": 14, "item_groups": [ "car_misc" ] },
+      { "x": 0, "y": 0, "chance": 5, "item_groups": [ "snacks" ] },
+      { "x": 0, "y": 1, "chance": 8, "item_groups": [ "car_misc" ] },
+      { "x": 0, "y": 1, "chance": 2, "item_groups": [ "fast_food" ] },
+      { "x": -2, "y": 0, "chance": 10, "items": [ "blanket" ] },
+      { "x": -2, "y": 1, "chance": 10, "item_groups": [ "car_kit" ] }
+    ]
+  },
   {
     "id": "car_hatch_rack",
     "type": "vehicle",