Skip to content
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

A small selection of fixes. #3629

Merged
merged 8 commits into from Oct 15, 2013

Conversation

Projects
None yet
4 participants
@Rivet-the-Zombie
Copy link
Member

commented Oct 13, 2013

Some of the new fruit had weights that were way off, and all the new junk foods aside from fries were magenta, both issues have been addressed. Also removes morale boost from dried meat and vegetables and fixes PDA's lack of ammo type tag. Makes (acid) rain protection a clothing flag instead of specific to one article of clothing. Makes storage bags smaller when not in use. Also fixes DE .44 magnum ammo count as pointed out on the forums.

@@ -7723,7 +7723,7 @@
"type" : "COMESTIBLE",
"id" : "watermelon",
"name" : "watermelon",
"weight" : 4000,
"weight" : 200,

This comment has been minimized.

Copy link
@i2amroy

i2amroy Oct 13, 2013

Member

This should be about 600, (600 * 8 charges = 4800 g, a fairly average watermelon that's just a bit on the small side).

@@ -7489,7 +7489,7 @@
"type" : "COMESTIBLE",
"id" : "pineapple",
"name" : "pineapple",
"weight" : 1500,
"weight" : 300,

This comment has been minimized.

Copy link
@i2amroy

i2amroy Oct 13, 2013

Member

You can probably drop this all of the way down to 250.

Rivet-the-Zombie added some commits Oct 13, 2013

@KA101

This comment has been minimized.

Copy link
Contributor

commented Oct 14, 2013

Hadn't known there was a color protocol on junk food. Thanks?

@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member Author

commented Oct 14, 2013

By and large most of the foods are colored to somewhat match their RL color. I saw that they were all magenta so I changed some of them to food-colors.

@KA101

This comment has been minimized.

Copy link
Contributor

commented Oct 14, 2013

OK, thanks.

@KA101

This comment has been minimized.

Copy link
Contributor

commented Oct 14, 2013

Hmm. Unless "dried meat" and "beef jerky" are split out (they may well be, though looking like not?), that's a net Nerf to commercial beef jerky. Might want to check that?

@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member Author

commented Oct 14, 2013

Beef jerky only requires salt and basic cooking. Plus it grants morale. 1 raw meat = 3 jerky.

Dried meat grants no morale and requires a special (bulky) machine and 25 batteries per unit of resulting dried meat plus a lot of time to make it. 2 raw meats = 2 dehydrated meats.

@kevingranade kevingranade merged commit eadf2c3 into CleverRaven:master Oct 15, 2013

1 check passed

default Merged build finished.
Details
@KA101

This comment has been minimized.

Copy link
Contributor

commented Oct 15, 2013

OK. Searched comestibles.json and only came up with "dried meat" in the description for Beef Jerky. :-/

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.