Commit Graph

6084 Commits (c5f61af172b5c74f5cd431b336bdb8496a0cc1f8)
 

Author SHA1 Message Date
lethosor c5f61af172 Merge remote-tracking branch 'acwatkins/feature/fixStuckWorkflowJobs' into develop 2015-05-24 11:44:45 -04:00
lethosor 7baf581b93 Make gui/gm-editor work with lua tables 2015-05-24 11:43:05 -04:00
lethosor e27493fa02 Treat plugins without a "plugin_dev" symbol as ordinary plugins 2015-05-24 11:42:22 -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 1bb5239e5b Merge pull request #616 from Putnam3145/patch-19
Made teleport work with cursor and handle errors.
2015-05-19 16:42:00 -04:00
Putnam3145 73527cc6eb Made teleport work with cursor and handle errors. 2015-05-19 13:18:40 -07: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 6278c94775 Update xml 2015-05-16 14:27:17 -04:00
lethosor 9b8b95e145 Check for jsonxx submodule in CMakeLists.txt
Addresses #603
2015-05-09 19:44:26 -04:00
lethosor db08df7e50 Update xml 2015-05-09 19:41:19 -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 b6ec48c99a Add a macro that allows exported functions to use different names 2015-05-09 09:42: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 3eb8604d91 Alphabetize NEWS 2015-05-09 09:37:32 -04:00
lethosor 6447695d1f Merge remote-tracking branch 'PeridexisErrant/add-scripts' into develop 2015-05-09 09:36:51 -04:00
Lethosor aa7297b7af Merge pull request #580 from lethosor/lua-enable
Allow Lua scripts to implement enable/disable commands and specify other behavior (e.g. "module mode") that they implement
2015-05-09 09:27:40 -04:00
lethosor a47a5f8b0a Add an alternative to script_environment() that requires scripts to
recognize use as a module

Also document the use of enable/disable with lua scripts
2015-05-09 09:21:00 -04:00
Peridexis Errant d7717a92ab Add burial.lua by Putnam
It's useful, and why not?
2015-05-09 17:29:03 +10:00
Peridexis Errant 939cab4451 Add fix-ster by Tacomagic
Allow setting fertility or sterility of units or whole species.
2015-05-09 16:35:19 +10:00
lethosor 9ce0616325 Allow scripts that recognize "moduleMode" to be used as modules 2015-05-08 18:03:19 -04:00
lethosor 42a6cfaee6 Improve Lua enable/disable error handling 2015-05-08 18:03:19 -04:00
lethosor eaf282c18e Allow lua scripts to be enabled and disabled with built-in commands 2015-05-08 18:03:19 -04:00
lethosor db423c1aa6 Allow Lua scripts to specify whether they can be used as a module or
enabled/disabled
2015-05-08 18:03:18 -04:00
lethosor e73a2f8778 Move script internals to a single table 2015-05-08 18:03:18 -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 51d61d91cb Change tabs to spaces. 2015-05-07 20:50:19 -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 4e5326e25d Only allow quicksave to be used in fortress mode 2015-05-06 18:47:40 -04:00
lethosor 7c943179c7 Update clsocket 2015-04-30 19:22:53 -04:00
Lethosor c095371814 Merge pull request #606 from Putnam3145/patch-16
Make full-heal -r optionally remove corpse.
2015-04-29 17:37:22 -04:00
Lethosor 06a2e430dc Merge pull request #608 from Putnam3145/patch-17
Made "could not find syndrome" error work.
2015-04-29 17:37:06 -04:00
Putnam3145 aeeb2cfd6e Made "could not find syndrome" error work.
Before, it was trying to look at the syndrome ID it didn't actually find.
2015-04-29 14:19:24 -07:00
Lethosor 3d56ec3362 Merge pull request #605 from Putnam3145/patch-15
Made hack-wish assign quality properly.
2015-04-26 21:05:25 -04:00
Putnam3145 f6b9d19762 Make full-heal -r optionally remove corpse. 2015-04-24 18:59:09 -07:00
Putnam3145 3911b3e388 Update NEWS with hack-wish quality change. 2015-04-23 18:15:02 -07:00
Putnam3145 d4c2ec9365 Made hack-wish assign quality properly.
Also added a few return values and localized most functions so that it can be better used with dfhack.script_environment.
2015-04-23 18:11:13 -07:00
lethosor a1fd1d9219 Document dwarfmonitor and allow date format to be modified 2015-04-19 12:38:37 -04:00
lethosor a4a2b2f1de Use TCSADRAIN instead of TCSAFLUSH when initializing raw mode 2015-04-19 11:58:35 -04:00
lethosor 3eb814ce51 Clean up gui/dfstatus.lua 2015-04-18 19:19:43 -04:00
lethosor e3b7d61bc1 Fix a few view-item-info issues
* Make descriptions work
* Allow the script to be enabled/disabled
* Avoid appending an empty line to script output and add a DFHack
  label
2015-04-18 18:57:21 -04:00
lethosor 1a23ce136a Merge remote-tracking branch 'PeridexisErrant/item-info' into develop 2015-04-18 17:56:32 -04:00
Lethosor 30fbb205a2 Update NEWS 2015-04-18 17:29:57 -04:00
Lethosor 6c72a0850d Set MACOSX_RPATH to 1
This allows plugins with vmethod hooks to be reloaded on OS X by making paths
embedded in shared libraries use @rpath instead of embedding the build 
directory, which avoids the need to change them them later. Modifying paths in
libdfhack.dylib caused it to be reloaded, which prevented hooks from working.
2015-04-18 11:40:20 -04:00