GitHub PullRequestEvent at 2014-10-03 20:44:52
Repository: oolite
Actor: cim--
Payload: {"action":"closed","number":112,"pull_request":{"url":"https://api.github.com/repos/OoliteProject/oolite/pulls/112","id":21905949,"html_url":"https://github.com/OoliteProject/oolite/pull/112","diff_url":"https://github.com/OoliteProject/oolite/pull/112.diff","patch_url":"https://github.com/OoliteProject/oolite/pull/112.patch","issue_url":"https://api.github.com/repos/OoliteProject/oolite/issues/112","number":112,"state":"closed","locked":false,"title":"Customisable laser properties","user":{"login":"cim--","id":4066616,"avatar_url":"https://avatars.githubusercontent.com/u/4066616?v=2","gravatar_id":"","url":"https://api.github.com/users/cim--","html_url":"https://github.com/cim--","followers_url":"https://api.github.com/users/cim--/followers","following_url":"https://api.github.com/users/cim--/following{/other_user}","gists_url":"https://api.github.com/users/cim--/gists{/gist_id}","starred_url":"https://api.github.com/users/cim--/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cim--/subscriptions","organizations_url":"https://api.github.com/users/cim--/orgs","repos_url":"https://api.github.com/users/cim--/repos","events_url":"https://api.github.com/users/cim--/events{/privacy}","received_events_url":"https://api.github.com/users/cim--/received_events","type":"User","site_admin":false},"body":"This allows laser properties to be customised by OXP, and new laser weapons to be defined. Should work with any equipment starting \"EQ_WEAPON_\", and the weapon_info dictionary sets its properties (all values have defaults to pulse laser)\r\n\r\nIt also includes some modifications I've been playing with to the beam/military laser spec which I think give much more interesting fights and sort out some of the balance issues.\r\n\r\nAlso included: weapons can have default colours set, which are overridden by the ship laser colour. At the moment I've spread the weapon colours out a bit to demonstrate+test this, but we could put the defaults back to red easily enough.\r\n\r\nCurrent incompatibilities:\r\n - weapon_energy doesn't work for setting NPC forward laser damage any more (the moment we made lasers writable by script that property became somewhat silly, and the obvious new method is to define a suitable laser weapon for the ship). Still works for turret damage and for missile damage (though the missile damage use is obsolete)\r\n - the old \"twin plasma cannon\" isn't there any more. I doubt anyone is going to miss it. At some future point extending the weapon customisation code to allow projectile and plasma weapons should be possible, but that would require teaching the NPCs how to lead their shots - the code is already in the plasma turret methods, of course - and perhaps about ammunition counts, which is well outside the scope of this code.\r\n\r\nCloses #21","created_at":"2014-09-28T20:17:00Z","updated_at":"2014-10-03T20:44:51Z","closed_at":"2014-10-03T20:44:51Z","merged_at":"2014-10-03T20:44:51Z","merge_commit_sha":"d03c2c8293d18f760bb1d9a8183df62eed62caf4","assignee":null,"milestone":{"url":"https://api.github.com/repos/OoliteProject/oolite/milestones/3","labels_url":"https://api.github.com/repos/OoliteProject/oolite/milestones/3/labels","id":697980,"number":3,"title":"Version 1.82","description":"","creator":{"login":"cim--","id":4066616,"avatar_url":"https://avatars.githubusercontent.com/u/4066616?v=2","gravatar_id":"","url":"https://api.github.com/users/cim--","html_url":"https://github.com/cim--","followers_url":"https://api.github.com/users/cim--/followers","following_url":"https://api.github.com/users/cim--/following{/other_user}","gists_url":"https://api.github.com/users/cim--/gists{/gist_id}","starred_url":"https://api.github.com/users/cim--/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cim--/subscriptions","organizations_url":"https://api.github.com/users/cim--/orgs","repos_url":"https://api.github.com/users/cim--/repos","events_url":"https://api.github.com/users/cim--/events{/privacy}","received_events_url":"https://api.github.com/users/cim--/received_events","type":"User","site_admin":false},"open_issues":1,"closed_issues":7,"state":"open","created_at":"2014-06-22T18:14:41Z","updated_at":"2014-10-03T20:44:51Z","due_on":null},"commits_url":"https://api.github.com/repos/OoliteProject/oolite/pulls/112/commits","review_comments_url":"https://api.github.com/repos/OoliteProject/oolite/pulls/112/comments","review_comment_url":"https://api.github.com/repos/OoliteProject/oolite/pulls/comments/{number}","comments_url":"https://api.github.com/repos/OoliteProject/oolite/issues/112/comments","statuses_url":"https://api.github.com/repos/OoliteProject/oolite/statuses/6bf2bb00a129c805ed758b521dfb8363aa8a065b","head":{"label":"OoliteProject:customisable-laser-properties","ref":"customisable-laser-properties","sha":"6bf2bb00a129c805ed758b521dfb8363aa8a065b","user":{"login":"OoliteProject","id":4068060,"avatar_url":"https://avatars.githubusercontent.com/u/4068060?v=2","gravatar_id":"","url":"https://api.github.com/users/OoliteProject","html_url":"https://github.com/OoliteProject","followers_url":"https://api.github.com/users/OoliteProject/followers","following_url":"https://api.github.com/users/OoliteProject/following{/other_user}","gists_url":"https://api.github.com/users/OoliteProject/gists{/gist_id}","starred_url":"https://api.github.com/users/OoliteProject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OoliteProject/subscriptions","organizations_url":"https://api.github.com/users/OoliteProject/orgs","repos_url":"https://api.github.com/users/OoliteProject/repos","events_url":"https://api.github.com/users/OoliteProject/events{/privacy}","received_events_url":"https://api.github.com/users/OoliteProject/received_events","type":"Organization","site_admin":false},"repo":{"id":10004412,"name":"oolite","full_name":"OoliteProject/oolite","owner":{"login":"OoliteProject","id":4068060,"avatar_url":"https://avatars.githubusercontent.com/u/4068060?v=2","gravatar_id":"","url":"https://api.github.com/users/OoliteProject","html_url":"https://github.com/OoliteProject","followers_url":"https://api.github.com/users/OoliteProject/followers","following_url":"https://api.github.com/users/OoliteProject/following{/other_user}","gists_url":"https://api.github.com/users/OoliteProject/gists{/gist_id}","starred_url":"https://api.github.com/users/OoliteProject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OoliteProject/subscriptions","organizations_url":"https://api.github.com/users/OoliteProject/orgs","repos_url":"https://api.github.com/users/OoliteProject/repos","events_url":"https://api.github.com/users/OoliteProject/events{/privacy}","received_events_url":"https://api.github.com/users/OoliteProject/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/OoliteProject/oolite","description":"The main Oolite repository.","fork":false,"url":"https://api.github.com/repos/OoliteProject/oolite","forks_url":"https://api.github.com/repos/OoliteProject/oolite/forks","keys_url":"https://api.github.com/repos/OoliteProject/oolite/keys{/key_id}","collaborators_url":"https://api.github.com/repos/OoliteProject/oolite/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/OoliteProject/oolite/teams","hooks_url":"https://api.github.com/repos/OoliteProject/oolite/hooks","issue_events_url":"https://api.github.com/repos/OoliteProject/oolite/issues/events{/number}","events_url":"https://api.github.com/repos/OoliteProject/oolite/events","assignees_url":"https://api.github.com/repos/OoliteProject/oolite/assignees{/user}","branches_url":"https://api.github.com/repos/OoliteProject/oolite/branches{/branch}","tags_url":"https://api.github.com/repos/OoliteProject/oolite/tags","blobs_url":"https://api.github.com/repos/OoliteProject/oolite/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/OoliteProject/oolite/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/OoliteProject/oolite/git/refs{/sha}","trees_url":"https://api.github.com/repos/OoliteProject/oolite/git/trees{/sha}","statuses_url":"https://api.github.com/repos/OoliteProject/oolite/statuses/{sha}","languages_url":"https://api.github.com/repos/OoliteProject/oolite/languages","stargazers_url":"https://api.github.com/repos/OoliteProject/oolite/stargazers","contributors_url":"https://api.github.com/repos/OoliteProject/oolite/contributors","subscribers_url":"https://api.github.com/repos/OoliteProject/oolite/subscribers","subscription_url":"https://api.github.com/repos/OoliteProject/oolite/subscription","commits_url":"https://api.github.com/repos/OoliteProject/oolite/commits{/sha}","git_commits_url":"https://api.github.com/repos/OoliteProject/oolite/git/commits{/sha}","comments_url":"https://api.github.com/repos/OoliteProject/oolite/comments{/number}","issue_comment_url":"https://api.github.com/repos/OoliteProject/oolite/issues/comments/{number}","contents_url":"https://api.github.com/repos/OoliteProject/oolite/contents/{+path}","compare_url":"https://api.github.com/repos/OoliteProject/oolite/compare/{base}...{head}","merges_url":"https://api.github.com/repos/OoliteProject/oolite/merges","archive_url":"https://api.github.com/repos/OoliteProject/oolite/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/OoliteProject/oolite/downloads","issues_url":"https://api.github.com/repos/OoliteProject/oolite/issues{/number}","pulls_url":"https://api.github.com/repos/OoliteProject/oolite/pulls{/number}","milestones_url":"https://api.github.com/repos/OoliteProject/oolite/milestones{/number}","notifications_url":"https://api.github.com/repos/OoliteProject/oolite/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/OoliteProject/oolite/labels{/name}","releases_url":"https://api.github.com/repos/OoliteProject/oolite/releases{/id}","created_at":"2013-05-11T19:50:30Z","updated_at":"2014-09-29T19:33:29Z","pushed_at":"2014-10-03T20:44:51Z","git_url":"git://github.com/OoliteProject/oolite.git","ssh_url":"git@github.com:OoliteProject/oolite.git","clone_url":"https://github.com/OoliteProject/oolite.git","svn_url":"https://github.com/OoliteProject/oolite","homepage":"http://www.oolite.org","size":46655,"stargazers_count":36,"watchers_count":36,"language":"Objective-C","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":15,"mirror_url":null,"open_issues_count":19,"forks":15,"open_issues":19,"watchers":36,"default_branch":"master"}},"base":{"label":"OoliteProject:master","ref":"master","sha":"483070ece289d9ce7b1bab5dc7ab4991201581f3","user":{"login":"OoliteProject","id":4068060,"avatar_url":"https://avatars.githubusercontent.com/u/4068060?v=2","gravatar_id":"","url":"https://api.github.com/users/OoliteProject","html_url":"https://github.com/OoliteProject","followers_url":"https://api.github.com/users/OoliteProject/followers","following_url":"https://api.github.com/users/OoliteProject/following{/other_user}","gists_url":"https://api.github.com/users/OoliteProject/gists{/gist_id}","starred_url":"https://api.github.com/users/OoliteProject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OoliteProject/subscriptions","organizations_url":"https://api.github.com/users/OoliteProject/orgs","repos_url":"https://api.github.com/users/OoliteProject/repos","events_url":"https://api.github.com/users/OoliteProject/events{/privacy}","received_events_url":"https://api.github.com/users/OoliteProject/received_events","type":"Organization","site_admin":false},"repo":{"id":10004412,"name":"oolite","full_name":"OoliteProject/oolite","owner":{"login":"OoliteProject","id":4068060,"avatar_url":"https://avatars.githubusercontent.com/u/4068060?v=2","gravatar_id":"","url":"https://api.github.com/users/OoliteProject","html_url":"https://github.com/OoliteProject","followers_url":"https://api.github.com/users/OoliteProject/followers","following_url":"https://api.github.com/users/OoliteProject/following{/other_user}","gists_url":"https://api.github.com/users/OoliteProject/gists{/gist_id}","starred_url":"https://api.github.com/users/OoliteProject/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/OoliteProject/subscriptions","organizations_url":"https://api.github.com/users/OoliteProject/orgs","repos_url":"https://api.github.com/users/OoliteProject/repos","events_url":"https://api.github.com/users/OoliteProject/events{/privacy}","received_events_url":"https://api.github.com/users/OoliteProject/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/OoliteProject/oolite","description":"The main Oolite repository.","fork":false,"url":"https://api.github.com/repos/OoliteProject/oolite","forks_url":"https://api.github.com/repos/OoliteProject/oolite/forks","keys_url":"https://api.github.com/repos/OoliteProject/oolite/keys{/key_id}","collaborators_url":"https://api.github.com/repos/OoliteProject/oolite/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/OoliteProject/oolite/teams","hooks_url":"https://api.github.com/repos/OoliteProject/oolite/hooks","issue_events_url":"https://api.github.com/repos/OoliteProject/oolite/issues/events{/number}","events_url":"https://api.github.com/repos/OoliteProject/oolite/events","assignees_url":"https://api.github.com/repos/OoliteProject/oolite/assignees{/user}","branches_url":"https://api.github.com/repos/OoliteProject/oolite/branches{/branch}","tags_url":"https://api.github.com/repos/OoliteProject/oolite/tags","blobs_url":"https://api.github.com/repos/OoliteProject/oolite/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/OoliteProject/oolite/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/OoliteProject/oolite/git/refs{/sha}","trees_url":"https://api.github.com/repos/OoliteProject/oolite/git/trees{/sha}","statuses_url":"https://api.github.com/repos/OoliteProject/oolite/statuses/{sha}","languages_url":"https://api.github.com/repos/OoliteProject/oolite/languages","stargazers_url":"https://api.github.com/repos/OoliteProject/oolite/stargazers","contributors_url":"https://api.github.com/repos/OoliteProject/oolite/contributors","subscribers_url":"https://api.github.com/repos/OoliteProject/oolite/subscribers","subscription_url":"https://api.github.com/repos/OoliteProject/oolite/subscription","commits_url":"https://api.github.com/repos/OoliteProject/oolite/commits{/sha}","git_commits_url":"https://api.github.com/repos/OoliteProject/oolite/git/commits{/sha}","comments_url":"https://api.github.com/repos/OoliteProject/oolite/comments{/number}","issue_comment_url":"https://api.github.com/repos/OoliteProject/oolite/issues/comments/{number}","contents_url":"https://api.github.com/repos/OoliteProject/oolite/contents/{+path}","compare_url":"https://api.github.com/repos/OoliteProject/oolite/compare/{base}...{head}","merges_url":"https://api.github.com/repos/OoliteProject/oolite/merges","archive_url":"https://api.github.com/repos/OoliteProject/oolite/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/OoliteProject/oolite/downloads","issues_url":"https://api.github.com/repos/OoliteProject/oolite/issues{/number}","pulls_url":"https://api.github.com/repos/OoliteProject/oolite/pulls{/number}","milestones_url":"https://api.github.com/repos/OoliteProject/oolite/milestones{/number}","notifications_url":"https://api.github.com/repos/OoliteProject/oolite/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/OoliteProject/oolite/labels{/name}","releases_url":"https://api.github.com/repos/OoliteProject/oolite/releases{/id}","created_at":"2013-05-11T19:50:30Z","updated_at":"2014-09-29T19:33:29Z","pushed_at":"2014-10-03T20:44:51Z","git_url":"git://github.com/OoliteProject/oolite.git","ssh_url":"git@github.com:OoliteProject/oolite.git","clone_url":"https://github.com/OoliteProject/oolite.git","svn_url":"https://github.com/OoliteProject/oolite","homepage":"http://www.oolite.org","size":46655,"stargazers_count":36,"watchers_count":36,"language":"Objective-C","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":15,"mirror_url":null,"open_issues_count":19,"forks":15,"open_issues":19,"watchers":36,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/OoliteProject/oolite/pulls/112"},"html":{"href":"https://github.com/OoliteProject/oolite/pull/112"},"issue":{"href":"https://api.github.com/repos/OoliteProject/oolite/issues/112"},"comments":{"href":"https://api.github.com/repos/OoliteProject/oolite/issues/112/comments"},"review_comments":{"href":"https://api.github.com/repos/OoliteProject/oolite/pulls/112/comments"},"review_comment":{"href":"https://api.github.com/repos/OoliteProject/oolite/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/OoliteProject/oolite/pulls/112/commits"},"statuses":{"href":"https://api.github.com/repos/OoliteProject/oolite/statuses/6bf2bb00a129c805ed758b521dfb8363aa8a065b"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"cim--","id":4066616,"avatar_url":"https://avatars.githubusercontent.com/u/4066616?v=2","gravatar_id":"","url":"https://api.github.com/users/cim--","html_url":"https://github.com/cim--","followers_url":"https://api.github.com/users/cim--/followers","following_url":"https://api.github.com/users/cim--/following{/other_user}","gists_url":"https://api.github.com/users/cim--/gists{/gist_id}","starred_url":"https://api.github.com/users/cim--/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cim--/subscriptions","organizations_url":"https://api.github.com/users/cim--/orgs","repos_url":"https://api.github.com/users/cim--/repos","events_url":"https://api.github.com/users/cim--/events{/privacy}","received_events_url":"https://api.github.com/users/cim--/received_events","type":"User","site_admin":false},"comments":0,"review_comments":0,"commits":12,"additions":415,"deletions":379,"changed_files":13}}