Commit Graph

78 Commits (558caa24fbfcbc11f3ea652743b415e302fa0765)

Author SHA1 Message Date
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 10cfef0553 Fix whitespace issues 2015-02-14 22:53:06 -05:00
lethosor a615723b38 Update remaining plugins to use REQUIRE_GLOBAL 2014-12-06 19:30:05 -05:00
Alexander Gavrilov a273327c6a Remove "using namespace std" from MiscUtils.h. 2013-10-10 12:15:50 +04:00
Alexander Gavrilov d7e35c2d23 Add built-in enable and disable commands. 2013-09-30 13:19:51 +04:00
Alexander Gavrilov dc7f9f56cd Implement a low stock level announcement as suggested by falconne. 2012-12-02 15:31:43 +04:00
Alexander Gavrilov 2cb594ba89 Tweak the workflow lua api: include history in output of listConstraints. 2012-11-30 14:48:05 +04:00
jj 614225cc5f follow rename itemst.flags.artifact1 -> artifact 2012-11-28 19:48:47 +01:00
Alexander Gavrilov bfc11cf946 Add persistent history of per-constraint item counts in workflow.
This will be needed for properly merging or integrating the status
screen by falconne. The history is maintained as a circular buffer
of up to 28 entries, and persists in save files.
2012-11-28 19:25:01 +04:00
Alexander Gavrilov f587d603e8 Allow the workflow goal gap in any range between 1..goal-1 2012-11-19 18:59:58 +04:00
Alexander Gavrilov 2953e4c386 Implement a dialog to specify a workflow constraint with all features. 2012-11-17 20:32:39 +04:00
Quietust e2b9b703a0 Get rid of tabs 2012-11-16 15:33:36 -06:00
Quietust 766aca4911 Rename general_ref vectors for consistency 2012-11-12 08:27:58 -06:00
Alexander Gavrilov d5c31942b5 Add a way to only count locally-made items in workflow. 2012-11-11 15:56:31 +04:00
Alexander Gavrilov eb936c4ce0 Support milking and shearing in workflow. 2012-11-10 17:06:54 +04:00
Alexander Gavrilov a7bf526f41 Make workflow consider squad-assigned items busy. 2012-11-08 21:27:56 +04:00
Alexander Gavrilov 4c2c6a1911 Fix handling of Collect Webs jobs in workflow. 2012-10-26 23:53:18 +04:00
Alexander Gavrilov 1f994295b8 Consider assigned vehicles in use, and tweak text color rendering. 2012-10-25 13:20:41 +04:00
Alexander Gavrilov 79d2cb1a5c Remove the C++ version of the job output deduction code and switch to lua. 2012-10-25 12:44:23 +04:00
Alexander Gavrilov 8eebfa007c Tweak the workflow gui script to make the UI operate smoother. 2012-10-25 12:15:18 +04:00
Alexander Gavrilov 59ec9b304e Implement adding workflow constraints from gui/workflow. 2012-10-24 21:49:30 +04:00
Alexander Gavrilov 616c57257d Support changing the constraint ranges from the workflow gui script.
TODO: implement creating completely new constraints.
2012-10-24 19:25:06 +04:00
Alexander Gavrilov 7b67df4b4e Merge remote-tracking branch 'q-github/master' 2012-10-24 16:49:12 +04:00
Alexander Gavrilov 09f8e8e419 Start working on gui for workflow. 2012-10-23 21:42:03 +04:00
Quietust 27c7dfde4f ANY_FREE -> IN_PLAY, to match terminology used in DF's error messages 2012-10-23 12:14:21 -05:00
Alexander Gavrilov 459c69046b Dissolve the World module class into a namespace.
It made accessing persistent data way too cumbersome.
2012-10-06 13:46:20 +04:00
Timothy Collett 96abc903ab Merge branch 'master' of http://github.com/peterix/dfhack 2012-09-10 11:54:56 -04:00
Timothy Collett 274d6038ad Merge further changes (???) 2012-09-10 09:19:21 -04:00
Alexander Gavrilov fd0bf2ef92 Extract the color enum from color_ostream to toplevel. 2012-08-19 09:21:25 +04:00
Petr Mrázek cde97bba6f Fix workflow some more 2012-08-13 07:42:02 +02:00
Petr Mrázek 4eedd6f5f0 Fix workflow. 2012-08-13 07:39:11 +02:00
Valentin Ochs 2c703ffbca Remove unnecessary whitespace 2012-08-06 16:59:09 +02:00
Valentin Ochs bb760bd376 Added quality constraints to workflow plugin 2012-08-06 16:55:55 +02:00
Petr Mrázek 2781723f7b Linux build works again. 2012-06-14 02:25:15 +02:00
Petr Mrázek 5f33ebde41 Merge https://github.com/Rinin/dfhack 2012-06-14 00:01:38 +02:00
Rinin 705b60ca27 Fixed BrewDrink products counting 2012-05-22 19:22:36 +04:00
Alexander Gavrilov 65349039f0 Fix workflow bug: properly deduce the output material of BrewDrink jobs. 2012-05-22 17:50:48 +04:00
Alexander Gavrilov 5afe2ca002 Update dfhack for specific_ref. 2012-05-03 11:47:04 +04:00
Alexander Gavrilov 2303a25bde Implement unconstructed building instance creation and linking into world.
For more flexibility, the base api is split into 3 phases:
alloc, setSize, and construct. No support for non-actual
buildings like stockpiles and activity zones at the moment.
2012-04-29 21:07:39 +04:00
Alexander Gavrilov 0a6982f404 Enable warnings correctly on linux and fix a lot of them. 2012-04-20 13:30:37 +04:00
Kelly Martin 43e4814147 Mod workflow to properly handle custom reactions that produce CRAFTS 2012-04-16 10:34:12 -05:00
Alexander Gavrilov 93c795cfc3 Job module api tweaks: add a namespace to match others and some funcs. 2012-04-10 11:43:36 +04:00
Kelly Martin f931060dd9 Exclude worn items from counts for workflow 2012-04-07 12:11:53 -05:00
Petr Mrázek 7ff728b6fc Track world and map changes separately for plugin_onstatechange 2012-04-01 02:56:54 +02:00
Alexander Gavrilov 9d6e26fa5f Fix crashing color_ostream::printerr due to vfprintf vs fprintf mixup.
Also enable heap clearing in gdb mode, and fix a few newlines.
2012-03-31 22:26:41 +04:00
Alexander Gavrilov 81bc73f435 Follow a typo fix in flag name. 2012-03-30 10:44:52 +04:00
Petr Mrázek 004acdad4e Tweaks!
Strip commands.clear() from all plugins
Fix changeitem - a variable name has changed in item flags
2012-03-29 18:37:22 +02:00
Alexander Gavrilov 58eb199036 Add many new template functions for enums & bitfields.
An incompatible change: ENUM_KEY_STR returns std::string now.
The old behavior is available via enum_item_key_str function.
2012-03-17 12:52:22 +04:00
Petr Mrázek 1ac8025025 Merge https://github.com/angavrilov/dfhack
Conflicts:
	plugins/workflow.cpp
2012-03-15 14:43:05 +01:00
Alexander Gavrilov c42e2ff053 Support crafts and add a couple of options in workflow. 2012-03-14 12:09:02 +04:00