Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign up[READY] Added engine blocks and engine deconstruction recipes. #22865
+269
−0
Conversation
This comment has been minimized.
This comment has been minimized.
|
Nice, thanks!
… On Feb 3, 2018, at 3:11 AM, Kevin Granade ***@***.***> wrote:
Fixes #18419
Started by @LyleSY, I mostly just fixed some syntax.
This does the bare minimum, but the various recipes need to be tweaked to yield different amounts of parts.
You can view, comment on, or merge this pull request online at:
#22865
Commit Summary
Added engine blocks and engine deconstruction recipes.
File Changes
M data/json/items/vehicle/engine.json (55)
A data/json/recipes/engines.json (225)
M json_whitelist (1)
Patch Links:
https://github.com/CleverRaven/Cataclysm-DDA/pull/22865.patch
https://github.com/CleverRaven/Cataclysm-DDA/pull/22865.diff
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.
|
This comment has been minimized.
This comment has been minimized.
|
To be clear, I'm asking for feedback on what to set the various item drop rates to. I can either incorporate feedback here, or if someone wants to re-branch off of this and open a new PR that tweaks the items, that works too. |
boydkr
reviewed
Feb 8, 2018
data/json/recipes/engines.json
Outdated
| "difficulty": 4, | ||
| "time": 40000, | ||
| "components": [ | ||
| [ [ "drivebelt", 1 ] ], |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
It might be a drive belt plus an accessory belt, but if so it should be
```[ "drive_belt", 2 ]``` to avoid confusion, so it needs to change.
|
Rawng
reviewed
Feb 11, 2018
data/json/items/vehicle/engine.json
Outdated
| "id": "engine_block_massive", | ||
| "copy-from": "spare_part", | ||
| "type": "GENERIC", | ||
| "name": "large engine block", |
This comment has been minimized.
This comment has been minimized.
Rawng
Feb 11, 2018
Contributor
Massive engine block is named large, and small engine block is named medium
This comment has been minimized.
This comment has been minimized.
|
This PR does help out #18419 but I don't believe it would close it |
BorkBorkGoesTheCode
reviewed
May 27, 2018
data/json/recipes/engines.json
Outdated
| [ [ "drivebelt", 1 ] ], | ||
| [ [ "filter_liquid", 1 ] ], | ||
| [ [ "motor_small", 1 ] ], | ||
| [ [ "well_pump", 2 ] ], |
This comment has been minimized.
This comment has been minimized.
BorkBorkGoesTheCode
May 27, 2018
Contributor
I think adding a unique fuel pump item might be better than using a well pump for fault repair.
This comment has been minimized.
This comment has been minimized.
kevingranade
Jul 15, 2018
Author
Member
This is outside the scope of this PR. It requires new items, adjusting the vehicle faults, possibly crafting recipes, etc. It's valid as its own issue though.
kevingranade
force-pushed the
kevingranade:engine-disassembly
branch
to
526a7a9
Jul 15, 2018
kevingranade
changed the title
[WIP][CR] Added engine blocks and engine deconstruction recipes.
[READY] Added engine blocks and engine deconstruction recipes.
Jul 15, 2018
data/json/items/vehicle/engine.json
Outdated
| "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.", |
This comment has been minimized.
This comment has been minimized.
ZhilkinSerg
merged commit 91006d2
into
CleverRaven:master
Jul 17, 2018
Night-Pryanik
referenced this pull request
Jul 22, 2018
Closed
Add ability to pull engine parts from used engines or craft makeshift ones #23935
kevingranade
deleted the
kevingranade:engine-disassembly
branch
Aug 28, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
kevingranade commentedFeb 3, 2018
Fixes #18419
Started by @LyleSY, I mostly just fixed some syntax.
This does the bare minimum, but the various recipes need to be tweaked to yield different amounts of parts.