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

Item/Recipe Additions, Changes #13142

Merged
merged 6 commits into from Jul 31, 2015

Conversation

Reviewers
No reviews
Assignees

@Coolthulhu Coolthulhu

Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@chaosvolt @Barhandar @BevapDin @Coolthulhu
@chaosvolt
Copy link
Contributor

commented Jul 31, 2015

A couple things thought up or observed.

Item Additions:

  1. Flatbread. Simpler and less filling alternative to normal leavened bread.
  2. A greatcoat. Since we have peacoats instead of wool trenchcoats, one could regard this as the duster equivalent.
  3. Windbreaker jacket. Unlike the evac jacket, it's VAR_SIZE and also rainproof. But also less warmth.

Recipe tweaks:

  1. Added flatbread to cooking recipes that use bread, cornbread, and other options.
  2. Added an option to dismantle spikes, scrap suits, springs, wires, and blades.
chaosvolt
Item/Recipe Additions, Changes 
A couple things thought up or observed.

Item Additions:
1. Flatbread. Simpler and less filling alternative to normal leavened
bread.
2. A greatcoat. Since we have peacoats instead of wool trenchcoats, one
could regard this as the duster equivalent.
3. Windbreaker

Recipe tweaks:
1. Made recipe for spike and scrap suit reversible.
2. Added an option to dismantle springs, wires, and blades.
Loading status checks…
52afb59
data/json/items/armor.json Outdated
"cutting" : 0,
"warmth" : 10,
"phase" : "solid",
"environmental_protection" : 0,

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Jul 31, 2015

Contributor

I'd buff it to 1 or 2, because it's made of plastic and waterproof.
data/json/items/comestibles.json Outdated
"quench" : 0,
"healthy" : 1,
"addiction_potential" : 0,
"nutrition" : 15,

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Jul 31, 2015

Contributor

3 flours for 8*15=120 nutrition. How does it compare to similar food products, such as johnnycake?

That healthy 1 doesn't fit, fried flour with water isn't exactly healthy.
data/json/items/comestibles.json Outdated
"charges" : 8,
"bashing" : 0,
"flags" : ["EATEN_HOT"],
"fun" : 1

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Jul 31, 2015

Contributor

I can't really think of food blander than fried flour... 0 would fit better. Also that "EATEN_HOT" doesn't fit.
@Barhandar

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

  1. Made recipe for spike and scrap suit reversible.
  2. Added an option to dismantle springs, wires, and blades.

You mean, disabled batch-crafting of spikes, springs, wires and blades?
@BevapDin

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

Made recipe for spike and scrap suit reversible.
Added an option to dismantle springs, wires, and blades.

You mean, disabled batch-crafting of spikes, springs, wires and blades?

It only disables batch-crafting for spikes and scrap suit. Springs, wires, and blades have separate uncraft recipes, so they are technically not reversible (in the sense of directly reverting what has been crafted). The uncraft recipe can yield items completely unrelated to the crafting recipe.
@Barhandar

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

It only disables batch-crafting for spikes

Which, last time I checked, are vehicle-installable and might be used in quantity. So I still see no point in making them un-batchable.

Speaking of which, why is batch-crafting disabled for reversible items, in the first place? Batch only reduces time requirement, not tool charges nor ingredients. And disablement makes crafting stuff which is reversible for no reason (looking at you, sandwiches) annoying.
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

Speaking of which, why is batch-crafting disabled for reversible items, in the first place? Batch only reduces time requirement, not tool charges nor ingredients.

I don't think it is like that for any balance-related reasons. Probably a technical thing. I'll check if it's easy to change, because it looks like a big "feature placeholder".
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Ack. I could add separate uncraft recipes for spikes and scrap suits then, just to underp that. >.>

As for flatbread, note that regular bread has 18 nutrition, which is the main thing I was comparing it to.

EDIT: Also, it seems like every baking item has the EATEN_HOT flag, so unsure why the flag wouldn't fit for it, especially if the player's making their own.
@Barhandar

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

As for flatbread, note that regular bread has 18 nutrition, which is the main thing I was comparing it to.

_Corn_bread has 18 nutrition (and also 4 portions instead of 8). Regular "bread" has 20.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

...doh. Ah right, read that wrong.

It seems the general pattern is that flour-based breads and similar have a stack size of 8, and corn-based ones have a stack size of 4.

EDIT: Corn, not cord. Cordbread doesn't sound that tasty at all. XP
chaosvolt
Windbreak buff, flatbread buff, recipe changes. 
1. Gave windbreaker enviornmental protection of 2.
2. Zeroed the healthiness and fun of flatbread.
3. Gave the spike and scrapsuit uncraft recipes instead of being
reversible. Though for the latter, you're likely having a very weird day
if you've got a pile of scrap suits laying around.
4. Added flatbread to recipes that allow the use of bread and/or
alternatives.
Loading status checks…
52d6b6b
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

...yep, I'm clearly up way too early. Reducing flatbread's fun and healthiness to zero is a nerf, not a buff. >.>
@Barhandar

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

Added flatbread to recipes that allow the use of bread and/or
alternatives.

Can lua scripts be used in mainline data, outside of mods?

Can lua scripts modify recipe components?
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Wat. This has a negative amount of things to do with an item addition in mainline content. :V
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

I don't like the idea of flatbread sandwiches with same stats as regular bread ones for lower cost.

If you want flatbread sandwiches, change it so that flatbread piece has the same nutrition as regular one, but less charges for same amount of flour.
@Barhandar

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

Wat. This has a negative amount of things to do with an item addition in mainline content. :V

