{"action":"created","issue":{"url":"https://api.github.com/repos/ComputerScienceHouse/bingehack4/issues/58","labels_url":"https://api.github.com/repos/ComputerScienceHouse/bingehack4/issues/58/labels{/name}","comments_url":"https://api.github.com/repos/ComputerScienceHouse/bingehack4/issues/58/comments","events_url":"https://api.github.com/repos/ComputerScienceHouse/bingehack4/issues/58/events","html_url":"https://github.com/ComputerScienceHouse/bingehack4/pull/58","id":103153714,"number":58,"title":"Pull from upstream","user":{"login":"dgonyeo","id":2439413,"avatar_url":"https://avatars.githubusercontent.com/u/2439413?v=3","gravatar_id":"","url":"https://api.github.com/users/dgonyeo","html_url":"https://github.com/dgonyeo","followers_url":"https://api.github.com/users/dgonyeo/followers","following_url":"https://api.github.com/users/dgonyeo/following{/other_user}","gists_url":"https://api.github.com/users/dgonyeo/gists{/gist_id}","starred_url":"https://api.github.com/users/dgonyeo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dgonyeo/subscriptions","organizations_url":"https://api.github.com/users/dgonyeo/orgs","repos_url":"https://api.github.com/users/dgonyeo/repos","events_url":"https://api.github.com/users/dgonyeo/events{/privacy}","received_events_url":"https://api.github.com/users/dgonyeo/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":7,"created_at":"2015-08-26T02:04:42Z","updated_at":"2015-09-02T13:36:50Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/ComputerScienceHouse/bingehack4/pulls/58","html_url":"https://github.com/ComputerScienceHouse/bingehack4/pull/58","diff_url":"https://github.com/ComputerScienceHouse/bingehack4/pull/58.diff","patch_url":"https://github.com/ComputerScienceHouse/bingehack4/pull/58.patch"},"body":"There were many, many conflicts here.\r\n\r\nNotable new changes include (but are not limited to):\r\n\r\n- s/ncurses/libuncursed/ A new rendering library. Supports different\r\n  tilesets (ascii, unicode, and some graphical tiles)\r\n- A new in-game window displays possible actions a player can take\r\n- Rewritten save system that can handle watching and replaying games\r\n- \"lots and lots of bugfixes\"\r\n- cmake is dead, long live aimake (upstream dropped support for cmake,\r\n  so we will too)\r\n- Multi-turn actions (like reading a spellbook or shift-moving) will now\r\n  step through all the turns rapidly, instead of displaying them as a\r\n  single turn\r\n- Various UI tweaks, like the window borders turn red now when you're\r\n  low on health\r\n\r\nSome of the things that caused the biggest conflicts:\r\n\r\n- __Ring of Power__: It needed to be largely reimplemented. Tracking what your state with the ring is (none, carrying, or being worn) is now done through extrinsics the ring provides. Previously it was done by adding fields to the user's struct.\r\n- __Trident of Fish Command__: The way The Trident of Fish Command detected fish no longer works. Now the trident provides an extrinsic, which is checked for in the same place ESP, telepathy, etc. are checked.\r\n- __Drunken Boxing__: The file (libnethack/src/uhitm.c) this was implemented in appears to have been completely rewritten. I grabbed the diffs from our changes, and attempted to work the logic back in to the new file. I think it works, but others testing this would be appreciated\r\n- __aimake__: With aimake being the One Build System to rule them all, it needed tweaking to support Potter's rumors file. Also we're currently lacking tiles for Potter, Lilith, Lolth, Mammon, Chulhu, and Sammael. This only produces a warning, and I intend to create these tiles for a later PR.\r\n\r\nBuilding now works as follows:\r\n```bash\r\nmkdir build\r\ncd build\r\n../aimake -i /tmp/bingehack4 -v\r\n```\r\n\r\nIt will install itself into the `/tmp/bingehack4` directory."},"comment":{"url":"https://api.github.com/repos/ComputerScienceHouse/bingehack4/issues/comments/137083401","html_url":"https://github.com/ComputerScienceHouse/bingehack4/pull/58#issuecomment-137083401","issue_url":"https://api.github.com/repos/ComputerScienceHouse/bingehack4/issues/58","id":137083401,"user":{"login":"eatnumber1","id":17551,"avatar_url":"https://avatars.githubusercontent.com/u/17551?v=3","gravatar_id":"","url":"https://api.github.com/users/eatnumber1","html_url":"https://github.com/eatnumber1","followers_url":"https://api.github.com/users/eatnumber1/followers","following_url":"https://api.github.com/users/eatnumber1/following{/other_user}","gists_url":"https://api.github.com/users/eatnumber1/gists{/gist_id}","starred_url":"https://api.github.com/users/eatnumber1/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/eatnumber1/subscriptions","organizations_url":"https://api.github.com/users/eatnumber1/orgs","repos_url":"https://api.github.com/users/eatnumber1/repos","events_url":"https://api.github.com/users/eatnumber1/events{/privacy}","received_events_url":"https://api.github.com/users/eatnumber1/received_events","type":"User","site_admin":false},"created_at":"2015-09-02T13:36:49Z","updated_at":"2015-09-02T13:36:49Z","body":"Finally got started on this review. I'm only getting started though, but here's what I've got so far:\r\n * `libnethack/dat/oracles.txt`: Trailing whitespace\r\n * `libnethack/include/artilist.h`: Indent continuation lines further\r\n * `libnethack/include/prop.h`: `LAST_PROP` should be `WORN_RING_OF_POWER`\r\n * `libnethack/include/you.h`: Fix whitespace\r\n * `libnethack/include/you.h`: Don't litter the code with `#defines`. Instead, put that define in a header, and document what it's for."}}