Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(balance): gasoline engines can burn alcohol, V8 and V12 engines in general require higher-quality fuel #5750

Merged
merged 6 commits into from
Dec 4, 2024
Merged

feat(balance): gasoline engines can burn alcohol, V8 and V12 engines in general require higher-quality fuel #5750

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
653530e
feat(balance): set gasoline engines to use alcohol as alternative fue…
chaosvolt Nov 22, 2024
1178097
Merge branch 'main' into do-not-drink-and-drive-does-not-apply-to-the…
chaosvolt Nov 23, 2024
35549d3
Update combustion.json
chaosvolt Nov 23, 2024
12421f2
Merge branch 'main' into do-not-drink-and-drive-does-not-apply-to-the…
chaosvolt Nov 24, 2024
803b0d1
Merge branch 'main' into do-not-drink-and-drive-does-not-apply-to-the…
chaosvolt Nov 27, 2024
5e64f42
Merge branch 'main' into do-not-drink-and-drive-does-not-apply-to-the…
chaosvolt Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 32 additions & 9 deletions data/json/vehicleparts/combustion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,40 @@
"m2c": 65,
"//": "40% energy efficiency",
"extend": { "flags": [ "E_COLD_START" ] },
"description": "A combustion engine. Burns diesel fuel from a tank in the vehicle. Can also burn biodiesel or lamp oil, though somewhat less efficiently."
"description": "A combustion engine. Burns diesel fuel from a tank in the vehicle. Can also burn biodiesel or oil, though somewhat less efficiently."
},
{
"abstract": "gasoline_engine",
"copy-from": "engine_combustion",
"type": "vehicle_part",
"fuel_type": "gasoline",
"fuel_options": [ "gasoline", "avgas", "biodiesel" ],
"fuel_options": [ "gasoline", "avgas", "chem_ethanol", "denat_alcohol", "chem_methanol" ],
"//2": "TODO: remove when injectors are implemented",
"m2c": 60,
"//": "30% energy efficiency",
"description": "A combustion engine. Burns gasoline fuel from a tank in the vehicle."
"description": "A combustion engine. Burns gasoline fuel from a tank in the vehicle. Can also burn concentrated alcohol, though somewhat less efficiently."
},
{
"abstract": "gas_turbine_engine",
"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",
"denat_alcohol",
"chem_methanol"
],
"m2c": 60,
"//": "25% energy efficiency",
"extend": { "flags": [ "E_NO_POWER_DECAY" ] },
"description": "An advanced combustion engine. Burns gasoline or diesel or aviation fuel from a tank in the vehicle. Can also burn lamp oil, though somewhat less efficiently. Better power-to-weight ratio than a traditional engine but consumes more fuel, its power will not diminish even when multiple of them are installed."
"description": "An advanced combustion engine. Burns gasoline or diesel or aviation fuel from a tank in the vehicle. Can also burn biodiesel, oil, or concentrated alcohol; though somewhat less efficiently. Better power-to-weight ratio than a traditional engine but consumes more fuel, its power will not diminish even when multiple of them are installed."
},
{
"id": "diesel_engine_i6",
Expand Down Expand Up @@ -112,7 +123,10 @@
"removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 5 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] }
},
"damage_reduction": { "all": 100 }
"damage_reduction": { "all": 100 },
"//": "More powerful engines require higher-quality fuel, aside from low-efficiency turbines which can eat anything.",
"fuel_options": [ "diesel", "biodiesel", "jp8" ],
"description": "A combustion engine. Burns diesel fuel from a tank in the vehicle. Can also burn biodiesel, though somewhat less efficiently."
},
{
"id": "engine_1cyl",
Expand Down Expand Up @@ -206,7 +220,10 @@
"removal": { "skills": [ [ "mechanics", 6 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] }
},
"damage_reduction": { "all": 110 }
"damage_reduction": { "all": 110 },
"//": "More powerful engines require higher-quality fuel, aside from low-efficiency turbines which can eat anything.",
"fuel_options": [ "gasoline", "avgas" ],
"description": "A combustion engine. Burns gasoline fuel from a tank in the vehicle."
},
{
"id": "diesel_engine_v12",
Expand All @@ -228,7 +245,10 @@
"removal": { "skills": [ [ "mechanics", 6 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 7 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] }
},
"damage_reduction": { "all": 110 }
"damage_reduction": { "all": 110 },
"//": "More powerful engines require higher-quality fuel, aside from low-efficiency turbines which can eat anything.",
"fuel_options": [ "diesel", "biodiesel", "jp8" ],
"description": "A combustion engine. Burns diesel fuel from a tank in the vehicle. Can also burn biodiesel, though somewhat less efficiently."
},
{
"id": "engine_v6",
Expand Down Expand Up @@ -272,7 +292,10 @@
"removal": { "skills": [ [ "mechanics", 3 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ], [ "steel_tiny", 1 ] ] }
},
"damage_reduction": { "all": 100 }
"damage_reduction": { "all": 100 },
"//": "More powerful engines require higher-quality fuel, aside from low-efficiency turbines which can eat anything.",
"fuel_options": [ "gasoline", "avgas" ],
"description": "A combustion engine. Burns gasoline fuel from a tank in the vehicle."
},
{
"id": "engine_vtwin",
Expand Down
Loading