Commit Graph

2679 Commits (d17b3dba501b1421206cd715be8eacee5da3fe1e)

Author SHA1 Message Date
Japa 5ce6fceacc Send the center with the world map, based off current embark if available, otherwise adventurer position. 2015-09-16 23:25:23 +05:30
Warmist 80fd4b1365 Some additions and fixes.
Added new functions: select, set(non)blocking, isBlocking.
Set default to non-blocking. Added "would block" to ignored errors.
2015-09-16 09:57:22 +03:00
expwnent f9fce7e6a1 Convert tab to spaces in RemoteFortressReader.proto. 2015-09-15 03:21:09 -04:00
lethosor b58ccc9e55 Fix embark-tools title alignment 2015-09-12 20:28:42 -04:00
lethosor a852ca10d7 Merge remote-tracking branches 'warmist/luasocket' and 'warmist/advfort' into develop 2015-09-12 19:59:53 -04:00
Japa 3b36a23404 Add soldier state to remotefortressreader.cpp 2015-09-07 22:41:24 +05:30
Japa 07c601be99 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
Conflicts:
	plugins/remotefortressreader.cpp
2015-09-05 15:00:03 +05:30
Japa 1a78cabd7c Add profession color and unit flags to remotefortressreader 2015-09-05 14:54:12 +05:30
lethosor 1ea2da511b Fix whitespace 2015-09-02 15:53:13 -04:00
Japa 44a670db4d Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-09-03 00:14:31 +05:30
Japa 6881aeac70 Enable sending of creature_raw in remotefortressreader.cpp 2015-09-03 00:13:48 +05:30
lethosor 7437400c18 command-prompt: Prevent unloading when prompt is active 2015-08-29 19:38:41 -04:00
lethosor c6ae3e11fd Rename remotefortressreader to RemoteFortressReader 2015-08-26 16:40:59 -04:00
lethosor 8292f56f63 New tweak: embark-profile-name 2015-08-25 10:12:31 -04:00
lethosor ec4a3bda54 Merge branch 'develop' into plugin-manager 2015-08-17 08:17:56 -04:00
warmist 7639420455 Update luasocket.lua 2015-08-17 10:07:20 +03:00
Japa bf7fc42710 Made remotefortressreader.cpp get the elevations from the next region over for the last line. 2015-08-17 00:11:52 +05:30
Japa f60b3e8117 Added a function to get region tiles from remotefortressreader.cpp 2015-08-16 20:28:52 +05:30
Warmist 5bb69cfe04 Add luasocket to CMakeLists.txt 2015-08-15 15:12:13 +03:00
Warmist d9c50d677f A lua interface for csockets in a spirit of luasocket 2015-08-15 15:09:12 +03:00
lethosor 735498c3f9 Fix merge conflict 2015-08-14 16:23:39 -04:00
lethosor 4fc6cb6f17 Several PluginManager improvements
* load/unload/reload are no longer restricted to plugins that exist
  on startup
* Names passed to DFHACK_PLUGIN must match the plugin's filename
  (remotefortressreader vs RemoteFortressReader, counters vs probe)
* "plug" output lists all plugins and state/command information
* Deleted plugins can be reloaded again if they are replaced
* load/unload/reload don't fail silently with broken plugins
* Built-in commands are recognized internally (e.g. "help help"
  does not display "help is not a recognized command"), although help
  for them is not yet implemented
* New command: "type" (bash-like) - shows where/how a command is
  implemented
