Commit Graph

1446 Commits (bd1756e5d0c8e0bb0a43d8fb51ebdc4eb8735003)

Author SHA1 Message Date
Kelly Martin bd1756e5d0 Autolabor: change the fallback labor (for dwarfs for which nothing seems appropriate) from NONE to CLEAN. Fiddle with weights in assignment algorithm. 2012-12-11 09:29:03 -06:00
Kelly Martin 3e8ba2dd06 Autolabor: fix bring-crutch labor 2012-12-11 09:19:38 -06:00
Kelly Martin 017b986987 Autolabor: fix wound cleaning labor. 2012-12-11 09:06:37 -06:00
Kelly Martin a914f8e8e0 Autolabor: busy dwarfs may be reassigned now, but with a strong preference for their current job; armed dwarfs are given preference for outside jobs; include experience gained toward next level in preference weighting 2012-12-10 08:34:11 -06:00
Kelly Martin 0ef4522f95 Merge branch 'master' into autolabor 2012-12-08 21:26:50 -06:00
Kelly Martin 468412b9fc Autolabor: fix unitialized variable bug causing broker to be inappropriately excluded from work 2012-12-08 21:14:23 -06:00
Kelly Martin 412a004751 Autolabor: identify labors that may involve going outside and apply an assignment penalty for such labors to dwarfs who have minor children (in order to keep the kids inside) 2012-12-08 10:55:44 -06:00
Kelly Martin 6ae82187d2 Autolabor: more tweaks to hauling labor decoding, fix heap corruption due to array underflow 2012-12-08 03:51:07 -06:00
Kelly Martin e7d3fbe97b Autolabor: track labors actually being used (to avoid "gone fishing" bug); fix several wrong labor map entries; add several special cases for hauling (still not all there yet); add debug warning if job deduction appears wrong; flail about mightily trying to resolve heap corruption on unload 2012-12-08 02:42:22 -06:00
Alexander Gavrilov 7307f4e870 Fix crash and confusing behavior in automaterial. 2012-12-08 09:51:35 +04:00
Kelly Martin 42670f0233 Autolabor: only care about skills that are used for labors, when determining a dwarf's highest skill. 2012-12-07 15:41:39 -06:00
jj ebc2625d97 ditch the unused Vegetation module 2012-12-06 23:47:25 +01:00
Kelly Martin fa9b71adc5 autolabor: add archery targets, improve JobLaborMapper's destructor 2012-12-06 09:39:14 -06:00
jj e1b70d171c ruby: tweak is_citizen test 2012-12-06 12:48:16 +01:00
Alexander Gavrilov cd6eb9edd3 If training ammo is forbidden for all use, don't move it to combat chests. 2012-12-06 12:00:18 +04:00
Kelly Martin 0df60a0b4f Autolabor: slabs, animal trainers 2012-12-06 01:38:43 -06:00
Kelly Martin f8d6b83088 Add 'allow fishing' and 'allow hunting' config options. Protect against accidentially trying to set or unset the NONE labor or any other invalid labor value (which corrupts DF). Add traction benches. Change prioritization around quite a bit. 2012-12-04 20:23:19 -06:00
jj 74ebe7d207 ruby: add df-static-flagarray 2012-12-04 17:55:29 +01:00
jj 0b80dff09d ruby: add d-float support 2012-12-04 17:18:09 +01:00
Kelly Martin 0f1aaa6ec4 Autolabor: Items marked for dump now generate haul refuse demand. Also corrected labor for dump item jobs. 2012-12-04 01:59:44 -06:00
Kelly Martin 287ee2bc04 Autolabor: allow multiple simultaneous jobs at farms. 2012-12-03 14:20:57 -06:00
jj 3953112eb9 dump Vegetation::t_plant, fix plant.is_burning 2012-12-03 19:03:07 +01:00
Kelly Martin 208b9915ea Autolabor: splints and crutches are furniture (at least at a forge); remove test that excludes pet owners from being given jobs when they're idle; add test for hungry/thirsty dwarves to trigger a feed/water civilians requirement; add a vehicle hauling requirement based on the existence of hauling routes 2012-12-03 04:28:08 -06:00
Kelly Martin 9563dae5d7 Autolabor: add labors for construct bridge, construct nestbox, construct trap, deconstruct wagon; fix error in labor for deconstruct furnace/tradedepot/construction; actually update the "active dwarf" numbers displayed in "autolabor list"; increase assignment penalty for dwarfs using skills lower than their best skill; increase assignment bonus for continuing in the same labor and for having the right tool for the job. 2012-12-03 01:41:02 -06:00
Kelly Martin 44bb965c97 Autolabor: add more building labors 2012-12-02 18:41:20 -06:00
Kelly Martin 4cd217b782 to new assignment algorithm. Add priority boost for labors based on how long it's been since they were last used, to avoid labor starvation. Move persistent configuration to "autolabor/2.0" to avoid conflicting with older versions. 2012-12-02 14:27:13 -06:00
Kelly Martin b743f4f42d Autolabor: remove some debug spam, and fix an error in computing preference scoring 2012-12-02 09:47:15 -06:00
Alexander Gavrilov dc7f9f56cd Implement a low stock level announcement as suggested by falconne. 2012-12-02 15:31:43 +04:00
Kelly Martin 799da41f70 Autolabor: Add debugging messages from the labor deduction module; add deduction rules for some building destroy jobs; automatically exclude handless dwarfs from labor poor; use DF's own hauling job counts to compute hauling demand (and arrange for the "hauling canary" so that this always works) 2012-12-02 02:02:16 -06:00
Kelly Martin 45564ca0cb Autolabor: generating haulers based on unstockpiled items (less than ideal). Fix wrong build labor for Farmer's workshop. Add build labor function for constructions (also works for furnaces and trade depots). Add architect detection. Use a different mechanism for selecting dwarfs for labors. 2012-12-01 23:12:41 -06:00
Kelly Martin 15f7ffa0e2 autolabor: add ConstructBuilding (Farm); change priority calculation 2012-12-01 17:39:01 -06:00
Kelly Martin bb2b97baa3 autolabor: exclude "item lost" jobs, exclude jobs that are not first-in-queue at workshop, improve debug messages 2012-12-01 16:09:52 -06:00
Kelly Martin 201430ed08 Autolabor: add health awareness, fix initialization crash, fix idle dwarf loop crash 2012-12-01 14:08:15 -06:00
Alexander Gavrilov df2e9f00e1 Document that search now works in the stockpile settings screen. 2012-12-01 17:21:06 +04:00
Alexander Gavrilov fd5b19fe8d Merge remote-tracking branch 'falconne/search'
Conflicts:
	plugins/search.cpp
