From 35533448865b38ccee1efba78ab92a798fe8afa5 Mon Sep 17 00:00:00 2001 From: Chorus System Date: Sat, 18 Nov 2023 16:29:33 -0500 Subject: [PATCH 1/4] Added alcohol fuels to engine Made gasoline and JP8 engines capable of using ethanol, methanol, and denatured alcohol as fuel. --- data/json/vehicleparts/combustion.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/vehicleparts/combustion.json b/data/json/vehicleparts/combustion.json index 2ecedc733b5a..4e14ae1ab5ec 100644 --- a/data/json/vehicleparts/combustion.json +++ b/data/json/vehicleparts/combustion.json @@ -31,7 +31,7 @@ "copy-from": "engine_combustion", "type": "vehicle_part", "fuel_type": "gasoline", - "fuel_options": [ "gasoline", "avgas" ], + "fuel_options": [ "gasoline", "avgas", "chem_ethanol", "chem_methanol", "denat_alcohol" ], "//2": "TODO: remove when injectors are implemented", "m2c": 60, "//": "30% energy efficiency", @@ -42,7 +42,7 @@ "copy-from": "engine_combustion", "type": "vehicle_part", "fuel_type": "gasoline", - "fuel_options": [ "gasoline", "diesel", "lamp_oil", "jp8", "motor_oil", "avgas", "biodiesel" ], + "fuel_options": [ "gasoline", "diesel", "lamp_oil", "jp8", "motor_oil", "avgas", "biodiesel", "chem_ethanol", "chem_methanol", "denat_alcohol" ], "m2c": 60, "//": "25% energy efficiency", "extend": { "flags": [ "E_NO_POWER_DECAY" ] }, From 3a8f0195e80f376e88faf3a89c5f92dbb6d6d26d Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Sat, 18 Nov 2023 21:33:36 +0000 Subject: [PATCH 2/4] style(autofix.ci): automated formatting --- data/json/vehicleparts/combustion.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/data/json/vehicleparts/combustion.json b/data/json/vehicleparts/combustion.json index 4e14ae1ab5ec..d949bd624798 100644 --- a/data/json/vehicleparts/combustion.json +++ b/data/json/vehicleparts/combustion.json @@ -42,7 +42,18 @@ "copy-from": "engine_combustion", "type": "vehicle_part", "fuel_type": "gasoline", - "fuel_options": [ "gasoline", "diesel", "lamp_oil", "jp8", "motor_oil", "avgas", "biodiesel", "chem_ethanol", "chem_methanol", "denat_alcohol" ], + "fuel_options": [ + "gasoline", + "diesel", + "lamp_oil", + "jp8", + "motor_oil", + "avgas", + "biodiesel", + "chem_ethanol", + "chem_methanol", + "denat_alcohol" + ], "m2c": 60, "//": "25% energy efficiency", "extend": { "flags": [ "E_NO_POWER_DECAY" ] }, From 80c2d72e695e085140b735ac193324feb2198d86 Mon Sep 17 00:00:00 2001 From: Chorus System Date: Sat, 18 Nov 2023 18:45:03 -0500 Subject: [PATCH 3/4] Replace ethanol with biodiesel --- data/json/vehicleparts/combustion.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/data/json/vehicleparts/combustion.json b/data/json/vehicleparts/combustion.json index d949bd624798..ec0413a29685 100644 --- a/data/json/vehicleparts/combustion.json +++ b/data/json/vehicleparts/combustion.json @@ -31,7 +31,7 @@ "copy-from": "engine_combustion", "type": "vehicle_part", "fuel_type": "gasoline", - "fuel_options": [ "gasoline", "avgas", "chem_ethanol", "chem_methanol", "denat_alcohol" ], + "fuel_options": [ "gasoline", "avgas", "biodiesel" ], "//2": "TODO: remove when injectors are implemented", "m2c": 60, "//": "30% energy efficiency", @@ -49,10 +49,7 @@ "jp8", "motor_oil", "avgas", - "biodiesel", - "chem_ethanol", - "chem_methanol", - "denat_alcohol" + "biodiesel" ], "m2c": 60, "//": "25% energy efficiency", From 3ba8c8a1c9dd573b6f37ee950a210b9687f3e74c Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Sat, 18 Nov 2023 23:45:50 +0000 Subject: [PATCH 4/4] style(autofix.ci): automated formatting --- data/json/vehicleparts/combustion.json | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/data/json/vehicleparts/combustion.json b/data/json/vehicleparts/combustion.json index ec0413a29685..8d2d492f47ce 100644 --- a/data/json/vehicleparts/combustion.json +++ b/data/json/vehicleparts/combustion.json @@ -42,15 +42,7 @@ "copy-from": "engine_combustion", "type": "vehicle_part", "fuel_type": "gasoline", - "fuel_options": [ - "gasoline", - "diesel", - "lamp_oil", - "jp8", - "motor_oil", - "avgas", - "biodiesel" - ], + "fuel_options": [ "gasoline", "diesel", "lamp_oil", "jp8", "motor_oil", "avgas", "biodiesel" ], "m2c": 60, "//": "25% energy efficiency", "extend": { "flags": [ "E_NO_POWER_DECAY" ] },