* "plug" can accept multiple plugin names
* "ls" displays more information about unloaded/unrecognized plugins
* "load all" changed to "load -all" (or "load --all", "load -a", ...)
2015-08-14 16:11:23 -04:00
Japa a71a6d45cc Added a function to pull the world map from remotefortressreader.cpp 2015-08-14 15:36:36 +05:30
Japa 22374e6d86 Fixed remotefortressreader.cpp DF version detection. 2015-08-13 15:59:15 +05:30
Japa e4ac25d1e0 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-08-13 11:26:33 +05:30
Japa a60c8d8e7c Added conditionals to remotefortressreader.cpp to make compiling for v 0.24.11 easier. 2015-08-13 11:25:59 +05:30
lethosor 05f36856f4 fix-unit-occupancy: Always provide feedback when running command 2015-08-10 11:30:21 -04:00
lethosor 9b5f42e3a9 tweak farm-plot-select: Only show controls when plots are fully built
Fixes #521
2015-08-10 10:41:47 -04:00
lethosor fcd15bfd73 Move vshook plugin to title-version and enable by default 2015-08-09 13:37:26 -04:00
lethosor bce9d98633 New plugin: fix-unit-occupancy (fixes bug 3499) 2015-08-07 14:33:38 -04:00
lethosor 44287fc3a0 remotefortressreader: Check map validity before reading map info
Fixes JapaMala/armok-vision#5
2015-08-06 13:42:13 -04:00
lethosor 090f542d49 Allow for per-plugin compile flags 2015-08-06 13:33:53 -04:00
Lethosor bc5b46dce0 Merge pull request #660 from lethosor/jsoncpp
Replace jsonxx with jsoncpp
2015-08-06 12:37:51 -04:00
lethosor e02815dc30 Fix manipulator crash when selecting from empty custom profession list 2015-07-31 16:46:00 -04:00
lethosor 01e04c24c5 Use a separate lua state in dwarfmonitor render hook 2015-07-31 14:25:33 -04:00
lethosor d02e67267a Replace jsonxx with jsoncpp 2015-07-29 15:50:33 -04:00
lethosor a90f3c3d67 stockpiles: Restrict characters in filenames when saving
Previously, it was possible to save outside of the stocksettings
directory or fail to save in a nonexistent subdirectory (e.g. when
a stockpile name had slashes in it).

Resolves #621
2015-07-29 14:17:14 -04:00
lethosor 4e45cc5bbb stocks: Use ^ and $ to match the beginning/end of item names
Closes #624
2015-07-29 13:44:32 -04:00
lethosor 7fc682b199 Fix dismissal of current screen when zooming to items 2015-07-29 11:22:38 -04:00
lethosor 825d46af51 Move ListColumn class to a separate header 2015-07-28 21:48:00 -04:00
lethosor dd7c20c848 Add safer helpers to get STRING_X keys from interface_key sets
A few plugins were using input->rbegin() previously, which crashes
if input is empty and isn't strictly guaranteed to return a
STRING_X key.
2015-07-28 18:34:29 -04:00
lethosor b73e859a37 Reorganize stocks viewscreen to fit a 25-row resolution 2015-07-28 14:37:49 -04:00
lethosor 5ca5feb855 Stop embark-tools from crashing on unload
Also enable sand indicator and mouse controls by default and refactor
2015-07-27 21:38:53 -04:00
lethosor c3c625e7bd Remove embark-tools nano (implemented in 0.40.24) 2015-07-27 18:22:18 -04:00
lethosor 889c76b147 buildingplan: Don't assume building and item type names match
There are a few building types (e.g. hatch covers) where this is not
the case.

Fixes #604
2015-07-27 14:10:55 -04:00
lethosor 6352a6e266 Expand confirm plugin and improve safety of adding/removing hooks
* New option: trade-select-all: Prompts when selecting all goods
  when some goods are already selected
* Improved trade confirmation message depending on selected goods
* Made seize and offer confirmations only display when goods in the
  appropriate columns are selected
* States of each option are now listed by "confirm help"
2015-07-27 12:03:29 -04:00
lethosor ed3cbe2e60 Add several trade-related confirmations 2015-07-27 10:05:59 -04:00
lethosor 35f229c578 Add confirmations for hauling route/stop deletion and depot removal 2015-07-27 10:05:59 -04:00
lethosor 175edf501a Add "confirm" plugin - implements a few confirmation dialogs
See #577
2015-07-27 10:05:59 -04:00
lethosor f1a6e5fbe9 tweak farm-plot-select: Don't require crops to be discovered
Crops whose seeds haven't been discovered are still listed in
menus as of 0.40.10
2015-07-24 11:17:04 -04:00
lethosor 6c55164be4 Fix a potential crash in tweak farm-plot-select
Related to #396
2015-07-24 10:54:59 -04:00
Japa 867e78b6fd Correctly identify ice material. 2015-07-04 09:22:41 +05:30
lethosor 87b1524aec search: give text input priority over cursor keys 2015-06-30 16:45:45 -04:00
lethosor 8058472dd9 Check for null pointers in several places in the search plugin
Fixes #650 (and a few other potential issues)
2015-06-30 16:20:01 -04:00
lethosor 2c734233eb New tweak: kitchen-keys
Fixes an issue where HOTKEY_KITCHEN_* bindings aren't used by DF:
http://www.bay12games.com/dwarves/mantisbt/view.php?id=614

