Skip to content

/Cataclysm-DDA

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

Metalworking Package - ready for merge! #2648

Merged
merged 12 commits into from Aug 26, 2013

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@Rivet-the-Zombie @CataJenkins @cootue @i2amroy
@Rivet-the-Zombie
Copy link
Member

commented Aug 25, 2013

Blacksmithing/metalworking system with a few new tools and a lot of new recipes.

Believe me, I know the science behind this iteration is incredibly simplified and vague but I feel that it's close enough for Cataclysm's generally loose crafting simulation model.
@CataJenkins

This comment has been minimized.

Sign in to view
Copy link

commented Aug 25, 2013

Build successful!
Refer to this link for build results: http://ci.narc.ro/job/Cataclysm-PullRequests/599/
@cootue

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Aug 25, 2013

Looking good, and what would you say for some can or canister recipes so I can mass-produce batteries from metal scrap and acid rain? ;)
@CataJenkins

This comment has been minimized.

Sign in to view
Copy link

commented Aug 26, 2013

Build successful!
Refer to this link for build results: http://ci.narc.ro/job/Cataclysm-PullRequests/620/
@CataJenkins

This comment has been minimized.

Sign in to view
Copy link

commented Aug 26, 2013

Build successful!
Refer to this link for build results: http://ci.narc.ro/job/Cataclysm-PullRequests/622/
@CataJenkins

This comment has been minimized.

Sign in to view
Copy link

commented Aug 26, 2013

Build successful!
Refer to this link for build results: http://ci.narc.ro/job/Cataclysm-PullRequests/624/
@CataJenkins

This comment has been minimized.

Sign in to view
Copy link

commented Aug 26, 2013

Build successful!
Refer to this link for build results: http://ci.narc.ro/job/Cataclysm-PullRequests/627/
@CataJenkins

This comment has been minimized.

Sign in to view
Copy link

commented Aug 26, 2013

Build successful!
Refer to this link for build results: http://ci.narc.ro/job/Cataclysm-PullRequests/642/
@ghost

This comment has been minimized.

Sign in to view
Copy link

commented Aug 26, 2013

How about an Amateur Blacksmith profession?
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member Author

commented Aug 26, 2013

Why not? Having a new profession to show off the new content sounds like a good idea.
@CataJenkins

This comment has been minimized.

Sign in to view
Copy link

commented Aug 26, 2013

Build successful!
Refer to this link for build results: http://ci.narc.ro/job/Cataclysm-PullRequests/645/
@ghost

This comment has been minimized.

Sign in to view
Copy link

commented Aug 26, 2013

Just took a look at your additions. This stuff is amazing! The only thing I can think of now... A vehicle-mounted forge that runs on gasoline! B-)
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member Author

commented Aug 26, 2013

You know if this gets merged y'all can build off of it.
I'm tired of post-apocalyptic blacksmithing JSONs for now. Short of final tweaks I'm not adding anything further to this at the present time.
@ghost

This comment has been minimized.

Sign in to view
Copy link

commented Aug 26, 2013

All right, all right. Doing all this isn't easy. Good work, this is quality stuff!
data/raw/professions.json Outdated
"hammer"
],
"name":"Blacksmith",
"points":1,

This comment has been minimized.

Sign in to view
Copy link
@i2amroy

i2amroy Aug 26, 2013

Member

I'd probably bump this up to a 3 or 2 point profession. Other then that this PR seems pretty good to go.
@CataJenkins

This comment has been minimized.

Sign in to view
Copy link

commented Aug 26, 2013

Build successful!
Refer to this link for build results: http://ci.narc.ro/job/Cataclysm-PullRequests/647/

i2amroy added a commit that referenced this pull request Aug 26, 2013

@i2amroy
Merge PR #2648 - Metalworking expansion! 
Conflicts:
	data/raw/item_groups.json
	data/raw/items/armor.json
	data/raw/items/books.json
	data/raw/recipes.json
f1d9daf

@i2amroy i2amroy merged commit f295bd8 into CleverRaven:master Aug 26, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.