-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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.
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
Add pottery cottage basecamp #49333
Merged
ZhilkinSerg
merged 12 commits into
CleverRaven:0.F-dev
from
krulunio:basecamp_pottery_cottage
Jun 21, 2021
Merged
Add pottery cottage basecamp #49333
ZhilkinSerg
merged 12 commits into
CleverRaven:0.F-dev
from
krulunio:basecamp_pottery_cottage
Jun 21, 2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This adds mattress beds, straw beds and 7 types of shacks/walls (log, metal, migo resin, rammed earth, rock, wattle and daub, wood)
actual-nh
reviewed
Jun 17, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A few grammar fixes from a sleep-deprived once-over...
data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json
Outdated
Show resolved
Hide resolved
data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json
Outdated
Show resolved
Hide resolved
data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json
Outdated
Show resolved
Hide resolved
data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json
Outdated
Show resolved
Hide resolved
data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json
Outdated
Show resolved
Hide resolved
data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json
Outdated
Show resolved
Hide resolved
data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json
Outdated
Show resolved
Hide resolved
data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_blacksmith.json
Outdated
Show resolved
Hide resolved
data/json/recipes/basecamps/fbmc_pottery_cottage/recipe_pottery_cottage_common.json
Outdated
Show resolved
Hide resolved
Co-authored-by: actual-nh <[email protected]>
Co-authored-by: actual-nh <[email protected]>
Co-authored-by: actual-nh <[email protected]>
ZhilkinSerg
pushed a commit
that referenced
this pull request
Jul 3, 2021
anothersimulacrum
pushed a commit
to anothersimulacrum/Cataclysm-DDA
that referenced
this pull request
Jul 3, 2021
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.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Content "Add pottery cottage basecamp"
Purpose of change
I'm working on more basecamp types, here's pottery cottage basecamp (1 variant).
Describe the solution
Add rather short upgrade path: build butchery rack with table, build small blacksmith forge in 3 steps.
This camp camp doesn't support expansions, because it's often in the middle of river; however, it starts with most basecamp missions (except for: radio, relaying, walls, recruiting, scouting, patrolling, dismantling), kitchen, saltworks, clay working and fishing recipes. Butchery rack allows hunting, blacksmith adds blacksmith_recipes_1 and 7.
Describe alternatives you've considered
Allow expansions: house has 3 beds (if we count sofas), enough for 1.5 expansion; pottery cottage can spawn on riverside, usually with 4 non-river OMTs, one being pottery workshop with pond; this means we need to place 3 shacks: 1/4 of OMT is house, another 1/4 is garden with paths to garden and cellar (could fit 1 shack), rest is small river (could fit 3 shacks).
Testing
Created camp and upgraded it, here are screenshots.