GitHub PullRequestEvent at 2014-09-07 17:38:34
Repository: Cataclysm-DDA
Actor: Rivet-the-Zombie
Payload: {"action":"closed","number":8876,"pull_request":{"url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/8876","id":20860111,"html_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/8876","diff_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/8876.diff","patch_url":"https://github.com/CleverRaven/Cataclysm-DDA/pull/8876.patch","issue_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/8876","number":8876,"state":"closed","locked":false,"title":"Load scenarios from JSON after professions.","user":{"login":"narc0tiq","id":591573,"avatar_url":"https://avatars.githubusercontent.com/u/591573?v=2","gravatar_id":"4d76fe5051d57648f9c3abbb75f4fcbf","url":"https://api.github.com/users/narc0tiq","html_url":"https://github.com/narc0tiq","followers_url":"https://api.github.com/users/narc0tiq/followers","following_url":"https://api.github.com/users/narc0tiq/following{/other_user}","gists_url":"https://api.github.com/users/narc0tiq/gists{/gist_id}","starred_url":"https://api.github.com/users/narc0tiq/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/narc0tiq/subscriptions","organizations_url":"https://api.github.com/users/narc0tiq/orgs","repos_url":"https://api.github.com/users/narc0tiq/repos","events_url":"https://api.github.com/users/narc0tiq/events{/privacy}","received_events_url":"https://api.github.com/users/narc0tiq/received_events","type":"User","site_admin":false},"body":"Reading JSON files is a breadth-first-search, so moving the scenarios.json file deeper into the data/json/ directory tree, we ensure it loads *after* data/json/professions.json.\r\n\r\nFixes #8871 and also *correctly* fixes #8837.\r\n\r\nNote: I've also added a change to make the JSON search order a breadth-first search instead of a pre-order depth-first search. This should be somewhat more manageable, though of course feel free to cherry-pick only the bugfix if you disagree.","created_at":"2014-09-07T13:32:52Z","updated_at":"2014-09-07T17:38:33Z","closed_at":"2014-09-07T17:38:33Z","merged_at":"2014-09-07T17:38:33Z","merge_commit_sha":"3ef85590bf95afdcbc80d9f04d2cfd13130a3264","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/8876/commits","review_comments_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/8876/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/8876/comments","statuses_url":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/statuses/55af2d9323d31ba57586a0cf26229136fcd69a52","head":{"label":"narc0tiq:scenarios-after-professions","ref":"scenarios-after-professions","sha":"55af2d9323d31ba57586a0cf26229136fcd69a52","user":{"login":"narc0tiq","id":591573,"avatar_url":"https://avatars.githubusercontent.com/u/591573?v=2","gravatar_id":"4d76fe5051d57648f9c3abbb75f4fcbf","url":"https://api.github.com/users/narc0tiq","html_url":"https://github.com/narc0tiq","followers_url":"https://api.github.com/users/narc0tiq/followers","following_url":"https://api.github.com/users/narc0tiq/following{/other_user}","gists_url":"https://api.github.com/users/narc0tiq/gists{/gist_id}","starred_url":"https://api.github.com/users/narc0tiq/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/narc0tiq/subscriptions","organizations_url":"https://api.github.com/users/narc0tiq/orgs","repos_url":"https://api.github.com/users/narc0tiq/repos","events_url":"https://api.github.com/users/narc0tiq/events{/privacy}","received_events_url":"https://api.github.com/users/narc0tiq/received_events","type":"User","site_admin":false},"repo":{"id":10282072,"name":"Cataclysm-DDA","full_name":"narc0tiq/Cataclysm-DDA","owner":{"login":"narc0tiq","id":591573,"avatar_url":"https://avatars.githubusercontent.com/u/591573?v=2","gravatar_id":"4d76fe5051d57648f9c3abbb75f4fcbf","url":"https://api.github.com/users/narc0tiq","html_url":"https://github.com/narc0tiq","followers_url":"https://api.github.com/users/narc0tiq/followers","following_url":"https://api.github.com/users/narc0tiq/following{/other_user}","gists_url":"https://api.github.com/users/narc0tiq/gists{/gist_id}","starred_url":"https://api.github.com/users/narc0tiq/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/narc0tiq/subscriptions","organizations_url":"https://api.github.com/users/narc0tiq/orgs","repos_url":"https://api.github.com/users/narc0tiq/repos","events_url":"https://api.github.com/users/narc0tiq/events{/privacy}","received_events_url":"https://api.github.com/users/narc0tiq/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/narc0tiq/Cataclysm-DDA","description":"Cataclysm - Dark Days Ahead. A fork/variant of Cataclysm Roguelike by Whales.","fork":true,"url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA","forks_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/forks","keys_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/keys{/key_id}","collaborators_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/teams","hooks_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/hooks","issue_events_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/issues/events{/number}","events_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/events","assignees_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/assignees{/user}","branches_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/branches{/branch}","tags_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/tags","blobs_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/git/refs{/sha}","trees_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/git/trees{/sha}","statuses_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/statuses/{sha}","languages_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/languages","stargazers_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/stargazers","contributors_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/contributors","subscribers_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/subscribers","subscription_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/subscription","commits_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/commits{/sha}","git_commits_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/git/commits{/sha}","comments_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/comments{/number}","issue_comment_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/issues/comments/{number}","contents_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/contents/{+path}","compare_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/compare/{base}...{head}","merges_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/merges","archive_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/downloads","issues_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/issues{/number}","pulls_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/pulls{/number}","milestones_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/milestones{/number}","notifications_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/labels{/name}","releases_url":"https://api.github.com/repos/narc0tiq/Cataclysm-DDA/releases{/id}","created_at":"2013-05-25T09:23:22Z","updated_at":"2014-05-20T03:56:35Z","pushed_at":"2014-09-07T14:22:27Z","git_url":"git://github.com/narc0tiq/Cataclysm-DDA.git","ssh_url":"git@github.com:narc0tiq/Cataclysm-DDA.git","clone_url":"https://github.com/narc0tiq/Cataclysm-DDA.git","svn_url":"https://github.com/narc0tiq/Cataclysm-DDA","homepage":"http://www.cataclysm.glyphgryph.com/","size":86001,"stargazers_count":0,"watchers_count":0,"language":"C++","has_issues":false,"has_downloads":true,"has_wiki":true,"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":"3f7a6877d74a76b56253330c4412cf32705bddc1","user":{"login":"CleverRaven","id":4367009,"avatar_url":"https://avatars.githubusercontent.com/u/4367009?v=2","gravatar_id":null,"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":null,"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-09-07T02:45:49Z","pushed_at":"2014-09-07T17: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://en.cataclysmdda.com/","size":289981,"stargazers_count":466,"watchers_count":466,"language":"C++","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":537,"mirror_url":null,"open_issues_count":632,"forks":537,"open_issues":632,"watchers":466,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/8876"},"html":{"href":"https://github.com/CleverRaven/Cataclysm-DDA/pull/8876"},"issue":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/8876"},"comments":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/issues/8876/comments"},"review_comments":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/pulls/8876/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/8876/commits"},"statuses":{"href":"https://api.github.com/repos/CleverRaven/Cataclysm-DDA/statuses/55af2d9323d31ba57586a0cf26229136fcd69a52"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"Rivet-the-Zombie","id":5084581,"avatar_url":"https://avatars.githubusercontent.com/u/5084581?v=2","gravatar_id":"ecf5a0cae1bcc7689884b60dec4a658a","url":"https://api.github.com/users/Rivet-the-Zombie","html_url":"https://github.com/Rivet-the-Zombie","followers_url":"https://api.github.com/users/Rivet-the-Zombie/followers","following_url":"https://api.github.com/users/Rivet-the-Zombie/following{/other_user}","gists_url":"https://api.github.com/users/Rivet-the-Zombie/gists{/gist_id}","starred_url":"https://api.github.com/users/Rivet-the-Zombie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Rivet-the-Zombie/subscriptions","organizations_url":"https://api.github.com/users/Rivet-the-Zombie/orgs","repos_url":"https://api.github.com/users/Rivet-the-Zombie/repos","events_url":"https://api.github.com/users/Rivet-the-Zombie/events{/privacy}","received_events_url":"https://api.github.com/users/Rivet-the-Zombie/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":2,"additions":64,"deletions":19,"changed_files":4}}