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

Engine name to object #38441

Merged
merged 1 commit into from
Feb 28, 2020
Merged

Engine name to object #38441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 22 additions & 22 deletions data/json/items/vehicle/engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"abstract": "engine_combustion",
"type": "ENGINE",
"category": "veh_parts",
"name": "internal combustion engine",
"name": { "str": "internal combustion engine" },
"material": "iron",
"symbol": ":",
"color": "light_cyan"
Expand All @@ -12,7 +12,7 @@
"abstract": "engine_diesel",
"copy-from": "engine_combustion",
"type": "ENGINE",
"name": "base diesel engine",
"name": { "str": "base diesel engine" },
"faults": [
"fault_engine_belt_drive",
"fault_engine_filter_air",
Expand All @@ -28,7 +28,7 @@
"abstract": "engine_gasoline",
"copy-from": "engine_combustion",
"type": "ENGINE",
"name": "base gasoline engine",
"name": { "str": "base gasoline engine" },
"faults": [
"fault_engine_belt_drive",
"fault_engine_filter_air",
Expand All @@ -43,15 +43,15 @@
"abstract": "engine_steam",
"copy-from": "engine_combustion",
"type": "ENGINE",
"name": "base steam engine",
"name": { "str": "base steam engine" },
"looks_like": "v12_diesel",
"faults": [ "fault_engine_belt_drive", "fault_engine_filter_air", "fault_engine_pump_water", "fault_engine_starter" ]
},
{
"id": "1cyl_combustion",
"copy-from": "engine_gasoline",
"type": "ENGINE",
"name": "1-cylinder engine",
"name": { "str": "1-cylinder engine" },
"description": "A single-cylinder 4-stroke combustion engine.",
"weight": "20000 g",
"volume": "1500 ml",
Expand All @@ -63,7 +63,7 @@
"id": "1cyl_combustion_large",
"copy-from": "engine_gasoline",
"type": "ENGINE",
"name": "large 1-cylinder engine",
"name": { "str": "large 1-cylinder engine" },
"description": "A powerful high-compression single-cylinder 4-stroke combustion engine.",
"weight": "40000 g",
"volume": "2 L",
Expand All @@ -75,7 +75,7 @@
"id": "1cyl_combustion_small",
"copy-from": "engine_gasoline",
"type": "ENGINE",
"name": "small 1-cylinder engine",
"name": { "str": "small 1-cylinder engine" },
"description": "A small single-cylinder 2-stroke combustion engine.",
"weight": "10000 g",
"volume": "750 ml",
Expand All @@ -87,7 +87,7 @@
"id": "i4_combustion",
"copy-from": "engine_gasoline",
"type": "ENGINE",
"name": "Inline-4 engine",
"name": { "str": "Inline-4 engine" },
"description": "A small, yet powerful 4-cylinder combustion engine.",
"weight": "130000 g",
"volume": "3500 ml",
Expand All @@ -98,7 +98,7 @@
"id": "i6_diesel",
"copy-from": "engine_diesel",
"type": "ENGINE",
"name": "I6 diesel engine",
"name": { "str": "I6 diesel engine" },
"description": "A powerful straight-6 diesel engine.",
"weight": "185000 g",
"volume": "7 L",
Expand All @@ -109,7 +109,7 @@
"id": "v2_combustion",
"copy-from": "engine_gasoline",
"type": "ENGINE",
"name": "V-twin engine",
"name": { "str": "V-twin engine" },
"description": "A 2-cylinder 4-stroke combustion engine.",
"weight": "45000 g",
"volume": "2 L",
Expand All @@ -120,7 +120,7 @@
"id": "v6_combustion",
"copy-from": "engine_gasoline",
"type": "ENGINE",
"name": "V6 engine",
"name": { "str": "V6 engine" },
"description": "A powerful 6-cylinder combustion engine.",
"weight": "180000 g",
"volume": "4750 ml",
Expand All @@ -131,7 +131,7 @@
"id": "v6_diesel",
"copy-from": "engine_diesel",
"type": "ENGINE",
"name": "V6 diesel engine",
"name": { "str": "V6 diesel engine" },
"description": "A powerful 6-cylinder diesel engine.",
"weight": "190000 g",
"volume": "5 L",
Expand All @@ -142,7 +142,7 @@
"id": "v8_combustion",
"copy-from": "engine_gasoline",
"type": "ENGINE",
"name": "V8 engine",
"name": { "str": "V8 engine" },
"description": "A large and very powerful 8-cylinder combustion engine.",
"weight": "250000 g",
"volume": "7500 ml",
Expand All @@ -153,7 +153,7 @@
"id": "v8_diesel",
"copy-from": "engine_diesel",
"type": "ENGINE",
"name": "V8 diesel engine",
"name": { "str": "V8 diesel engine" },
"description": "A powerful 8-cylinder diesel engine.",
"weight": "255000 g",
"volume": "8 L",
Expand All @@ -164,7 +164,7 @@
"id": "v12_combustion",
"copy-from": "engine_gasoline",
"type": "ENGINE",
"name": "V12 engine",
"name": { "str": "V12 engine" },
"description": "A massive and extremely powerful V12 engine, usually built into high end sports cars.",
"weight": "300000 g",
"volume": "14500 ml",
Expand All @@ -175,7 +175,7 @@
"id": "v12_diesel",
"copy-from": "engine_diesel",
"type": "ENGINE",
"name": "V12 diesel engine",
"name": { "str": "V12 diesel engine" },
"description": "A massive and extremely powerful V12 engine, usually built into heavy trucks.",
"weight": "310000 g",
"volume": "15 L",
Expand All @@ -186,7 +186,7 @@
"id": "steam_watts_small",
"copy-from": "engine_steam",
"type": "ENGINE",
"name": "makeshift steam engine",
"name": { "str": "makeshift steam engine" },
"description": "A small, primitive, steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condenser recaptures the water, making this a closed cycle system.",
"weight": "225000 g",
"volume": "62500 ml",
Expand All @@ -197,7 +197,7 @@
"id": "steam_triple_small",
"copy-from": "engine_steam",
"type": "ENGINE",
"name": "small steam engine",
"name": { "str": "small steam engine" },
"description": "A small steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condenser recaptures the water, making this a closed cycle system.",
"weight": "180000 g",
"volume": "37500 ml",
Expand All @@ -208,7 +208,7 @@
"id": "steam_triple_medium",
"copy-from": "engine_steam",
"type": "ENGINE",
"name": "medium steam engine",
"name": { "str": "medium steam engine" },
"description": "A medium-sized steam engine. An integrated boiler burns coal to heat water into steam, driving a reciprocating shaft. A condenser recaptures the water, making this a closed cycle system.",
"weight": "280000 g",
"volume": "57500 ml",
Expand Down Expand Up @@ -274,7 +274,7 @@
"id": "small_turbine_engine",
"copy-from": "engine_gasoline",
"type": "ENGINE",
"name": "1350 hp gas turbine engine",
"name": { "str": "1350 hp gas turbine engine" },
"description": "A gas turbine engine, usually used for military vehicles. Known for its high rate of fuel consumption.",
"weight": "1130000 g",
"volume": "45 L",
Expand All @@ -285,7 +285,7 @@
"id": "medium_turbine_engine",
"copy-from": "engine_gasoline",
"type": "ENGINE",
"name": "1900 hp gas turbine engine",
"name": { "str": "1900 hp gas turbine engine" },
"description": "A large gas turbine engine, usually used for military helicopters. Known for its high rate of fuel consumption.",
"weight": "1582000 g",
"volume": "63 L",
Expand All @@ -296,7 +296,7 @@
"id": "large_turbine_engine",
"copy-from": "engine_gasoline",
"type": "ENGINE",
"name": "6000 hp gas turbine engine",
"name": { "str": "6000 hp gas turbine engine" },
"description": "A massive gas turbine engine, used to power the V-22 Osprey. Known for its high rate of fuel consumption.",
"weight": "3164000 g",
"volume": "95 L",
Expand Down