Document keybinds in dfhack.init-example#972
Conversation
|
@lethosor - any idea why Travis is silent? |
|
It was disabled temporarily because of the current state of the develop branch (e.g. the ruby plugin won't compile anywhere, besides the issues on Windows addressed in another PR). I'll see if there's a better way to check PRs, but I doubt this PR would pass the compilation stage. I can definitely test this locally, though (although it might be a couple days). |
be79b24 to
7c37edb
Compare
|
Rebased on develop to fix merge conflicts, added a commit to improve |
docs/Core.rst
Outdated
|
|
||
| There are two ways to run DFHack commands from an OS terminal. | ||
|
|
||
| * If DF and DFHack are already running, calling ``dfhack-run my command`` |
There was a problem hiding this comment.
Should be ./dfhack-run on *nix
|
Incidentally, you do get an error if you run either version from the console. As far as I know, plugin commands can't detect whether they're invoked by a keybinding (only the DFHack core can), so merging the logic into autodump_main and making it silent when invoked as a keybinding isn't possible. Even if it were, it's easier to delegate the task of determining whether the UI state is valid to the hotkey guards (Gui::cursor_hotkey, Gui::any_item_hotkey, etc.). Anyway, thanks for documenting the |
|
OK, looks like the core docs need some extra work - I'll split that out into a new pull request. I'll also remove the autodump changes, and squash the rest for clarity. The good news is that |
7c37edb to
782af19
Compare
conf.py
Outdated
| import fnmatch | ||
| from io import open | ||
| from itertools import starmap | ||
| from functools import lru_cache |
There was a problem hiding this comment.
This isn't implemented in Python 2
There was a problem hiding this comment.
It looks like the only two things this is used for are zero-argument functions, so it might as well be replaced with a simple memoize/cache decorator.
782af19 to
0d0fbd9
Compare
|
Rebased on develop to remove merge conflict in NEWS.rst, and removed use of lru_cache (again). |
|
@lethosor - I've fixed the merge conflict, any other blockers? |
|
I've been dealing with OS upgrades and changes to Lua GUI scripts/hooks for a few days here, and I'll probably be busy in real life later this week. Sorry for the timing being somewhat inconvenient, but I'll get to this when I have time. No need to delete/recreate the comment to notify me again - I do check the list of PRs periodically, and definitely before releases. |
0d0fbd9 to
a3b42df
Compare
|
Sorry - just checking that it wasn't a problem that I needed to fix. (I've also added a commit to expand the |
a3b42df to
f170b70
Compare
|
Rebased to fix merge conflict in NEWS.rst |
Closes issue #971 - DFHack/scripts#5 is the complementary pull.
This pull:
dfhack.init-exampleNEWS.rst, including fordwarfvetautodump(since keybinds may now have spaces in the command if quoted). Further work, to remove theautodump-destroy-itemcase, would be welcome but is beyond my C++ skills.