GitHub PullRequestReviewCommentEvent at 2014-10-28 23:36:46
Repository: Cataclysm-DDA
Actor: KA101
Payload: {"action":"created","comment":{"url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/comments/19511997","id":19511997,"diff_hunk":"@@ -673,7 +673,10 @@ int player::roll_bash_damage(bool crit)\n         bash_cap = 5 + stat + skill;\n \n     if (unarmed_attack())\n-        bash_dam = rng(0, int(stat / 2) + unarmed_skill);\n+        if (weapon.has_flag(\"UNARMED_WEAPON\"))","path":"src/melee.cpp","position":5,"original_position":5,"commit_id":"c617664b30023c55eb7a3a30cb4c352a5667d55b","original_commit_id":"c617664b30023c55eb7a3a30cb4c352a5667d55b","user":{"login":"KA101","id":4195632,"avatar_url":"https://avatars.githubusercontent.com/u/4195632?v=2","gravatar_id":"","url":"https://api.github.com/users/KA101","html_url":"https://github.com/KA101","followers_url":"https://api.github.com/users/KA101/followers","following_url":"https://api.github.com/users/KA101/following{/other_user}","gists_url":"https://api.github.com/users/KA101/gists{/gist_id}","starred_url":"https://api.github.com/users/KA101/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KA101/subscriptions","organizations_url":"https://api.github.com/users/KA101/orgs","repos_url":"https://api.github.com/users/KA101/repos","events_url":"https://api.github.com/users/KA101/events{/privacy}","received_events_url":"https://api.github.com/users/KA101/received_events","type":"User","site_admin":false},"body":"I'll be making some fixes in the merge (UNARMED_WEAPONs can have cut damage, too) and one of 'em is gonna be bracing this.  We prefer that every if-statement have the stuff it's gating enclosed in braces, so\r\n`if (it's an unarmed weapon) {`\r\n`add the weapon's damage;`\r\n`}`\r\n\r\nNot everything is braced ATM.  Our procedure is that folks brace stuff they work on, and if you're working on something extant that isn't braced & is part of a pile of non-braced things, it's nice if you add braces to the surrounding ones too.","created_at":"2014-10-28T23:36:46Z","updated_at":"2014-10-28T23:36:46Z","html_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/9725#discussion_r19511997","pull_request_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/9725","_links":{"self":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/comments/19511997"},"html":{"href":"https://github.com/CleverRaven/Cataclysm-DDA/pull/9725#discussion_r19511997"},"pull_request":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/9725"}}},"pull_request":{"url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/9725","id":23496383,"html_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/9725","diff_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/9725.diff","patch_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/9725.patch","issue_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/9725","number":9725,"state":"open","locked":false,"title":"Fix to unarmed melee weapon bash","user":{"login":"jokermatt999","id":273833,"avatar_url":"https://avatars.githubusercontent.com/u/273833?v=2","gravatar_id":"","url":"https://api.github.com/users/jokermatt999","html_url":"https://github.com/jokermatt999","followers_url":"https://api.github.com/users/jokermatt999/followers","following_url":"https://api.github.com/users/jokermatt999/following{/other_user}","gists_url":"https://api.github.com/users/jokermatt999/gists{/gist_id}","starred_url":"https://api.github.com/users/jokermatt999/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jokermatt999/subscriptions","organizations_url":"https://api.github.com/users/jokermatt999/orgs","repos_url":"https://api.github.com/users/jokermatt999/repos","events_url":"https://api.github.com/users/jokermatt999/events{/privacy}","received_events_url":"https://api.github.com/users/jokermatt999/received_events","type":"User","site_admin":false},"body":"I'd seen it mentioned on the forums a few times that unarmed weapons bash damage was disregarded. I checked, and sure enough the calculation for unarmed damage didn't take it into account. Does this look better?","created_at":"2014-10-28T22:40:18Z","updated_at":"2014-10-28T23:36:46Z","closed_at":null,"merged_at":null,"merge_commit_sha":"97741581bfbe9ece6f3fe64470864524a521b364","assignee":{"login":"KA101","id":4195632,"avatar_url":"https://avatars.githubusercontent.com/u/4195632?v=2","gravatar_id":"","url":"https://api.github.com/users/KA101","html_url":"https://github.com/KA101","followers_url":"https://api.github.com/users/KA101/followers","following_url":"https://api.github.com/users/KA101/following{/other_user}","gists_url":"https://api.github.com/users/KA101/gists{/gist_id}","starred_url":"https://api.github.com/users/KA101/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/KA101/subscriptions","organizations_url":"https://api.github.com/users/KA101/orgs","repos_url":"https://api.github.com/users/KA101/repos","events_url":"https://api.github.com/users/KA101/events{/privacy}","received_events_url":"https://api.github.com/users/KA101/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/9725/commits","review_comments_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/9725/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/9725/comments","statuses_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/statuses/c617664b30023c55eb7a3a30cb4c352a5667d55b","head":{"label":"jokermatt999:unarmed_bash","ref":"unarmed_bash","sha":"c617664b30023c55eb7a3a30cb4c352a5667d55b","user":{"login":"jokermatt999","id":273833,"avatar_url":"https://avatars.githubusercontent.com/u/273833?v=2","gravatar_id":"","url":"https://api.github.com/users/jokermatt999","html_url":"https://github.com/jokermatt999","followers_url":"https://api.github.com/users/jokermatt999/followers","following_url":"https://api.github.com/users/jokermatt999/following{/other_user}","gists_url":"https://api.github.com/users/jokermatt999/gists{/gist_id}","starred_url":"https://api.github.com/users/jokermatt999/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jokermatt999/subscriptions","organizations_url":"https://api.github.com/users/jokermatt999/orgs","repos_url":"https://api.github.com/users/jokermatt999/repos","events_url":"https://api.github.com/users/jokermatt999/events{/privacy}","received_events_url":"https://api.github.com/users/jokermatt999/received_events","type":"User","site_admin":false},"repo":{"id":25792812,"name":"Cataclysm-DDA","full_name":"jokermatt999/Cataclysm-DDA","owner":{"login":"jokermatt999","id":273833,"avatar_url":"https://avatars.githubusercontent.com/u/273833?v=2","gravatar_id":"","url":"https://api.github.com/users/jokermatt999","html_url":"https://github.com/jokermatt999","followers_url":"https://api.github.com/users/jokermatt999/followers","following_url":"https://api.github.com/users/jokermatt999/following{/other_user}","gists_url":"https://api.github.com/users/jokermatt999/gists{/gist_id}","starred_url":"https://api.github.com/users/jokermatt999/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jokermatt999/subscriptions","organizations_url":"https://api.github.com/users/jokermatt999/orgs","repos_url":"https://api.github.com/users/jokermatt999/repos","events_url":"https://api.github.com/users/jokermatt999/events{/privacy}","received_events_url":"https://api.github.com/users/jokermatt999/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jokermatt999/Cataclysm-DDA","description":"Cataclysm - Dark Days Ahead. A fork/variant of Cataclysm Roguelike by Whales.","fork":true,"url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA","forks_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/forks","keys_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/teams","hooks_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/hooks","issue_events_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/issues/events{/number}","events_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/events","assignees_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/assignees{/user}","branches_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/branches{/branch}","tags_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/tags","blobs_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/git/refs{/sha}","trees_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/statuses/{sha}","languages_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/languages","stargazers_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/stargazers","contributors_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/contributors","subscribers_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/subscribers","subscription_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/subscription","commits_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/commits{/sha}","git_commits_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/git/commits{/sha}","comments_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/comments{/number}","issue_comment_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/issues/comments/{number}","contents_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/contents/{+path}","compare_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/merges","archive_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/downloads","issues_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/issues{/number}","pulls_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/pulls{/number}","milestones_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/milestones{/number}","notifications_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/labels{/name}","releases_url":"https://api.github.com/repos/jokermatt999/Cataclysm-DDA/releases{/id}","created_at":"2014-10-26T21:59:45Z","updated_at":"2014-10-27T21:59:40Z","pushed_at":"2014-10-28T22:32:55Z","git_url":"git://github.com/jokermatt999/Cataclysm-DDA.git","ssh_url":"git@github.com:jokermatt999/Cataclysm-DDA.git","clone_url":"https://github.com/jokermatt999/Cataclysm-DDA.git","svn_url":"https://github.com/jokermatt999/Cataclysm-DDA","homepage":"http://en.cataclysmdda.com/","size":280819,"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":"b62985214a6e65ef64649e2e05ad51670a5edd34","user":{"login":"CleverRaven","id":4367009,"avatar_url":"https://avatars.githubusercontent.com/u/4367009?v=2","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=2","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":"2014-10-26T13:01:50Z","pushed_at":"2014-10-28T05:10:09Z","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":379572,"stargazers_count":503,"watchers_count":503,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":576,"mirror_url":null,"open_issues_count":691,"forks":576,"open_issues":691,"watchers":503,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/9725"},"html":{"href":"https://github.com/CleverRaven/Cataclysm-DDA/pull/9725"},"issue":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/9725"},"comments":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/9725/comments"},"review_comments":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/9725/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/9725/commits"},"statuses":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/statuses/c617664b30023c55eb7a3a30cb4c352a5667d55b"}}}}