{"action":"created","comment":{"url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/comments/238300532","pull_request_review_id":180806190,"id":238300532,"node_id":"MDI0OlB1bGxSZXF1ZXN0UmV2aWV3Q29tbWVudDIzODMwMDUzMg==","diff_hunk":"@@ -309,7 +309,7 @@\n     \"healthy\": -2,\n     \"quench\": 2,\n     \"fun\": -10,\n-    \"calories\": 208,\n+    \"calories\": 50,","path":"data/json/items/comestibles/carnivore.json","position":23,"original_position":23,"commit_id":"4aea590096e9882cdb48bfe28347418d1ee89a44","original_commit_id":"4aea590096e9882cdb48bfe28347418d1ee89a44","user":{"login":"Treah","id":12091471,"node_id":"MDQ6VXNlcjEyMDkxNDcx","avatar_url":"https://avatars0.githubusercontent.com/u/12091471?v=4","gravatar_id":"","url":"https://api.github.com/users/Treah","html_url":"https://github.com/Treah","followers_url":"https://api.github.com/users/Treah/followers","following_url":"https://api.github.com/users/Treah/following{/other_user}","gists_url":"https://api.github.com/users/Treah/gists{/gist_id}","starred_url":"https://api.github.com/users/Treah/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Treah/subscriptions","organizations_url":"https://api.github.com/users/Treah/orgs","repos_url":"https://api.github.com/users/Treah/repos","events_url":"https://api.github.com/users/Treah/events{/privacy}","received_events_url":"https://api.github.com/users/Treah/received_events","type":"User","site_admin":false},"body":"I have no problem with increasing the weight and volume and adjusting for the change in calories. ","created_at":"2018-12-03T14:58:05Z","updated_at":"2018-12-03T14:58:06Z","html_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/26916#discussion_r238300532","pull_request_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/26916","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/comments/238300532"},"html":{"href":"https://github.com/CleverRaven/Cataclysm-DDA/pull/26916#discussion_r238300532"},"pull_request":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/26916"}},"in_reply_to_id":238262939},"pull_request":{"url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/26916","id":235278397,"node_id":"MDExOlB1bGxSZXF1ZXN0MjM1Mjc4Mzk3","html_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/26916","diff_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/26916.diff","patch_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/26916.patch","issue_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/26916","number":26916,"state":"open","locked":false,"title":"[CR] Added correct calorie amounts for Meat and Fat along with tallow ","user":{"login":"Treah","id":12091471,"node_id":"MDQ6VXNlcjEyMDkxNDcx","avatar_url":"https://avatars0.githubusercontent.com/u/12091471?v=4","gravatar_id":"","url":"https://api.github.com/users/Treah","html_url":"https://github.com/Treah","followers_url":"https://api.github.com/users/Treah/followers","following_url":"https://api.github.com/users/Treah/following{/other_user}","gists_url":"https://api.github.com/users/Treah/gists{/gist_id}","starred_url":"https://api.github.com/users/Treah/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Treah/subscriptions","organizations_url":"https://api.github.com/users/Treah/orgs","repos_url":"https://api.github.com/users/Treah/repos","events_url":"https://api.github.com/users/Treah/events{/privacy}","received_events_url":"https://api.github.com/users/Treah/received_events","type":"User","site_admin":false},"body":"#### Summary\r\nModified values for Meat Fat and Tallow. \r\nUsed USDA values for reference using Beef as the measure. Meat was calculated at 90% lean.\r\n\r\n### Purpose of change\r\nCorrected calorie values for meat and fat along with tallow to correct IRL values. The value for fat was incorrect and too high. Also changed the health modifier for consuming fat to be higher from -3 and -2 for tallow to -5. \r\n\r\n#### Describe the solution\r\nUsing IRL values for each of these acording to the values in game such as OZ and Lbs of meat and fat and tallow. The previous ones were either too high or too low. \r\n\r\nMeat in game is .5 lbs so the value from below was cut in half. \r\nFat in game is 0.25 Liters so this value was used to find calories. It was not possible to use lbs. This come to 1.04 cups which is used on the site. \r\nTallow is calculated for the USDA on a oz or cup sizes. Found that one portion of tallow was 0.07 L so used this to convert to OZ 2.47. \r\n\r\nFixes: #26914\r\n\r\n\r\n#### Describe alternatives you've considered\r\nCorrecting the overall nutrition system in game. \r\n\r\n#### Additional context\r\nReferences for each value. \r\nMeat: https://ndb.nal.usda.gov/ndb/foods/show/13346?fgcd=&manu=&format=&count=&max=25&offset=&sort=default&order=asc&qlookup=beef&ds=SR&qt=&qp=&qa=&qn=&q=&ing=\r\nFat: Same as Tallow. \r\nMeat Cooked: https://ndb.nal.usda.gov/ndb/foods/show/13347?man=&lfacet=&count=&max=25&qlookup=cooked+beef&offset=&sort=default&format=Abridged&reportfmt=other&rptfrm=&ndbno=&nutrient1=&nutrient2=&nutrient3=&subset=&totCount=&measureby=&Qv=1&Q329124=8.45&Q329125=.5&Qv=1&Q329124=8.45&Q329125=1\r\n\r\nTallow: https://ndb.nal.usda.gov/ndb/foods/show/04001?man=&lfacet=&count=&max=25&qlookup=beef&offset=&sort=default&format=Abridged&reportfmt=other&rptfrm=&ndbno=&nutrient1=&nutrient2=&nutrient3=&subset=&totCount=&measureby=&Qv=1&Q323854=1&Q323855=0.291&Qv=1&Q323854=1&Q323855=1\r\n\r\nEtc animal parts: Using the USDA web page for BEEF for these. Using Weight values as weight to volume is inconsistent with this and I feel weight is what normally meat is measured at. \r\n\r\n","created_at":"2018-12-02T19:15:12Z","updated_at":"2018-12-03T14:58:06Z","closed_at":null,"merged_at":null,"merge_commit_sha":"8fd57342c2557b02f3a8b8123ca9b070d01d6893","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[{"id":887828902,"node_id":"MDU6TGFiZWw4ODc4Mjg5MDI=","url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/labels/%3CBugfix%3E","name":"<Bugfix>","color":"29fc29","default":false},{"id":490080170,"node_id":"MDU6TGFiZWw0OTAwODAxNzA=","url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/labels/Food%20/%20Vitamins","name":"Food / Vitamins","color":"ffbf36","default":false},{"id":41067655,"node_id":"MDU6TGFiZWw0MTA2NzY1NQ==","url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/labels/Game:%20Balance","name":"Game: Balance","color":"5319e7","default":false},{"id":235869031,"node_id":"MDU6TGFiZWwyMzU4NjkwMzE=","url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/labels/[JSON]","name":"[JSON]","color":"c2e0c6","default":false}],"milestone":null,"commits_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/26916/commits","review_comments_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/26916/comments","review_comment_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/comments{/number}","comments_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/26916/comments","statuses_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/statuses/4aea590096e9882cdb48bfe28347418d1ee89a44","head":{"label":"Treah:meat_cal","ref":"meat_cal","sha":"4aea590096e9882cdb48bfe28347418d1ee89a44","user":{"login":"Treah","id":12091471,"node_id":"MDQ6VXNlcjEyMDkxNDcx","avatar_url":"https://avatars0.githubusercontent.com/u/12091471?v=4","gravatar_id":"","url":"https://api.github.com/users/Treah","html_url":"https://github.com/Treah","followers_url":"https://api.github.com/users/Treah/followers","following_url":"https://api.github.com/users/Treah/following{/other_user}","gists_url":"https://api.github.com/users/Treah/gists{/gist_id}","starred_url":"https://api.github.com/users/Treah/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Treah/subscriptions","organizations_url":"https://api.github.com/users/Treah/orgs","repos_url":"https://api.github.com/users/Treah/repos","events_url":"https://api.github.com/users/Treah/events{/privacy}","received_events_url":"https://api.github.com/users/Treah/received_events","type":"User","site_admin":false},"repo":{"id":34691075,"node_id":"MDEwOlJlcG9zaXRvcnkzNDY5MTA3NQ==","name":"Cataclysm-DDA","full_name":"Treah/Cataclysm-DDA","private":false,"owner":{"login":"Treah","id":12091471,"node_id":"MDQ6VXNlcjEyMDkxNDcx","avatar_url":"https://avatars0.githubusercontent.com/u/12091471?v=4","gravatar_id":"","url":"https://api.github.com/users/Treah","html_url":"https://github.com/Treah","followers_url":"https://api.github.com/users/Treah/followers","following_url":"https://api.github.com/users/Treah/following{/other_user}","gists_url":"https://api.github.com/users/Treah/gists{/gist_id}","starred_url":"https://api.github.com/users/Treah/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Treah/subscriptions","organizations_url":"https://api.github.com/users/Treah/orgs","repos_url":"https://api.github.com/users/Treah/repos","events_url":"https://api.github.com/users/Treah/events{/privacy}","received_events_url":"https://api.github.com/users/Treah/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Treah/Cataclysm-DDA","description":"Cataclysm - Dark Days Ahead. A fork/variant of Cataclysm Roguelike by Whales.","fork":true,"url":"https://api.github.com/repos/Treah/Cataclysm-DDA","forks_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/forks","keys_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/teams","hooks_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/hooks","issue_events_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/issues/events{/number}","events_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/events","assignees_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/assignees{/user}","branches_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/branches{/branch}","tags_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/tags","blobs_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/git/refs{/sha}","trees_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/statuses/{sha}","languages_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/languages","stargazers_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/stargazers","contributors_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/contributors","subscribers_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/subscribers","subscription_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/subscription","commits_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/commits{/sha}","git_commits_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/git/commits{/sha}","comments_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/comments{/number}","issue_comment_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/issues/comments{/number}","contents_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/contents/{+path}","compare_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/merges","archive_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/downloads","issues_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/issues{/number}","pulls_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/pulls{/number}","milestones_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/milestones{/number}","notifications_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/labels{/name}","releases_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/releases{/id}","deployments_url":"https://api.github.com/repos/Treah/Cataclysm-DDA/deployments","created_at":"2015-04-27T21:01:57Z","updated_at":"2018-11-28T16:35:41Z","pushed_at":"2018-12-02T22:03:08Z","git_url":"git://github.com/Treah/Cataclysm-DDA.git","ssh_url":"git@github.com:Treah/Cataclysm-DDA.git","clone_url":"https://github.com/Treah/Cataclysm-DDA.git","svn_url":"https://github.com/Treah/Cataclysm-DDA","homepage":"http://en.cataclysmdda.com/","size":1426816,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"CleverRaven:master","ref":"master","sha":"05d851eaa71db83b02137a31e91eafd577e56a51","user":{"login":"CleverRaven","id":4367009,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQzNjcwMDk=","avatar_url":"https://avatars0.githubusercontent.com/u/4367009?v=4","gravatar_id":"","url":"https://api.github.com/users/CleverRaven","html_url":"https://github.com/CleverRaven","followers_url":"https://api.github.com/users/CleverRaven/followers","following_url":"https://api.github.com/users/CleverRaven/following{/other_user}","gists_url":"https://api.github.com/users/CleverRaven/gists{/gist_id}","starred_url":"https://api.github.com/users/CleverRaven/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CleverRaven/subscriptions","organizations_url":"https://api.github.com/users/CleverRaven/orgs","repos_url":"https://api.github.com/users/CleverRaven/repos","events_url":"https://api.github.com/users/CleverRaven/events{/privacy}","received_events_url":"https://api.github.com/users/CleverRaven/received_events","type":"Organization","site_admin":false},"repo":{"id":5973855,"node_id":"MDEwOlJlcG9zaXRvcnk1OTczODU1","name":"Cataclysm-DDA","full_name":"CleverRaven/Cataclysm-DDA","private":false,"owner":{"login":"CleverRaven","id":4367009,"node_id":"MDEyOk9yZ2FuaXphdGlvbjQzNjcwMDk=","avatar_url":"https://avatars0.githubusercontent.com/u/4367009?v=4","gravatar_id":"","url":"https://api.github.com/users/CleverRaven","html_url":"https://github.com/CleverRaven","followers_url":"https://api.github.com/users/CleverRaven/followers","following_url":"https://api.github.com/users/CleverRaven/following{/other_user}","gists_url":"https://api.github.com/users/CleverRaven/gists{/gist_id}","starred_url":"https://api.github.com/users/CleverRaven/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/CleverRaven/subscriptions","organizations_url":"https://api.github.com/users/CleverRaven/orgs","repos_url":"https://api.github.com/users/CleverRaven/repos","events_url":"https://api.github.com/users/CleverRaven/events{/privacy}","received_events_url":"https://api.github.com/users/CleverRaven/received_events","type":"Organization","site_admin":false},"html_url":"https://github.com/CleverRaven/Cataclysm-DDA","description":"Cataclysm - Dark Days Ahead. A turn-based survival game set in a post-apocalyptic world.","fork":false,"url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA","forks_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/forks","keys_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/keys{/key_id}","collaborators_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/teams","hooks_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/hooks","issue_events_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/events{/number}","events_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/events","assignees_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/assignees{/user}","branches_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/branches{/branch}","tags_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/tags","blobs_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/git/refs{/sha}","trees_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/git/trees{/sha}","statuses_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/statuses/{sha}","languages_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/languages","stargazers_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/stargazers","contributors_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/contributors","subscribers_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/subscribers","subscription_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/subscription","commits_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/commits{/sha}","git_commits_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/git/commits{/sha}","comments_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/comments{/number}","issue_comment_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/comments{/number}","contents_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/contents/{+path}","compare_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/compare/{base}...{head}","merges_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/merges","archive_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/downloads","issues_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues{/number}","pulls_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls{/number}","milestones_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/milestones{/number}","notifications_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/labels{/name}","releases_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/releases{/id}","deployments_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/deployments","created_at":"2012-09-26T22:57:43Z","updated_at":"2018-12-03T14:13:57Z","pushed_at":"2018-12-03T13:38:33Z","git_url":"git://github.com/CleverRaven/Cataclysm-DDA.git","ssh_url":"git@github.com:CleverRaven/Cataclysm-DDA.git","clone_url":"https://github.com/CleverRaven/Cataclysm-DDA.git","svn_url":"https://github.com/CleverRaven/Cataclysm-DDA","homepage":"http://cataclysmdda.org","size":1426917,"stargazers_count":2293,"watchers_count":2293,"language":"C++","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":1520,"mirror_url":null,"archived":false,"open_issues_count":1027,"license":{"key":"other","name":"Other","spdx_id":"NOASSERTION","url":null,"node_id":"MDc6TGljZW5zZTA="},"forks":1520,"open_issues":1027,"watchers":2293,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/26916"},"html":{"href":"https://github.com/CleverRaven/Cataclysm-DDA/pull/26916"},"issue":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/26916"},"comments":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/26916/comments"},"review_comments":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/26916/comments"},"review_comment":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/26916/commits"},"statuses":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/statuses/4aea590096e9882cdb48bfe28347418d1ee89a44"}},"author_association":"CONTRIBUTOR"}}
{"actor":{"display_login":"Treah"}}