From eaab7722c1607fad898f18ab4b68747574f80a5a Mon Sep 17 00:00:00 2001
From: Rail-Runner <8814734+Rail-Runner@users.noreply.github.com>
Date: Tue, 12 May 2020 13:38:43 +0300
Subject: [PATCH] Add aero-engine

---
 data/json/itemgroups/supplies.json     |  1 +
 data/json/items/vehicle/engine.json    | 12 ++++++++++
 data/json/vehicleparts/combustion.json | 31 ++++++++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json
index a338abec04bf7..7d38344a6f418 100644
--- a/data/json/itemgroups/supplies.json
+++ b/data/json/itemgroups/supplies.json
@@ -395,6 +395,7 @@
       [ "steam_triple_small", 1 ],
       [ "steam_triple_medium", 1 ],
       [ "steam_watts_small", 1 ],
+      { "item": "aero_engine_light", "prob": 1 },
       [ "1cyl_combustion_small", 10 ],
       [ "vehicle_controls", 3 ],
       [ "horn_car", 10 ],
diff --git a/data/json/items/vehicle/engine.json b/data/json/items/vehicle/engine.json
index e8ea9822bf265..5b280482bcc7d 100644
--- a/data/json/items/vehicle/engine.json
+++ b/data/json/items/vehicle/engine.json
@@ -86,6 +86,18 @@
     "displacement": 20,
     "faults": [  ]
   },
+  {
+    "id": "aero_engine_light",
+    "copy-from": "engine_gasoline",
+    "type": "ENGINE",
+    "name": { "str": "light aero-engine" },
+    "description": "An air-cooled, four-cylinder, horizontally opposed internal combustion engine, rated for 150 horsepower.  Commonly used on light aircraft.",
+    "weight": "111000 g",
+    "volume": "4750 ml",
+    "price": 80000,
+    "price_postapoc": 2000,
+    "displacement": 524
+  },
   {
     "id": "i4_combustion",
     "copy-from": "engine_gasoline",
diff --git a/data/json/vehicleparts/combustion.json b/data/json/vehicleparts/combustion.json
index 9b481f34d20b1..b0c18208eccc6 100644
--- a/data/json/vehicleparts/combustion.json
+++ b/data/json/vehicleparts/combustion.json
@@ -15,6 +15,16 @@
     "flags": [ "ENGINE", "E_COMBUSTION", "E_ALTERNATOR", "E_HIGHER_SKILL", "E_HEATER" ],
     "description": "A combustion engine.  Burns fuel from a tank in the vehicle."
   },
+  {
+    "abstract": "aero_engine",
+    "copy-from": "engine_combustion",
+    "type": "vehicle_part",
+    "fuel_type": "avgas",
+    "fuel_options": [ "avgas", "gasoline" ],
+    "m2c": 60,
+    "//": "30% energy efficiency",
+    "description": "A combustion engine for use on aircraft.  Burns gasoline or avgas fuel from a tank in the vehicle."
+  },
   {
     "abstract": "diesel_engine",
     "copy-from": "engine_combustion",
@@ -181,6 +191,27 @@
     "extend": { "flags": [ "FOLDABLE" ] },
     "damage_reduction": { "all": 40 }
   },
+  {
+    "id": "engine_aero_light",
+    "copy-from": "aero_engine",
+    "type": "vehicle_part",
+    "item": "aero_engine_light",
+    "durability": 300,
+    "epower": -200,
+    "power": 111900,
+    "energy_consumption": 373000,
+    "breaks_into": [
+      { "item": "steel_lump", "count": [ 30, 40 ] },
+      { "item": "steel_chunk", "count": [ 30, 40 ] },
+      { "item": "scrap", "count": [ 30, 40 ] }
+    ],
+    "requirements": {
+      "install": { "skills": [ [ "mechanics", 5 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] },
+      "removal": { "skills": [ [ "mechanics", 4 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
+      "repair": { "skills": [ [ "mechanics", 6 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
+    },
+    "damage_reduction": { "all": 50 }
+  },
   {
     "id": "engine_inline4",
     "copy-from": "gasoline_engine",