{"action":"opened","number":946,"pull_request":{"url":"https://api.github.com/repos/Interkarma/daggerfall-unity/pulls/946","id":221798523,"node_id":"MDExOlB1bGxSZXF1ZXN0MjIxNzk4NTIz","html_url":"https://github.com/Interkarma/daggerfall-unity/pull/946","diff_url":"https://github.com/Interkarma/daggerfall-unity/pull/946.diff","patch_url":"https://github.com/Interkarma/daggerfall-unity/pull/946.patch","issue_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/issues/946","number":946,"state":"open","locked":false,"title":"Clean more files","user":{"login":"Allofich","id":19624336,"node_id":"MDQ6VXNlcjE5NjI0MzM2","avatar_url":"https://avatars2.githubusercontent.com/u/19624336?v=4","gravatar_id":"","url":"https://api.github.com/users/Allofich","html_url":"https://github.com/Allofich","followers_url":"https://api.github.com/users/Allofich/followers","following_url":"https://api.github.com/users/Allofich/following{/other_user}","gists_url":"https://api.github.com/users/Allofich/gists{/gist_id}","starred_url":"https://api.github.com/users/Allofich/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Allofich/subscriptions","organizations_url":"https://api.github.com/users/Allofich/orgs","repos_url":"https://api.github.com/users/Allofich/repos","events_url":"https://api.github.com/users/Allofich/events{/privacy}","received_events_url":"https://api.github.com/users/Allofich/received_events","type":"User","site_admin":false},"body":"More file cleanup, this time it's\r\n\r\nScripts/External\r\nScripts/Game/Entities\r\nScripts/Game/Formulas\r\n\r\nThis includes a minor functional fix. I noticed while cleaning up the condition code in `PlayerEntity.cs` that the  alliance and rivalry changes, and the new ruler changes to regions were not taking effect (I wasn't properly updating the faction data dictionary). Only changes to power were taking effect. Of course we still need the rumors so this stuff is actually visible to the player.\r\n\r\nAgain, will pause here until you're OK with it. These files are more volatile than the API ones but if any merge conflicts do come up they shouldn't be hard to fix, as these are all very simple changes.\r\n\r\nQuestion: I'm simplifying conditionals like\r\n\r\n```\r\nif (something == true)\r\n```\r\nand\r\n```\r\nreturn (something ? true : false)\r\n```\r\nto just be\r\n```\r\nif (something)\r\n````\r\nand\r\n```\r\nreturn (something)\r\n```\r\n\r\nand I think I prefer the shorter versions, but do you prefer having \"true\" and \"false\" written out?\r\n\r\nFixes:\r\nRemove unused using statements\r\nSpacing clean up and whitespace removal\r\nRemove deprecated DaggerfallDisease\r\nFix shadowed variables\r\nAdd newline at end of files\r\nSimplify conditional expressions\r\nAdd readonly keyword where appropriate\r\nRemove redundant return statement\r\nRevise TODO comment\r\nMerge nested if statements\r\nRemove redundant int to int casts\r\nMake values const where appropriate\r\nA little safer null checking in damage calculation\r\nRemove out-of-date comments and TODOs\r\nFix region alliances, rivalries, ruler data to actually update","created_at":"2018-10-10T13:53:16Z","updated_at":"2018-10-10T13:53:16Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/pulls/946/commits","review_comments_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/pulls/946/comments","review_comment_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/issues/946/comments","statuses_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/statuses/952a5810c1d60b5f0d9e2f31866e7fcc01456f70","head":{"label":"Allofich:cleanup","ref":"cleanup","sha":"952a5810c1d60b5f0d9e2f31866e7fcc01456f70","user":{"login":"Allofich","id":19624336,"node_id":"MDQ6VXNlcjE5NjI0MzM2","avatar_url":"https://avatars2.githubusercontent.com/u/19624336?v=4","gravatar_id":"","url":"https://api.github.com/users/Allofich","html_url":"https://github.com/Allofich","followers_url":"https://api.github.com/users/Allofich/followers","following_url":"https://api.github.com/users/Allofich/following{/other_user}","gists_url":"https://api.github.com/users/Allofich/gists{/gist_id}","starred_url":"https://api.github.com/users/Allofich/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Allofich/subscriptions","organizations_url":"https://api.github.com/users/Allofich/orgs","repos_url":"https://api.github.com/users/Allofich/repos","events_url":"https://api.github.com/users/Allofich/events{/privacy}","received_events_url":"https://api.github.com/users/Allofich/received_events","type":"User","site_admin":false},"repo":{"id":70586776,"node_id":"MDEwOlJlcG9zaXRvcnk3MDU4Njc3Ng==","name":"daggerfall-unity","full_name":"Allofich/daggerfall-unity","private":false,"owner":{"login":"Allofich","id":19624336,"node_id":"MDQ6VXNlcjE5NjI0MzM2","avatar_url":"https://avatars2.githubusercontent.com/u/19624336?v=4","gravatar_id":"","url":"https://api.github.com/users/Allofich","html_url":"https://github.com/Allofich","followers_url":"https://api.github.com/users/Allofich/followers","following_url":"https://api.github.com/users/Allofich/following{/other_user}","gists_url":"https://api.github.com/users/Allofich/gists{/gist_id}","starred_url":"https://api.github.com/users/Allofich/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Allofich/subscriptions","organizations_url":"https://api.github.com/users/Allofich/orgs","repos_url":"https://api.github.com/users/Allofich/repos","events_url":"https://api.github.com/users/Allofich/events{/privacy}","received_events_url":"https://api.github.com/users/Allofich/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Allofich/daggerfall-unity","description":"Open source recreation of Daggerfall in the Unity engine","fork":true,"url":"https://api.github.com/repos/Allofich/daggerfall-unity","forks_url":"https://api.github.com/repos/Allofich/daggerfall-unity/forks","keys_url":"https://api.github.com/repos/Allofich/daggerfall-unity/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Allofich/daggerfall-unity/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Allofich/daggerfall-unity/teams","hooks_url":"https://api.github.com/repos/Allofich/daggerfall-unity/hooks","issue_events_url":"https://api.github.com/repos/Allofich/daggerfall-unity/issues/events{/number}","events_url":"https://api.github.com/repos/Allofich/daggerfall-unity/events","assignees_url":"https://api.github.com/repos/Allofich/daggerfall-unity/assignees{/user}","branches_url":"https://api.github.com/repos/Allofich/daggerfall-unity/branches{/branch}","tags_url":"https://api.github.com/repos/Allofich/daggerfall-unity/tags","blobs_url":"https://api.github.com/repos/Allofich/daggerfall-unity/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Allofich/daggerfall-unity/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Allofich/daggerfall-unity/git/refs{/sha}","trees_url":"https://api.github.com/repos/Allofich/daggerfall-unity/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Allofich/daggerfall-unity/statuses/{sha}","languages_url":"https://api.github.com/repos/Allofich/daggerfall-unity/languages","stargazers_url":"https://api.github.com/repos/Allofich/daggerfall-unity/stargazers","contributors_url":"https://api.github.com/repos/Allofich/daggerfall-unity/contributors","subscribers_url":"https://api.github.com/repos/Allofich/daggerfall-unity/subscribers","subscription_url":"https://api.github.com/repos/Allofich/daggerfall-unity/subscription","commits_url":"https://api.github.com/repos/Allofich/daggerfall-unity/commits{/sha}","git_commits_url":"https://api.github.com/repos/Allofich/daggerfall-unity/git/commits{/sha}","comments_url":"https://api.github.com/repos/Allofich/daggerfall-unity/comments{/number}","issue_comment_url":"https://api.github.com/repos/Allofich/daggerfall-unity/issues/comments{/number}","contents_url":"https://api.github.com/repos/Allofich/daggerfall-unity/contents/{+path}","compare_url":"https://api.github.com/repos/Allofich/daggerfall-unity/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Allofich/daggerfall-unity/merges","archive_url":"https://api.github.com/repos/Allofich/daggerfall-unity/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Allofich/daggerfall-unity/downloads","issues_url":"https://api.github.com/repos/Allofich/daggerfall-unity/issues{/number}","pulls_url":"https://api.github.com/repos/Allofich/daggerfall-unity/pulls{/number}","milestones_url":"https://api.github.com/repos/Allofich/daggerfall-unity/milestones{/number}","notifications_url":"https://api.github.com/repos/Allofich/daggerfall-unity/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Allofich/daggerfall-unity/labels{/name}","releases_url":"https://api.github.com/repos/Allofich/daggerfall-unity/releases{/id}","deployments_url":"https://api.github.com/repos/Allofich/daggerfall-unity/deployments","created_at":"2016-10-11T11:32:03Z","updated_at":"2018-10-10T11:15:27Z","pushed_at":"2018-10-10T13:40:06Z","git_url":"git://github.com/Allofich/daggerfall-unity.git","ssh_url":"git@github.com:Allofich/daggerfall-unity.git","clone_url":"https://github.com/Allofich/daggerfall-unity.git","svn_url":"https://github.com/Allofich/daggerfall-unity","homepage":"http://www.dfworkshop.net","size":95811,"stargazers_count":0,"watchers_count":0,"language":"C#","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"Interkarma:0.6","ref":"0.6","sha":"ecffb3c3d0e60616a0a4029bb2b23501eb44803e","user":{"login":"Interkarma","id":10426244,"node_id":"MDQ6VXNlcjEwNDI2MjQ0","avatar_url":"https://avatars3.githubusercontent.com/u/10426244?v=4","gravatar_id":"","url":"https://api.github.com/users/Interkarma","html_url":"https://github.com/Interkarma","followers_url":"https://api.github.com/users/Interkarma/followers","following_url":"https://api.github.com/users/Interkarma/following{/other_user}","gists_url":"https://api.github.com/users/Interkarma/gists{/gist_id}","starred_url":"https://api.github.com/users/Interkarma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Interkarma/subscriptions","organizations_url":"https://api.github.com/users/Interkarma/orgs","repos_url":"https://api.github.com/users/Interkarma/repos","events_url":"https://api.github.com/users/Interkarma/events{/privacy}","received_events_url":"https://api.github.com/users/Interkarma/received_events","type":"User","site_admin":false},"repo":{"id":28884050,"node_id":"MDEwOlJlcG9zaXRvcnkyODg4NDA1MA==","name":"daggerfall-unity","full_name":"Interkarma/daggerfall-unity","private":false,"owner":{"login":"Interkarma","id":10426244,"node_id":"MDQ6VXNlcjEwNDI2MjQ0","avatar_url":"https://avatars3.githubusercontent.com/u/10426244?v=4","gravatar_id":"","url":"https://api.github.com/users/Interkarma","html_url":"https://github.com/Interkarma","followers_url":"https://api.github.com/users/Interkarma/followers","following_url":"https://api.github.com/users/Interkarma/following{/other_user}","gists_url":"https://api.github.com/users/Interkarma/gists{/gist_id}","starred_url":"https://api.github.com/users/Interkarma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Interkarma/subscriptions","organizations_url":"https://api.github.com/users/Interkarma/orgs","repos_url":"https://api.github.com/users/Interkarma/repos","events_url":"https://api.github.com/users/Interkarma/events{/privacy}","received_events_url":"https://api.github.com/users/Interkarma/received_events","type":"User","site_admin":false},"html_url":"https://github.com/Interkarma/daggerfall-unity","description":"Open source recreation of Daggerfall in the Unity engine","fork":false,"url":"https://api.github.com/repos/Interkarma/daggerfall-unity","forks_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/forks","keys_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/teams","hooks_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/hooks","issue_events_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/issues/events{/number}","events_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/events","assignees_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/assignees{/user}","branches_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/branches{/branch}","tags_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/tags","blobs_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/git/refs{/sha}","trees_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/statuses/{sha}","languages_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/languages","stargazers_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/stargazers","contributors_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/contributors","subscribers_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/subscribers","subscription_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/subscription","commits_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/commits{/sha}","git_commits_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/git/commits{/sha}","comments_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/comments{/number}","issue_comment_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/issues/comments{/number}","contents_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/contents/{+path}","compare_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/merges","archive_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/downloads","issues_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/issues{/number}","pulls_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/pulls{/number}","milestones_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/milestones{/number}","notifications_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/labels{/name}","releases_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/releases{/id}","deployments_url":"https://api.github.com/repos/Interkarma/daggerfall-unity/deployments","created_at":"2015-01-06T21:18:36Z","updated_at":"2018-10-10T11:53:03Z","pushed_at":"2018-10-10T11:53:02Z","git_url":"git://github.com/Interkarma/daggerfall-unity.git","ssh_url":"git@github.com:Interkarma/daggerfall-unity.git","clone_url":"https://github.com/Interkarma/daggerfall-unity.git","svn_url":"https://github.com/Interkarma/daggerfall-unity","homepage":"http://www.dfworkshop.net","size":95804,"stargazers_count":417,"watchers_count":417,"language":"C#","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":76,"mirror_url":null,"archived":false,"open_issues_count":6,"license":{"key":"mit","name":"MIT License","spdx_id":"MIT","url":"https://api.github.com/licenses/mit","node_id":"MDc6TGljZW5zZTEz"},"forks":76,"open_issues":6,"watchers":417,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Interkarma/daggerfall-unity/pulls/946"},"html":{"href":"https://github.com/Interkarma/daggerfall-unity/pull/946"},"issue":{"href":"https://api.github.com/repos/Interkarma/daggerfall-unity/issues/946"},"comments":{"href":"https://api.github.com/repos/Interkarma/daggerfall-unity/issues/946/comments"},"review_comments":{"href":"https://api.github.com/repos/Interkarma/daggerfall-unity/pulls/946/comments"},"review_comment":{"href":"https://api.github.com/repos/Interkarma/daggerfall-unity/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Interkarma/daggerfall-unity/pulls/946/commits"},"statuses":{"href":"https://api.github.com/repos/Interkarma/daggerfall-unity/statuses/952a5810c1d60b5f0d9e2f31866e7fcc01456f70"}},"author_association":"CONTRIBUTOR","merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":true,"commits":1,"additions":161,"deletions":347,"changed_files":18}}
{"actor":{"display_login":"Allofich"}}