2012-12-01 16:55:52 +04:00
Kelly Martin afb6d8ef79 Autolabor: improve (hopefully) the functionality for mapping jobs to labors. Still some gaps to fill, but not many. 2012-12-01 02:26:06 -06:00
Kelly Martin d2ec52fa0b Merge branch 'master' into autolabor 2012-11-30 21:47:30 -06:00
Kelly Martin 05dce0d2f1 Fix inadvertently prematurely terminated block comment. 2012-11-30 21:24:18 -06:00
Kelly Martin 384a667e97 Assorted progress on new autolabor. Still lots of issues. 2012-11-30 20:22:58 -06:00
Kelly Martin 5f3328dcb2 Merge branch 'master' into autolabor
Conflicts:
	plugins/autolabor.cpp
2012-11-30 11:25:41 -06:00
Kelly Martin eecb604800 Sync submodules 2012-11-30 11:23:58 -06:00
Anuradha Dissanayake 210c1650ec Add stockpile screen searching capability 2012-12-01 01:01:04 +13:00
Alexander Gavrilov 2cb594ba89 Tweak the workflow lua api: include history in output of listConstraints. 2012-11-30 14:48:05 +04:00
Anuradha Dissanayake abe027c940 Copy changes from ag fork 2012-11-30 22:44:05 +13:00
jj d7f7538d01 ruby: fix Pointer assignment 2012-11-29 17:11:29 +01:00
jj 771a5ac50b ruby: tweak flagarray#inspect 2012-11-28 20:08:34 +01: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
Anuradha Dissanayake 593dc4f554 Fix handling of manipulator hotkey in unit search screen 2012-11-28 17:18:38 +04:00
jj 8f0d552556 ruby: add DFHack::VERSION 2012-11-28 13:33:07 +01:00