It has to do with modifying one place with recipe instead of a dozen every time a certain kind of item is added. Since distributed handling - #11051, which allows setting a parameter in the item's definition without modifying recipes at all - is unlikely to get implemented anytime soon, I'd settle for being able to modify a Lua script, which then adjusts recipes when they're loaded.

I don't like the idea of flatbread sandwiches with same stats as regular bread ones for lower cost.

Wastebread. You're welcome!
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Wastebread does add a touch of lunacy to everything, but yeah. I guess I could lower charges instead of nutirition.

Though every option for sandwiches has different nutrition. Should we make different recipes for hardtack too? >.>
@Barhandar

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

I guess I could lower charges instead of nutirition.

Or do the same thing hardtack does, make it require twice the ingredients for the craft.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

...for flatbread? It's tortillas, basically. >.>
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

Wastebread. You're welcome!

Checked it out.
Wastebread is now declared a balance crime.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Wastebread. Guaranteed to add a touch of absurdity to any discussion.

In any case, I guess I'll go with 20 nutrition and a stack of 6. Same net nutrition per stack (which is still less than a stack of bread) without causing sandwich lunacy like wastebread does.
@Barhandar

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

...for flatbread? It's tortillas, basically. >.>

So is hardtack, which is, by the way, preparable without yeast and only uses 1.5x more flour for the same amount of resulting floor than plain bread. And it needs salt, which only requires a single visit to the swamps (and a lot of time, but...).
So basically the flatbread, here, is hardtack which had salt exchanged for the flour. And made to spoil. Not exactly a favorable comparsion as long as salt is renewable.

Wastebread is now declared a balance crime.

It would be if it didn't have more complex preparation than "find some flour-resulting seeds, plant them, get tons of flour after a season" of other breads.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Hardtack also takes stupidly long to prepare. Not really sure how to balance flatbread relative to hardtack, but balancing it regular to normal bread is infinitely simpler. >.>
Chaosvolt
Flatbread tweaks 
Changed it to have 20 nutrition and stack of 6, instead of 15 nutrition and 8 stack size. Both come out to 120 nutrition per stack (for reference, bread is 160 per stack).
Loading status checks…
99547e4
@Barhandar

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

Hardtack also takes stupidly long to prepare.

Once. It's imperishable, so you can do it one time and then not worry about having bread for sandwiches for years, and not get annoyed by needing to sequentally craft things without a (semi-auto) crafting queue.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

I've found it only practical to make them 5 at a time, actually. 30 hours to make 20 stacks, last I checked.
@Barhandar

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

I've found it only practical to make them 5 at a time, actually. 30 hours to make 20 stacks, last I checked.

Sounds like it needs a dose of batch-time-factor. After all, it should be possible to do several pieces of bread at once.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Would be nice, yes. Oh derp, I'm doing recipes tweaks and additions, I could be doing that. >_>

EDIT: Oh! And I almost forgot I was gonna give the hoodie the over layer.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Ahah, finally found that biscuits have a batch time factor. Was gonna be reluctant to give bread-type foods batching ability if none had that property.
chaosvolt
Batch time factoring, hoodie tweak 
1. Gave a batch time factor to hardtack and a few other bread items,
used the factor from biscuits.
Loading status checks…
2a918b9

@Coolthulhu Coolthulhu self-assigned this Jul 31, 2015

@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Ah, hope it goes well.
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

So, hoodies. Not mergeable until they both act the same way.
I'd drop the change for now and maybe later retry in a separate PR.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Ah, okay. Guess I'll drop the change then, yeah. Should I now, wait for you to de-assign, or let you mess with it?
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

If you're still on the branch, push it now.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Ah, okay.
Chaosvolt
Hoodie re-tweak 
Removed "OUTER" flag from hoodie again. Always leery of adding commits while it's assigned.
b56b2b6
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

By the way, why is a spike/suit recipe a separate one rather than just adding "reversible": true to the original one?
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Knee-jerk reaction on my part. Unlike spikes, I would assume disabling batch crafting for scrapsuits wouldn't be as annoying? @_@
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

BevapDin already fixed that and I merged the fix. It no longer disables batch crafting.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Doh. Since spikes use the same hammering quality needed to make them, I'm guessing even that can be changed to a reversible recipe.

Blades, wires, and springs use different tools to make though, so their uncraft recipes probably should stay.

Guess I'll fix that then?
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

Sounds about right.
What about scrap suit?
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Scrap suit can be made reversible, yeah. Even before that batch thing was fixed, it wasn't really something you'd be likely to craft and then uncraft in bulk.

EDIT: Augh, bad Github client, work faster. Editing single files at a time using the online editor is faster. >.<
chaosvolt
Reversible recipe tweaks 
1. Made spike and scrapsuit recipes reversible now that the batch fix is
in.
a5f5b01
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

Merge now? Wait for spike/scrap reversal fix?
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Is syncing now.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

There we go. Sorry about that. x.x

Coolthulhu added a commit that referenced this pull request Jul 31, 2015

@Coolthulhu
Merge pull request #13142 from chaosvolt/item-additions-metal-recipes 
Item/Recipe Additions, Changes
b3ab538

@Coolthulhu Coolthulhu merged commit b3ab538 into CleverRaven:master Jul 31, 2015

@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jul 31, 2015

Minor: barbed wire now stands out as non-uncraftable
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jul 31, 2015

Ack, back. And...huh, that's an oddity. Didn't even know it was uncraftable.

And thank you for the merge. ^^"

@chaosvolt chaosvolt deleted the chaosvolt:item-additions-metal-recipes branch Aug 6, 2015

@Cyrano7 Cyrano7 referenced this pull request Jan 12, 2016

Merged

Remove hardtack from sandwich recipes #14818

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.