expwnent
|
6622e9e06f
|
Merge branch 'canStepBetween' into recent
Conflicts:
library/modules/Maps.cpp
|
2013-01-05 13:32:29 -05:00 |
|
expwnent
|
5fc466ef7e
|
Work now: also update dig on pause.
|
2013-01-05 12:50:44 -05:00 |
|
expwnent
|
d2a2a63d01
|
Merge branch 'recent' into workNow
Conflicts:
plugins/CMakeLists.txt
|
2013-01-05 12:45:34 -05:00 |
|
expwnent
|
874dfbdc4f
|
Merge branch 'eventManager' into autoSyndrome
|
2013-01-05 11:40:55 -05:00 |
|
expwnent
|
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 |
Anuradha Dissanayake
|
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 |
Kelly Martin
|
9404267c1f
|
Autolabor: Tell DF to immediately process jobs after each run.
|
2013-01-04 13:14:20 -06:00 |
|
expwnent
|
715f191c26
|
EventManager: made the frequency part of EventHandler.
|
2013-01-03 19:31:29 -05:00 |
|
expwnent
|
910e398a7b
|
EventManager: added invasion event.
|
2013-01-03 15:52:56 -05:00 |
Warmist
|
c22c4d009c
|
Added convenience functions to eventful (see Lua API.rst)
|
2013-01-03 20:30:51 +02:00 |
|
Kelly Martin
|
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 |
|
expwnent
|
4e4e382b8f
|
EventManager: added syndrome event.
|
2013-01-02 18:30:15 -05:00 |
|
Warmist
|
8b5e847dfa
|
New event for eventful. postWorkshopFillSidebarMenu for tweaking the sidebar menu on workshops.
|
2013-01-02 23:43:38 +02:00 |
|
expwnent
|
38ef75418a
|
AutoSyndrome: added an option to delete boiling rocks as they are created (on by default).
|
2013-01-02 14:09:16 -05:00 |
|
expwnent
|
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 |
|
expwnent
|
bf0f0e910b
|
Merge branch 'eventManager' into autoSyndrome
|
2013-01-02 12:40:20 -05:00 |
|
expwnent
|
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 |
|
expwnent
|
fa78d6ccfc
|
Merge branch 'recent' into eventManager-unstable
Conflicts:
library/modules/Job.cpp
|
2013-01-02 03:16:45 -05:00 |
|
expwnent
|
b320fb25f3
|
AutoSyndrome: added smart arguments for location, worker id, and reaction id.
|
2013-01-02 00:07:23 -05:00 |
|
Kelly Martin
|
41615d0446
|
Autolabor: adjust idle clawback to deal with "pickup equipment" for miners.
|
2013-01-01 17:53:24 -06:00 |
|
Kelly Martin
|
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 |
|
Kelly Martin
|
3a24565728
|
Autolabor: add construction labor for hatch.
|
2013-01-01 15:12:45 -06:00 |
expwnent
|
0572e87d7b
|
SkyEternal: allocates new z-levels of sky as needed, or on request.
|
2012-12-31 13:57:59 -05:00 |
|
Kelly Martin
|
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 |
|
Kelly Martin
|
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 |
|
Warmist
|
e4f4943b10
|
Merge branch 'master' of https://github.com/angavrilov/dfhack
|
2012-12-23 12:34:05 +02:00 |
|
expwnent
|
a4dc79565a
|
AutoSyndrome: allowed for triggering DFHack commands from in game reactions.
|
2012-12-22 00:13:07 -05:00 |
|
Warmist
|
786149a630
|
Added new event to eventful: onWorkshopFillSidebarMenu
|
2012-12-21 00:42:15 +02:00 |
|
expwnent
|
7972902c81
|
stepBetween: named a few things better, and fixed a lot.
|
2012-12-19 20:30:37 -05:00 |
|
expwnent
|
555c754636
|
EventManager: added construction and building events.
|
2012-12-18 18:34:38 -05:00 |
|
Kelly Martin
|
a9fec84c72
|
Autolabor: add paved roads.
|
2012-12-18 16:23:02 -06:00 |
|
expwnent
|
01e5e93825
|
Renamed Maps::canWalkBetween to Maps::canPathBetween and added Maps::canWalkBetween, which does what it says.
|
2012-12-16 23:26:50 -05:00 |
|
Kelly Martin
|
4ac6d9c0c3
|
Autolabor: add a number of destroy furniture labors (all "haul furniture")
|
2012-12-16 00:03:26 -06:00 |
|
Kelly Martin
|
8bf359ba02
|
Autolabor: add labor for ivory & horn crafts (yawn)
|
2012-12-15 21:18:06 -06:00 |
|
expwnent
|
75db99a3c7
|
autoSyndrome: deleted an unused constant.
|
2012-12-15 18:52:05 -05:00 |
|
expwnent
|
3e5537e321
|
autoSyndrome: made it use EventManager.
|
2012-12-15 18:47:51 -05:00 |
|
expwnent
|
dae162a0b4
|
Merge branch 'eventManager' into autoSyndrome
|
2012-12-15 18:18:59 -05:00 |
|
expwnent
|
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 |
|
expwnent
|
86e002f3ff
|
EventManager: added item creation event.
|
2012-12-15 16:49:13 -05:00 |
|
expwnent
|
b0314755e0
|
EventManager: added unit death event.
|
2012-12-15 14:40:11 -05:00 |
|
Warmist
|
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 |
|
expwnent
|
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 |
|
expwnent
|
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 |
|
expwnent
|
747723187f
|
EventManager: first draft.
|
2012-12-14 21:05:38 -05:00 |
|
Kelly Martin
|
cd7c39f2db
|
Autolabor: add deconstruct labor for cages
|
2012-12-14 09:34:03 -06:00 |
|
Warmist
|
08f454cc81
|
Removed old reactionhooks.lua
|
2012-12-14 16:41:59 +02:00 |
|
Warmist
|
e46d434c25
|
Missing lua file for eventful.
|
2012-12-14 16:33:26 +02:00 |
|
expwnent
|
af7f11fdfa
|
autoSyndrome: made the syndrome logic make more sense.
|
2012-12-13 11:30:37 -05:00 |
jj
|
bba96494f3
|
ruby: add unit_hostiles to list hostiles units (duh)
|
2012-12-13 17:20:21 +01:00 |
|
expwnent
|
a28fc65e6d
|
autoSyndrome now deals with creature_class.
|
2012-12-13 11:13:56 -05:00 |
|
Kelly Martin
|
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 |
|
expwnent
|
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 |
|
Kelly Martin
|
82031092a9
|
Autolabor: rework tool management to try to reduce tool litter
|
2012-12-12 14:28:11 -06:00 |
|
Warmist
|
ddceabbfb7
|
Merge branch 'master' of git://github.com/jjyg/dfhack
|
2012-12-12 18:58:11 +02:00 |
|
Kelly Martin
|
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 |
|
Kelly Martin
|
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 |
|
Kelly Martin
|
b75c1da95e
|
Autolabor: add build waterwheel.
|
2012-12-12 08:46:52 -06:00 |
|
jj
|
662d3101c7
|
ruby: fix onupdate tick limiting + advmode, add pageprotect, add :script_finished
|
2012-12-11 17:25:51 +01:00 |
|
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 |
|
jj
|
6bc791d985
|
follow df-structure rename unit.unknown8 + able_stand_*
|
2012-12-10 22:50:33 +01: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 |
|
expwnent
|
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 |
|
Warmist
|
6c4f163a5e
|
Merge branch 'master' of https://github.com/angavrilov/dfhack
Conflicts:
NEWS
|
2012-12-09 14:25:31 +02:00 |
|
Warmist
|
6d0e505fd2
|
Added onItemContaminate to eventful and readme/news for eventful
|
2012-12-09 14:15:39 +02:00 |
|
Warmist
|
a0a566dbf2
|
Tidy up eventful.cpp
|
2012-12-09 13:00:49 +02: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 |
|
expwnent
|
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 |
|
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 |