expwnent
63e1f61f4f
autoSyndrome/syndromeTrigger: deal with overlap better for commands.
2013-05-12 12:43:45 -04:00
expwnent
c127ad052e
autoSyndrome and syndromeTrigger documentation.
2013-05-11 19:20:02 -04:00
expwnent
29b5e20575
autoSyndrome should now work with syndromeTrigger.
2013-05-11 16:46:37 -04:00
jj
dd739313b1
ruby: tweak item_isfree
2013-04-30 18:38:52 +02:00
Alexander Gavrilov
f3e357d161
Fix detection of GET_MATERIAL_FROM_REAGENT results in workflow.
...
Dereference pointer to strings. Also just return undefined
material instead of skipping the product if it still fails.
2013-04-30 19:42:51 +04:00
Petr Mrázek
18a91ef221
Merge https://github.com/ab9rf/dfhack
...
Conflicts:
library/xml
plugins/stonesense
2013-04-24 18:00:40 +02:00
Petr Mrázek
c39f4bc182
Fix build bug in automaterial.
2013-04-24 17:49:18 +02:00
Petr Mrázek
222c61ab25
Merge branch 'IsoRemote' of https://github.com/JapaMala/dfhack
2013-04-24 17:36:22 +02:00
Petr Mrázek
2e379c4d3f
Merge https://github.com/Falconne/dfhack
...
Conflicts:
plugins/CMakeLists.txt
plugins/stonesense
2013-04-24 17:24:03 +02:00
Petr Mrázek
df6355a092
Merge https://github.com/jjyg/dfhack
2013-04-24 16:24:14 +02:00
Petr Mrázek
0efbc74ac2
Merge https://github.com/quietust/dfhack
...
Conflicts:
NEWS
2013-04-24 16:21:59 +02:00
Petr Mrázek
aad5296f91
Merge branch 'master' of https://github.com/rampaging-poet/dfhack
2013-04-24 16:14:30 +02:00
Petr Mrázek
3e59794733
Merge branch 'master' of https://github.com/cherrydev/dfhack
...
Conflicts:
Readme.html
2013-04-24 16:13:27 +02:00
Robert Heinrich
ce47033190
fix in zone UI filters: lower case 'f' conflicted as hotkey with toggling between pit and pond in the pit screen. So now the filter keys use upper case letters instead.
2013-04-24 23:37:05 +12:00
Robert Heinrich
024a3d766b
Added some more commands to autobutcher UI script.
...
Changed autobutcher behavior a bit:
now protected units count towards the target quota,
units available for adoption are considered as protected.
Added filters for caged, male and female to assignement UI
for cages, pastures and pits.
2013-04-24 23:37:05 +12:00
Robert Heinrich
fd265b37d6
Added lua GUI front-end for autobutcher.
2013-04-24 23:37:05 +12:00
Anuradha Dissanayake
80de3c05fa
Stocks plugin: Add keywords to search for flags.
2013-04-24 23:31:37 +12:00
Anuradha Dissanayake
eb8b2faf66
Stocks plugin: fix inventory check, add trade assignments, better hotkets.
2013-04-23 22:15:25 +12:00
jj
c9776f481c
ruby: add construction/siegeengine bld subtypes in building_alloc
2013-04-21 22:29:51 +02:00
Anuradha Dissanayake
e70d7b404a
Don't exclude webs, check for items in inventory before discarding those without a valid position.
2013-04-20 12:09:07 +12:00
jj
de5e713c51
ruby: add rb dfhack command shortcut
2013-04-16 21:54:03 +02:00
Anuradha Dissanayake
811bd191d5
Add wear filter
2013-04-15 20:43:13 +12:00
falconne
d99b930f58
Better Stocks - Quality & Wear filters
2013-04-14 16:39:21 +12:00
jj
13451bd487
ruby: fix crash on Compound#_cpp_delete
2013-04-14 01:17:44 +02:00
falconne
17513283d4
Better Stocks screen - WIP
2013-04-14 00:45:06 +12:00
jj
40f9f06360
dig: ignore tile shape if hidden
2013-04-12 15:23:16 +02:00
jj
b2e22a2c42
ruby: add facility to queue dfhack commands
2013-04-12 15:23:13 +02:00
Anuradha Dissanayake
d0ba4f5881
Better Stocks screen - WIP
2013-04-11 20:52:46 +12:00
Quietust
399fd107e4
Make createitem create shoes in pairs (as well as gloves)
2013-04-08 08:29:50 -05:00
Petr Mrázek
658e64c1b2
Fix allegro, stonesense/deplibs is now hack/libs, sync isoworld and stonesense
2013-04-07 20:25:38 +02:00
expwnent
fc6cb3ae42
Merge branches 'autoSyndrome', 'outsideOnly' and 'syndromeTrigger'
2013-04-07 14:00:24 -04:00
expwnent
959321ec22
syndromeTrigger: logic tweak.
2013-04-07 13:56:12 -04:00
expwnent
1c78f06a1c
syndromeTrigger: only complain once.
2013-04-07 13:22:38 -04:00
expwnent
b057a0d82a
Merge branch 'once' into syndromeTrigger
2013-04-07 13:19:18 -04:00
expwnent
ddc4cad73b
autoSyndrome: fixed a bug when a reaction didn't have a valid mat_index.
2013-04-07 13:17:00 -04:00
expwnent
329538edfd
digsmart temp commit.
2013-04-07 13:08:32 -04:00
Japa
3b921feb61
Skip ice and brook floors.
2013-04-06 17:07:46 +05:30
Anuradha Dissanayake
efaa247d2a
Stocks start
2013-04-06 17:40:07 +13:00
Japa
660ce50542
Floors are loaded one level below solid blocks.
2013-04-06 02:42:51 +05:30
Japa
541e4f0947
Changed liquids to use an enum.
2013-04-04 14:28:43 +05:30
jj
f1410c10c6
digcircle: fix bug #181 (help: radius -> diameter)
2013-04-03 22:16:36 +02:00
Petr Mrázek
575b1c45fc
Sync isoworld, linux fixes
2013-04-03 01:10:06 +02:00
Petr Mrázek
3580409cc1
Sync isoworld, some protobuf building changes
2013-04-02 22:37:41 +02:00
Petr Mrázek
c361ba7bf4
Sync, fix isoworld in .gitmodules
2013-04-02 19:19:29 +02:00
Petr Mrázek
5ff9947a06
Merge branch '0.34.11-r3-bugfixes'
2013-04-02 19:17:32 +02:00
Petr Mrázek
fe922e3528
Merge branch 'IsoRemote' of https://github.com/JapaMala/dfhack
2013-04-02 19:01:46 +02:00
Japa
33f0f0d3f3
Isoworldremote plugin now gives material lists, and verifies weather a map block has anything in it.
2013-04-02 22:03:32 +05:30
Alexander Gavrilov
9d6f202988
Fix the search plugin crashing the military screen.
...
The cause of the crash is that the right list is used for multiple
different things in different pages, so when cleaning up after a
page switch it is not acceptable to mess with it in any way. However
the search plugin changed its length, thus causing a crash if the
new contents were shorter than the original candidate list.
2013-04-02 22:42:55 +13:00
Alexander Gavrilov
462a08a4ea
Fix the search plugin crashing the military screen.
...
The cause of the crash is that the right list is used for multiple
different things in different pages, so when cleaning up after a
page switch it is not acceptable to mess with it in any way. However
the search plugin changed its length, thus causing a crash if the
new contents were shorter than the original candidate list.
2013-04-02 12:03:37 +04:00
Japa
c0a4db32e9
Fixed the single tile reported coordinates.
2013-04-02 11:57:30 +05:30
Japa
b2f4029f42
Added in more sanity checks.
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-04-02 02:58:06 +05:30
Petr Mrázek
29a2f36e4a
Fix small bug in the tweak plugin
2013-04-01 17:42:02 +02:00
Petr Mrázek
b0ee4fe9d9
Update stonesense
2013-04-11 21:08:33 +02:00
Anuradha Dissanayake
d7c91975c0
Fix warnings
2013-04-01 20:02:39 +13:00
Anuradha Dissanayake
1070eec016
Make planned doors pet passable
2013-04-01 19:52:34 +13:00
Anuradha Dissanayake
1550df496f
Right align happiness monitor to avoid interference with announcements
2013-04-01 19:52:13 +13:00
Anuradha Dissanayake
c020c0271c
Respect export mandates
2013-04-01 19:21:10 +13:00
Japa
86a02952f8
Changed coords to embark tiles instead of blocks.
2013-04-01 04:39:30 +05:30
Japa
4bb80d9865
Added some sanity checks to isoworldremote.cpp
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-03-31 12:31:44 +05:30
Japa
39390e2749
Got a working connection with Isoworld.
2013-03-31 02:42:06 +05:30
jj
135289e89a
ruby: add MapTile#burrow
2013-03-30 20:22:25 +01:00
expwnent
0397912353
Merge branch 'master' into digSmart
...
Conflicts:
plugins/CMakeLists.txt
2013-03-30 12:46:10 -04:00
Japa
a3de35c32e
Added isoworld to the build list.
2013-03-30 15:27:37 +05:30
Japa
9981d21965
Merge branch 'IsoRemote' of github.com:JapaMala/dfhack into IsoRemote
...
Conflicts:
plugins/CMakeLists.txt
plugins/isoworldremote.cpp
2013-03-30 13:03:22 +05:30
Japa
14369d18dc
Initial work on the isoworldremote plugin, which sends sections of the map to isoworld.
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-03-30 12:38:42 +05:30
Anuradha Dissanayake
2027416997
Merge pull request #1 from zkf/overlay-position
...
Right-align happiness monitor overlay.
2013-03-29 20:59:54 -07:00
Anuradha Dissanayake
a5b9848271
Clean up
2013-03-30 16:38:21 +13:00
Anuradha Dissanayake
edc305db69
AutoTrade plugin: Automatically send items in marked stockpiles to trade depot, when trading is possible.
2013-03-30 16:38:03 +13:00
Bjørnar Hansen
323c56a641
Right-align happiness monitor overlay.
...
The overlay was blocking game messages which are displayed on the left side.
2013-03-29 15:03:09 +01:00
Japa
6e9de245c2
Started work on isoworld remote
2013-03-27 01:24:13 +05:30
expwnent
637daad83d
Outside only: new plugin. Buildings that start with OUTSIDE_ONLY get destroyed instantly before they can be created.
2013-03-24 00:15:20 -04:00
expwnent
52480b155b
autoSyndrome: made it only print each error message at most once per DF run.
2013-03-23 22:46:43 -04:00
expwnent
32e321c704
Merge branch 'once' into autoSyndrome
2013-03-23 22:39:57 -04:00
expwnent
b4092f62e6
New module: Once. Intended to help prevent debug error message spam.
2013-03-23 22:38:33 -04:00
Anuradha Dissanayake
dc9a62fd1d
Fix crash when using right mouse button
2013-03-22 23:08:33 +13:00
expwnent
cd00213e66
autoSyndrome: fixed a bug where it complains because can't find the worker because it didn't get a copy of the job quickly enough. It can still happen, it just doesn't complain anymore.
2013-03-17 11:02:31 -04:00
expwnent
cf57fba58e
autoSyndrome: reorganize everything, make it make more sense.
2013-03-17 01:18:12 -04:00
expwnent
83f7ad1700
syndromeTrigger: renamed from trueTransformation and generalized it to allow for triggering commands on any syndrome infection.
2013-03-17 00:23:08 -04:00
expwnent
16b64b9fc3
workNow: added option to look for jobs every time a dwarf finishes or cancels a job.
2013-03-16 22:43:57 -04:00
jj
4fe37b4bd5
ruby: fix DfFlagarray.inspect when no indexenum
2013-03-16 21:06:31 +01:00
Petr Mrázek
49024809ce
Update NEWS, build DFusion by default
2013-03-16 18:37:16 +01:00
jj
ffa9c50486
autoSyndrome: stop spam, and disable by default
2013-03-16 13:26:59 +01:00
Anuradha Dissanayake
59ec9bfc57
Update versions
2013-03-16 22:13:01 +13:00
Anuradha Dissanayake
a85d6bd2dd
Merge branch 'mousequery'
2013-03-16 20:40:20 +13:00
Anuradha Dissanayake
4bd5e3db77
Add mousequery to build
2013-03-16 20:35:53 +13:00
Anuradha Dissanayake
c16bd3d71a
Apply r3 name changes
2013-03-16 18:25:02 +13:00
jj
cc5d354a59
Merge branch 'master' of github:jjyg/dfhack
2013-03-16 01:04:29 +01:00
Anuradha Dissanayake
b961cb6a09
Merge branch 'master' of https://github.com/peterix/dfhack
2013-03-16 12:51:31 +13:00
Anuradha Dissanayake
f69f245732
Allow planned constructions orthogonal to stairs
2013-03-16 12:26:37 +13:00
Anuradha Dissanayake
5a92eabb6b
Add all fortress dwarves to happiness monitor.
2013-03-16 10:29:17 +13:00
Timothy Collett
6a31abc60f
Another update to stonesense :-P
2013-03-15 14:30:21 -04:00
Timothy Collett
d87bfd7f26
Update to Stonesense
2013-03-15 14:28:46 -04:00
Timothy Collett
c93cb693c8
Merge branch 'master' of http://github.com/peterix/dfhack
2013-03-14 13:35:28 -04:00
Timothy Collett
9a58c5b7b3
Stonesense updates
2013-03-14 13:33:01 -04:00
Quietust
2b675c80ce
Fix createitem to not leak memory
2013-03-14 12:00:16 -05:00
Petr Mrázek
c5aa808737
Sync submodules
2013-03-14 05:07:30 +01:00
Anuradha Dissanayake
b5806f7278
Copy fixes from r3 to fix search issues in Nobles screen.
2013-03-13 22:21:30 +13:00
Anuradha Dissanayake
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
falconne
bc0c493b7c
Workaround for strange crash in accelerated mod
2013-03-12 21:18:29 +13:00
falconne
8e9fc235a9
Adding a debug mode to track down an elusive bug.
2013-03-10 16:14:00 +13:00
Warmist
3ed5f06f49
Fix for eventful and a advfort not to show worn items.
2013-03-09 12:54:07 +02:00
Anuradha Dissanayake
63707471f4
WIP - More logical categories and variable windows
2013-03-07 22:27:06 +13:00
Kelly Martin
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
Anuradha Dissanayake
701b7b7d9b
Multiple data averaging windows and gcc fixes.
2013-03-02 15:14:56 +13:00
Quietust
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
Quietust
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
Anuradha Dissanayake
4afe74efa6
Add DwarfMonitor plugin to monitor activities and happiness levels in a fort.
2013-02-28 23:39:22 +13:00
Quietust
f55030909f
Add createItem plugin, spawns an item at the selected unit's feet
2013-02-27 11:09:06 -06:00
Alexander Gavrilov
03b91ca26c
Fix a problem in binpatch.lua and comment out debug messages in tweak.
2013-02-26 12:29:02 +04:00
jj
2bbe6824fb
fix tweak/stable-cursor for low z-levels
2013-02-21 15:26:35 +01:00
jj
6b70a89321
ruby: typo in autogen/int8_t
2013-02-17 02:05:01 +01:00
cherrydev
db98b06c6e
Added documentation of autolabor exemption from burrowed dwarves
2013-02-15 19:16:26 -08:00
Warmist
b0528d283b
Merge branch 'master' of git://github.com/peterix/dfhack
2013-02-15 20:23:39 +02:00
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
expwnent
4c2dfdf772
Dig smart: dig out minerals as you discover them. Very rough draft.
2013-01-09 15:15:11 -05: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
expwnent
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
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
expwnent
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
expwnent
fd05d30733
Digging invaders: improved edge cost evaluation.
2013-01-04 18:11:38 -05:00
Kelly Martin
9404267c1f
Autolabor: Tell DF to immediately process jobs after each run.
2013-01-04 13:14:20 -06:00
expwnent
2ca943ae20
Digging invaders: comment out debug print statements.
2013-01-04 00:43:39 -05:00
expwnent
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
expwnent
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
expwnent
47eca42f68
Digging invaders: made it possible to customize which races can dig.
2013-01-03 23:18:40 -05:00
expwnent
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
expwnent
ed6dcf9589
DiggingInvaders: made invaders dig automatically, instead of on request.
2013-01-03 21:25:50 -05:00
expwnent
f145f8d528
Merge branch 'eventManager' into diggingInvaders-unstable
2013-01-03 19:32:12 -05:00
expwnent
715f191c26
EventManager: made the frequency part of EventHandler.
2013-01-03 19:31:29 -05:00
expwnent
b82d6940b6
Digging invaders: started on making invaders keep digging until done.
2013-01-03 18:45:53 -05:00
expwnent
1d6dec54c7
Digging Invaders: reorganized the files to make it easier to work with.
2013-01-03 18:14:16 -05:00
expwnent
84b8fae326
Merge branch 'eventManager' into diggingInvaders-unstable
2013-01-03 15:53:06 -05:00
expwnent
910e398a7b
EventManager: added invasion event.
2013-01-03 15:52:56 -05:00
expwnent
34d9785ce5
Digging Invaders: minor changes.
2013-01-03 14:38:05 -05:00
expwnent
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
expwnent
0b68e66dc9
DiggingInvaders: fixed a problem with deconstructing hatches.
2013-01-03 13:32:50 -05:00
Warmist
c22c4d009c
Added convenience functions to eventful (see Lua API.rst)
2013-01-03 20:30:51 +02:00