6a31abc60f
Another update to stonesense :-P
2013-03-15 14:30:21 -04:00
d87bfd7f26
Update to Stonesense
2013-03-15 14:28:46 -04:00
c93cb693c8
Merge branch 'master' of http://github.com/peterix/dfhack
2013-03-14 13:35:28 -04:00
9a58c5b7b3
Stonesense updates
2013-03-14 13:33:01 -04:00
2b675c80ce
Fix createitem to not leak memory
2013-03-14 12:00:16 -05:00
c5aa808737
Sync submodules
2013-03-14 05:07:30 +01:00
b5806f7278
Copy fixes from r3 to fix search issues in Nobles screen.
2013-03-13 22:21:30 +13:00
215a2e78af
Fix crash when persistent data refers to missing buildings. Can only happen if planned buildings are removed with the plugin removed, then the game is reloaded after the plugin is put back.
2013-03-13 21:44:33 +13:00
bc0c493b7c
Workaround for strange crash in accelerated mod
2013-03-12 21:18:29 +13:00
8e9fc235a9
Adding a debug mode to track down an elusive bug.
2013-03-10 16:14:00 +13:00
3ed5f06f49
Fix for eventful and a advfort not to show worn items.
2013-03-09 12:54:07 +02:00
63707471f4
WIP - More logical categories and variable windows
2013-03-07 22:27:06 +13:00
0b31fbafea
Remove the "assign random labors to random dwarfs" nonsense that I put in while drunk or something.
2013-03-02 23:05:09 -06:00
701b7b7d9b
Multiple data averaging windows and gcc fixes.
2013-03-02 15:14:56 +13:00
b07f2fc33f
Get entity from unit->civ_id instead of from ui (so it works in advmode), and only get site in fortress mode
2013-02-28 10:00:00 -06:00
9bd999ebc1
Update createitem to allow specifying quantity, also allow it to auto-detect whether it needs to create extra gloves and assign handedness
2013-02-28 09:23:48 -06:00
4afe74efa6
Add DwarfMonitor plugin to monitor activities and happiness levels in a fort.
2013-02-28 23:39:22 +13:00
f55030909f
Add createItem plugin, spawns an item at the selected unit's feet
2013-02-27 11:09:06 -06:00
03b91ca26c
Fix a problem in binpatch.lua and comment out debug messages in tweak.
2013-02-26 12:29:02 +04:00
2bbe6824fb
fix tweak/stable-cursor for low z-levels
2013-02-21 15:26:35 +01:00
6b70a89321
ruby: typo in autogen/int8_t
2013-02-17 02:05:01 +01:00
db98b06c6e
Added documentation of autolabor exemption from burrowed dwarves
2013-02-15 19:16:26 -08:00
b0528d283b
Merge branch 'master' of git://github.com/peterix/dfhack
2013-02-15 20:23:39 +02:00
ab6a993689
friendship.lua: removed debug printing
2013-02-15 20:21:33 +02:00
bb5d98e895
friendship fixes.
2013-02-15 20:19:55 +02:00
fe70df593b
Sync submodules
2013-02-14 18:36:21 -06:00
ac2e45c843
Compatibility with older GCC versions in the search plugin
2013-02-14 12:45:58 +01:00
8de172f1c8
Binsearch in units.active can't possibly work, ever.
2013-02-14 13:13:25 +04:00
a8f5e54e37
Sync submodules
2013-02-14 09:53:14 +01:00
e35a1c7720
Correct autolabor2 for changes in structures.
2013-02-13 16:00:09 -06:00
8d278a87db
Merge branch 'master' of https://github.com/angavrilov/dfhack.git
...
Conflicts:
plugins/devel/CMakeLists.txt
2013-02-13 13:52:02 -06:00
f9a3450aca
Reinstate old autolabor in its original place.
2013-02-13 13:34:39 -06:00
ff0012c91f
Move new autolabor to autolabor2 in devel.
2013-02-13 13:33:32 -06:00
27f5dc7631
Autolabor: add in the rest of the building construct and deconstruct labors. Also handle wood crafts at the craftdwarf's shop.
2013-02-13 13:07:54 -06:00
a17760af4f
Communicate the Plugin pointer to the plugin in a decent sort of way.
2013-02-13 14:45:24 +04:00
a5c21745eb
Enable all plan modes when entering quickfort mode
2013-02-09 16:49:36 +13:00
2f4979d3fa
Add Quickfort mode
2013-02-08 00:04:52 +13:00
1956f8b92d
Lock selection mode toggle
2013-02-07 22:57:07 +13:00
0e384ada75
Sync submodules
2013-02-05 05:34:34 +01:00
dff16c3c1d
Define nullptr for gcc < 4.6
2013-02-02 02:24:05 +13:00
ecf255243f
Plugin to easily find and resume suspended constructions
2013-02-02 02:24:05 +13:00
056bde451a
Remove some leftover code
2013-01-29 21:22:17 +13:00
ae8bb7c9f8
Fix for gcc errors.
2013-01-29 20:44:56 +13:00
58125a57a7
Merge remote-tracking branch 'remotes/github/buildingplan'
2013-01-27 23:42:28 +13:00
6546af94ee
Clear persistent data after item assigned. Fix some material selection screen functionality.
2013-01-24 20:16:18 +13:00
f036360688
Add filters for quality, material and decorations.
2013-01-23 23:25:38 +13:00
675e92f350
Autolabor: add build floor grate labor, add unbuild screwpump labor, protect pump operators, do not clear labors on already busy dwarfs
2013-01-22 16:34:51 -06:00
f5a0644b45
Fix bad refactor
2013-01-18 23:29:08 +13:00
192baa5638
Building plan plugin: place furniture before it's built. Initial checkin.
2013-01-18 23:28:45 +13:00
e1a2e6ece4
Block and grey out the trade screen actions when search is active.
...
After actually trying the search in game, it is obvious that
clearing search upon pressing the trade button is confusing,
because if you don't pay enough attention, it looks exactly
like as if the trade actually happened.
2013-01-16 20:42:41 +04:00
597074498f
Fix various issues with updated search.
...
- Priority conflict with tweak military-stable-assign.
- The noble screen misbehaves if only one list item is left.
- Noble screen search string not reset after Enter/Esc.
2013-01-16 20:30:11 +04:00
14d41b8eda
Update search to the newer structure definitions.
2013-01-16 18:55:05 +04:00
309f162566
Fix line endings again.
2013-01-16 18:54:35 +04:00
ed0baa3f69
Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin.
2013-01-16 18:48:59 +04:00
4257c9fe84
Ignore vermin in animals screen search
2013-01-16 18:48:55 +04:00
8741983aaa
Fix for gcc errors. It seems calls to base class members in a templated class must be fully template qualified.
2013-01-16 18:48:49 +04:00
655cd3602c
Merge remote-tracking branch 'falconne/search'
2013-01-16 18:30:29 +04:00
940d5fe891
Merge https://github.com/expwnent/dfhack
2013-01-15 23:49:10 +01:00
0073c1bec2
Track xml and stonesense
2013-01-15 23:16:15 +01:00
90a62a82f7
Autolabor: add screw pump build labor
2013-01-14 12:12:56 -06:00
c031a7e081
Merge branch 'infiniteSky'
2013-01-13 15:28:31 -05:00
44662de601
Infinite sky: bug with z level flags.
2013-01-13 15:28:17 -05:00
fdcb248ea0
Merge branch 'automaterial_box'
2013-01-12 23:39:50 +13:00
83ef94774b
A better format for toggle strings.
2013-01-12 23:32:30 +13:00
4c2dfdf772
Dig smart: dig out minerals as you discover them. Very rough draft.
2013-01-09 15:15:11 -05:00
3c6ddc2a8c
Merge branch 'master' of https://github.com/expwnent/dfhack
...
Conflicts:
NEWS
library/xml
2013-01-09 10:09:58 -06:00
476afafb3c
Merge branch 'autoSyndrome' into recent
2013-01-07 12:09:55 -05:00
6fd9ce339d
Autosyndrome: fixed the rules on when syndromes apply.
2013-01-07 12:09:39 -05:00
1990e2caf7
Small fix to adv site creation, now it's really centered around you
2013-01-07 02:01:59 +02:00
553a312266
Autolabor: add deconstruct bridge labor
2013-01-06 10:59:20 -06:00
6d6d55a937
Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin.
2013-01-06 18:32:49 +13:00
140f78c8a0
Ignore vermin in animals screen search
2013-01-06 18:14:25 +13:00
0fa27d6c34
Fix for gcc errors. It seems calls to base class members in a templated class must be fully template qualified.
2013-01-06 14:59:39 +13:00
3ffbef2396
Merge branch 'canStepBetween' into recent
2013-01-05 18:10:29 -05:00
f8abd5c595
StepBetween: renamed stuff back to the way it was. Thought I had already done that.
2013-01-05 18:09:50 -05:00
47b20ea301
Infinite sky: added glyphs and made it print status when no arguments given.
2013-01-05 17:32:23 -05:00
86c3c385bd
Autolabor: exclude hauling labors from clawback
2013-01-05 16:27:57 -06:00
4d57a053fc
Infinite sky: added helpful print statements.
2013-01-05 16:51:29 -05:00
151ff0f296
Infinite sky: rename from sky eternal.
2013-01-05 16:34:33 -05:00
4920293c2d
Infinite sky: get it to compile.
2013-01-05 16:30:48 -05:00
471e82a88a
Merge branch 'skyEternal' into infiniteSky
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 16:18:01 -05:00
9246ac9b05
Merge branch 'workNow' into recent
2013-01-05 13:36:24 -05:00
cf3ac48518
Merge in autoSyndrome, trueTransformation, ...
2013-01-05 13:35:49 -05:00
6622e9e06f
Merge branch 'canStepBetween' into recent
...
Conflicts:
library/modules/Maps.cpp
2013-01-05 13:32:29 -05:00
5fc466ef7e
Work now: also update dig on pause.
2013-01-05 12:50:44 -05:00
d2a2a63d01
Merge branch 'recent' into workNow
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 12:45:34 -05:00
874dfbdc4f
Merge branch 'eventManager' into autoSyndrome
2013-01-05 11:40:55 -05:00
bc5cdf8877
Auto syndrome: got rid of allow multiple syndromes option that didn't make any sense, and made sure that if allowing multiple targets it doesn't attach the syndrome to the worker twice.
2013-01-05 11:37:56 -05:00
3c7ca2ad71
Digging invaders: buildings can only be destroyed orthogonally, made path cost deal with hatches and raised bridges, but did NOT yet make job assignment deal with them.
2013-01-05 11:06:46 -05:00
4bef70ab6f
Merge branch 'search'
2013-01-06 02:27:57 +13:00
91ee8ac020
Refactor search to handle more types of screens cleanly.
...
Added search to screens:
* Animals
* Military positions assignment
* Announcements
* Room list
* Job list
* Burrow assignment
2013-01-06 00:26:16 +13:00
a7d6cf5157
Digging invaders: fixed a few problems involving digging and stairs, added a way to debug path cost, added a way to set the cost of each type of invasion job, made invaders only pathfind to one local instead of all of them.
2013-01-04 21:02:09 -05:00
fd05d30733
Digging invaders: improved edge cost evaluation.
2013-01-04 18:11:38 -05:00
9404267c1f
Autolabor: Tell DF to immediately process jobs after each run.
2013-01-04 13:14:20 -06:00
2ca943ae20
Digging invaders: comment out debug print statements.
2013-01-04 00:43:39 -05:00
038cc91fcd
Digging invaders: fixed a bug where it would reassign long-lasting jobs, making them take forever. Also added a check for the case that invaders cannot dig to any locals.
2013-01-04 00:35:47 -05:00
b6f0ae5b14
Digging invaders: keep track of who's working on the job, and check periodically to see if they quit.
2013-01-04 00:08:54 -05:00
47eca42f68
Digging invaders: made it possible to customize which races can dig.
2013-01-03 23:18:40 -05:00
0fecdfadb1
Digging Invaders: when assigning a job, get rid of old one. Handle loading and unloading. Optimizations for when invaders can already reach someone.
2013-01-03 22:46:17 -05:00
ed6dcf9589
DiggingInvaders: made invaders dig automatically, instead of on request.
2013-01-03 21:25:50 -05:00
f145f8d528
Merge branch 'eventManager' into diggingInvaders-unstable
2013-01-03 19:32:12 -05:00
715f191c26
EventManager: made the frequency part of EventHandler.
2013-01-03 19:31:29 -05:00
b82d6940b6
Digging invaders: started on making invaders keep digging until done.
2013-01-03 18:45:53 -05:00
1d6dec54c7
Digging Invaders: reorganized the files to make it easier to work with.
2013-01-03 18:14:16 -05:00
84b8fae326
Merge branch 'eventManager' into diggingInvaders-unstable
2013-01-03 15:53:06 -05:00
910e398a7b
EventManager: added invasion event.
2013-01-03 15:52:56 -05:00
34d9785ce5
Digging Invaders: minor changes.
2013-01-03 14:38:05 -05:00
b62e50f2e1
DiggingInvaders: get rid of the framework for assigning multiple dig/deconstruct/etc operations at the same time.
2013-01-03 14:16:10 -05:00
0b68e66dc9
DiggingInvaders: fixed a problem with deconstructing hatches.
2013-01-03 13:32:50 -05:00
c22c4d009c
Added convenience functions to eventful (see Lua API.rst)
2013-01-03 20:30:51 +02:00
796e387398
Add a guard against an invalid item pointer, and don't try to deduce construction labor for item_lost jobs
2013-01-03 12:24:32 -06:00
f60e44c395
DiggingInvaders: minor changes.
2013-01-03 13:11:11 -05:00
7b561f108b
Fix hotkey detection
2013-01-03 22:01:01 +13:00
7586e62374
Digging Invaders: fixed a problem with removing constructions.
2013-01-02 22:35:05 -05:00
5201870356
Digging Invaders: get rid of debug prints.
2013-01-02 22:13:23 -05:00
ae43865489
Digging Invaders: actually seems to basically work!
2013-01-02 22:11:05 -05:00
4e4e382b8f
EventManager: added syndrome event.
2013-01-02 18:30:15 -05:00
8b5e847dfa
New event for eventful. postWorkshopFillSidebarMenu for tweaking the sidebar menu on workshops.
2013-01-02 23:43:38 +02:00
38ef75418a
AutoSyndrome: added an option to delete boiling rocks as they are created (on by default).
2013-01-02 14:09:16 -05:00
5e2877be23
AutoSyndrome: added options for worker only (vs all in building), allow multiple targets, and allow multiple syndromes.
2013-01-02 13:47:59 -05:00
bf0f0e910b
Merge branch 'eventManager' into autoSyndrome
2013-01-02 12:40:20 -05:00
144e0b4dcb
Digging Invaders: merged eventManager and recent.
2013-01-02 11:26:30 -05:00
c3b2ae2137
EventManager: allowed plugins to specify how often they need events to be checked, in the event that monitoring is necessary.
2013-01-02 11:07:56 -05:00
581a8dd955
Prevent material selection cursor from going past its bounds
2013-01-02 22:27:26 +13:00
fa78d6ccfc
Merge branch 'recent' into eventManager-unstable
...
Conflicts:
library/modules/Job.cpp
2013-01-02 03:16:45 -05:00
b320fb25f3
AutoSyndrome: added smart arguments for location, worker id, and reaction id.
2013-01-02 00:07:23 -05:00
1fe3a0e343
Merge branch 'automaterial_box'
2013-01-02 14:01:11 +13:00
41615d0446
Autolabor: adjust idle clawback to deal with "pickup equipment" for miners.
2013-01-01 17:53:24 -06:00
d50aa24ebf
Autolabor: fix idle stepdown (seems to work much better), change some scoring weights, change autolabor list output to include busy and idle counters
2013-01-01 16:35:09 -06:00
3a24565728
Autolabor: add construction labor for hatch.
2013-01-01 15:12:45 -06:00
7df7b1758c
Merge branch 'automaterial' of https://github.com/Falconne/dfhack into automaterial_box
2013-01-01 19:51:29 +13:00
a1eadd0f08
Allocate sky blocks when needed.
...
Allow stairs to be designated on top of each other in open space.
2013-01-01 19:46:11 +13:00
0572e87d7b
SkyEternal: allocates new z-levels of sky as needed, or on request.
2012-12-31 13:57:59 -05:00
6ab8c8c30e
Autolabor: change fishery build labor to CLEAN_FISH to control random acts of fish extermination; add build labor for wells.
2012-12-28 07:58:29 -06:00
6d4c003748
Autolabor: fix dig-from-below bug regaring mining jobs, add overallocation detection and remediation, fix fishing and hunting
2012-12-27 02:52:54 -06:00
5d04148aad
Make gcc happy
2012-12-27 20:15:32 +13:00
1ed129e1a7
Allow placing constructions in unconnected open space, with sensible restrictions
2012-12-26 01:02:57 +13:00
40e25b6a1f
Better handling of open space construction placement
2012-12-25 18:08:41 +13:00
5e54c9919a
Improved check for figuring out what tiles can have constructions.
2012-12-24 00:59:12 +13:00
e4f4943b10
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-12-23 12:34:05 +02:00
2f48ed5d9a
Added restrictliquids and restrictice commands.
2012-12-23 01:09:21 -08:00
03aedf6895
Enabling designation like rectangular selection for constructions, with unlimited selection size and auto skipping of tiles that can't be built on.
2012-12-23 03:04:41 +13:00
a4dc79565a
AutoSyndrome: allowed for triggering DFHack commands from in game reactions.
2012-12-22 00:13:07 -05:00
786149a630
Added new event to eventful: onWorkshopFillSidebarMenu
2012-12-21 00:42:15 +02:00
46b9148277
Digging invaders: it still doesn't work, but now it's a lot simpler.
2012-12-20 00:35:45 -05:00
9cb3f19630
Digging invaders: Minor changes. Still unstable.
2012-12-19 20:44:22 -05:00
ee4f37ff72
Merge branch 'canWalkBetween' into diggingInvaders
2012-12-19 20:31:17 -05:00
7972902c81
stepBetween: named a few things better, and fixed a lot.
2012-12-19 20:30:37 -05:00
fcbc5d1cb0
Digging invaders. Temp commit. Unstable.
2012-12-19 18:46:46 -05:00
555c754636
EventManager: added construction and building events.
2012-12-18 18:34:38 -05:00
a9fec84c72
Autolabor: add paved roads.
2012-12-18 16:23:02 -06:00
a09764e77b
Digging Invaders: more optimizations.
2012-12-18 15:22:21 -05:00
110a9a5579
Digging Invaders: a bit faster.
2012-12-17 20:44:35 -05:00
937769874d
Digging Invaders: kind of works, but WAAAAAY too slow.
2012-12-17 20:12:11 -05:00
957a4da474
Minor changes.
2012-12-17 18:05:57 -05:00
ef80dbacde
More fiddling. Almost kind of works.
2012-12-17 17:36:35 -05:00
76fcf1c335
Digging invaders: multi-dimensional edge cost: always prefer walking over digging, no matter how far.
2012-12-17 14:22:45 -05:00
94673e447d
diggingInvaders: reimplemented path-based digging. Works kind of ok.
2012-12-17 13:37:02 -05:00
ed1766936b
diggingInvaders: sadly, it seems that minimum spanning tree is a terrible heuristic for vertex Steiner tree in this case.
2012-12-17 00:54:39 -05:00
bf25ea5129
diggingInvaders: fixed a major bug with edge sorting.
2012-12-17 00:17:07 -05:00
d79583a2c9
Merge branch 'canWalkBetween' into diggingInvaders
2012-12-16 23:39:36 -05:00
01e5e93825
Renamed Maps::canWalkBetween to Maps::canPathBetween and added Maps::canWalkBetween, which does what it says.
2012-12-16 23:26:50 -05:00
a61cbc661b
diggingInvaders: starting a rewrite. Unstable
2012-12-16 21:44:23 -05:00
9aa95ddca8
diggingInvaders: int -> int32_t
2012-12-16 17:06:46 -05:00
2760484c37
diggingInvaders: cleanup.
2012-12-16 16:53:02 -05:00
131d19e4cf
Merge branch 'eventManager' into diggingInvaders
2012-12-16 16:43:58 -05:00
8a242b3c0d
Merge branch 'master' into diggingInvaders
2012-12-16 16:34:45 -05:00
4ac6d9c0c3
Autolabor: add a number of destroy furniture labors (all "haul furniture")
2012-12-16 00:03:26 -06:00
8bf359ba02
Autolabor: add labor for ivory & horn crafts (yawn)
2012-12-15 21:18:06 -06:00
75db99a3c7
autoSyndrome: deleted an unused constant.
2012-12-15 18:52:05 -05:00
3e5537e321
autoSyndrome: made it use EventManager.
2012-12-15 18:47:51 -05:00
dae162a0b4
Merge branch 'eventManager' into autoSyndrome
2012-12-15 18:18:59 -05:00
935058f0a5
EventManager: moved files around, made eventExample not run by default, and got rid of the silly NONE event type.
2012-12-15 17:43:41 -05:00
86e002f3ff
EventManager: added item creation event.
2012-12-15 16:49:13 -05:00
b0314755e0
EventManager: added unit death event.
2012-12-15 14:40:11 -05:00
4af6b728b7
Small fix to gm-editor. Added proj_itemst and proj_unitst to eventful. Now you can make custom projectiles (e.g. rockets?)
2012-12-15 13:27:16 +02:00
155a4d044c
EventManager: fiddled with time events. Made it possible to register for time events before a world is loaded. Also added some files I forgot to add to the previous commit.
2012-12-14 23:29:28 -05:00
cf619a519e
EventManager: made event handlers unregister when plugins are unloaded. Also changed PluginManager so that plugins can call core.getPluginManager() during plugin_init.
2012-12-14 22:14:38 -05:00
747723187f
EventManager: first draft.
2012-12-14 21:05:38 -05:00
cd7c39f2db
Autolabor: add deconstruct labor for cages
2012-12-14 09:34:03 -06:00
08f454cc81
Removed old reactionhooks.lua
2012-12-14 16:41:59 +02:00
e46d434c25
Missing lua file for eventful.
2012-12-14 16:33:26 +02:00
af7f11fdfa
autoSyndrome: made the syndrome logic make more sense.
2012-12-13 11:30:37 -05:00
bba96494f3
ruby: add unit_hostiles to list hostiles units (duh)
2012-12-13 17:20:21 +01:00
a28fc65e6d
autoSyndrome now deals with creature_class.
2012-12-13 11:13:56 -05:00
2535b50bfc
Autolabor: add construct chain labor, add destruct trap labor, change overbroad test for military status (was catching uniformed reservists, who are eligible to do civilian labor)
2012-12-12 22:25:23 -06:00
3a541e26be
autoSyndrome: automatically detects boiling rock syndromes better, and checks if each syndrome is applicable to the unit that finished the job.
2012-12-12 23:01:05 -05:00
82031092a9
Autolabor: rework tool management to try to reduce tool litter
2012-12-12 14:28:11 -06:00
ddceabbfb7
Merge branch 'master' of git://github.com/jjyg/dfhack
2012-12-12 18:58:11 +02:00
3b9f21a1ea
Autolabor: do not count designations in hidden squares (since your dwarves can't reach them anyway). Also apply an assignment penalty for assigning a dwarf to a labor other than the one the dwarf is doing
2012-12-12 10:37:09 -06:00
0fc01c48e1
Autolabor: add construct labor for GearAssembly, AxleHorizonal, and AxleVertical (the last is a guess, but probably right)
2012-12-12 09:52:13 -06:00
b75c1da95e
Autolabor: add build waterwheel.
2012-12-12 08:46:52 -06:00
662d3101c7
ruby: fix onupdate tick limiting + advmode, add pageprotect, add :script_finished
2012-12-11 17:25:51 +01:00
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
3e8ba2dd06
Autolabor: fix bring-crutch labor
2012-12-11 09:19:38 -06:00
017b986987
Autolabor: fix wound cleaning labor.
2012-12-11 09:06:37 -06:00
966deb4647
Fix crash and confusing behavior in automaterial.
2012-12-11 22:05:00 +13:00
6bc791d985
follow df-structure rename unit.unknown8 + able_stand_*
2012-12-10 22:50:33 +01:00
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
e85f4eb880
First draft of autoSyndrome: a tool for replacing boiling rock syndromes with something more reliable. Uses non-df-recognized tags in material definition raws.
2012-12-09 21:19:40 -05:00
6c4f163a5e
Merge branch 'master' of https://github.com/angavrilov/dfhack
...
Conflicts:
NEWS
2012-12-09 14:25:31 +02:00
6d0e505fd2
Added onItemContaminate to eventful and readme/news for eventful
2012-12-09 14:15:39 +02:00
a0a566dbf2
Tidy up eventful.cpp
2012-12-09 13:00:49 +02:00
0ef4522f95
Merge branch 'master' into autolabor
2012-12-08 21:26:50 -06:00
468412b9fc
Autolabor: fix unitialized variable bug causing broker to be inappropriately excluded from work
2012-12-08 21:14:23 -06:00
72921fbfd5
Made workNow only check jobs when the game becomes paused instead of constantly when paused. Also made it enable/disable on command.
2012-12-08 12:50:33 -05:00
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
6ae82187d2
Autolabor: more tweaks to hauling labor decoding, fix heap corruption due to array underflow
2012-12-08 03:51:07 -06:00
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
7307f4e870
Fix crash and confusing behavior in automaterial.
2012-12-08 09:51:35 +04:00
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
ebc2625d97
ditch the unused Vegetation module
2012-12-06 23:47:25 +01:00
fa9b71adc5
autolabor: add archery targets, improve JobLaborMapper's destructor
2012-12-06 09:39:14 -06:00
e1b70d171c
ruby: tweak is_citizen test
2012-12-06 12:48:16 +01:00
cd6eb9edd3
If training ammo is forbidden for all use, don't move it to combat chests.
2012-12-06 12:00:18 +04:00
0df60a0b4f
Autolabor: slabs, animal trainers
2012-12-06 01:38:43 -06:00
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
74ebe7d207
ruby: add df-static-flagarray
2012-12-04 17:55:29 +01:00
0b80dff09d
ruby: add d-float support
2012-12-04 17:18:09 +01:00
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
745b347b5b
Fix const correctness
2012-12-04 10:30:49 +13:00
287ee2bc04
Autolabor: allow multiple simultaneous jobs at farms.
2012-12-03 14:20:57 -06:00
3953112eb9
dump Vegetation::t_plant, fix plant.is_burning
2012-12-03 19:03:07 +01:00
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
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
44bb965c97
Autolabor: add more building labors
2012-12-02 18:41:20 -06:00
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
b743f4f42d
Autolabor: remove some debug spam, and fix an error in computing preference scoring
2012-12-02 09:47:15 -06:00
dc7f9f56cd
Implement a low stock level announcement as suggested by falconne.
2012-12-02 15:31:43 +04:00
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
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
15f7ffa0e2
autolabor: add ConstructBuilding (Farm); change priority calculation
2012-12-01 17:39:01 -06:00
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
201430ed08
Autolabor: add health awareness, fix initialization crash, fix idle dwarf loop crash
2012-12-01 14:08:15 -06:00
df2e9f00e1
Document that search now works in the stockpile settings screen.
2012-12-01 17:21:06 +04:00
fd5b19fe8d
Merge remote-tracking branch 'falconne/search'
...
Conflicts:
plugins/search.cpp
2012-12-01 16:55:52 +04:00
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
d2ec52fa0b
Merge branch 'master' into autolabor
2012-11-30 21:47:30 -06:00
05dce0d2f1
Fix inadvertently prematurely terminated block comment.
2012-11-30 21:24:18 -06:00
384a667e97
Assorted progress on new autolabor. Still lots of issues.
2012-11-30 20:22:58 -06:00
6bc6f3e555
Merge branch 'search'
2012-12-01 10:21:37 +13:00
5f3328dcb2
Merge branch 'master' into autolabor
...
Conflicts:
plugins/autolabor.cpp
2012-11-30 11:25:41 -06:00
eecb604800
Sync submodules
2012-11-30 11:23:58 -06:00
210c1650ec
Add stockpile screen searching capability
2012-12-01 01:01:04 +13:00
2cb594ba89
Tweak the workflow lua api: include history in output of listConstraints.
2012-11-30 14:48:05 +04:00
abe027c940
Copy changes from ag fork
2012-11-30 22:44:05 +13:00
13666ec6e6
Merge remote-tracking branch 'remotes/origin/automaterial'
2012-11-30 20:27:32 +13:00
d2a13ad2c7
Merge branch 'autopasture'
2012-11-30 19:53:14 +13:00
d59d1c652e
Fix gcc compile of search plugin
2012-11-30 19:50:42 +13:00
d7f7538d01
ruby: fix Pointer assignment
2012-11-29 17:11:29 +01:00
Timothy Collett
Quietust
Petr Mrázek
Anuradha Dissanayake
Warmist
Kelly Martin
Alexander Gavrilov
jj
cherrydev
Anuradha Dissanayake
expwnent
expwnent
rampaging-poet