Commit Graph

1704 Commits (17cf52206a5941d73768fe70dfdd95c8522755dd)

Author SHA1 Message Date
Warmist ab6a993689 friendship.lua: removed debug printing 2013-02-15 20:21:33 +02:00
Warmist bb5d98e895 friendship fixes. 2013-02-15 20:19:55 +02:00
Kelly Martin fe70df593b Sync submodules 2013-02-14 18:36:21 -06:00
Petr Mrázek ac2e45c843 Compatibility with older GCC versions in the search plugin 2013-02-14 12:45:58 +01:00
Alexander Gavrilov 8de172f1c8 Binsearch in units.active can't possibly work, ever. 2013-02-14 13:13:25 +04:00
Petr Mrázek a8f5e54e37 Sync submodules 2013-02-14 09:53:14 +01:00
Kelly Martin e35a1c7720 Correct autolabor2 for changes in structures. 2013-02-13 16:00:09 -06:00
Kelly Martin 8d278a87db Merge branch 'master' of https://github.com/angavrilov/dfhack.git
Conflicts:
	plugins/devel/CMakeLists.txt
2013-02-13 13:52:02 -06:00
Kelly Martin f9a3450aca Reinstate old autolabor in its original place. 2013-02-13 13:34:39 -06:00
Kelly Martin ff0012c91f Move new autolabor to autolabor2 in devel. 2013-02-13 13:33:32 -06:00
Kelly Martin 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
Alexander Gavrilov a17760af4f Communicate the Plugin pointer to the plugin in a decent sort of way. 2013-02-13 14:45:24 +04:00
Anuradha Dissanayake a5c21745eb Enable all plan modes when entering quickfort mode 2013-02-09 16:49:36 +13:00
Anuradha Dissanayake 2f4979d3fa Add Quickfort mode 2013-02-08 00:04:52 +13:00
Anuradha Dissanayake 1956f8b92d Lock selection mode toggle 2013-02-07 22:57:07 +13:00
Petr Mrázek 0e384ada75 Sync submodules 2013-02-05 05:34:34 +01:00
Anuradha Dissanayake dff16c3c1d Define nullptr for gcc < 4.6 2013-02-02 02:24:05 +13:00
Anuradha Dissanayake ecf255243f Plugin to easily find and resume suspended constructions 2013-02-02 02:24:05 +13:00
Anuradha Dissanayake 056bde451a Remove some leftover code 2013-01-29 21:22:17 +13:00
Anuradha Dissanayake ae8bb7c9f8 Fix for gcc errors. 2013-01-29 20:44:56 +13:00
falconne 58125a57a7 Merge remote-tracking branch 'remotes/github/buildingplan' 2013-01-27 23:42:28 +13:00
Anuradha Dissanayake 6546af94ee Clear persistent data after item assigned. Fix some material selection screen functionality. 2013-01-24 20:16:18 +13:00
Anuradha Dissanayake f036360688 Add filters for quality, material and decorations. 2013-01-23 23:25:38 +13:00
Kelly Martin 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
Anuradha Dissanayake f5a0644b45 Fix bad refactor 2013-01-18 23:29:08 +13:00
Anuradha Dissanayake 192baa5638 Building plan plugin: place furniture before it's built. Initial checkin. 2013-01-18 23:28:45 +13:00
Alexander Gavrilov 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
Alexander Gavrilov 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
Alexander Gavrilov 14d41b8eda Update search to the newer structure definitions. 2013-01-16 18:55:05 +04:00
Alexander Gavrilov 309f162566 Fix line endings again. 2013-01-16 18:54:35 +04:00
Anuradha Dissanayake ed0baa3f69 Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin. 2013-01-16 18:48:59 +04:00
Anuradha Dissanayake 4257c9fe84 Ignore vermin in animals screen search 2013-01-16 18:48:55 +04:00
Anuradha Dissanayake 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
Alexander Gavrilov 655cd3602c Merge remote-tracking branch 'falconne/search' 2013-01-16 18:30:29 +04:00
Petr Mrázek 940d5fe891 Merge https://github.com/expwnent/dfhack 2013-01-15 23:49:10 +01:00
Petr Mrázek 0073c1bec2 Track xml and stonesense 2013-01-15 23:16:15 +01:00
Kelly Martin 90a62a82f7 Autolabor: add screw pump build labor 2013-01-14 12:12:56 -06:00
expwnent c031a7e081 Merge branch 'infiniteSky' 2013-01-13 15:28:31 -05:00
expwnent 44662de601 Infinite sky: bug with z level flags. 2013-01-13 15:28:17 -05:00
Anuradha Dissanayake fdcb248ea0 Merge branch 'automaterial_box' 2013-01-12 23:39:50 +13:00
Anuradha Dissanayake 83ef94774b A better format for toggle strings. 2013-01-12 23:32:30 +13:00
Quietust 3c6ddc2a8c Merge branch 'master' of https://github.com/expwnent/dfhack
Conflicts:
	NEWS
	library/xml
