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] More Foods #4451

Closed
wants to merge 11 commits into from

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@EkarusRyndren @Rivet-the-Zombie @KA101 @ianestrachan
@EkarusRyndren
Copy link
Contributor

commented Nov 18, 2013

How's about more food? What do you think?
@EkarusRyndren
Food for everyone 
Mostly chicken and junk food.
Loading status checks…
eca3ea1
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member

commented Nov 18, 2013

Looks like you still need item spawns and recipes.

I like what I see overall though!
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 18, 2013

@Rivet-the-Zombie Yeah, gonna wait until I've got a few more items in there to work on those. (And time) Two things I'm worried about though are the Niño nachos and the Prick Pies, not sure if I'm stepping on any toes.

I would like to change "Energy soda" to "Mountain Dew" if there are no objections though.
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member

commented Nov 18, 2013

I'm against getting overtly brand-specific on foods, unless you're going to make up some sort of in-world brand and confine it to the description text. Overall we have a vague naming system that largely favors stuff like 'cola' and 'potato chips' so perhaps something like 'citrus soda' might be best.
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 18, 2013

@Rivet-the-Zombie The reason I wanted to use Mountain Dew specifically is it seems to be renown for inhuman amounts of sugar. I will forever remember the time I was at a convention center and just saw some poor bastard all by himself at a table, shaking, with 30+ empty cans around him. XD But I see your point.
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member

commented Nov 18, 2013

I will forever remember the time I was at a convention center and just saw some poor bastard all by himself at a table, shaking, with 30+ empty cans around him.

Drinking away his sorrows?

I guess nothing prevents you from throwing some sort of fictional brand name in the description text field for your soda.
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Nov 18, 2013

Citrus soda? Like Fanta? Decaf's the best!