See #526
2015-06-27 11:02:26 -04:00
lethosor 3795edb673 Fix colors in 'tweak kitchen-prefs-color' 2015-06-27 09:54:31 -04:00
lethosor 4246dbd02a New tweak: kitchen-prefs-color
Disabled in default dfhack.init to avoid confusion
2015-06-26 23:19:53 -04:00
lethosor 8d21dd0a23 New tweak: kitchen-prefs-empty
Fixes a layout issue on the kitchen prefs viewscreen with empty tabs
http://www.bay12games.com/dwarves/mantisbt/view.php?id=9000

See #526
2015-06-26 23:19:39 -04:00
lethosor 38d377f4c4 Fix a few zone plugin crashes
* Avoid checking building types of null pointers
* Detect selected cages properly

Fixes #646
2015-06-23 21:21:21 -04:00
Lethosor c9f7fcfd05 Merge pull request #640 from lethosor/search-look-list
Add look menu search
2015-06-22 08:44:34 -04:00
Japa 33cb5e951f Fixed whitespace and returns. 2015-06-22 18:01:19 +05:30
Japa a071f5bf6c Added preliminary building list to remotefortressreader. Untested. 2015-06-22 00:40:17 +05:30
Japa 96640c837f Made remotefortressreader send an item list, and the item that constructions are made from. 2015-06-20 22:17:35 +05:30
Japa 4182a30cc5 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-06-19 23:30:47 +05:30
Japa 4b05423e58 Made remotefortressreader send proper indices for inbuilt materials. 2015-06-19 23:28:32 +05:30
lethosor a8480070a0 Add look menu search 2015-06-16 20:36:19 -04:00
lethosor 81cba0b0fc Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop 2015-06-16 19:56:16 -04:00
lethosor 8145a04944 dwarfmonitor: Add mouse cursor widget
Suggested by @ragundo
2015-06-15 13:42:29 -04:00
lethosor 7581bda7d5 Update dwarfmonitor documentation and NEWS 2015-06-13 21:50:15 -04:00
lethosor 93c9a41a3a Reimplement dwarfmonitor widgets in Lua (and improve customizability)
Widget positions and a few other options (e.g. date formats) can be
specified in dfhack-config/dwarfmonitor.json on a per-instance basis.

Related changes:
* Fixed an issue loading JSON files from Lua
* JSON files in dfhack-config (only dwarfmonitor.json currently) are
  no longer copied into the DF directory when building DFHack. This
  keeps developers' personal settings intact, but will require
  copying over changes made to DFHack's copies manually.
* Fixed incorrect config path in dwarfmonitor help
2015-06-13 21:15:43 -04:00
Fukken-Saved 9a262ad013 Travis compliance 2015-06-13 14:19:14 -04:00
Fukken-Saved d4c7cd2a4e Update autohauler.cpp 2015-06-13 14:08:42 -04:00
lethosor 2d121caabc Allow searching noble suggestions in liaison meetings
Closes #622
2015-06-11 21:37:58 -04:00
Lethosor 09db800f3d Change tabs to spaces 2015-06-11 12:50:00 -04:00
Japa eef9f49ae8 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-06-11 21:51:03 +05:30
Japa cf13b677b6 Added all main tile flags to the list of sent stuff. 2015-06-11 21:49:42 +05:30
lethosor 84b0b48028 dwarfmonitor: Allow weather indicator to be configured separately 2015-06-10 23:09:01 -04:00
lethosor eabcee38e5 dwarfmonitor: Get rid of "Clear" weather indicator 2015-06-10 23:05:33 -04:00
Adam Watkins 772ad0372d Improved issue with workflow job being resumed but never being worked
Fixes #487

* This doesn't fix existing stuck jobs, in order to fix, remove repeat, cancel, add, repeat
* Most workshops worked great after this, however, I noticed my bone bolts and wood bolts still got stuck, not sure if it is the same issue

