From 526a7a90f7f72dbe8dd31519842b32b85fe7cc78 Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Sat, 3 Feb 2018 08:02:28 +0000 Subject: [PATCH 1/2] Added engine blocks and engine deconstruction recipes. --- data/json/items/vehicle/engine.json | 55 +++++++ data/json/recipes/engines.json | 214 ++++++++++++++++++++++++++++ 2 files changed, 269 insertions(+) create mode 100644 data/json/recipes/engines.json diff --git a/data/json/items/vehicle/engine.json b/data/json/items/vehicle/engine.json index 55755306be6e6..c2c5a884d511f 100644 --- a/data/json/items/vehicle/engine.json +++ b/data/json/items/vehicle/engine.json @@ -161,5 +161,60 @@ "volume": 60, "price": 32000, "displacement": 1200 + }, + { + "id": "engine_block_massive", + "copy-from": "spare_part", + "type": "GENERIC", + "name": "massive engine block", + "description": "The beginnings of a massive gas or diesel engine. It's not good for much of anything on its own.", + "material": "iron", + "weight": 280000, + "volume": 25, + "price": 30000 + }, + { + "id": "engine_block_large", + "copy-from": "spare_part", + "type": "GENERIC", + "name": "large engine block", + "description": "The beginnings of a large gas or diesel engine. It's not good for much of anything on its own.", + "material": "iron", + "weight": 190000, + "volume": 20, + "price": 20000 + }, + { + "id": "engine_block_medium", + "copy-from": "spare_part", + "type": "GENERIC", + "name": "medium engine block", + "description": "The beginnings of a medium size gas or diesel engine. It's not good for much of anything on its own.", + "material": "iron", + "weight": 90000, + "volume": 10, + "price": 10000 + }, + { + "id": "engine_block_small", + "copy-from": "spare_part", + "type": "GENERIC", + "name": "small engine block", + "description": "The beginnings of a medium size gas or diesel engine. It's not good for much of anything on its own.", + "material": "iron", + "weight": 40000, + "volume": 5, + "price": 5000 + }, + { + "id": "engine_block_tiny", + "copy-from": "spare_part", + "type": "GENERIC", + "name": "tiny engine block", + "description": "The beginnings of a tiny size gas or diesel engine. It's not good for much of anything on its own.", + "material": "iron", + "weight": 8000, + "volume": 2, + "price": 3500 } ] diff --git a/data/json/recipes/engines.json b/data/json/recipes/engines.json new file mode 100644 index 0000000000000..9825dd6886028 --- /dev/null +++ b/data/json/recipes/engines.json @@ -0,0 +1,214 @@ +[ + { + "abstract": "engine_disassembly", + "type": "uncraft", + "skill_used": "mechanics", + "qualities": [ { "id": "SCREW", "level": 1 }, { "id": "WRENCH", "level": 1 }, { "id": "WRENCH_FINE", "level": 1 } ] + }, + { + "type": "uncraft", + "result": "1cyl_combustion", + "copy-from": "engine_disassembly", + "difficulty": 4, + "time": 40000, + "components": [ + [ [ "drivebelt", 2 ] ], + [ [ "filter_air", 1 ] ], + [ [ "filter_liquid", 1 ] ], + [ [ "motor_small", 1 ] ], + [ [ "well_pump", 2 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 40 ] ], + [ [ "engine_block_tiny", 1 ] ], + [ [ "metal_tank_little", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "1cyl_combustion_small", + "copy-from": "engine_disassembly", + "difficulty": 4, + "time": 40000, + "components": [ + [ [ "drivebelt", 2 ] ], + [ [ "filter_air", 1 ] ], + [ [ "filter_liquid", 1 ] ], + [ [ "motor_small", 1 ] ], + [ [ "well_pump", 2 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 40 ] ], + [ [ "engine_block_tiny", 1 ] ], + [ [ "metal_tank_little", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "i4_combustion", + "copy-from": "engine_disassembly", + "difficulty": 4, + "time": 40000, + "components": [ + [ [ "drivebelt", 2 ] ], + [ [ "filter_air", 1 ] ], + [ [ "filter_liquid", 1 ] ], + [ [ "motor_small", 1 ] ], + [ [ "well_pump", 2 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 40 ] ], + [ [ "engine_block_small", 1 ] ], + [ [ "metal_tank_little", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "i6_diesel", + "copy-from": "engine_disassembly", + "difficulty": 4, + "time": 50000, + "components": [ + [ [ "drivebelt", 2 ] ], + [ [ "filter_air", 1 ] ], + [ [ "filter_liquid", 1 ] ], + [ [ "motor_small", 1 ] ], + [ [ "well_pump", 1 ] ], + [ [ "pump_complex", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 40 ] ], + [ [ "glowplug", 1 ] ], + [ [ "engine_block_medium", 1 ] ], + [ [ "metal_tank_little", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "v2_combustion", + "copy-from": "engine_disassembly", + "difficulty": 4, + "time": 40000, + "components": [ + [ [ "drivebelt", 2 ] ], + [ [ "filter_air", 1 ] ], + [ [ "filter_liquid", 1 ] ], + [ [ "motor_small", 1 ] ], + [ [ "well_pump", 2 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 40 ] ], + [ [ "engine_block_tiny", 1 ] ], + [ [ "metal_tank_little", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "v6_combustion", + "copy-from": "engine_disassembly", + "difficulty": 4, + "time": 40000, + "components": [ + [ [ "drivebelt", 2 ] ], + [ [ "filter_air", 1 ] ], + [ [ "filter_liquid", 1 ] ], + [ [ "motor_small", 1 ] ], + [ [ "well_pump", 2 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 40 ] ], + [ [ "engine_block_medium", 1 ] ], + [ [ "metal_tank_little", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "v6_diesel", + "copy-from": "engine_disassembly", + "difficulty": 4, + "time": 50000, + "components": [ + [ [ "drivebelt", 2 ] ], + [ [ "filter_air", 1 ] ], + [ [ "filter_liquid", 1 ] ], + [ [ "motor_small", 1 ] ], + [ [ "well_pump", 1 ] ], + [ [ "pump_complex", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 40 ] ], + [ [ "glowplug", 1 ] ], + [ [ "engine_block_medium", 1 ] ], + [ [ "metal_tank_little", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "v8_combustion", + "copy-from": "engine_disassembly", + "difficulty": 4, + "time": 40000, + "components": [ + [ [ "drivebelt", 2 ] ], + [ [ "filter_air", 1 ] ], + [ [ "filter_liquid", 1 ] ], + [ [ "motor_small", 1 ] ], + [ [ "well_pump", 2 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 40 ] ], + [ [ "engine_block_large", 1 ] ], + [ [ "metal_tank_little", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "v8_diesel", + "copy-from": "engine_disassembly", + "difficulty": 4, + "time": 50000, + "components": [ + [ [ "drivebelt", 2 ] ], + [ [ "filter_air", 1 ] ], + [ [ "filter_liquid", 1 ] ], + [ [ "motor_small", 1 ] ], + [ [ "well_pump", 1 ] ], + [ [ "pump_complex", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 40 ] ], + [ [ "glowplug", 1 ] ], + [ [ "engine_block_large", 1 ] ], + [ [ "metal_tank_little", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "v12_combustion", + "copy-from": "engine_disassembly", + "difficulty": 4, + "time": 40000, + "components": [ + [ [ "drivebelt", 2 ] ], + [ [ "filter_air", 1 ] ], + [ [ "filter_liquid", 1 ] ], + [ [ "motor_small", 1 ] ], + [ [ "well_pump", 2 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 40 ] ], + [ [ "engine_block_massive", 1 ] ], + [ [ "metal_tank_little", 1 ] ] + ] + }, + { + "type": "uncraft", + "result": "v12_diesel", + "copy-from": "engine_disassembly", + "difficulty": 4, + "time": 50000, + "components": [ + [ [ "drivebelt", 2 ] ], + [ [ "filter_air", 1 ] ], + [ [ "filter_liquid", 1 ] ], + [ [ "motor_small", 1 ] ], + [ [ "well_pump", 1 ] ], + [ [ "pump_complex", 1 ] ], + [ [ "power_supply", 1 ] ], + [ [ "cable", 40 ] ], + [ [ "glowplug", 1 ] ], + [ [ "engine_block_massive", 1 ] ], + [ [ "metal_tank_little", 1 ] ] + ] + } +] From df1f07ef282bed7056f1378c961f899c9489976b Mon Sep 17 00:00:00 2001 From: Kevin Granade Date: Mon, 16 Jul 2018 19:29:26 -0700 Subject: [PATCH 2/2] tiny copyedits --- data/json/items/vehicle/engine.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/items/vehicle/engine.json b/data/json/items/vehicle/engine.json index c2c5a884d511f..fb9088b2d4bb1 100644 --- a/data/json/items/vehicle/engine.json +++ b/data/json/items/vehicle/engine.json @@ -167,7 +167,7 @@ "copy-from": "spare_part", "type": "GENERIC", "name": "massive engine block", - "description": "The beginnings of a massive gas or diesel engine. It's not good for much of anything on its own.", + "description": "The beginnings of a massive gas or diesel engine. It's not good for much of anything on its own.", "material": "iron", "weight": 280000, "volume": 25, @@ -178,7 +178,7 @@ "copy-from": "spare_part", "type": "GENERIC", "name": "large engine block", - "description": "The beginnings of a large gas or diesel engine. It's not good for much of anything on its own.", + "description": "The beginnings of a large gas or diesel engine. It's not good for much of anything on its own.", "material": "iron", "weight": 190000, "volume": 20, @@ -189,7 +189,7 @@ "copy-from": "spare_part", "type": "GENERIC", "name": "medium engine block", - "description": "The beginnings of a medium size gas or diesel engine. It's not good for much of anything on its own.", + "description": "The beginnings of a medium gas or diesel engine. It's not good for much of anything on its own.", "material": "iron", "weight": 90000, "volume": 10, @@ -200,7 +200,7 @@ "copy-from": "spare_part", "type": "GENERIC", "name": "small engine block", - "description": "The beginnings of a medium size gas or diesel engine. It's not good for much of anything on its own.", + "description": "The beginnings of a small gas or diesel engine. It's not good for much of anything on its own.", "material": "iron", "weight": 40000, "volume": 5, @@ -211,7 +211,7 @@ "copy-from": "spare_part", "type": "GENERIC", "name": "tiny engine block", - "description": "The beginnings of a tiny size gas or diesel engine. It's not good for much of anything on its own.", + "description": "The beginnings of a tiny gas or diesel engine. It's not good for much of anything on its own.", "material": "iron", "weight": 8000, "volume": 2,