(There was an oh-so-brief period when they made decaf Mountain Dew. I miss that stuff. :-( )
@EkarusRyndren
Added spawn lists and recipes 
Does anyone know how to implement bologna as a recipe?
Loading status checks…
1a522d0
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member

commented Nov 19, 2013

Does anyone know how to implement bologna as a recipe?

Since you obviously know how to create recipes.json entries, are you asking for a real-life recipe for bologna?
data/json/item_groups.json Outdated
@@ -5,11 +5,18 @@
"items":[
["chocolate", 50],
["candy", 60],
["candy2", 60],

This comment has been minimized.

Sign in to view
Copy link
@Rivet-the-Zombie

Rivet-the-Zombie Nov 19, 2013

Member

Your indents are all funny. Please fix.

This comment has been minimized.

Sign in to view
Copy link
@EkarusRyndren

EkarusRyndren Nov 19, 2013

Author Contributor

@Rivet-the-Zombie I'm looking at it in Notepad ++ and it looks fine, is there some difference between spaces and tabs that I'm not aware of and which should I be using in the event there is?

This comment has been minimized.

Sign in to view
Copy link
@Rivet-the-Zombie

Rivet-the-Zombie Nov 19, 2013

Member

Yeah there's a big difference between tabs and spaces. In short, never use tabs, ALWAYS make sure you're using spaces.
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 19, 2013

@Rivet-the-Zombie I need to know what to base the in-game recipe off of
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Nov 19, 2013

Indents are apparently two spaces. Notepad++ defaults to making tabs 4 spaces and auto-adding them to newlines to maintain indentation. (My last PR gave Rivet & GlyphGryph fits on that issue.)

As for in-game recipe, ply-meat such as bologna seems like a scaled-up and meat-changed version of the Mannwurst? It's basically a very thick and fine-ground sausage, firmer consistency than braunschewiger, IIRC?

(edited to clarify questionable language :-/ )
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member

commented Nov 19, 2013

@Rivet-the-Zombie I need to know what to base the in-game recipe off of

Sausage or Mannwurst would be my guess.
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 19, 2013

@KA101 Is there a way to change that setting?

@Rivet-the-Zombie So just use the sausage/mannwurst recipes with a result change?
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Nov 19, 2013

N++: yeah. In mine, it's Settings>Preferences>Language Menu/Tab Settings, then hit the link "4" and change it to 2.

Recipes: Bologna is a bit larger (diameter/length) than typical sausage, so maybe require more meat/seasonings/time?
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member

commented Nov 19, 2013

I'd go with same recipe, but more meat, maybe less seasonings since bologna isn't usually real heavily seasoned.
@EkarusRyndren
Irradiated Foods, Pudding, Junk Food, Bugfixes 
IT'S ALL THERE. AND MORE.
Loading status checks…
6ccd847
data/json/items/comestibles.json Outdated
"heal" : -1,
"addiction_potential" : 0,
"nutrition" : 8,
"description" : "It's first may may have been Oscar. Can be eaten cold.",

This comment has been minimized.

Sign in to view
Copy link
@ianestrachan

ianestrachan Nov 20, 2013

Contributor

"may may", probably only should be one?

Or rather, "name may" is probably what you meant.
data/json/items/comestibles.json Outdated
"price" : 75,
"material" : "hflesh",
"nutrition" : 4,
"description" : "A heavily processed saussage, common place at baseball games before the cataclysm. It would taste much better prepared.",

This comment has been minimized.

Sign in to view
Copy link
@ianestrachan

ianestrachan Nov 20, 2013

Contributor

"commonplace" is one word when used in this context.

http://dictionary.reference.com/browse/commonplace?r=75&src=ref&ch=dic
data/json/items/comestibles.json Outdated
"price" : 160,
"material" : "hflesh",
"nutrition" : 4,
"description" : "A heavily processed saussage, dipped in batter and deep fried. It would taste much better prepared.",

This comment has been minimized.

Sign in to view
Copy link
@ianestrachan

ianestrachan Nov 20, 2013

Contributor

"saussage" -> "sausage"
data/json/items/comestibles.json Outdated
"addiction_potential" : 0,
"nutrition" : 40,
"nutrition" : 20,
"description" : "A heavily processed saussage, dipped in batter and deep fried. Cooked, this corndog now tastes much better but will spoil.",

This comment has been minimized.

Sign in to view
Copy link
@ianestrachan

ianestrachan Nov 20, 2013

Contributor

"saussage" -> "sausage", again.
data/json/items/melee.json Outdated
"symbol": ")",
"color": "dark_gray",
"name": "waffleiron",
"description": "A waffleiron. For making waffles.",

This comment has been minimized.

Sign in to view
Copy link
@ianestrachan

ianestrachan Nov 20, 2013

Contributor

"waffle iron" is two words.
@ianestrachan

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Nov 20, 2013

Few minor spelling/grammar issues but nothing major.

I'm pretty sure that's not how irradiating stuff works, by the way. Yeah, irradiating something can sterilize it (hence sterilizing medical instruments this way) but that'll be completely undone by the fact that all of those foods will have been exposed to the open air again as none of them are in sealed containers.
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 20, 2013

@ianestrachan It wouldn't be that difficult to add a bag or use the DEJAR function (Though I'd hate having to redo it XD) but if it's that big an issue I can change it. As far as the grammar errors are concerned I'll fix those in the next upload... I'm running out of stuff to add so it may or may not be done soon, depends on if anyone suggests anything more.

EkarusRyndren added some commits Nov 20, 2013

@EkarusRyndren
Now with less typos and grammar errors! 
Fixed the typos, misspellings, and grammar errors that ianestrachan
found
Loading status checks…
872885d
@EkarusRyndren
Added some more junk food, meals, and fixed recipes and irradiated fo… 
…ods.

Lots of fixes. Lots and lots of fixes.
Loading status checks…
0d12ecb
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 21, 2013

I'm gonna leave it sit overnight, hopefully that'll be everything for this build if no one has any complaints. I forgot to mention that in the most recent commit I removed the morale bonus from cooked meat, the "hot food" bonus should be enough.

EkarusRyndren added some commits Nov 21, 2013

@EkarusRyndren
(Hopefully) Stopped making Jenkins cry. 
I DIDN'T MEAN TO.
Loading status checks…
2dfe959
@EkarusRyndren
Fixed the bugs... again... 
Who'd a thunk it, you can run new stuff though the game and have it
point the horrible spots in your work out to you... Sorry Jenkins.
Loading status checks…
2dc1128
@EkarusRyndren
Re-Added the Strawberries... 
...Yeah I'm not sure how they got removed, but they're back now.
Loading status checks…
0302b92
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 22, 2013

@KA101 So it turns out I apparently deleted the strawberries... I'm not sure how this happened, but it's been fixed. Assuming no further problems, it should be ready to go, removing the WIP tag...

EkarusRyndren added some commits Nov 22, 2013

@EkarusRyndren
More bug fixes
Loading status checks…
9d5e2a9
@EkarusRyndren
Okay, I think that's all of them 
I think.
Loading status checks…
138a05c
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 22, 2013

Alright, I'm out of ideas. I'm down to "Jenkins is mad at me"
@EkarusRyndren
MAYBE FIXED IT. 
I don't really know anymore.
Loading status checks…
8c58601

@EkarusRyndren EkarusRyndren closed this Nov 22, 2013

@EkarusRyndren EkarusRyndren deleted the EkarusRyndren:MoreFood branch Nov 22, 2013

@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Nov 22, 2013

This really should stick around. :-(
@EkarusRyndren

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Nov 22, 2013

@KA101 It'll be back, trying to update my version of it so Jerkins will like the files again and I broke something on my end, trying to fix it now XDD

@EkarusRyndren EkarusRyndren restored the EkarusRyndren:MoreFood branch Nov 22, 2013

@EkarusRyndren EkarusRyndren deleted the EkarusRyndren:MoreFood branch Nov 22, 2013

@EkarusRyndren EkarusRyndren restored the EkarusRyndren:MoreFood branch Nov 23, 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.