Skip to content

Commit

Permalink
Merge pull request #17 from CleverRaven/master
Browse files Browse the repository at this point in the history 
Update with recent changes to master
  • Loading branch information
@SkippyMcSkip
SkippyMcSkip committed Jul 17, 2018
2 parents 1f92a5b + 91006d2 commit 0bd2c6a
Show file tree
Hide file tree
Showing 2 changed files with 269 additions and 0 deletions.
55 changes: 55 additions & 0 deletions data/json/items/vehicle/engine.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 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 small 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 gas or diesel engine. It's not good for much of anything on its own.",
"material": "iron",
"weight": 8000,
"volume": 2,
"price": 3500
}
]
214 changes: 214 additions & 0 deletions data/json/recipes/engines.json
View file
Original file line number Diff line number Diff line change
@@ -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 ] ]
]
}
]

0 comments on commit 0bd2c6a

Please sign in to comment.