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

[WIP][CR] Craftting - mutliple results / byproducts #8364

Merged
merged 14 commits into from Jul 30, 2014

Conversation

Reviewers
No reviews
Assignees

@KA101 KA101

Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@Robik81 @KA101 @kevingranade
@Robik81
Copy link
Contributor

commented Jul 28, 2014

I am working on crafting expansion. Goal is to be able to define multiple results for recipe without forced redefinition of any existing ones.

I have working prototype, which have these limitations:

  • crafting ui does not show any info about byproducts
  • you can define reverse process for main result, but not for byproducts (this one is fine, I do not plan to change that)

Sorry for messing up previous pull request.

Robik81 added some commits Jul 27, 2014

@Robik81
Crafting byproducts
8f0ae9b
@Robik81
Revert "Crafting byproducts" 
This reverts commit 8f0ae9b.
adb78ef
@Robik81
Revert "Revert "Crafting byproducts"" 
This reverts commit adb78ef.
Loading status checks…
8f830d8
@Robik81
Byproducts charges / amounts 
Byproducts can now have charges multiplier (equivalent of result_mult
for result) and amount (like 5x skewer)
Testing recipe for toothpick.
Loading status checks…
1854ffe
@Robik81
Checks for containers before crafting 
Original check wasn't good enough for multiple liquid products.

Testing recipe 'juice' that produces multiple liquids from one apple.
Loading status checks…
cb48386
@Robik81
Crafting byproducts
0ac32ee
@Robik81
Revert "Crafting byproducts" 
This reverts commit 8f0ae9b.
f165ca7
@Robik81
Revert "Revert "Crafting byproducts"" 
This reverts commit adb78ef.
0b24a8f
@Robik81
Byproducts charges / amounts 
Byproducts can now have charges multiplier (equivalent of result_mult
for result) and amount (like 5x skewer)
Testing recipe for toothpick.
ba025a3
@Robik81
Checks for containers before crafting 
Original check wasn't good enough for multiple liquid products.

Testing recipe 'juice' that produces multiple liquids from one apple.
58dceb2
@Robik81
Merge remote-tracking branch 'origin/CraftMutlipleResults' into Craft… 
…MutlipleResults

Conflicts:
	src/game.cpp
Loading status checks…
34ba124
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 28, 2014

np, we're not limited to a finite amount of PRs. Sorry Git was frustrating.
@Robik81
Crafting UI 
Additional information about byproducts in crafting UI
Loading status checks…
ae8e511
@Robik81

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 29, 2014

Crating UI change is in.

Examples:
toothpick
juice

Thoughts?
@Robik81
Recipe: Lard 
Byproduct: cracklins
Source: http://en.wikipedia.org/wiki/Lard
"A by-product of dry-rendering lard is deep-fried meat, skin and
membrane tissue known as cracklings.[4]"

Fix of return type from function print_item
Loading status checks…
09b94c3
@Robik81

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 29, 2014

Serious recipe: Lard
Details in commit
@kevingranade

This comment has been minimized.

Sign in to view
Copy link
Member

commented Jul 29, 2014

Cool, no issues with the menu changes.

@KA101 KA101 self-assigned this Jul 29, 2014

@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 29, 2014

With the serious-recipe, I'm willing to queue this for merge. Will strike the test-recipes in the process, unless you beat me to it or have some reason that I shouldn't merge it yet.
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 30, 2014

What is with Git not sending Jenkins the stuff?!

KA101 added a commit that referenced this pull request Jul 30, 2014

@KA101
Merge pull request #8364 from Robik81/CraftMutlipleResults 
[WIP][CR] Craftting - mutliple results / byproducts
8d77e14

@KA101 KA101 merged commit 8d77e14 into CleverRaven:master Jul 30, 2014
1 check failed

1 check failed

default
Details

@Robik81 Robik81 deleted the Robik81:CraftMutlipleResults branch Jul 30, 2014

@Robik81

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 30, 2014

Those pesky testing recipes got in. I made new PR for their cleanup.

#8381
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.