2013-01-09 10:09:58 -06:00
expwnent 476afafb3c Merge branch 'autoSyndrome' into recent 2013-01-07 12:09:55 -05:00
expwnent 6fd9ce339d Autosyndrome: fixed the rules on when syndromes apply. 2013-01-07 12:09:39 -05:00
Warmist 1990e2caf7 Small fix to adv site creation, now it's really centered around you 2013-01-07 02:01:59 +02:00
Kelly Martin 553a312266 Autolabor: add deconstruct bridge labor 2013-01-06 10:59:20 -06:00
Anuradha Dissanayake 6d6d55a937 Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin. 2013-01-06 18:32:49 +13:00
Anuradha Dissanayake 140f78c8a0 Ignore vermin in animals screen search 2013-01-06 18:14:25 +13:00
Anuradha Dissanayake 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
expwnent 3ffbef2396 Merge branch 'canStepBetween' into recent 2013-01-05 18:10:29 -05:00
expwnent f8abd5c595 StepBetween: renamed stuff back to the way it was. Thought I had already done that. 2013-01-05 18:09:50 -05:00
expwnent 47b20ea301 Infinite sky: added glyphs and made it print status when no arguments given. 2013-01-05 17:32:23 -05:00
Kelly Martin 86c3c385bd Autolabor: exclude hauling labors from clawback 2013-01-05 16:27:57 -06:00
expwnent 4d57a053fc Infinite sky: added helpful print statements. 2013-01-05 16:51:29 -05:00
expwnent 151ff0f296 Infinite sky: rename from sky eternal. 2013-01-05 16:34:33 -05:00
expwnent 4920293c2d Infinite sky: get it to compile. 2013-01-05 16:30:48 -05:00
expwnent 471e82a88a Merge branch 'skyEternal' into infiniteSky
Conflicts:
	plugins/CMakeLists.txt
2013-01-05 16:18:01 -05:00
expwnent 9246ac9b05 Merge branch 'workNow' into recent 2013-01-05 13:36:24 -05:00
expwnent cf3ac48518 Merge in autoSyndrome, trueTransformation, ... 2013-01-05 13:35:49 -05:00
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 4bef70ab6f Merge branch 'search' 2013-01-06 02:27:57 +13: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
Anuradha Dissanayake 7b561f108b Fix hotkey detection 2013-01-03 22:01:01 +13: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
Anuradha Dissanayake 581a8dd955 Prevent material selection cursor from going past its bounds 2013-01-02 22:27:26 +13: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
Anuradha Dissanayake 1fe3a0e343 Merge branch 'automaterial_box' 2013-01-02 14:01:11 +13: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
Anuradha Dissanayake 7df7b1758c Merge branch 'automaterial' of https://github.com/Falconne/dfhack into automaterial_box 2013-01-01 19:51:29 +13:00
Anuradha Dissanayake 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
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
Anuradha Dissanayake 5d04148aad Make gcc happy 2012-12-27 20:15:32 +13:00
Anuradha Dissanayake 1ed129e1a7 Allow placing constructions in unconnected open space, with sensible restrictions 2012-12-26 01:02:57 +13:00
falconne 40e25b6a1f Better handling of open space construction placement 2012-12-25 18:08:41 +13:00
Anuradha Dissanayake 5e54c9919a Improved check for figuring out what tiles can have constructions. 2012-12-24 00:59:12 +13:00
Warmist e4f4943b10 Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-12-23 12:34:05 +02:00
rampaging-poet 2f48ed5d9a Added restrictliquids and restrictice commands. 2012-12-23 01:09:21 -08:00
Anuradha Dissanayake 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
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
Alexander Gavrilov 966deb4647 Fix crash and confusing behavior in automaterial. 2012-12-11 22:05:00 +13: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