* The unk_v4020_1 field was not being reset to -1 when resuming the job.
* Updated to be reset only when the job is being resumed
** Setting it to -1 without checking sets this field on all workflow jobs, which causes a crash
* Made other calls to suspend call set_resumed rather than setting the suspend field

This is the behavior I saw for the unk_v4020_1 field:
Suspended jobs: -1
Jobs not in the top of the list but not suspended: -1
Jobs at the top of the list to work next, not suspended: A positive integer (priority of job?)
2015-05-22 22:26:58 -04:00
lethosor 0f1adeb3e7 Update stonesense 2015-05-17 12:47:43 -04:00
lethosor 84b2f814e8 Disable some plugin output on startup
* tweak: Log tweak changes to stderr.log instead of the console
* stockflow: Use "enable stockflow" instead of "stockflow enable"
  in dfhack.init-example
2015-05-16 18:23:02 -04:00
lethosor a577248a38 Make memview output more readable 2015-05-09 19:41:13 -04:00
lethosor 6eb929b306 Move JSON files out of hack/ folder 2015-05-09 16:04:15 -04:00
lethosor a8f5e683f7 Merge remote-tracking branches 'RossM/autolabor-changes', 'RossM/workflow-changes' and 'lethosor/plugin-exports' into develop 2015-05-09 09:39:55 -04:00
lethosor d0ba6d7019 Fix tweak fps-min 2015-05-08 17:35:46 -04:00
lethosor 9c404a535d Make search plugin intercept MOVIES and HELP keys 2015-05-08 16:27:52 -04:00
Ross Morgan-Linial 3001053cef Change tabs to spaces. 2015-05-07 21:51:03 -07:00
Ross Morgan-Linial 7aac9a8fb8 Improve workflow handling of plant reactions
Makes workflow understand "seeds of any plant", "thread of any plant",
"drink of any plant", "powder of any plant", and "liquid of any plant"
when counting items.

Changes workflow's handling of the built-in plant reactions to
understand that they always produce plant products, and that they also
produce seeds.

This means that you can set a target for, for example, "powder of any
plant", and workflow will use a milling job to produce that.
2015-05-07 20:49:29 -07:00
Ross Morgan-Linial 3da939bb02 Change tabs to spaces. 2015-05-07 20:41:11 -07:00
Ross Morgan-Linial 684ff433d4 Autolabor changes
Try harder to concentrate skill on certain dwarves, at the expense of
potentially allowing more idle dwarves.

Attempt to keep dwarves with tools from running off and doing other
things while holding on the tool so much.

Add comments explaining the two modes autolabor uses depending on number
of idle dwarves.
2015-05-07 20:37:01 -07:00
Ross Morgan-Linial 82202efb26 Don't reset disabled labors
Autolabor was disabling all labors on dwarves selected for trading or
diplomacy, even if those labors were not supposed to be managed by
autolabor. This is wrong.
2015-05-07 20:36:51 -07:00
lethosor a1fd1d9219 Document dwarfmonitor and allow date format to be modified 2015-04-19 12:38:37 -04:00
lethosor 6187ac3054 Only initialize steam-engine when a fortress mode map is loaded
world->raws.buildings.workshops is not always cleared on world load
(notably in the arena), so it can contain invalid pointers from
previous games.

Fixes #444
2015-04-02 17:17:29 -04:00
lethosor 786581689f Move get_dfhack_version() to a separate namespace and add a few other version-related functions 2015-04-02 16:37:58 -04:00
lethosor 9b6d8d2799 Allow dev plugins to be skipped on startup 2015-04-01 17:50:22 -04:00
lethosor 82d72007fc Move zoom-related commands to a separate dev plugin 2015-04-01 17:24:52 -04:00
lethosor 7913517b2c Add "nyan stop" command 2015-04-01 17:02:33 -04:00
expwnent 6779849bc6 This requires a return value in Windows, and really should have one anyway. 2015-03-29 14:21:59 -04:00
Lethosor 88c3a629d5 Fix vshook 2015-03-26 19:27:22 -04:00
James Logsdon f8d8baef39 Remove explicit tokens and use ENUM_KEY_STR for profession templates 2015-03-25 15:04:52 -04:00