{"action":"created","comment":{"url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/comments/49534154","id":49534154,"diff_hunk":"@@ -3965,6 +3984,19 @@ bool item::ammo_consume( int qty ) {\n     return false;\n }\n \n+itype_id item::ammo_current() const\n+{\n+    if( is_ammo() ) {\n+        return typeId();","path":"src/item.cpp","position":null,"original_position":63,"commit_id":"6fb1b9c4755ece5f0bfbb021a0490c04cb2ea56d","original_commit_id":"162c9a2ded2b41e00f11486fa4b2a2ac58514bb9","user":{"login":"BevapDin","id":5095435,"avatar_url":"https://avatars.githubusercontent.com/u/5095435?v=3","gravatar_id":"","url":"https://api.github.com/users/BevapDin","html_url":"https://github.com/BevapDin","followers_url":"https://api.github.com/users/BevapDin/followers","following_url":"https://api.github.com/users/BevapDin/following{/other_user}","gists_url":"https://api.github.com/users/BevapDin/gists{/gist_id}","starred_url":"https://api.github.com/users/BevapDin/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/BevapDin/subscriptions","organizations_url":"https://api.github.com/users/BevapDin/orgs","repos_url":"https://api.github.com/users/BevapDin/repos","events_url":"https://api.github.com/users/BevapDin/events{/privacy}","received_events_url":"https://api.github.com/users/BevapDin/received_events","type":"User","site_admin":false},"body":"> Incidentally we use  \"NULL\"  and  \"null\"  throughout the codebase.\r\n\r\nThat's why I came up with `string_id<T>::NULL_ID` (see string_id.h). It is, however, of the type `string_id<T>`, not just a plain `std::string`. Using it avoids having to remember what the null id actually is.\r\n\r\nFor example: it's \"mon_null\" for monster type, but that string appears exactly once as string literal in the source, all other places use `NULL_ID`.\r\n\r\n> Would there be any objection to a separate PR that converts everything to the same and if so which is the preferred form?\r\n\r\nI would avoid that, to much work. You'll have to change various JSON files or translate the old null-ids to new null-ids.\r\n\r\n> Is  type->id  ever an empty string?\r\n\r\n`type->id` is always a valid item type id, so yes, this should work fine.","created_at":"2016-01-13T00:00:40Z","updated_at":"2016-01-13T00:00:40Z","html_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/14799#discussion_r49534154","pull_request_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/14799","_links":{"self":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/comments/49534154"},"html":{"href":"https://github.com/CleverRaven/Cataclysm-DDA/pull/14799#discussion_r49534154"},"pull_request":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/14799"}}},"pull_request":{"url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/14799","id":55641480,"html_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/14799","diff_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/14799.diff","patch_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/14799.patch","issue_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/14799","number":14799,"state":"open","locked":false,"title":"Relaod using magazines [WIP] [CR]","user":{"login":"mugling","id":12238606,"avatar_url":"https://avatars.githubusercontent.com/u/12238606?v=3","gravatar_id":"","url":"https://api.github.com/users/mugling","html_url":"https://github.com/mugling","followers_url":"https://api.github.com/users/mugling/followers","following_url":"https://api.github.com/users/mugling/following{/other_user}","gists_url":"https://api.github.com/users/mugling/gists{/gist_id}","starred_url":"https://api.github.com/users/mugling/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mugling/subscriptions","organizations_url":"https://api.github.com/users/mugling/orgs","repos_url":"https://api.github.com/users/mugling/repos","events_url":"https://api.github.com/users/mugling/events{/privacy}","received_events_url":"https://api.github.com/users/mugling/received_events","type":"User","site_admin":false},"body":"The aims of this PR is to define the minimal specification for a magazine and allow it to be reloaded and unloaded. A second PR can then extend the reloading code so that guns have either integral (default) or detachable magazines. Subsequent PR's can then start to implement specific magazines.\r\n\r\nIn this implementation magazines store one or more ammo items within their `contents` vector. At present these must be of the same type (as returned by `item::ammo_current`) so contained ammo should only differ in terms of damage or other such properties. `item::get_curammo_id` is deprecated in favour of `item::ammo_current` which is extended to correctly handle magazines with contained ammo.\r\n\r\nA later refactor of `game::unload` can probably combine unloading of magazines and containers but such refinements are possibly best left until a minimal working implementation can be committed.\r\n\r\nTODO:\r\n- [X] Magazines can be repeatedly loaded with equivalent ammo until full\r\n- [X] Magazines when unloaded return appropriately stacked ammo\r\n- [X] Loaded magazines increase in weight proportional to contained ammo\r\n- [X] Guns presently ignore ammo contained within magazines\r\n- [ ] Info for magazines is correctly displayed","created_at":"2016-01-11T16:10:20Z","updated_at":"2016-01-13T00:00:40Z","closed_at":null,"merged_at":null,"merge_commit_sha":"8767b60548fa7e51d24526c020201dfb1d95a430","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/14799/commits","review_comments_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/14799/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/14799/comments","statuses_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/statuses/6fb1b9c4755ece5f0bfbb021a0490c04cb2ea56d","head":{"label":"mugling:magazines","ref":"magazines","sha":"6fb1b9c4755ece5f0bfbb021a0490c04cb2ea56d","user":{"login":"mugling","id":12238606,"avatar_url":"https://avatars.githubusercontent.com/u/12238606?v=3","gravatar_id":"","url":"https://api.github.com/users/mugling","html_url":"https://github.com/mugling","followers_url":"https://api.github.com/users/mugling/followers","following_url":"https://api.github.com/users/mugling/following{/other_user}","gists_url":"https://api.github.com/users/mugling/gists{/gist_id}","starred_url":"https://api.github.com/users/mugling/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mugling/subscriptions","organizations_url":"https://api.github.com/users/mugling/orgs","repos_url":"https://api.github.com/users/mugling/repos","events_url":"https://api.github.com/users/mugling/events{/privacy}","received_events_url":"https://api.github.com/users/mugling/received_events","type":"User","site_admin":false},"repo":{"id":35048130,"name":"Cataclysm-DDA","full_name":"mugling/Cataclysm-DDA","owner":{"login":"mugling","id":12238606,"avatar_url":"https://avatars.githubusercontent.com/u/12238606?v=3","gravatar_id":"","url":"https://api.github.com/users/mugling","html_url":"https://github.com/mugling","followers_url":"https://api.github.com/users/mugling/followers","following_url":"https://api.github.com/users/mugling/following{/other_user}","gists_url":"https://api.github.com/users/mugling/gists{/gist_id}","starred_url":"https://api.github.com/users/mugling/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mugling/subscriptions","organizations_url":"https://api.github.com/users/mugling/orgs","repos_url":"https://api.github.com/users/mugling/repos","events_url":"https://api.github.com/users/mugling/events{/privacy}","received_events_url":"https://api.github.com/users/mugling/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/mugling/Cataclysm-DDA","description":"Cataclysm - Dark Days Ahead. A fork/variant of Cataclysm Roguelike by Whales.","fork":true,"url":"https://api.github.com/repos/mugling/Cataclysm-DDA","forks_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/forks","keys_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/teams","hooks_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/hooks","issue_events_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/issues/events{/number}","events_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/events","assignees_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/assignees{/user}","branches_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/branches{/branch}","tags_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/tags","blobs_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/git/refs{/sha}","trees_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/statuses/{sha}","languages_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/languages","stargazers_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/stargazers","contributors_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/contributors","subscribers_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/subscribers","subscription_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/subscription","commits_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/commits{/sha}","git_commits_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/git/commits{/sha}","comments_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/comments{/number}","issue_comment_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/issues/comments{/number}","contents_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/contents/{+path}","compare_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/merges","archive_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/downloads","issues_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/issues{/number}","pulls_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/pulls{/number}","milestones_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/milestones{/number}","notifications_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/labels{/name}","releases_url":"https://api.github.com/repos/mugling/Cataclysm-DDA/releases{/id}","created_at":"2015-05-04T17:12:42Z","updated_at":"2016-01-12T23:34:36Z","pushed_at":"2016-01-12T23:34:31Z","git_url":"git://github.com/mugling/Cataclysm-DDA.git","ssh_url":"git@github.com:mugling/Cataclysm-DDA.git","clone_url":"https://github.com/mugling/Cataclysm-DDA.git","svn_url":"https://github.com/mugling/Cataclysm-DDA","homepage":"http://en.cataclysmdda.com/","size":675052,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"CleverRaven:master","ref":"master","sha":"d320e65f70d0d73d7786a8a575445c4df8d92eb6","user":{"login":"CleverRaven","id":4367009,"avatar_url":"https://avatars.githubusercontent.com/u/4367009?v=3","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,"name":"Cataclysm-DDA","full_name":"CleverRaven/Cataclysm-DDA","owner":{"login":"CleverRaven","id":4367009,"avatar_url":"https://avatars.githubusercontent.com/u/4367009?v=3","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},"private":false,"html_url":"https://github.com/CleverRaven/Cataclysm-DDA","description":"Cataclysm - Dark Days Ahead. A fork/variant of Cataclysm Roguelike by Whales.","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}","created_at":"2012-09-26T22:57:43Z","updated_at":"2016-01-12T23:32:32Z","pushed_at":"2016-01-12T23:34:35Z","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://en.cataclysmdda.com/","size":923619,"stargazers_count":846,"watchers_count":846,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":838,"mirror_url":null,"open_issues_count":1255,"forks":838,"open_issues":1255,"watchers":846,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/14799"},"html":{"href":"https://github.com/CleverRaven/Cataclysm-DDA/pull/14799"},"issue":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/14799"},"comments":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/14799/comments"},"review_comments":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/14799/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/14799/commits"},"statuses":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/statuses/6fb1b9c4755ece5f0bfbb021a0490c04cb2ea56d"}}}}