Commit Graph

4313 Commits (22f9f3b042b615f22ab23b8590fdb6e6b7b76b45)

Author SHA1 Message Date
Japa 9ef9a6b519 Send bodypart raws from RemoteFortressReader 2016-06-20 13:21:11 +05:30
Japa 980be6e2af Added a cleaner format for sending over region info. 2016-06-16 21:36:35 +05:30
Michael Casadevall 39c96c474a Fix ordering, news, and indentation
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-14 16:13:26 -04:00
lethosor f07bc03c69 Update clsocket and Open()/Listen() usage 2016-06-14 13:21:51 -04:00
Lethosor 9021fcab2e Merge pull request #946 from NCommander/fix-produce-structure
Modify DFHack to handle new produce() prototype. Major thanks to leth…
2016-06-13 17:24:22 -04:00
Michael Casadevall a03b32846a Modify DFHack to handle new produce() prototype. Major thanks to lethosor, and ragundo for their help in this
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-13 16:57:45 -04:00
lethosor f908a1d1b6 Replace catsplosion plugin with a script
Closes #938, #722
2016-06-11 21:44:15 -04:00
Michael Casadevall fead8a80ff Fix tabs to spaces
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 04:15:03 -04:00
Michael Casadevall e45fbfc61d Modified dwaftvet plugin to work with latest DFHack
Initial commit of the dwarfvet plugin

Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 04:14:59 -04:00
Japa 8543121ece add fog of war and traffic to probe.cpp 2016-06-03 00:32:11 +05:30
Japa 44b8433282 Make remotefortressreader.cpp mark blocks as hidden that aren't visible directly to the adventurer 2016-06-03 00:31:02 +05:30
Japa b1072b65e4 Don't send designations in adventure mode 2016-05-31 22:53:48 +05:30
Japa 3dcd3e14f0 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-05-28 21:24:02 +05:30
Japa 569325823d Send world name and time with world center in remotefortressreader.cpp 2016-05-28 21:23:26 +05:30
Japa 0867f3d311 Add dig designations to probe.cpp 2016-05-28 08:29:12 +05:30
Japa c0419d919e Add lake levels to remotefortressreader.cpp 2016-05-28 08:28:17 +05:30
carbohydratesn 9be928541c Include math.h
3dveins.cpp won't build for me without math.h as a dependency - errors about 'fabsf' and other math functions

arch linux, gcc-multilib 6.1.1-1
2016-05-22 16:45:58 -04:00
lethosor dabf443260 Merge remote-tracking branch 'eswald/stockflow-43' into develop 2016-05-17 23:29:01 -04:00
lethosor d198bf547a Unit list search: reset cursor position to 0 before switching pages
On empty lists, pressing "up" sets the cursor position to -1. This results in a
crash if the list is populated, which the search plugin does before switching
pages.

Fixes #928
2016-05-17 23:23:54 -04:00
Eric Wald 3f0857bff3 Incrementing the manager order id properly.
There's a chance that not doing so could lead to a crash, somehow.
2016-05-16 19:48:52 -06:00
lethosor a8f9f912c9 Merge remote-tracking branch 'eswald/stockflow-43' into develop 2016-05-16 20:40:50 -04:00
Eric Wald 11a0bea002 Moving a search option to the bottom of the screen.
The list of workers in the workshop profile page can take nearly the full height of the screen.
2016-05-15 22:49:35 -06:00
Eric Wald 2df41e6bad Clearing the active flag for new stockflow orders.
It's not entirely clear what this flag does when there aren't any conditions on the order, but new manual orders start as Ready instead of Active.
2016-05-15 22:06:20 -06:00
Eric Wald 0b1004f2b8 Notice resizing immediately, instead of on next key press 2016-05-15 09:14:30 -06:00
Eric Wald 6add87b358 Simplifying key strings 2016-05-15 08:58:45 -06:00
Eric Wald 6575f5f412 Removing the quantity limit on stockflow orders. 2016-05-14 23:40:01 -06:00
Eric Wald 3e8d4f9257 New command for clearing the stockpile order.
Shift-Space by default, using the SETUPGAME_SAVE_PROFILE_ABORT key.
2016-05-14 23:35:07 -06:00
Eric Wald 8c7d5366c9 Switching to the new manager order flags 2016-05-14 23:33:38 -06:00
Eric Wald 02e0b9e721 Manager interface now uses the full height.
Its navigation behavior has also changed, and it now has key hints for navigation.
2016-05-14 22:42:49 -06:00
Ben Lubar 3af24507a3 adjust autogems to work with the workshop profile changes 2016-05-14 20:15:49 -05:00
lethosor 55e58e5f06 Update handling of viewscreen_workshop_profilest in Gui module, search/sort plugins 2016-05-14 11:43:37 -04:00
lethosor 74898a5424 createitem: move all created items to cursor if applicable 2016-05-11 17:54:37 -04:00
lethosor 38051a5a48 remove tweak manager-quantity 2016-05-11 17:51:57 -04:00
lethosor e0a0a26739 ANY_GENERIC35 -> 36 2016-05-10 17:57:15 -04:00
lethosor d93cbd709e Merge remote-tracking branches 'warmist/fixpositions', 'warmist/gm_editor_changes', 'rubybrowncoat/feature/fix-multiquality-gui-create-item' and 'AtomicChicken/item-trigger-fix' into develop 2016-05-09 20:55:14 -04:00
Japa 56f2603097 Send over rivers through remotefortressreader.cpp 2016-05-02 20:58:36 +05:30
Japa b8f5496b24 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-04-25 22:39:18 +05:30
Japa 572d38e3db Made remotefortressreader.cpp return the correct area of interest in the world when on the embark screen. 2016-04-25 22:38:47 +05:30
lethosor f66dd77a72 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-04-23 20:33:25 -04:00
lethosor 5418233117 to_string -> int_to_string 2016-04-22 20:27:53 -04:00
lethosor fd54003384 More make_pair replacements 2016-04-22 20:26:07 -04:00
lethosor ec42967996 Use std::make_pair instead of initializer lists 2016-04-22 19:43:05 -04:00
lethosor 8784a133e8 Initialize maps in a MSVC 2010-compatible way 2016-04-22 18:45:32 -04:00
lethosor 52728babd4 Merge branch 'develop' into zone-unassign 2016-04-22 18:41:15 -04:00
PeridexisErrant acac839371 Replace fixdiplomats, fixmerchants with scripts 2016-04-20 11:12:06 +10:00
Japa 856c3b06f4 Added dig designations to remotefortressreader.cpp 2016-04-19 19:15:33 +05:30
Japa 1317792cde Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-04-19 18:17:39 +05:30
Lethosor 50f2851772 Merge pull request #742 from PeridexisErrant/ls-cleanup
Ls cleanup
2016-04-17 17:59:22 -04:00
lethosor 8226134f67 Make can_trade() return true if at least one caravan can trade
Fixes #900
2016-04-16 17:13:00 -04:00
PeridexisErrant ae81454786 Minor fixes, space no longer required
Thanks to 2882422
2016-04-15 16:28:41 +10:00
PeridexisErrant 273c22f606 Shorten "ls" help for plugins
I think that's all of them.
2016-04-15 16:28:41 +10:00
lethosor 0d37209063 use trade_state enum 2016-04-13 09:44:57 -04:00
lethosor a92b67c80d Add ability to edit min/max logs and remove cap
Closes #893
2016-04-12 19:52:51 -04:00
lethosor 999d89c5af Fix tile background colors in CopyScreen 2016-04-12 17:10:54 -04:00
lethosor daadc2ef85 Update stonesense 2016-04-10 20:11:52 -04:00
lethosor 2399539990 Merge remote-tracking branches 'warmist/patch-7', 'warmist/patch-8' and 'warmist/patch-9' into develop 2016-04-10 11:58:48 -04:00
Warmist 812f6df272 Fix building-hacks color for auto_gears option
Now it should select the gear color correctly
2016-04-10 16:55:08 +03:00
Warmist c4c452c288 Show sidebar when moving from screen to screen
When both are from lua the old logic failed.
2016-04-10 16:51:58 +03:00
Warmist 29f08cd20d Fix eventful trying to show sidebar
It should not try to do that if e.g. showing buildingitems. Maybe later we will have more valid focus strings (e.g. custom item view for some buildings) but for now just use vanilla (or callback function not a class)
2016-04-10 14:58:03 +03:00
Warmist 9c9f710d5b Fix eventful not showing sidebar sometimes
E.g. when destroying buildings
2016-04-10 14:47:33 +03:00
lethosor 4c4b727a2e Update stonesense 2016-04-09 20:09:41 -04:00
lethosor 33472b823b createitem: fall back to units.active[0] if a cursor is available but no unit 2016-04-05 11:49:38 -04:00
lethosor f5d10ecf61 vectors: attempt to identify instances of virtual classes
Also:
- don't restrict to heap ranges (e.g. allow globals)
- stylistic cleanup
2016-04-03 20:47:21 -04:00
Japa 39bcee11d8 fixed a crash in remotefortressreader.cpp that occured if Armok Vision is connected while saving. 2016-04-03 11:09:16 +05:30
Japa 4d95395afc added a function to remotefortressreader.cpp to insert keyboard events 2016-03-21 22:56:48 +05:30
Japa 2f4a5e8449 Fix missing return 2016-03-20 22:04:21 +05:30
Japa a3ddc63836 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
Conflicts:
	plugins/remotefortressreader.cpp
2016-03-20 16:30:49 +05:30
Japa 14e61db99d Add ability for remotefortressreader.cpp to send over the current screen 2016-03-20 16:27:05 +05:30
Ben Lubar 197e163a42 add follow_unit_id and follow_item_id to RemoteFortressReader 2016-03-14 13:54:46 -05:00
Japa 2f86683d37 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-03-13 18:31:52 +05:30
Japa 2fc784f825 Add world pole orientation to remotefortressreader.cpp. 2016-03-13 18:31:27 +05:30
expwnent 5bb98295b3 Merge pull request #810 from PeridexisErrant/colonies
Colonies as a script, + place feature by Warmist
2016-03-13 08:32:05 -04:00
expwnent b71c1b9e7c Merge pull request #751 from PeridexisErrant/remove-dfusion
Remove dfusion, df2mc, mapexport, dwarfexport
2016-03-13 08:22:07 -04:00
Warmist bc02e2a844 Add auto-gears mode for building hacks for automatic animation and gear positions. 2016-03-13 13:37:36 +02:00
Warmist 5895621eec Change eventful to have sane(r) callback for produce 2016-03-13 12:57:36 +02:00
Japa 4a5971966a Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-03-12 21:53:17 +05:30
sv-esk 6ab8c8b9b1 fix teledwarf bug (leaves babies lying on ground) 2016-03-10 13:54:38 +02:00
Japa 5ec03774b5 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-03-05 17:30:54 +05:30
sv-esk 198571dca3 fix manipulator bug (unable to apply last custom profession)
"selected" starts with 1, not 0
2016-03-03 01:24:18 +02:00
Japa a5494f74a0 Added world pole direction to RemoteFortressReader.proto 2016-02-28 21:26:15 +05:30
lethosor 297bbd6f20 Merge remote-tracking branch 'warmist/develop' into develop (closes #772) 2016-02-24 17:24:03 -05:00
lethosor 78a7d7a43b Merge remote-tracking branches 'sv-esk/autolabor_new_jobs' and 'sv-esk/manipulator' into develop 2016-02-24 16:36:57 -05:00
lethosor 9d0d4fd08b Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2016-02-24 16:34:29 -05:00
lethosor 79fde493e2 Merge remote-tracking branch 'eswald/autogems-bugfix' into develop 2016-02-24 16:33:54 -05:00
Lethosor d479f30592 Merge pull request #826 from eswald/stockflow-4206
Updating Stockflow for version 42.06
2016-02-24 17:35:20 +01:00
Eric Wald 8ce115646a Updating Stockflow for version 42.06
The manager can now specify each type of craft individually, as well as in general.
There may be a better justification for not allowing pearl and shell scepters, though.
2016-02-23 22:09:26 -07:00
sv-esk 20572fb667 add new jobs to autolabor 2016-02-23 19:01:14 +02:00
Japa 420eb5341b Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-02-20 01:31:12 +05:30
Japa ac068b4738 Fixed DF color translation in remotefortressreader.cpp 2016-02-20 01:30:56 +05:30
Eric Wald 224d29de88 Reversing o-W-g autogems default setting
Starter pack users have complained that it's too big a change from
vanilla, particularly given that strange moods need rough gems.
2016-02-13 21:01:26 -07:00
Eric Wald e160fec2b9 Ignoring forbidden rough gems 2016-02-13 20:59:08 -07:00
sv-esk d2450c34ff forbid manipulator editing ghosts
they are not flags1.dead
2016-02-12 13:47:58 +02:00
lethosor f4ce45deae Disable confirm note-delete in name entry
Fixes #820
2016-02-11 22:56:33 -05:00
sv-esk 83c70ccb0f forbid manipulator editing non-citizens 2016-02-11 13:31:52 +02:00
sv-esk ac070e49a4 forbid manipulator editing visitors 2016-02-11 06:24:18 +02:00
sv-esk 3cab865d58 fix manipulator racism
(allow editing non-dwarves)
2016-02-11 06:23:30 +02:00
sv-esk ff4b2f8522 add new skill columns 2016-02-11 06:23:21 +02:00
James Gilles 5d8c2fd502 Fix whitespace 2016-02-02 01:14:04 -05:00
Warmist 3e402fa97c Remove left over handlers from eventful 2016-02-01 22:23:31 +02:00
Warmist e4ae1c11f5 Update eventful's produce hook to new vmethod. Also make all events use no-handler version thus removing lot of unused functions (and empty function calls). 2016-02-01 22:23:29 +02:00
James Gilles 0a670bb0db Implement #804, move some functions to Units, colorize zone output, a
little cleanup
2016-02-01 11:12:06 -05:00
Japa 297f441bd6 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-02-01 20:01:00 +05:30
Japa 054954a72a Corrected the region details logic. 2016-02-01 20:00:25 +05:30
PeridexisErrant e519313b70 Convert colonies plugin to script, add place feature 2016-02-01 18:12:38 +11:00
Ben Lubar afa1199f98 Add support for grates and bars to Ruby.
See also: DFHack@248331a1967d2527a13bcf259f35bffe4dec86b8, DFHack#808
2016-01-31 15:19:58 -06:00
lethosor 248331a196 buildingplan: Support floodgates, grates, bars
See #808
2016-01-31 14:50:07 -05:00
Lethosor d063155b87 Merge pull request #808 from BenLubar/benlubar-floodgate-alloc
Fix floodgate allocation in C++/Lua and well and pressure plate allocation in Ruby.
2016-01-31 14:20:46 -05:00
Japa e49745d338 Added tile and material to growths in remotefortressreader.cpp 2016-02-01 00:41:13 +05:30
Ben Lubar 197e5ca2d9 update the name of the pressure plate field in ruby
https://github.com/DFHack/dfhack/blob/0.42.04-alpha2/library/modules/Buildings.cpp#L365-L371
2016-01-30 08:46:16 -06:00
Ben Lubar aab5c61923 set well bucket z correctly when allocating it in ruby
https://github.com/DFHack/dfhack/blob/0.42.04-alpha2/library/modules/Buildings.cpp#L347-L352
2016-01-29 14:51:32 -06:00
Japa 7f3191352c send growth info through remotefortressreader.cpp 2016-01-28 00:06:10 +05:30
Japa 4c4eda44f9 Added plant raw list to RemoteFortressReader.proto 2016-01-27 18:49:30 +05:30
lethosor a7b2d5e38f Fix autogems typedefs for MSVC and log errors to stderr 2016-01-16 11:45:04 -05:00
lethosor 15a9d7f491 Fix whitespace 2016-01-14 20:13:46 -05:00
Japa f02a504a00 Added tree coords to remotefortressreader.cpp 2016-01-12 00:10:16 +05:30
Japa ed62f0f554 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2016-01-10 12:47:03 +05:30
Japa ebf2dada62 Increased DF version define 2016-01-10 12:37:52 +05:30
Lethosor 004f46fecc Merge pull request #789 from eswald/autogems
New autogems plugin, automatically cutting rough gems.
2016-01-09 19:10:30 -05:00
Eric Wald 5f03bb743f Increasing autogems checks to once per day.
A legendary gem cutter couldn't quite clear a full suite of jobs before the next check, but it was a close call sometimes.
2016-01-09 16:47:06 -07:00
Eric Wald 7c9002c4ea Avoid overwriting dynamic lines.
Even vanilla DF has three additional workshop order lines that only show up with modded raws.
2016-01-09 14:47:00 -07:00
Lethosor 7041e49196 Merge pull request #785 from abbradar/develop
blueprint: fix compilation (i.e. undefined find)
2016-01-09 13:57:17 -05:00
Eric Wald 53780d8232 New autogems plugin, automatically cutting rough gems. 2016-01-08 23:18:41 -07:00
lethosor d670ee8ab4 New tweak: block-labors
Prevents labors that can't be used from being toggled

Suggested at http://www.bay12forums.com/smf/index.php?topic=121451.msg6719464#msg6719464
2016-01-08 19:27:11 -05:00
lethosor 97fb50c28f Add better support for default ListColumn values
This is only necessary for multiple-selection columns, and there aren't any
with non-pointer entry types currently, but casting nullptr to non-pointer types
isn't a great idea.
2016-01-06 17:30:07 -05:00
Nikolay Amiantov da3c6404fa blueprint: fix compilation (i.e. undefined find) 2016-01-06 03:03:19 +03:00
lethosor 3bcd58fca7 Use consistent key display 2016-01-04 19:31:57 -05:00
lethosor 2acdede03b New tweak: hide-priority
Adds an option to hide designation priority indicators
2016-01-04 19:29:30 -05:00
lethosor 9e020bb8c1 Make title-version show git info for dev builds 2016-01-01 11:50:11 -05:00
PeridexisErrant 81b055ee93 Implement "weather" as a script 2016-01-01 11:35:58 -05:00
lethosor d0c28d3f50 Prevent plugins with active viewscreens from being unloaded
This requires plugins to pass plugin_self to Screen::show(), but
avoids the need to implement special checks in plugin_onstatechange
for the SC_BEGIN_UNLOAD event.
2016-01-01 11:15:29 -05:00
lethosor d775333c00 fix-unit-occupancy: Account for wagon occupancy correctly
Previously, non-central wagon tiles would have their occupancy flag
cleared.
2015-12-31 13:38:38 -05:00
lethosor 2ef24a3daf Prevent nested command invocations in command-prompt
For example, running "devel/send-key SELECT" in command-prompt would
blow up the stack by recursively calling submit()
2015-12-27 22:35:14 -05:00
lethosor e075a06486 Add search controls to all viewscreen_petst subpages 2015-12-27 15:49:10 -05:00
lethosor 05926d9734 New tweak: title-start-rename
Adds a safe rename option to the title screen "Start Playing" menu
2015-12-26 11:47:58 -05:00
lethosor a9ad2f40f1 Add a location retirement confirmation 2015-12-25 11:18:55 -05:00
lethosor de160de0e8 showmood: use correct console encoding 2015-12-24 21:34:38 -05:00
Japa 15a6eb90d4 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-12-24 22:14:18 +05:30
Japa 10eed10b63 Add genger do remotefortressreader.cpp 2015-12-24 22:13:25 +05:30
lethosor e3e68a8df9 Add a search option to the location occupation menu 2015-12-23 16:57:43 -05:00
lethosor 2a2ab00ca9 Add "map" parameter to a lot of drawing functions
Ref #746
2015-12-22 11:42:51 -05:00
lethosor c9eab65c96 Fix more produce() calls 2015-12-22 09:54:00 -05:00
Lethosor e3420a5e67 Merge pull request #770 from eswald/instruments
Stockflow repairs
2015-12-19 23:11:55 -05:00
lethosor f0013ced56 tabs to spaces 2015-12-19 11:16:43 -05:00
lethosor 5a1e5e1464 Expose Units::casteFlagSet() 2015-12-19 11:07:35 -05:00
lethosor 15d3815f26 Merge remote-tracking branch 'quietust/develop' into develop 2015-12-19 10:58:38 -05:00
lethosor e7d8f9b2b3 Merge branch 'develop' of https://github.com/dfhack/dfhack into develop 2015-12-18 18:42:39 -05:00
lethosor 55d5706a21 Update structures and fix various issues with plugins producing items
reaction_product::produce() takes a new unidentified vector<void*>*.
Passing a reference to an empty vector appears to work.
2015-12-18 18:40:11 -05:00
Eric Wald 4dc94a565f Adjusting stockflow order numbers where possible.
Loading 0.40 saves in 0.42 results in a different list of reactions.  Fortunately, all but the instruments should still work.
2015-12-18 07:02:29 -07:00
Eric Wald 45625318bb Stockflow reaction list repairs.
Mostly, instruments and their pieces are made through generated custom reactions, instead of as tools.
Depends on df-structures commit e551233 for full potency.
2015-12-17 22:02:30 -07:00
Eric Wald e4de341168 Preparing for MakeInstrument elimination.
Instruments are now made individually, so this type of job no longer happens.  Therefore, it will probably be removed from the job_type enum.
2015-12-17 21:45:43 -07:00
Ben Lubar 270ff61fbd add parentheses around || that should be inside && 2015-12-13 12:23:56 -06:00
Quietust 7ef815afa8 apparently, casteFlagSet is a static function, despite its usefulness... 2015-12-12 17:58:58 -06:00
Quietust eb1092da6e Update strangemood plugin according to actual game code 2015-12-12 13:46:35 -06:00
lethosor 3083b01525 Add new labors to manipulator 2015-12-12 11:26:45 -05:00
lethosor 78d6b92127 Change strangemood permitted skill checks to job checks
permitted_skills was removed in 0.42 (dfhack/df-structures@6e2e8731)
2015-12-12 11:17:00 -05:00
lethosor 817ea5e01c Add new labors to autohauler/autolabor 2015-12-09 20:03:35 -05:00
lethosor 1668984585 UNITJOB_VIEW -> UNITJOB_VIEW_UNIT 2015-12-04 23:12:37 -05:00
Japa 23a5ce69bf Send unit names over remotefortressreader 2015-11-29 00:03:26 +05:30
lethosor df61233774 Merge remote-tracking branch 'PeridexisErrant/new-scripts' into develop 2015-11-26 16:13:27 -05:00
lethosor 55397425ef Only call fix-job-postings automatically when workflow is enabled
Also, don't consider dead postings problematic
2015-11-26 10:34:46 -05:00
lethosor 2700b01765 Ensure that the correct job posting is kept (if there is one) 2015-11-25 23:35:19 -05:00
lethosor 428a0a4cfe fix-unit-occupancy: Handle invalid coordinates instead of crashing
It appears that positions of caged units brought by traders can be
invalid, in particular.
2015-11-25 22:32:54 -05:00
lethosor ff677d12ba Merge remote-tracking branch 'lethosor/confirm-lua' into develop 2015-11-25 20:41:07 -05:00
lethosor 2aeac718cc workflow: Account for job postings correctly and fix existing issues
Without removing postings correctly, it was possible to end up with
multiple workers assigned to a job that workflow had suspended
multiple times, which caused crashes if more than one worker was
assigned to the same job by DF.

This adds an additional command, fix-job-postings, that runs
automatically when loading a world and fixes:
- Multiple job postings that point to the same job
- Job postings that point to a job where posting_index == -1
  (i.e. jobs that should have no posting assigned)

Fixes #741
2015-11-25 20:33:13 -05:00
lethosor af92b3ae1f Fix some confirm plugin issues and add a simple configuration UI
- Detect null pointers in trade-related functions
- Fix typo/issues pointed out by @dscorbett
- Reorder includes
2015-11-21 20:58:49 -05:00
lethosor b7dd93b6e8 Implement most of the confirm plugin in Lua
This should make resolving future issues easier, although implementing
new confirmations in lua isn't possible yet (each one requires a line
in confirm.cpp).

This also resolves an issue with note-delete and route-delete, with
dfhack/df-structures@1bc4f61
2015-11-21 19:01:35 -05:00
lethosor 67aed56183 Allow adding plugins temporarily without modifying plugins/CMakeLists.txt
Useful to avoid issues when switching between branches that modify
plugins/CMakeLists.txt
2015-11-17 17:42:03 -05:00
PeridexisErrant 842b9c5191 Implement feature as a script, add magma option
Functionality is exactly equivalent to the plugin, but with a new option
for players who want to enable magma furnaces without spoilers.
2015-11-17 16:43:56 +09:30
PeridexisErrant 2ba9ef04e3 Replace drybuckets plugin with a script
Also closes #248, by checking job and building flags.
2015-11-17 13:55:43 +09:30
lethosor 9c4fc64ac5 Fix display issue in tweak max-wheelbarrow 2015-11-16 21:47:29 -05:00
lethosor 16b2140dec Merge remote-tracking branch 'lethosor/fix-unit-occ-speed' into develop 2015-11-16 21:39:46 -05:00
PeridexisErrant 5f8f0c72aa Remove dwarfexport plugin (obsolete)
The Runesmith utility has long been replaced by Dwarf Therapist, and
it's attribute-editing functions are very well supported directly by
DFHack.
2015-11-17 11:13:22 +09:30
PeridexisErrant 836e1a3a37 Remove mapexport plugin (obsolete)
It's been disabled for more than a year, and nobody misses it.  If that
changes, it'll still be in the git history!
2015-11-17 11:13:21 +09:30
PeridexisErrant 291787a019 Remove df2mc plugin (obsolete)
It's still got it's own repo, but it hasn't been compatible with
Minecraft for years and shouldn't be in the DFHack repo.
2015-11-17 11:13:20 +09:30
PeridexisErrant 80e4b8d3df Remove DFusion plugin and script system
It's been four years since meaningful updates, and in that time
alternatives have emerged to almost everything.  Any remaining
functionality to replace is on the issue tracker.

Simpler is better, for users and developers, and removing a legacy
system makes it easier to understand how DFHack works.
2015-11-17 11:13:19 +09:30
lethosor 7ea0e198b3 fix-unit-occupancy: Only check unit list once
Fixes #749
2015-11-16 17:25:21 -05:00
lethosor 610170b0b0 Add hooks for getDwarfmodeViewDims and getDepthAt (new) 2015-11-15 11:54:34 -05:00
lethosor fcfffd1cb6 Track state of gui hooks
Also fix a bug in drawborder() and expand color-dfhack-text to test
multiple hooks
2015-11-15 11:54:34 -05:00
lethosor fff9072b07 Add initial support for hooking into Gui-related functions 2015-11-15 11:54:34 -05:00
lethosor 928bcb6d95 military search: Don't try to pass selection in empty list to DF
Fixes #748
2015-11-15 11:15:05 -05:00
lethosor 9273c177c1 Add "confirm uniform-delete" 2015-11-11 23:14:58 -05:00
lethosor 07a310b0f2 Prevent "confirm squad-disband" from triggering unnecessarily 2015-11-11 23:14:30 -05:00
lethosor e7c3b03ada Misc. confirm plugin cleanup
This avoids the need to list newly-added classes in multiple places
(which could be extended to the search plugin) and gets rid of a few
ugly macros, along with a few other minor changes.
2015-11-11 23:00:20 -05:00
lethosor 7663a9a7a7 confirm haul-delete: Additional UI state restrictions
Fixes #744
2015-11-10 17:24:10 -05:00
lethosor 97e9312d2a Update stonesense 2015-11-08 21:17:07 -05:00
Japa 79e1c4982e Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-11-08 13:54:14 +05:30
Japa 4db05cc8eb Add Unit size info to remotefortressreader.cpp 2015-11-08 13:05:25 +05:30
lethosor 047168b702 Fix workshop/furnace sidebar events 2015-11-07 16:15:37 -05:00
lethosor 8117549175 Merge remote-tracking branch 'warmist/patch-6' into develop
Add furnace to fillsidebarmenu hook
2015-11-07 16:04:05 -05:00
lethosor e176c3ea05 Merge remote-tracking branch 'PeridexisErrant/docs-again' into develop 2015-11-07 15:50:11 -05:00
lethosor ba0ae9e487 Merge remote-tracking branch 'PeridexisErrant/init-flags' into develop 2015-11-07 15:23:17 -05:00
PeridexisErrant 0bb203e7c9 Replace initflags plugin with scripts
Progress towards #722
2015-11-07 23:42:14 +11:00
lethosor 3ebe59859b box-select: Fix "tiles to fill" count 2015-11-06 20:04:54 -05:00
lethosor d1cd5df314 Merge remote-tracking branch 'DoctorVanGogh/automats-floorfix' into develop 2015-11-06 19:54:06 -05:00
PeridexisErrant 7f212178ca Move unused docs to plugin source files
This way they can easily be restored when the plugins are reactivated,
but don't confuse users until then.
2015-11-07 10:13:21 +11:00
DoctorVanGogh e9be1aa657 Fix for construction over existing construction & on top of walls
Fix to allow constructions on top of (natural) down stairs
2015-11-06 19:00:43 +01:00
lethosor 5c4e28dbff Fix initial cursor position with initial entry 2015-11-05 19:09:35 -05:00
lethosor ac8038fa79 Update stonesense 2015-11-04 20:06:35 -05:00
lethosor cbf31dcb37 Merge remote-tracking branch 'PeridexisErrant/NEWS-cleanup' into develop 2015-11-04 19:54:13 -05:00
Japa ea38404727 Added bridge direction. 2015-11-03 22:38:07 +05:30
Warmist 0fa35aef3c Update eventful.cpp
Fix furnace hook not being called.
2015-11-03 18:01:41 +02:00
Warmist a503e54484 Add furnaces to sidebar fill event 2015-11-03 17:59:24 +02:00
Japa 3fd4b01829 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-11-03 18:50:00 +05:30
Japa f5ca3f9e7b Made the direction info more meaningful. 2015-11-03 18:49:17 +05:30
DoctorVanGogh d692458038 Formatting 2015-11-03 10:07:27 +01:00
Lethosor f7a5574e9a Merge pull request #726 from DoctorVanGogh/zone-typo
zone: Fix typo in help text
2015-11-02 22:20:15 -05:00
DoctorVanGogh 923ce36323 zone: Fix typo in help text 2015-11-03 03:55:04 +01:00
Japa b4b90465c2 Added building direction to remotefortressreader.cpp for those buildings that have it in a meaningful way. 2015-11-02 23:22:58 +05:30
DoctorVanGogh a7fe1d9d73 Formatting 2015-11-02 05:05:17 +01:00
DoctorVanGogh 092979f362 Prevent building floor on top of constructed floor (mostly) 2015-11-02 02:51:52 +01:00
PeridexisErrant e11ce3bff4 Merge develop 2015-10-31 15:46:41 +11:00
lethosor ac71fa8070 Add isValidLabor() to Units module
Closes #711 and could avoid potential issues when editing units from
other civs with manipulator.
2015-10-30 18:41:09 -04:00
lethosor ff4f7203c5 Update stonesense 2015-10-30 17:08:39 -04:00
lethosor daf20c16bd Indicate development builds 2015-10-24 14:52:00 -04:00
lethosor 8de710f1c1 Add Renderer module - safer way to install custom renderers 2015-10-21 17:18:39 -04:00
lethosor 757c05db86 buildingplan-lib: depend on dfhack 2015-10-18 17:46:37 -04:00
lethosor dd32954cce Make buildingplan-lib a static library
This avoids building buildingplan-lib.cpp multiple times
2015-10-18 13:08:48 -04:00
lethosor c44ac8ec6e Improve handling of fatal errors and errors in dfhack.lua
* Several fatal errors that occurred during core initialization didn't
  stop initialization or set 'errorstate' properly, which caused
  update hooks and other code to crash later. This has been fixed and
  should address crashes like the one mentioned in #470.
* Errors when loading dfhack.lua now cause Lua::Open() to fail, which
  triggers a fatal error in Core::Init()
* Failure to initialize the console no longer results in a call to
  fatal() (since it didn't actually stop initialization previously)
2015-10-17 21:18:04 -04:00
lethosor 38be023d5d Fix TiletypeMaterial/tiletype_material comparison 2015-10-10 13:06:14 -04:00
Japa 46f6afada7 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-10-09 23:35:39 +05:30
Japa 30c14ed914 send stockpile and civzone extents in remotefortressreader.cpp 2015-10-09 23:35:12 +05:30
lethosor 5580a255f5 Update stonesense 2015-10-03 14:42:52 -04:00
lethosor 45d095cbab Replace translate_socket_error() implementations with DescribeError() 2015-10-03 10:37:48 -04:00
lethosor d343dfd8a0 Add a function to find viewscreens (or parents) of a given type
This makes it possible for some plugins to detect the game state more
reliably - for example, prospector would previously fail when
embarking if the viewscreen_choose_start_sitest instance had any
children.
2015-10-02 21:50:55 -04:00
Japa 449e0c7578 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-09-28 10:07:23 +05:30
Japa 5e43b6b2a6 Add buildigs to remotefortressreader.cpp 2015-09-28 10:06:04 +05:30
expwnent e95aea90e0 Fix CMake warning over INTERFACE_LINK_LIBRARIES / policy CMP0022. 2015-09-27 04:30:46 -04:00
lethosor 62c903b7be search: Fix crash when disabling a stockpile category
Closes #678
2015-09-21 19:25:20 -04:00
expwnent b532a56790 Merge remote-tracking branch 'dfhack/develop' into develop 2015-09-21 17:48:34 -04:00
expwnent 47378d4b85 Merge branch 'luasocket' into develop 2015-09-21 17:46:47 -04:00
expwnent fabcfcd921 Fixed trailing whitespace. 2015-09-21 17:42:30 -04:00
Japa 129218d5f8 fix whitespace. 2015-09-16 23:29:21 +05:30
Japa ed07a8478b Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-09-16 23:27:04 +05:30
Japa e49272854c Add basic army info to RemoteFortressReader.proto 2015-09-16 23:26:52 +05:30
Japa 5ce6fceacc Send the center with the world map, based off current embark if available, otherwise adventurer position. 2015-09-16 23:25:23 +05:30
Warmist 80fd4b1365 Some additions and fixes.
Added new functions: select, set(non)blocking, isBlocking.
Set default to non-blocking. Added "would block" to ignored errors.
2015-09-16 09:57:22 +03:00
expwnent f9fce7e6a1 Convert tab to spaces in RemoteFortressReader.proto. 2015-09-15 03:21:09 -04:00
lethosor b58ccc9e55 Fix embark-tools title alignment 2015-09-12 20:28:42 -04:00
lethosor a852ca10d7 Merge remote-tracking branches 'warmist/luasocket' and 'warmist/advfort' into develop 2015-09-12 19:59:53 -04:00
Japa 3b36a23404 Add soldier state to remotefortressreader.cpp 2015-09-07 22:41:24 +05:30
Japa 07c601be99 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
Conflicts:
	plugins/remotefortressreader.cpp
2015-09-05 15:00:03 +05:30
Japa 1a78cabd7c Add profession color and unit flags to remotefortressreader 2015-09-05 14:54:12 +05:30
lethosor 1ea2da511b Fix whitespace 2015-09-02 15:53:13 -04:00
Japa 44a670db4d Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-09-03 00:14:31 +05:30
Japa 6881aeac70 Enable sending of creature_raw in remotefortressreader.cpp 2015-09-03 00:13:48 +05:30
lethosor 7437400c18 command-prompt: Prevent unloading when prompt is active 2015-08-29 19:38:41 -04:00
lethosor c6ae3e11fd Rename remotefortressreader to RemoteFortressReader 2015-08-26 16:40:59 -04:00
lethosor 8292f56f63 New tweak: embark-profile-name 2015-08-25 10:12:31 -04:00
lethosor ec4a3bda54 Merge branch 'develop' into plugin-manager 2015-08-17 08:17:56 -04:00
warmist 7639420455 Update luasocket.lua 2015-08-17 10:07:20 +03:00
Japa bf7fc42710 Made remotefortressreader.cpp get the elevations from the next region over for the last line. 2015-08-17 00:11:52 +05:30
Japa f60b3e8117 Added a function to get region tiles from remotefortressreader.cpp 2015-08-16 20:28:52 +05:30
Warmist 5bb69cfe04 Add luasocket to CMakeLists.txt 2015-08-15 15:12:13 +03:00
Warmist d9c50d677f A lua interface for csockets in a spirit of luasocket 2015-08-15 15:09:12 +03:00
lethosor 735498c3f9 Fix merge conflict 2015-08-14 16:23:39 -04:00
lethosor 4fc6cb6f17 Several PluginManager improvements
* load/unload/reload are no longer restricted to plugins that exist
  on startup
* Names passed to DFHACK_PLUGIN must match the plugin's filename
  (remotefortressreader vs RemoteFortressReader, counters vs probe)
* "plug" output lists all plugins and state/command information
* Deleted plugins can be reloaded again if they are replaced
* load/unload/reload don't fail silently with broken plugins
* Built-in commands are recognized internally (e.g. "help help"
  does not display "help is not a recognized command"), although help
  for them is not yet implemented
* New command: "type" (bash-like) - shows where/how a command is
  implemented
* "plug" can accept multiple plugin names
* "ls" displays more information about unloaded/unrecognized plugins
* "load all" changed to "load -all" (or "load --all", "load -a", ...)
2015-08-14 16:11:23 -04:00
Japa a71a6d45cc Added a function to pull the world map from remotefortressreader.cpp 2015-08-14 15:36:36 +05:30
Japa 22374e6d86 Fixed remotefortressreader.cpp DF version detection. 2015-08-13 15:59:15 +05:30
Japa e4ac25d1e0 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-08-13 11:26:33 +05:30
Japa a60c8d8e7c Added conditionals to remotefortressreader.cpp to make compiling for v 0.24.11 easier. 2015-08-13 11:25:59 +05:30
lethosor 05f36856f4 fix-unit-occupancy: Always provide feedback when running command 2015-08-10 11:30:21 -04:00
lethosor 9b5f42e3a9 tweak farm-plot-select: Only show controls when plots are fully built
Fixes #521
2015-08-10 10:41:47 -04:00
lethosor fcd15bfd73 Move vshook plugin to title-version and enable by default 2015-08-09 13:37:26 -04:00
lethosor bce9d98633 New plugin: fix-unit-occupancy (fixes bug 3499) 2015-08-07 14:33:38 -04:00
lethosor 44287fc3a0 remotefortressreader: Check map validity before reading map info
Fixes JapaMala/armok-vision#5
2015-08-06 13:42:13 -04:00
lethosor 090f542d49 Allow for per-plugin compile flags 2015-08-06 13:33:53 -04:00
Lethosor bc5b46dce0 Merge pull request #660 from lethosor/jsoncpp
Replace jsonxx with jsoncpp
2015-08-06 12:37:51 -04:00
lethosor e02815dc30 Fix manipulator crash when selecting from empty custom profession list 2015-07-31 16:46:00 -04:00
lethosor 01e04c24c5 Use a separate lua state in dwarfmonitor render hook 2015-07-31 14:25:33 -04:00
lethosor d02e67267a Replace jsonxx with jsoncpp 2015-07-29 15:50:33 -04:00
lethosor a90f3c3d67 stockpiles: Restrict characters in filenames when saving
Previously, it was possible to save outside of the stocksettings
directory or fail to save in a nonexistent subdirectory (e.g. when
a stockpile name had slashes in it).

Resolves #621
2015-07-29 14:17:14 -04:00
lethosor 4e45cc5bbb stocks: Use ^ and $ to match the beginning/end of item names
Closes #624
2015-07-29 13:44:32 -04:00
lethosor 7fc682b199 Fix dismissal of current screen when zooming to items 2015-07-29 11:22:38 -04:00
lethosor 825d46af51 Move ListColumn class to a separate header 2015-07-28 21:48:00 -04:00
lethosor dd7c20c848 Add safer helpers to get STRING_X keys from interface_key sets
A few plugins were using input->rbegin() previously, which crashes
if input is empty and isn't strictly guaranteed to return a
STRING_X key.
2015-07-28 18:34:29 -04:00
lethosor b73e859a37 Reorganize stocks viewscreen to fit a 25-row resolution 2015-07-28 14:37:49 -04:00
lethosor 5ca5feb855 Stop embark-tools from crashing on unload
Also enable sand indicator and mouse controls by default and refactor
2015-07-27 21:38:53 -04:00
lethosor c3c625e7bd Remove embark-tools nano (implemented in 0.40.24) 2015-07-27 18:22:18 -04:00
lethosor 889c76b147 buildingplan: Don't assume building and item type names match
There are a few building types (e.g. hatch covers) where this is not
the case.

Fixes #604
2015-07-27 14:10:55 -04:00
lethosor 6352a6e266 Expand confirm plugin and improve safety of adding/removing hooks
* New option: trade-select-all: Prompts when selecting all goods
  when some goods are already selected
* Improved trade confirmation message depending on selected goods
* Made seize and offer confirmations only display when goods in the
  appropriate columns are selected
* States of each option are now listed by "confirm help"
2015-07-27 12:03:29 -04:00
lethosor ed3cbe2e60 Add several trade-related confirmations 2015-07-27 10:05:59 -04:00
lethosor 35f229c578 Add confirmations for hauling route/stop deletion and depot removal 2015-07-27 10:05:59 -04:00
lethosor 175edf501a Add "confirm" plugin - implements a few confirmation dialogs
See #577
2015-07-27 10:05:59 -04:00
lethosor f1a6e5fbe9 tweak farm-plot-select: Don't require crops to be discovered
Crops whose seeds haven't been discovered are still listed in
menus as of 0.40.10
2015-07-24 11:17:04 -04:00
lethosor 6c55164be4 Fix a potential crash in tweak farm-plot-select
Related to #396
2015-07-24 10:54:59 -04:00
Japa 867e78b6fd Correctly identify ice material. 2015-07-04 09:22:41 +05:30
lethosor 87b1524aec search: give text input priority over cursor keys 2015-06-30 16:45:45 -04:00
lethosor 8058472dd9 Check for null pointers in several places in the search plugin
Fixes #650 (and a few other potential issues)
2015-06-30 16:20:01 -04:00
lethosor 2c734233eb New tweak: kitchen-keys
Fixes an issue where HOTKEY_KITCHEN_* bindings aren't used by DF:
http://www.bay12games.com/dwarves/mantisbt/view.php?id=614

See #526
2015-06-27 11:02:26 -04:00
lethosor 3795edb673 Fix colors in 'tweak kitchen-prefs-color' 2015-06-27 09:54:31 -04:00
lethosor 4246dbd02a New tweak: kitchen-prefs-color
Disabled in default dfhack.init to avoid confusion
2015-06-26 23:19:53 -04:00
lethosor 8d21dd0a23 New tweak: kitchen-prefs-empty
Fixes a layout issue on the kitchen prefs viewscreen with empty tabs
http://www.bay12games.com/dwarves/mantisbt/view.php?id=9000

See #526
2015-06-26 23:19:39 -04:00
lethosor 38d377f4c4 Fix a few zone plugin crashes
* Avoid checking building types of null pointers
* Detect selected cages properly

Fixes #646
2015-06-23 21:21:21 -04:00
Lethosor c9f7fcfd05 Merge pull request #640 from lethosor/search-look-list
Add look menu search
2015-06-22 08:44:34 -04:00
Japa 33cb5e951f Fixed whitespace and returns. 2015-06-22 18:01:19 +05:30
Japa a071f5bf6c Added preliminary building list to remotefortressreader. Untested. 2015-06-22 00:40:17 +05:30
Japa 96640c837f Made remotefortressreader send an item list, and the item that constructions are made from. 2015-06-20 22:17:35 +05:30
Japa 4182a30cc5 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-06-19 23:30:47 +05:30
Japa 4b05423e58 Made remotefortressreader send proper indices for inbuilt materials. 2015-06-19 23:28:32 +05:30
lethosor a8480070a0 Add look menu search 2015-06-16 20:36:19 -04:00
lethosor 81cba0b0fc Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop 2015-06-16 19:56:16 -04:00
lethosor 8145a04944 dwarfmonitor: Add mouse cursor widget
Suggested by @ragundo
2015-06-15 13:42:29 -04:00
lethosor 7581bda7d5 Update dwarfmonitor documentation and NEWS 2015-06-13 21:50:15 -04:00
lethosor 93c9a41a3a Reimplement dwarfmonitor widgets in Lua (and improve customizability)
Widget positions and a few other options (e.g. date formats) can be
specified in dfhack-config/dwarfmonitor.json on a per-instance basis.

Related changes:
* Fixed an issue loading JSON files from Lua
* JSON files in dfhack-config (only dwarfmonitor.json currently) are
  no longer copied into the DF directory when building DFHack. This
  keeps developers' personal settings intact, but will require
  copying over changes made to DFHack's copies manually.
* Fixed incorrect config path in dwarfmonitor help
2015-06-13 21:15:43 -04:00
Fukken-Saved 9a262ad013 Travis compliance 2015-06-13 14:19:14 -04:00
Fukken-Saved d4c7cd2a4e Update autohauler.cpp 2015-06-13 14:08:42 -04:00
lethosor 2d121caabc Allow searching noble suggestions in liaison meetings
Closes #622
2015-06-11 21:37:58 -04:00
Lethosor 09db800f3d Change tabs to spaces 2015-06-11 12:50:00 -04:00
Japa eef9f49ae8 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-06-11 21:51:03 +05:30
Japa cf13b677b6 Added all main tile flags to the list of sent stuff. 2015-06-11 21:49:42 +05:30
lethosor 84b0b48028 dwarfmonitor: Allow weather indicator to be configured separately 2015-06-10 23:09:01 -04:00
lethosor eabcee38e5 dwarfmonitor: Get rid of "Clear" weather indicator 2015-06-10 23:05:33 -04:00
Adam Watkins 772ad0372d Improved issue with workflow job being resumed but never being worked
Fixes #487

* This doesn't fix existing stuck jobs, in order to fix, remove repeat, cancel, add, repeat
* Most workshops worked great after this, however, I noticed my bone bolts and wood bolts still got stuck, not sure if it is the same issue

* The unk_v4020_1 field was not being reset to -1 when resuming the job.
* Updated to be reset only when the job is being resumed
** Setting it to -1 without checking sets this field on all workflow jobs, which causes a crash
* Made other calls to suspend call set_resumed rather than setting the suspend field

This is the behavior I saw for the unk_v4020_1 field:
Suspended jobs: -1
Jobs not in the top of the list but not suspended: -1
Jobs at the top of the list to work next, not suspended: A positive integer (priority of job?)
2015-05-22 22:26:58 -04:00
lethosor 0f1adeb3e7 Update stonesense 2015-05-17 12:47:43 -04:00
lethosor 84b2f814e8 Disable some plugin output on startup
* tweak: Log tweak changes to stderr.log instead of the console
* stockflow: Use "enable stockflow" instead of "stockflow enable"
  in dfhack.init-example
2015-05-16 18:23:02 -04:00
lethosor a577248a38 Make memview output more readable 2015-05-09 19:41:13 -04:00
lethosor 6eb929b306 Move JSON files out of hack/ folder 2015-05-09 16:04:15 -04:00
lethosor a8f5e683f7 Merge remote-tracking branches 'RossM/autolabor-changes', 'RossM/workflow-changes' and 'lethosor/plugin-exports' into develop 2015-05-09 09:39:55 -04:00
lethosor d0ba6d7019 Fix tweak fps-min 2015-05-08 17:35:46 -04:00
lethosor 9c404a535d Make search plugin intercept MOVIES and HELP keys 2015-05-08 16:27:52 -04:00
Ross Morgan-Linial 3001053cef Change tabs to spaces. 2015-05-07 21:51:03 -07:00
Ross Morgan-Linial 7aac9a8fb8 Improve workflow handling of plant reactions
Makes workflow understand "seeds of any plant", "thread of any plant",
"drink of any plant", "powder of any plant", and "liquid of any plant"
when counting items.

Changes workflow's handling of the built-in plant reactions to
understand that they always produce plant products, and that they also
produce seeds.

This means that you can set a target for, for example, "powder of any
plant", and workflow will use a milling job to produce that.
2015-05-07 20:49:29 -07:00
Ross Morgan-Linial 3da939bb02 Change tabs to spaces. 2015-05-07 20:41:11 -07:00
Ross Morgan-Linial 684ff433d4 Autolabor changes
Try harder to concentrate skill on certain dwarves, at the expense of
potentially allowing more idle dwarves.

Attempt to keep dwarves with tools from running off and doing other
things while holding on the tool so much.

Add comments explaining the two modes autolabor uses depending on number
of idle dwarves.
2015-05-07 20:37:01 -07:00
Ross Morgan-Linial 82202efb26 Don't reset disabled labors
Autolabor was disabling all labors on dwarves selected for trading or
diplomacy, even if those labors were not supposed to be managed by
autolabor. This is wrong.
2015-05-07 20:36:51 -07:00
lethosor a1fd1d9219 Document dwarfmonitor and allow date format to be modified 2015-04-19 12:38:37 -04:00
lethosor 6187ac3054 Only initialize steam-engine when a fortress mode map is loaded
world->raws.buildings.workshops is not always cleared on world load
(notably in the arena), so it can contain invalid pointers from
previous games.

Fixes #444
2015-04-02 17:17:29 -04:00
lethosor 786581689f Move get_dfhack_version() to a separate namespace and add a few other version-related functions 2015-04-02 16:37:58 -04:00
lethosor 9b6d8d2799 Allow dev plugins to be skipped on startup 2015-04-01 17:50:22 -04:00
lethosor 82d72007fc Move zoom-related commands to a separate dev plugin 2015-04-01 17:24:52 -04:00
lethosor 7913517b2c Add "nyan stop" command 2015-04-01 17:02:33 -04:00
expwnent 6779849bc6 This requires a return value in Windows, and really should have one anyway. 2015-03-29 14:21:59 -04:00
Lethosor 88c3a629d5 Fix vshook 2015-03-26 19:27:22 -04:00
James Logsdon f8d8baef39 Remove explicit tokens and use ENUM_KEY_STR for profession templates 2015-03-25 15:04:52 -04:00
Ben Lubar d182b6c1c3 only create the stocksettings directory when it is requested 2015-03-24 17:46:49 -05:00
lethosor a5b2b92b30 Merge remote-tracking branch 'eswald/stockflow' into develop 2015-03-24 16:05:48 -04:00
lethosor ff38a60d56 Merge remote-tracking branch 'lethosor/ui-tweaks' into develop 2015-03-24 15:53:36 -04:00
expwnent 4fac0aff0d Fix compile: missing include in plugins/manipulator.cpp. 2015-03-24 12:25:50 -04:00
Eric Wald 4f963233f4 Enticing the bookkeeper to work more often 2015-03-20 19:23:04 -06:00
James Logsdon caed509d0b Simply maniuplator professions by adding the text token to the SkillColumn entries 2015-03-19 03:30:03 -04:00
Eric Wald 23707db1d3 Fixed ballistic arrow head orders 2015-03-15 16:38:59 -06:00
Eric Wald 6bfaa8d35d Better way to handle obsolete job types. 2015-03-15 16:37:35 -06:00
Eric Wald 81c2a6e79f Refactoring a table insert into reaction_entry. 2015-03-15 16:02:29 -06:00
Eric Wald 11d65b4f2d Always clear reactions when loading.
This removes a minor potential for memory leaks.
2015-03-15 15:43:46 -06:00
Eric Wald d18bd3e2a5 Preventing a stockflow error message in Arena mode 2015-03-15 14:08:47 -06:00
Lethosor 3639920a50 Merge pull request #575 from lethosor/game-type
Add gametype checks to World module
2015-03-13 22:25:37 -04:00
Lethosor 48b7c51027 Merge pull request #574 from melkor217/master
Negative autolabor pool size uses most unskilled dwarves.
2015-03-10 19:58:18 -04:00
lethosor 0c5b5c691a Use gametype checks in plugins 2015-03-09 20:17:18 -04:00
lethosor c2eba99cb9 Create professions folder if necessary 2015-03-05 16:57:58 -05:00
lethosor efa9224eef Merge remote-tracking branch 'lethosor/manipulator-expansion' into develop 2015-03-05 16:55:30 -05:00
lethosor 6f276ac419 Shorten option width to stay within 80 columns 2015-03-05 16:48:11 -05:00
Daniil Guzanov 4c06e022a6 Negative autolabor pool size uses most unskilled dwarves. 2015-03-06 00:47:18 +03:00
lethosor be2349d67d Revert "Expose manipulator columns to Lua"
This reverts commit 1d8b2d8cea.
2015-03-05 16:32:57 -05:00
lethosor 8459959124 Add fps-min to dfhack.init-example and plugin help 2015-03-05 16:29:36 -05:00
lethosor 83cb7b48f9 Add "fps-min" tweak and allow onupdate-based tweaks 2015-03-04 19:03:39 -05:00
lethosor abc60f53ad Add `tweak shift-8-scroll`; misc. tweak plugin changes
* Avoid dumping complete usage information for unrecognized tweaks
* Alphabetize tweaks in Readme.rst
2015-03-04 18:32:10 -05:00
Lethosor 499ac05ad3 Merge pull request #569 from Fukken-Saved/master
Small update (autohauler)
2015-03-04 15:08:52 -05:00
Fukken-Saved 7a26e633e9 Update autohauler.cpp 2015-03-04 07:06:24 -05:00
Fukken-Saved 36cee730f1 Update autohauler.cpp 2015-03-04 06:59:29 -05:00
lethosor 0b912f54be Fix field name in lua/stockflow.lua
From DFHack/df-structures#39
2015-03-01 17:32:25 -05:00
Lethosor 6bfbb93377 Merge pull request #557 from jlogsdon/manipulator-job-view
Add current job as a view mode in manipulator
2015-03-01 17:14:29 -05:00
James Logsdon 1ebb1f1d11 Add current job as a view mode in manipulator 2015-02-28 17:09:58 -05:00
lethosor 87867b96b9 Add autohauler to plugins/CMakeLists.txt 2015-02-27 23:18:26 -05:00
lethosor fdfebf4d4e Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop 2015-02-27 23:15:49 -05:00
lethosor cdf211d437 Merge remote-tracking branch 'PeridexisErrant/autobutcher-export' into develop 2015-02-27 23:13:06 -05:00
lethosor 64123d8fea Merge remote-tracking branch 'warmist/dev_building_hacks' into develop 2015-02-27 23:09:56 -05:00
Fukken-Saved ac5909ad2a Update autohauler.cpp
Some small text changes
2015-02-25 07:47:15 -05:00
Fukken-Saved a228977976 Update autohauler.cpp
Final whitespace fixes?
2015-02-25 07:26:54 -05:00
Fukken-Saved 53c88bab56 Update autohauler.cpp 2015-02-25 07:22:25 -05:00
Fukken-Saved 68d088eeb5 Revert "Add autohauler plugin to cmakelist"
This reverts commit a13c9b0310.
2015-02-25 07:13:29 -05:00
Fukken-Saved 6e0c7d6a4e Revert "whoops"
This reverts commit 5f498b1b78.
2015-02-25 07:13:09 -05:00
James Logsdon 2549f116a0 Custom Profession Templates in manipulator! 2015-02-24 15:51:24 -05:00
James Logsdon c2c8ae6a44 Add current job as a view mode in manipulator 2015-02-24 15:51:24 -05:00
lethosor 1d8b2d8cea Expose manipulator columns to Lua 2015-02-24 15:50:27 -05:00
lethosor 70824ade14 Allow shift to extend selection 2015-02-24 15:50:27 -05:00
lethosor e2d7a7395e Add several additional format options
Also set do_refresh_names and call calcIDs() when needed
2015-02-24 15:50:27 -05:00
lethosor c36daa4d7d Fix a few minor StringFormatter issues
* Recognize the end of a format specifier properly
* Make '$' actually work
2015-02-24 15:50:27 -05:00
lethosor 5a92080cc1 Add various ID formatting options, allow editing a single dwarf 2015-02-24 15:50:27 -05:00
lethosor b5797daa8a Allow custom nicknames/profession names to use format specifiers
Also prevent selecting/applying operations to uneditable units
2015-02-24 15:50:27 -05:00
lethosor 21e96ba369 Implement batch operation callbacks and a basic string formatter 2015-02-24 15:50:26 -05:00
lethosor dd17f90dcd Add a flag to allow mouse clicks to select ListColumn items 2015-02-24 15:50:26 -05:00
lethosor 9d600f00a0 Add batch operations menu 2015-02-24 15:50:26 -05:00
lethosor 990ab9c76b Typecast nullptr in ListColumn::getFirstSelectedElem() 2015-02-24 15:50:26 -05:00
lethosor 481e5cc19e Implement dwarf selection 2015-02-24 15:50:25 -05:00
Warmist 17fda7ffa0 Fixed whitespace. 2015-02-24 20:28:49 +02:00
Warmist e9ab892369 Building hacks changes.
Fixed buildings not consuming correct value of power. Added way to ignore unpowered state. Added setPower/getPower to change how much power building uses on the fly.
2015-02-24 15:37:38 +02:00
lethosor cebfa603e0 Update isoworld, stonesense 2015-02-22 16:51:37 -05:00
Fukken-Saved 5f498b1b78 whoops 2015-02-22 14:45:15 -05:00
Fukken-Saved a13c9b0310 Add autohauler plugin to cmakelist 2015-02-22 14:43:08 -05:00
Fukken-Saved 250bc0a58d Autohauler - An alternative to Autolabor 2015-02-22 14:41:45 -05:00
lethosor 100fce0419 Update submodules 2015-02-21 23:06:15 -05:00
lethosor 6a64525284 Include a ruby library for OS X
See #560
2015-02-21 21:53:08 -05:00
lethosor d7897caec7 Display a more user-friendly error message when the ruby library is not available 2015-02-21 21:50:25 -05:00
lethosor 0f77a1a578 Move DFHack version to a separate (static) library
This allows the DFHack version to be changed without recompiling
everything
2015-02-19 12:08:23 -05:00
lethosor c80fbbc397 Remove AS prefixes from add-spatter.cpp
The actual cause of this crash was fixed in #558

See #205
2015-02-19 12:05:32 -05:00
lethosor 2921879be8 Improve error detection and only list creatures when necessary 2015-02-17 14:33:58 -05:00
lethosor 645c2a7f86 Make catsplosion work on any specified creature(s)
Also add a "list" option
2015-02-17 14:16:50 -05:00
lethosor 3750b8c589 Add "DFHack" indicator to trackstop menus 2015-02-17 14:13:53 -05:00
lethosor 661eacf223 Always show trackstop menus when visible 2015-02-17 14:13:37 -05:00
Japa f2461254d4 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop 2015-02-17 22:52:39 +05:30
Japa 8423710c2f Made remotefortressreader.cpp return a specified number of map blocks, spiraling out from the center. 2015-02-17 22:51:33 +05:30
PeridexisErrant bc505952a3 Change autobutcher export format a little 2015-02-17 14:15:33 +11:00
lethosor b7f15ef2d6 Update xml, stonesense for 0.40 ui_advmode_menu changes
Closes #552
2015-02-16 19:10:15 -05:00
lethosor 9ef25f33a9 Update submodules (whitespace changes) 2015-02-14 23:28:16 -05:00
lethosor 10cfef0553 Fix whitespace issues 2015-02-14 22:53:06 -05:00
lethosor 3f9d3dc110 Use unix line endings in isoworldremote.proto 2015-02-13 15:14:31 -05:00
Japa 5dab36948a Merge branch 'master' of https://github.com/JapaMala/dfhack into develop 2015-02-13 19:55:00 +05:30
Japa 6e7b543414 Added liquids 2015-02-13 18:38:02 +05:30
lethosor 8e8f88f3db initflags: Remove debug output 2015-02-09 22:01:12 -05:00
Lethosor f287a99a37 Merge pull request #542 from scamtank/fix-armory
fix-armory: Substitute removed jobtypes with working ones
2015-02-09 11:07:51 -05:00
scamtank 9c4dbea392 Re-enabled fix-armory plugin 2015-02-09 00:22:19 +02:00
scamtank 35d357776c Substitute removed jobtypes with working ones
Replaced StoreItemInChest with StoreItemInHospital and StoreItemInCabinet with StoreOwnedItem. Seem to work on the basic level with waterskins and uniform cloaks.
2015-02-08 23:41:22 +02:00
lethosor 43d6a7b5d4 tradereq-pet-gender: Fix MSVC build error 2015-02-08 09:33:37 -05:00
lethosor 50770f8cdd Clean up whitespace in zone.cpp 2015-02-06 19:13:34 -05:00
lethosor 00072dae1d Fix crash in zone plugin from scrolling when assigning an owner to a cage
Fixes #534
2015-02-06 19:12:10 -05:00
Lethosor 67bf26dbbe Merge pull request #525 from lethosor/tweak-tradereq-pet-gender
New tweak to display pet genders on trade request screen
2015-02-03 08:25:12 -05:00
expwnent 69dfec88cb Merge remote-tracking branch 'dfhack/develop' into develop 2015-02-03 01:12:34 -05:00
lethosor 5a93de3f31 New tweak (tradereq-pet-gender): Displays pet genders on trade agreement screen
Closes #515
2015-02-02 10:04:31 -05:00
expwnent e5e0d93ef1 Added modtools/reaction-product-trigger. 2015-02-02 02:39:05 -05:00
lethosor e34178e367 Fix add-spatter crash
Hopefully fixes #205
2015-02-01 21:31:05 -05:00
expwnent 5b3e5b533e Make zone compile on Windows. 2015-01-31 21:04:12 -05:00
expwnent e9b4fc513a Merge remote-tracking branch 'cdombroski/zone-plugin-cleanup' into temp
Conflicts:
	NEWS
	plugins/zone.cpp
2015-01-31 21:01:41 -05:00
expwnent 1d8fd55a4a Merge remote-tracking branch 'cdombroski/dfhack-484' into develop
Conflicts:
	NEWS
2015-01-31 20:22:17 -05:00
expwnent 6b2e7cfe3e Merge pull request #511 from lethosor/stocksettings-create-dir
Create `stocksettings` directory on startup
2015-01-31 20:17:22 -05:00
expwnent ab01e7d102 Eventful no longer requires LUA_HOOK to do reaction events. 2015-01-31 20:10:06 -05:00
Chris Dombroski f608235b1e Fix some Lua things 2015-01-29 19:56:50 -05:00
Chris Dombroski f2eec3198c Rename findPenPitAtCoord 2015-01-29 15:02:54 -05:00
Chris Dombroski 48b6cf1beb Export functions to Buildings.h 2015-01-29 13:57:50 -05:00
Chris Dombroski 4199728ba6 Cleanup building methods before extracting to Buildings.h 2015-01-29 13:57:50 -05:00
Chris Dombroski c179f5b913 Extract some stuff from zone.cpp to plugins/Units.{h,cpp} 2015-01-28 21:28:32 -05:00
Chris Dombroski 789cc01e93 Remove gcc warnings 2015-01-28 21:28:32 -05:00
Chris Dombroski 10ec5f1330 Use auto to reduce vector iteration redundancy 2015-01-28 21:17:37 -05:00
Chris Dombroski 5f9fe871b3 Add isGelded() to the priority butcher checks
Fixes #484
2015-01-28 21:17:37 -05:00
Chris Dombroski 26ad797c43 isGelded function 2015-01-28 21:17:37 -05:00
Lethosor 58f896d569 Create `stocksettings` directory on startup 2015-01-26 16:28:57 -05:00
Japa ae2e4f99eb Merge branch 'develop' of https://github.com/DFHack/dfhack 2015-01-19 20:02:19 +05:30
Japa 8efac385cc changed tile direction to a string, rather than a hard to understand int. 2015-01-19 19:58:09 +05:30
expwnent 53a8032f8a Fix compile of blueprint plugin on Linux. 2015-01-16 03:27:14 -05:00
expwnent 06c4755168 Merge branch 'blueprint' of https://github.com/cdombroski/dfhack into temp
Conflicts:
	NEWS
	Readme.html
2015-01-15 22:45:57 -05:00
Chris Dombroski da2224b0ba Changed how parameters are parsed. 2015-01-14 14:58:15 -05:00
Chris Dombroski 106612f386 Use alternate qf syntax for output. 2015-01-14 14:08:54 -05:00
Chris Dombroski d0273b8eff Now puts room designations in the query blueprint 2015-01-13 16:15:54 -05:00
Chris Dombroski f315ee43a4 Added stockpiles 2015-01-13 14:28:28 -05:00
Chris Dombroski 3489c2f39a Buildings complete 2015-01-13 09:40:24 -05:00
Japa 3e91d34ab3 remotefortressreader.cpp only sends map changes now. 2015-01-11 16:16:53 +05:30
Chris Dombroski ea313b6bf5 plugins/blueprint.cpp: Buildings hopefully 2015-01-09 16:00:47 -05:00
lethosor aa332e18e2 Remove stray whitespace 2015-01-08 16:59:37 -05:00
lethosor 859fdd60d6 annoucnement -> announcement 2015-01-08 16:59:25 -05:00
Chris Dombroski b627240943 Dig mode complete 2015-01-08 12:17:18 -05:00
Chris Dombroski 819327348b Blueprint plugin basic structure
It should be able to load and make empty blueprint files.
2015-01-08 08:28:54 -05:00
lethosor c39cf1fb49 Add room assignment search 2015-01-05 21:09:30 -05:00
expwnent 448404a465 Fix buildingplan stuff on Windows. 2015-01-05 20:02:54 -05:00
expwnent 1519d8e9ea Disable fortplan and buildingplan for now because it doesn't compile on Windows. 2015-01-05 19:34:01 -05:00
lethosor cd64fb84b7 Make fortplan use Filesystem::getcwd() 2015-01-05 17:37:41 -05:00
lethosor f451cfb3a5 Merge remote-tracking branches 'cdombroski/autobutcher' and 'cdombroski/siren.lua'
Also update NEWS
2015-01-05 16:59:08 -05:00
lethosor 67f0aa774c Merge remote-tracking branch 'lethosor/tweaks-2'
Conflicts:
	NEWS
2015-01-05 16:54:24 -05:00
lethosor e9fd8cf231 Merge remote-tracking branch 'lethosor/embark-tools-mouse'
Also update NEWS
2015-01-05 16:53:06 -05:00
lethosor 0c768796e2 Merge remote-tracking branch 'danaris/fortplan'
Conflicts:
	plugins/buildingplan.cpp
2015-01-05 16:47:35 -05:00
lethosor 7da9ab8f80 Merge remote-tracking branch 'lethosor/0.40.22-plugins'
Also update NEWS
2015-01-05 16:37:34 -05:00
lethosor 1d0b4deef6 Merge remote-tracking branch 'eswald/trackstop'
Conflicts:
	NEWS
2015-01-05 16:22:18 -05:00
lethosor ad6b19f1b2 Merge remote-tracking branch 'PeridexisErrant/needs_porting-cleanup'
Conflicts:
	NEWS
2015-01-05 16:21:24 -05:00
lethosor 6e36b224d1 Merge remote-tracking branch 'ramblurr/stockpiles'
Also update stockpiles plugin to use REQUIRE_GLOBAL()

Conflicts:
	plugins/stockpiles.cpp
2015-01-05 16:16:29 -05:00
lethosor ca0860c3bd Merge remote-tracking branch 'lethosor/plugin-globals' 2015-01-05 16:05:40 -05:00
Chris Dombroski 929f63ee2e Fix error in WatchedRace::SortUnitsByAge 2015-01-05 15:57:34 -05:00
Chris Dombroski c069a87b47 Update isGay(df::unit) with better determination 2015-01-05 14:59:32 -05:00
Chris Dombroski 1cdf61908e Collapse ProcessUnits_* methods. 2015-01-05 14:25:44 -05:00
Chris Dombroski 084bbc3162 Add isGay(df::unit*) method 2015-01-05 13:54:17 -05:00
Japa 5626bb8da7 layer and vein materials were being set wrong. 2015-01-04 19:05:48 +05:30
lethosor 47d6e111c8 New tweak: "max-wheelbarrow" 2015-01-01 14:36:49 -05:00
lethosor ffac2f1795 New tweak: "eggs-fertile" 2015-01-01 13:48:11 -05:00
lethosor cade0d9723 Add local area mouse controls to embark-tools 2015-01-01 11:06:50 -05:00
Japa c373e57c02 Added world names. 2014-12-31 17:50:43 +05:30
Lethosor efc42c253e Fix remaining issues with mousequery 2014-12-27 11:03:06 -05:00
Timothy Collett 088f3715cb Finish up the bare-bones fortplan plugin with support for furniture that is made from an item of the same name 2014-12-23 17:09:35 -05:00
Timothy Collett 5547722414 Initial work on fortplan plugin, including separating out code that needs to be shared with buildingplan 2014-12-23 16:56:15 -05:00
lethosor ee958c0f8f Update some plugins/scripts for 0.40.22
* autolabor, manipulator: Add BUILD_CONSTRUCTION and BUILD_ROAD labors
* mousequery: Support "toggle engravings" sidebar mode
* devel/export-dt-ini.lua: Add body_part_flags

Conflicts:
	plugins/mousequery.cpp
2014-12-21 16:49:33 -05:00
Japa bc58b0a822 Added map location to info. 2014-12-17 19:42:40 +05:30
Eric Wald 0b7f890d87 Trackstop bugfix: No longer prevents cancelling building removal.
Thanks to Ramblurr for pointing this out.
2014-12-16 21:10:18 -07:00
Japa cc5a78f848 Added function to get the map size, and fixed a stupid material bug. 2014-12-17 08:40:29 +05:30
expwnent 5fc8a1f51f digFlood CLEAR error. 2014-12-15 13:41:22 -05:00
PeridexisErrant f3826abc0c cleaning up in needs_porting
Removed obsolete plugins.  Started hotkeys port.  Mostly-finished
position port.  Corrected dwarfmonitor date display.  Documented
putontable.lua in readme.
2014-12-15 23:11:23 +11:00
Japa 6982de88bd Added very basic viewport size and position sending. 2014-12-12 21:04:23 +05:30
Japa d11df5b87f Added a simple unit listing to remotefortressreader.cpp. Updated stonesense. 2014-12-11 20:10:49 +05:30
Japa 22edb5a033 Merge branch 'master' of https://github.com/DFHack/dfhack
Conflicts:
	library/xml
	plugins/isoworld
	plugins/rendermax/CMakeLists.txt
	plugins/rendermax/renderer_light.cpp
	plugins/rendermax/renderer_light.hpp
	plugins/rendermax/renderer_opengl.hpp
	plugins/rendermax/rendermax.cpp
	plugins/rendermax/rendermax.lua
2014-12-11 17:53:19 +05:30
lethosor 09681cf029 Update skeleton plugin 2014-12-06 20:55:57 -05:00
lethosor 88b51fcb5b Allow strangemood to work if debug_nomoods is not available 2014-12-06 20:29:08 -05:00
lethosor a615723b38 Update remaining plugins to use REQUIRE_GLOBAL 2014-12-06 19:30:05 -05:00
lethosor 5de3e6110a Merge remote-tracking branch 'origin/develop' into plugin-globals 2014-12-06 17:32:44 -05:00
Casey Link b9a2ecb440 stockpiles: properly initialize quality arrays
Props to @fricy for identifying this bug.
2014-12-05 17:39:29 +01:00
Casey Link b0e0bbda9b stockpiles: show proper cased names in filter list 2014-12-05 16:53:19 +01:00
Casey Link 52f4cb3fc1 stockpiles: load prompt uses typing + filtering 2014-12-05 14:49:40 +01:00
Casey Link 332566f6a1 stockpiles: disable gui/script when plugin is disabled 2014-12-05 13:27:58 +01:00
Casey Link 0f06eb7f6f stockpiles: quiet debug 2014-12-05 12:42:59 +01:00
Casey Link 346f397bca stockpiles: fix loading crash 2014-12-05 12:35:24 +01:00
Casey Link 7e6066daf2 stockpiles: user friendly error handling
* display errors in the GUI when necessary
* handle older versions of DFHack without the persist module
2014-12-05 12:35:24 +01:00
Casey Link 2f4678eee5 stockpiles: more error handling & cleanup
* prevent crashes when the path doesn't exist
* remove duplicated functions
* sort file list case insensitively
2014-12-05 12:35:24 +01:00
lethosor 1525823948 Create stocksettings directory on startup if necessary 2014-12-05 12:35:24 +01:00
Casey Link b6118d272c stockpiles: integrate gui plugin into dfhack.init-example 2014-12-05 12:35:24 +01:00
Casey Link 1cde8cffa4 stockpiles: implement GUI controls 2014-12-05 12:35:19 +01:00
Casey Link 2e43ea8b38 stockpiles: refactor code into separate files
The file was approaching 3000 lines and contained multiple classes,
making it a real PITA to navigate through. upcoming features would only
add more LOC, so splitting was necessary.
2014-12-05 11:02:40 +01:00
expwnent 19e977528c Merge branch 'autolabor-artisans' of https://github.com/pkdawson/dfhack into develop
Conflicts:
	NEWS
2014-12-04 23:49:13 -05:00
expwnent c83ed531bc Merge remote-tracking branches 'lethosor/stocks-esc', 'lethosor/patch-8', 'lethosor/0.40.19-update-labors' and 'lethosor/fixTexts' into develop 2014-12-04 23:34:48 -05:00
lethosor cac2245438 Update some plugins to use REQUIRE_GLOBAL 2014-12-03 23:26:54 -05:00
Lethosor 16c2d4df99 stocks: Make LEAVESCREEN have priority over text entry
This should fix conflicts if LEAVESCREEN is bound to "Space" only
2014-12-03 17:52:42 -05:00
lethosor e206c242c6 Add a plugin_globals vector to aid in safety checks for plugins that require globals
This allows "using df::global::foo" to be replaced by "REQUIRE_GLOBAL(foo)",
and DFHack will refuse to load the plugin if df::global::foo is NULL
2014-12-02 21:32:04 -05:00
lethosor 2d7ea52c40 Clarify autolabor initialization failure 2014-12-02 17:58:30 -05:00
lethosor e3c13fc555 Add gelding to autolabor and manipulator 2014-12-02 17:30:16 -05:00
expwnent 7859da7d77 Update stonesense. 2014-11-30 12:31:29 -05:00
expwnent 921f0dd06a Merge remote-tracking branch 'quietust/develop' into develop 2014-11-30 11:31:59 -05:00
expwnent 9dbe639919 Merge pull request #402 from Ramblurr/stockpiles
plugin: Stockpile Settings Serialization
2014-11-28 23:15:46 -05:00
Patrick Dawson a6ae6d4c28 autolabor: Fix compile on Windows.
VC10 wants an explicit return type for lambdas.
2014-11-28 00:55:26 +01:00
Patrick Dawson 794e1ee6f0 autolabor: Document and improve the talent pool parameter. 2014-11-27 21:13:20 +01:00
Casey Link cb6d4da2f2 stockpules: fix protobuf-lite support
Looks like we lost more than just TextFormat when we lost full protobuf
support. Copied these two serialization functions over.
2014-11-27 16:36:42 +01:00
Patrick Dawson 8b1b32a499 autolabor: Add a talent pool parameter. 2014-11-27 15:56:14 +01:00
Casey Link d352d0f42d stockpiles: remove dependency on full protobuf 2014-11-27 14:23:54 +01:00
Casey Link de919050b1 Revert "install the full protobuf library"
This reverts commit 443a9676e1.
2014-11-27 13:40:11 +01:00
Casey Link 7cbb1ed043 Revert "use full protobuf library project wide"
This reverts commit f100d30f56.
2014-11-27 13:39:30 +01:00
Casey Link b6f5bcb7dc stockpiles: fix compilation on windows
VS2010 only supports a subset of C++11
2014-11-27 13:28:17 +01:00
lethosor 445640f80c Allow commands invoked through command-prompt to access selected items/units/buildings
Fixes #273
2014-11-25 20:25:31 -05:00
Quietust 84d24ca13f Fix Hold->HoldTerrain, also use a proper fix for Attack 2014-11-25 11:30:25 -06:00
Casey Link f100d30f56 use full protobuf library project wide
since plugins are using full protobuf, there is no reason
for everything not to. this removes the need to ship both the full
protobuf lib and the protobuf-lite lib.
2014-11-25 10:48:51 +01:00
Casey Link 063b669f6b stockpiles: cleanup output and add docs 2014-11-22 18:57:56 +01:00
Casey Link 00c1676744 stockpiles: correct typo 2014-11-22 18:54:22 +01:00
Casey Link e599f4b1e1 stockpiles: more user documentation 2014-11-22 18:33:49 +01:00
Casey Link f2d4bf53bd stockpiles: fix empty list crash
I was clear()ing all empty stockpile index vectors , but DF expects them
to be initialized with '\0' despite the fact they aren't used.

To keep DF happy and prevent segfaults, we now initialize all lists to
their appropriate sizes with a sane default value.
2014-11-22 18:33:49 +01:00
Casey Link 869a92dfc5 stockpiles: handle all metals and stones 2014-11-22 18:33:49 +01:00
Casey Link 0e8832f05d stockpiles: overwrite existing files 2014-11-22 18:33:49 +01:00
Casey Link f1ce575be3 stockpiles: animals list still shown even when disabled 2014-11-22 18:33:49 +01:00
Casey Link 4f2851199e stockpiles: handle animal cages and prepared meals 2014-11-22 18:33:49 +01:00
Casey Link e525b47815 stockpiles: make gem other mats more robust 2014-11-22 18:33:49 +01:00
Casey Link eb3a71c739 stockpiles: fix finished goods quality 2014-11-22 18:33:48 +01:00
Casey Link 12b27e09bb stockpiles: handle furniture sand_bags field 2014-11-22 18:33:48 +01:00
Casey Link 98a1278128 stockpiles: fix quality unserialization 2014-11-22 18:33:48 +01:00
Casey Link cc1e4d16a2 stockpiles: allow loading without file extension 2014-11-22 18:33:48 +01:00
Casey Link e66732f731 stockpiles: add missing protobuf field 2014-11-22 18:33:48 +01:00
Casey Link 79c65e0fcf stockpiles: fix male/female creature mat lookups 2014-11-22 18:33:48 +01:00
Casey Link 44af084e8e stockpiles: import from disk and write to memory 2014-11-22 18:33:48 +01:00
Casey Link 543a88d03d stockpiles: pass correct filename 2014-11-22 18:33:48 +01:00
Casey Link c251aeabe3 stockpiles: add optional debug output 2014-11-22 18:33:48 +01:00
Casey Link 86ba81a3a9 stockpiles: format with ANSI style and 4 spaces 2014-11-22 18:33:48 +01:00
Casey Link a4d19070e8 stockpiles: write some documentation 2014-11-22 18:33:48 +01:00
Casey Link f7ed821ef9 stockpiles: serialization complete
* working file import/export
2014-11-22 18:33:48 +01:00
Casey Link 224a19295d stockpiles: serialize through weapons+trap components
* generalize itemdefs
2014-11-22 18:33:48 +01:00
Casey Link 25f6c440d8 stockpiles: serialize through cloth 2014-11-22 18:33:47 +01:00
Casey Link d74ac1b3a6 stockpiles: serialize through leather
* more code reuse!
2014-11-22 18:33:47 +01:00
Casey Link e863df512b stockpiles: serialize through finished goods
* add stubs for remaining categories
* refactor w/ generics to reuse code
2014-11-22 18:33:47 +01:00
Casey Link dc5f0fed1a stockpiles: serialize ammo and coins 2014-11-22 18:33:47 +01:00
Casey Link d167b3f385 stockpiles: basic serialization for animals - stone 2014-11-22 18:33:47 +01:00
Casey Link 443a9676e1 install the full protobuf library
required to access text_format (needed by stockpiles plugin)
2014-11-22 18:33:47 +01:00
Casey Link ebb1345332 stockpiles: add settings protobuf message format 2014-11-22 18:33:47 +01:00
lethosor 4922c36ada Prevent farm-plot-select from selecting crops when no crops are listed
Fixes #396
2014-11-18 19:57:29 -05:00
Yoann Guillot 889bd06ffc ruby: fix windows platform detection 2014-11-16 13:00:38 +01:00
lethosor 9fd6e9f03c Expand dwarfmonitor weather indicator 2014-11-15 17:29:19 -05:00
lethosor bc73319333 Make rain indicator LIGHTBLUE for better visibility 2014-11-15 16:39:19 -05:00
lethosor 9b0d0eba45 Merge remote-tracking branch 'falconne/plugin_dwarfmonitor' into update-falconne-plugins 2014-11-15 16:36:35 -05:00
lethosor 4513fa4ab2 Merge remote-tracking branch 'falconne/plugin_stocks' into update-falconne-plugins 2014-11-15 16:34:59 -05:00
lethosor 61fa2fbda0 Merge remote-tracking branch 'falconne/plugin_automelt' into update-falconne-plugins
Conflicts:
	NEWS
	plugins/CMakeLists.txt
	plugins/automelt.cpp
2014-11-15 16:31:51 -05:00
lethosor f7fcb342ed Fix buildingplan compiling with GCC 2014-11-15 16:21:47 -05:00
lethosor 578ac08999 Merge remote-tracking branch 'falconne/plugin_buildingplan' into update-falconne-plugins 2014-11-15 16:18:00 -05:00
lethosor 3c1e07252b Update autotrade stockpile controls 2014-11-15 16:16:32 -05:00
lethosor d62305b69e Merge remote-tracking branch 'falconne/plugin_autodump' into update-falconne-plugins
Conflicts:
	plugins/autotrade.cpp
2014-11-15 15:56:44 -05:00
expwnent 3021fa47db Merge remote-tracking branches 'jjyg/develop', 'putnam/patch-4' and 'eswald/blank-histories' into develop
Conflicts:
	NEWS
2014-11-15 15:07:20 -05:00
Yoann Guillot 8042c5d342 ruby: load arch-specific ruby-autogen 2014-11-14 12:49:08 +01:00
Yoann Guillot 696380e749 ruby: distinguish ruby-autogen.rb name based on architecture 2014-11-14 12:47:42 +01:00
Yoann Guillot e2229f6a6a ruby: remove DL_RUBY cmake option 2014-11-14 12:38:24 +01:00
Alexander "Ace" Olofsson be1d411b83 Add missing <functional> include for std::greater 2014-11-09 11:19:51 +01:00
expwnent 1b0a2ecb8a Merge remote-tracking branch 'eswald/tradescreen' into develop
Conflicts:
	NEWS
2014-11-09 00:42:50 -05:00
expwnent c9cf94128e Merge pull request #376 from lethosor/mousequery-z-level-fix
Fix selection behavior of mousequery on lowest z-level
2014-11-09 00:37:46 -05:00
expwnent 267d0837ad Merge pull request #381 from lethosor/update-cmakelists
Re-enable rendermax in CMakeLists.txt
2014-11-09 00:34:23 -05:00
expwnent 7929d44030 Merge pull request #382 from PeridexisErrant/autolabor-fixes
Autolabor fixes
2014-11-09 00:33:46 -05:00
expwnent 8e492b1669 Merge pull request #384 from lethosor/dwarfmonitor-0.40.14+
Make dwarfmonitor compile for 0.40.14+
2014-11-09 00:33:14 -05:00
lethosor f069676fc2 Fix automaterial/box-select cursor color
Only use a dark green cursor when actually building a construction
2014-11-08 19:05:45 -05:00
lethosor 2484f89542 Update dwarfmonitor's happiness display 2014-11-08 15:08:56 -05:00
lethosor 04ceb64bad Merge remote-tracking branch 'origin/develop' into mousequery-z-level-fix
Conflicts:
	NEWS
2014-11-08 14:36:20 -05:00
PeridexisErrant 195ccf4bc8 Fix beekeeping, enable help message
Plugins should now be enabled with "enable autolabor".  The beekeeping
bug was fixed in DF0.40.07, so autolabor can set multiple beekeepers
again.
2014-11-08 11:45:20 +11:00
Lethosor ec580cdfa5 Re-enable rendermax in CMakeLists.txt 2014-11-07 16:43:50 -05:00
Eric Wald 8ac9748700 Switching fast-trade Shift-Up to move before marking
This makes it undo Shift-Down, instead of mirroring it, which works much better when you've gone too far down the list.
2014-11-06 23:06:17 -07:00
Eric Wald 46ebeaa722 Adding Shift-Up to the fast-trade tweak. 2014-11-06 22:22:02 -07:00
Eric Wald 7fb82131c7 Switching fast-trade from Shift-Enter to Shift-Down
Technically, from SELECT_ALL to CURSOR_DOWN_FAST, to avoid blocking the new native Select All functionality.
As a bonus, the new key repeats as you hold it down.
2014-11-06 22:14:00 -07:00
Eric Wald 777b2f6416 Moving trade screen search options to match the new column size 2014-11-06 22:05:05 -07:00
Eric Wald db7bc8c5c8 Removing autotrade's version reporting.
It's built with DFHack itself now, so the global version is more accurate than the plugin-specific version, which hasn't been consistently getting incremented.
2014-11-06 21:53:00 -07:00
Eric Wald 2ebc318daa Removing autotrade's obsolete Mark All 2014-11-06 21:47:14 -07:00
expwnent e9e8b83656 Update stonesense. 2014-11-05 20:57:57 -05:00
expwnent b81346fa21 Merge pull request #349 from lethosor/tweak-reorganization
'tweak' plugin cleanup/reorganization, new tweaks
2014-11-02 12:24:41 -05:00
lethosor 5232bffb53 farm-plot-select: Actually check for crop validity 2014-11-02 12:21:51 -05:00
expwnent 29d6bba669 Fix trackstop ambiguity complaints, update df-structures. 2014-11-02 11:55:01 -05:00
lethosor 14b947837c Merge remote-tracking branch 'origin/develop' into tweak-reorganization
Conflicts:
	NEWS
	Readme.html
	plugins/tweak/tweak.cpp
2014-11-02 11:40:53 -05:00
expwnent 87443035a9 Merge remote-tracking branch 'quietust/develop' into develop
Conflicts:
	plugins/manipulator.cpp
2014-11-02 04:05:51 -05:00
expwnent 4ccfb07a54 Merge pull request #350 from hobotron-df/fastdwarf-attack-speed
Fixes for fastdwarf combat speed and attack retargeting.
2014-11-02 03:37:55 -05:00
expwnent bfac2b97cc Merge pull request #352 from eswald/trackstop
New trackstop plugin
2014-11-02 03:34:22 -05:00
expwnent 82fb533176 Merge pull request #353 from eswald/autotrade-bugfix
Autotrade bugfix: Mark All now unmarks bin contents.
2014-11-02 03:33:28 -05:00
expwnent 6c356b5ae9 Merge pull request #359 from lethosor/embark-tools-oo-pr
embark-tools cleanup
2014-11-02 03:30:38 -05:00
expwnent 0fa2cab5ac Merge pull request #360 from eswald/automelt
Faster automelt
2014-11-02 03:29:01 -05:00
expwnent 0fd15cc1e4 Merge pull request #365 from eswald/stable-sorting
Stable sorting for Dwarf Manipulator
2014-11-02 03:26:14 -05:00
expwnent 49939ccb9c Merge pull request #369 from warmist/fix-rendermax
Update rendermax
2014-11-02 03:25:04 -05:00
Quietust bad923130c Manipulator - remove minimum width for Labors column, since it triggered the "should never happen" case upon extending the first column from 4 to 6 2014-11-01 11:24:05 -05:00
Quietust 7c92f4abaa Seems I misread the code from 0.34.11 - it switches against rand(2), not rand(3) 2014-10-31 13:47:04 -05:00
Quietust f08a32f4e2 Update Manipulator to display stress level instead of happiness 2014-10-31 13:33:35 -05:00
Quietust ed225de365 Update strangemood to check stress level for fell/macabre moods 2014-10-31 13:33:18 -05:00
Quietust f683395cae Comment out more of military-training tweak, which no longer compiles 2014-10-31 13:33:04 -05:00
Quietust d05f249619 Merge branch 'develop' of github.com:DFHack/dfhack into develop 2014-10-31 13:32:49 -05:00
expwnent 72654e602a Merge pull request #355 from lethosor/patch-6
Update digFlood documentation to mention onLoad(World).init
2014-10-31 11:48:04 -04:00
Alexander Gavrilov 04ec2c9932 Update version to v0.40.14 and hack things so they compile.
Also make the find-offsets script less likely to crash if the
unit structure is misaligned and add more integrity checks.
2014-10-26 16:40:39 +03:00
Eric Wald ac73c0eeba Allowing non-labor skills to sort stably. 2014-10-21 22:49:50 -06:00
Eric Wald 169da1342d Switching Dwarf Manipulator to a stable sort.
This means, for example, that when you sort by one skill, then by a second, dwarves with the first skill but not the second will still be grouped together.
2014-10-21 22:43:56 -06:00
lethosor f3626c1004 embark-tools cleanup
Fix #358: Disable "s" keybinding for settings on notes screen
2014-10-12 13:35:20 -04:00
Lethosor 0fd3f3dbf4 Update digFlood documentation to mention onLoad(World).init
Per http://www.bay12forums.com/smf/index.php?topic=139553.msg5712785#msg5712785
2014-10-05 23:14:25 -04:00
Eric Wald 95dd009a15 Restoring automelt for items in bins.
The stockpile iterator yields bins, but not their contents.  Should other containers be checked, too?
2014-10-05 17:57:57 -06:00
Eric Wald aafa3a5f91 Expanding on the rollers menu.
As requested by fricy.
2014-10-02 22:00:40 -06:00
lethosor d2fb51f99e New tweak: nestbox-color 2014-10-01 20:14:41 -04:00
Eric Wald 2e80c6053c Autotrade bugfix: Mark All now unmarks bin contents.
This prevents a form of cheating, because they already get traded with the bin itself, so their value had been counted twice.
However, the search plugin still enables this kind of cheating...
2014-09-29 21:37:05 -06:00
Eric Wald 4af9b7a054 Checking for more required variables.
Trying to use trackstop without ui or world results in a hard crash.
2014-09-28 21:34:42 -06:00
Eric Wald 0fad63bba7 New trackstop plugin.
Simply adds a menu to track stops, showing and changing friction and dump direction.
2014-09-28 18:24:07 -06:00
lethosor 425d81ea2d New tweak: civ-view-agreement 2014-09-28 13:13:53 -04:00
hobotron-df da72848b0b Fixes for fastdwarf combat speed and attack retargeting. 2014-09-27 19:47:27 -05:00
lethosor d34b22b2c2 New tweak: farm-plot-select 2014-09-27 19:56:31 -04:00
lethosor 999d265d50 New tweak: import-priority-category 2014-09-27 18:14:25 -04:00
lethosor aeb9ea54ec 'tweak' plugin cleanup/reorganization
* Removed confirm-embark, stable-temp, patrol-duty
* Split (enabled) tweaks into separate files
* New tweak: manager-quantity
2014-09-27 17:01:32 -04:00
Eric Wald e46a27c8a4 Switching automelt to the stockpile iterator. 2014-09-27 11:07:26 -06:00
jj eed684a8df fix superdwarf 2014-09-26 11:39:05 +02:00
jj 0766538ecd ruby: add df.print_color(col, string) 2014-09-25 15:53:03 +02:00
jj 1a38c72763 ruby: add stl-fstream to codegen 2014-09-25 13:19:00 +02:00
lethosor beb5216640 Fix selection behavior of mousequery on lowest z-level 2014-09-24 17:48:49 -04:00
jj c894346639 ruby: call RUBY_INIT_STACK 2014-09-19 21:38:22 +02:00
jj d75c01b0ff merge git://github.com/hobotron-df/dfhack 2014-09-19 21:37:28 +02:00
Alexander Gavrilov e6901a87d3 Update to 0.40.13 structures and fix compilation. 2014-09-19 00:05:15 +04:00
expwnent c927f0fa3c Merge remote-tracking branch 'lethosor/patch-5' 2014-09-16 17:25:28 -04:00
expwnent fde49176fe Merge remote-tracking branch 'lethosor/update-search-keys' 2014-09-16 17:23:45 -04:00
expwnent 040acd166b Merge remote-tracking branch 'eswald/automelt'
Conflicts:
	dfhack.init-example
2014-09-16 17:20:50 -04:00
expwnent a225984bc5 Merge remote-tracking branch 'eswald/hotkeys' 2014-09-16 17:11:15 -04:00
expwnent 5a1d88307f Merge remote-tracking branch 'eswald/stockpile-iterator' 2014-09-16 17:05:02 -04:00
Lethosor 1ea1b50790 job_material_category -> dfhack_material_category
Fixes #330 - submitted by @finndibaenn
2014-09-14 11:13:26 -04:00
lethosor 991fb3cea2 Change search key from 's' to 'q' on unit/job lists
Avoids a conflict with the "suspend job" option (added in 0.40.12)
2014-09-10 16:59:09 -04:00
Eric Wald e76b8c4b6b Merging automelt hotkey into autotrade line when links intrude.
The new interface looks significantly different, but only when there are too many stockpile links to show the lines in their usual places.
The difference between bright green and grey should be obvious most of the time, right?
2014-09-09 21:08:38 -06:00
Eric Wald 8bc2f02aee Moving the automelt hotkey next to autotrade. 2014-09-09 20:51:58 -06:00
Anuradha Dissanayake 757491f112 Add automelt plugin 2014-09-09 20:31:55 -06:00
Anuradha Dissanayake 07de1ce3f6 Add hotkeys plugin 2014-09-08 22:42:04 -06:00
expwnent 4800794ba6 Merge remote-tracking branch 'dfhack/develop' 2014-09-08 13:23:28 -04:00
expwnent f5039b37b8 Merge remote-tracking branch 'lethosor/osx-plug-dylib'
Conflicts:
	NEWS
2014-09-08 13:14:28 -04:00
expwnent 5152e1f13e Merge pull request #316 from eswald/trade-search
Removing new trade hotkeys while a counteroffer is displayed.
2014-09-08 13:12:31 -04:00
expwnent 52d0f1c3f6 Merge remote-tracking branch 'lethosor/autotrade-usage-newline' 2014-09-08 13:00:11 -04:00
Eric Wald 0f311a7606 Removing dead duplicate code. 2014-09-07 15:11:11 -06:00
Eric Wald 83b1317173 Switching stockflow to the internal getStockpileContents.
This should speed it up over checking each space individually, but no longer counts spaces with empty assigned bins and barrels as empty.
2014-09-07 15:07:57 -06:00
Eric Wald 1ce07c063d Canonical way to find the stockpile by id. 2014-09-07 14:55:34 -06:00
Eric Wald 3c58bd3948 Switching autotrade to use StockpileIterator.
This should speed it up a bit, and prevents it from marking a stream of empty bins.
2014-09-07 14:03:51 -06:00
Alexander Gavrilov a45438d172 Fix 3dveins crashing because of trees and malformed biome data.
The sky in the latest versions has uninitialized biome data, which
made the plugin crash on invalid vector index access. Also, trees
on ground may still have wrong geolayer inside them like obsidian.
2014-09-05 15:11:13 +04:00
Eric Wald 7143479253 Moving trade screen search dimming to the proper row.
Unfortunately, this now means it hits one of the search clear lines when both are active.
2014-09-04 23:28:59 -06:00
Eric Wald aaa8a829d1 Removing new trade hotkeys while a counteroffer is displayed.
Fixes http://www.bay12forums.com/smf/index.php?topic=126076.1140
It's tempting to use has_offer for this effect, but that flag remains true after hitting Enter to consider the offer.
Relies on a structure update: https://github.com/DFHack/df-structures/pull/18
2014-09-04 21:08:46 -06:00
Quietust cf06dc3503 Update to 0.40.11, fix a few devel plugins to build again 2014-09-04 08:26:45 -05:00
Quietust 92946e5fbc Minor reveal fix - only preallocate unreveal data for existing map blocks 2014-08-31 11:43:19 -05:00
lethosor 9aee476c6e Make plugins use ".plug.dylib" extension on OS X 2014-08-30 09:21:19 -04:00
lethosor 76ecc9b347 Add newline to autotrade usage
Fixes #304
2014-08-30 08:47:37 -04:00
hobotron-df e115a392f7 Added binary tarballs for ruby dependencies to work around cmake download failures against github (http://cloud.github.com/downloads/jjyg/dfhack/) 2014-08-29 19:52:23 -05:00
JapaMala 948fbb48f6 Updated stonesense 2014-08-29 18:45:25 +05:30
JapaMala b98b6f61d2 Merge branch 'remote_reader' of github.com:JapaMala/dfhack into develop 2014-08-29 18:39:57 +05:30
JapaMala 96a0bd0de0 Added growth locations to the fake growth materials 2014-08-29 17:08:21 +05:30
expwnent 79b572ba65 Update stonesense. 2014-08-29 05:26:07 -04:00
Quietust 5c0588dd34 Merge pull request #299 from eswald/stockflow-40
Stockflow Repairs
2014-08-28 14:56:04 -05:00
Quietust f0c52a9a73 Merge pull request #289 from eswald/trade-search
Moving trade screen search lines
2014-08-28 14:54:00 -05:00
Quietust 5ccd7dbb8f Merge pull request #296 from lethosor/embark-tools-render
embark-tools fix
2014-08-28 14:53:22 -05:00
Quietust 8bfc0e93ec Merge pull request #298 from eswald/stockpile-lines
Stockpile lines
2014-08-28 14:53:09 -05:00
Eric Wald 6d9d616fff Prioritizing search hooks on the trade screen.
The autotrade plugin has been intercepting the m/u/M/U keys if enabled after enabling the search plugin.  An explicit priority makes the search plugin always accept those keys while typing in a search line.
2014-08-25 21:18:52 -06:00
lethosor 17a23796c8 Fix embark-tools render() behavior 2014-08-25 13:08:11 -04:00
Eric Wald 632b0b85bd Speeding up the stockpile item count.
kr0pper reports two orders of magnitude speed improvement for check_pile() by using the map tile item cache.
2014-08-23 17:49:03 -06:00
Eric Wald 8495bddc2d Removing an obsolete workaround 2014-08-23 17:46:35 -06:00
Quietust eb221e1165 Fix some blatant bugs in somebody else's additions to showmood 2014-08-21 15:23:05 -05:00
Quietust 33f4f9fdcb Update cleanmap to optionally also clean up item spatters such as leaves 2014-08-20 10:54:00 -05:00
Quietust ae80ca9ec9 Merge branch 'develop' of github.com:DFHack/dfhack into develop 2014-08-20 10:32:59 -05:00
Eric Wald 6f77372367 No longer overwrites stockpile links
The new lines added to the stockpile 'q' menu are usually drawn at the bottom, where the last few Give/Take links are written.  Now, they notice when they would overwrite one of those links, and move somewhere else.  The 'Done' line can now be overwritten by stockflow, but that hint isn't necessary for experienced players.
2014-08-19 14:19:13 -06:00
Eric Wald c95ad05a7e Switching new stockpile menu keys from green to red. 2014-08-17 16:01:42 -06:00
Eric Wald 71098b6108 Moving the stocks stockpile hotkey to the bottom of the menu.
The hard-coded location is no longer appropriate for the new behavior of the linked stockpiles list.
2014-08-17 15:45:30 -06:00
Eric Wald 034e34f8b6 Moving the autotrade hotkey to the bottom of the menu.
The hard-coded location is no longer appropriate for the new behavior of the linked stockpiles list.
2014-08-17 15:44:54 -06:00
Eric Wald 9f17966f87 Moving stockflow hotkeys to the bottom of the menu.
The hard-coded location is no longer appropriate for the new behavior of the linked stockpiles list.
2014-08-17 15:44:02 -06:00
Eric Wald 2b59f0edca Switching Mark/Unmark all hotkeys to red
Following the policy described in the Readme.
2014-08-17 12:38:13 -06:00
Eric Wald 6060da5903 Moving Mark/Unmark all in the trade screen
These are in a different plugin, but affect the same interface.
2014-08-17 12:27:57 -06:00
Eric Wald 6ee29bfa11 Moving trade screen search lines
Now that this screen uses the window's full height, the hard-coded line is no longer appropriate.
2014-08-17 10:59:33 -06:00
expwnent 59e6607d8c Merge remote-tracking branch 'warmist/dev_building_hacks' into develop 2014-08-16 10:26:24 -04:00
Warmist f04b93210a Bug fixing.
Fixes for "tab" in hacked buildings.
2014-08-16 16:58:09 +03:00
Warmist 6868cab1fe Exposed dfhack.jobs.linkIntoWorld. Simplified eventful and gui.dwarfmode for sidebar use/creation. 2014-08-16 16:58:01 +03:00
Eric Wald f5d50adf0d Removing the leaves check for stockpile acceptability.
That item type no longer exists in DF 0.40; such items will now always be considered properly stored by any stockpile they're on.
2014-08-15 21:41:23 -06:00
Quietust 287301b682 Update autolabor to work with 0.40 2014-08-15 14:12:57 -05:00
Quietust 13bffed647 Update isoworld to a commit that actually exists 2014-08-15 09:44:52 -05:00
JapaMala 493dd47383 Updated df-structures and isoworld 2014-08-15 19:28:03 +05:30
JapaMala 5add8c433d Merge branch 'develop' of github.com:DFHack/dfhack into remote_reader
Conflicts:
	plugins/remotefortressreader.cpp
2014-08-15 19:15:00 +05:30
Quietust ebda2d8472 Fix ageItem to work correctly, and update XML 2014-08-15 08:13:15 -05:00
expwnent ce4d1db5a0 More removing unneeded fixes. 2014-08-15 04:23:54 -04:00
expwnent 820839fa8d Remove stuff that doesn't exist anymore from dfhack.init-example and documentation. 2014-08-15 03:03:25 -04:00
expwnent b2dc4bd104 autolabor doesn't load properly in windows. 2014-08-15 02:19:24 -04:00
Quietust c1ed62ad64 Merge branch 'develop' of git://github.com/DFHack/dfhack into develop
Conflicts:
	plugins/stockflow.cpp
2014-08-14 22:49:37 -05:00
Quietust 28d89db1fd Merge pull request #275 from eswald/stockflow-40
Stockflow Improvements
2014-08-14 16:33:46 -05:00
Quietust cfefc23e6a Add new labors to Manipulator 2014-08-11 15:21:24 -05:00
Quietust 8a9e3d1a72 Plugin cleanup - always do "using df::global::[foo]". Also, get rid of old 0.34.11 binpatches 2014-08-11 15:07:52 -05:00
Alexander Gavrilov 2471c4a68e Add a new API for converting between interface_key and string characters.
It's necessary now that the simple linear arrangement is broken.
2014-08-11 14:23:19 +04:00
Alexander Gavrilov 002bd5240b Bump version to v0.40.07 and update find-offsets to new pressure plate UI. 2014-08-11 14:14:42 +04:00
jj 0f99ea0ccb ruby: fix spawn_liquid for 40.06 2014-08-11 01:11:46 +02:00
Warmist 9d460d506e Probably a fix to rendermax for 0.40.xx 2014-08-09 22:14:55 +03:00
JapaMala 36435ca8cf Merge branch 'develop' of https://github.com/quietust/dfhack into remote_reader
Conflicts:
	library/modules/Items.cpp
	library/modules/MapCache.cpp
	library/modules/Maps.cpp
	library/modules/Materials.cpp
	library/modules/Translation.cpp
	plugins/CMakeLists.txt
2014-08-08 20:54:44 +05:30
JapaMala 756485c4db Added support for getting a list of plant growths with fake material names. 2014-08-08 20:35:57 +05:30
Quietust 55ebca4a7a Plant immolate/extirpate no longer work, but create/grow are still good 2014-08-06 10:03:34 -05:00
Quietust 9956b4a5ef Update getplants, plants, and prospector, and isolate autochop 2014-08-06 09:31:42 -05:00
Quietust 0463021823 Merge branch '0.40-plugin-updates' of github.com:lethosor/dfhack into develop 2014-08-06 08:27:29 -05:00
Quietust f34d68e567 Actual correct fix here 2014-08-05 20:28:09 -05:00
Quietust 86c036b7d3 Add an extra check that was missing 2014-08-05 20:19:31 -05:00
Quietust 1bcfcd36f6 Avoid buffer overrun on mouse clicks 2014-08-05 19:59:53 -05:00
lethosor fa26aa79ea Make some plugins compile for 0.40
dwarfmonitor: remove StoreItemInChest, StoreItemInCabinet, ProcessPlantsBag, and BrewDrink
dig/diggingInvaders/siege-engine: update special cases for trees to handle roots/branches/trunks
2014-08-04 12:28:22 -04:00
Eric Wald 19133ff327 Documenting the new Stockflow option. 2014-08-03 16:40:03 -06:00
Eric Wald 1aba6a6739 Faster stockflow mode, ignoring the bookkeeper. 2014-08-03 15:14:20 -06:00
Eric Wald 2ebebaf62f Deleting old stockflow records.
Once a stockpile has been removed or abandoned, its persistent configuration is obsolete.
2014-08-03 15:07:04 -06:00
Eric Wald 1b1475fb94 Warning about mismatched stockflow entries.
For the most part, mismatches should only happen if the reaction list has changed between world loads, which means either the raw files or the plugin files have been changed.  For now, such entries are ignored, though in some cases it might be possible to recover a new order number by searching through the reaction list.
2014-08-03 15:04:28 -06:00
Eric Wald 2db1c9d722 Moving the global job_types cache into the two functions that use it.
It's mostly an artifact of a misunderstanding, anyway.
2014-08-03 14:57:20 -06:00
Eric Wald 1aafa206bc Localizing a few Lua variables.
It seems like the globals could be localized, too, but I'm not quite sure what that would accomplish.
2014-08-02 18:08:13 -06:00
Eric Wald ad4d545036 Ignoring the removed job types for DF 0.40+
The version check allows the plugin to work with DF 0.34, just in case.
2014-08-02 17:58:36 -06:00
Quietust 2928f15629 Update fastdwarf to work properly in 0.40 2014-08-01 08:45:23 -05:00
Quietust 1450298484 assumed_identity -> identity 2014-07-29 16:30:22 -05:00
Quietust 88dfb1faef criminal_case -> crime 2014-07-29 16:27:16 -05:00
Quietust d6162cd189 death_info -> incident 2014-07-29 16:26:14 -05:00
JapaMala bc5e0f6ad6 Made DFHack buildable. Also added plant proto definitions 2014-07-23 19:57:47 +05:30
Quietust e711605413 Some minor corrections 2014-07-21 13:26:34 -05:00
Quietust 97de21357c First pass for 0.40 compatibility; still lots left to do, but this will at least build 2014-07-21 13:18:29 -05:00
JapaMala b598cbb0dd Merge branch 'develop' of github.com:DFHack/dfhack into develop 2014-07-20 16:43:00 +05:30
JapaMala 216019e5af Disconnected the RemoteReader values from the DF enums. 2014-07-17 17:46:00 +05:30
JapaMala 48e714b65b Merge branch 'develop' of github.com:DFHack/dfhack into remote_reader 2014-07-15 17:50:11 +05:30
JapaMala 2d5ec9e45d remotefortressreader can send over more info over the sockets. 2014-07-15 17:48:12 +05:30
expwnent 0a16bc2e12 Merge remote-tracking branch 'origin/perSaveScripts' into scriptOrganization
Conflicts:
	plugins/CMakeLists.txt
2014-07-07 09:01:07 -04:00
expwnent 6652074644 Delete the syndromeTrigger plugin. 2014-07-03 09:03:26 -04:00
expwnent 81c87d0921 EventManager: INTERACTION event for unit interactions. 2014-07-03 04:55:12 -04:00
JapaMala 829ad945ea Added a function to do a hash check on the entire fortress. It's not overly useful yet, other than benching. 2014-07-03 08:35:45 +05:30
JapaMala e04ab11659 Merge branch 'develop' of github.com:DFHack/dfhack into develop
Conflicts:
	library/xml
	plugins/stonesense
2014-07-02 23:18:55 +05:30
expwnent d765de4546 Merge remote-tracking branch 'lethosor/lua-runcommand2' into scriptOrganization 2014-07-01 02:05:14 -04:00
expwnent fe875f7c02 Cleaned up eventful.lua.eventType. 2014-06-30 03:16:45 -04:00
expwnent c7636ae442 Deleted devel/printArgs because there's a script for that. 2014-06-30 02:56:07 -04:00
expwnent 2894b406ac Sorted devel CMakeList. 2014-06-30 02:54:15 -04:00
expwnent deb755fd57 Sorted the plugins CMakeList. 2014-06-30 02:51:23 -04:00
expwnent 0aa2dc149f Converted outsideOnly plugin to Lua script. 2014-06-30 02:21:58 -04:00
expwnent 961d033ade EventManager: unload event for convenience. 2014-06-29 10:03:55 -04:00
expwnent f88c176dd3 Removed autoSyndrome. 2014-06-29 06:16:52 -04:00
warmist 5e2653998c Added rendermax to supported
It's stable enough and quite nice. Also one person missed it in release.
2014-06-28 16:18:04 +04:00
expwnent 8e7e87ac73 Added UNIT_ATTACK event to EventManager and exposed it to Lua. 2014-06-28 02:31:34 -04:00
Quietust fc7ac9b47f Update XML and sync plugin 2014-06-27 13:01:46 -05:00
Alexander Gavrilov 92c4514286 Merge branch 'embarktools-finder' of git://github.com/lethosor/dfhack into develop 2014-06-26 17:22:56 +04:00
JapaMala 4f9479cce5 Fixed a bug where remotefortressreader was using min_x for min_z. 2014-06-25 18:49:00 +05:30
lethosor 3c8ba091f2 Disable "stable position" when site finder is active 2014-06-24 10:08:50 -04:00
Quietust 9625d56384 Update Manipulator to respect entity permitted_labor settings
This has the effect of locking out the Alchemy labor, which is how it's
supposed to work in-game (but doesn't due to bug #6511)
2014-06-24 08:36:36 -05:00
expwnent 7313c18a2a EventManager/eventful: added ON_REPORT event and exposed it to Lua. 2014-06-23 09:15:46 -04:00
expwnent 9afc861a2a syndromeTrigger: use DFHACK_PLUGIN_IS_ENABLED properly. 2014-06-23 09:14:56 -04:00
expwnent 247bd212f3 Update stonesense. 2014-06-21 13:28:59 -04:00
JapaMala 3f717af0b7 Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
Conflicts:
	library/xml
2014-06-21 16:43:44 +05:30
expwnent f94fc5846d outsideOnly: allow checking periodically in case a building was made outside and then became inside. 2014-06-20 19:48:56 -04:00
expwnent c0e6e62cea outsideOnly: registration of buildings is now required, and you can also register buildings as inside-only. 2014-06-20 18:49:11 -04:00
expwnent 12d18ca64d Fix compile issues on windows. 2014-06-19 22:32:02 -04:00
expwnent 3357718d03 Merge remote-tracking branch 'origin/develop' into 0.34.11-r5
Conflicts:
	Readme.rst
	plugins/CMakeLists.txt
2014-06-19 19:59:20 -04:00
lethosor cca605d8b4 Prevent blank lines from being stored in history 2014-06-17 17:21:30 -04:00
lethosor 0c144b821d Reimplement command-prompt history
Also add shift-left/right for back/forward one word
2014-06-17 17:11:45 -04:00
lethosor 1684eced8a Remove (broken) command history
This reverts commit cc07a373f3.
2014-06-17 12:45:57 -04:00
lethosor 6f74d60521 Merge branch 'develop' into cmdprompt-lineedit 2014-06-17 12:33:04 -04:00
lethosor b8e7c8a946 Merge branch 'develop' into cmdprompt-lineedit 2014-06-17 12:28:46 -04:00
JapaMala ce849312c7 remotefortressreader now can send over sets of MapBlocks 2014-06-17 21:47:16 +05:30
Alexander Gavrilov 2db73a407d Merge branch 'manipulator_show_squad' from git://github.com/pierredavidbelanger/dfhack.git into develop 2014-06-17 10:39:26 +04:00
Alexander Gavrilov 86131781da Merge branch 'dev-embarktools-pr' of git://github.com/lethosor/dfhack into develop 2014-06-16 14:03:28 +04:00
Alexander Gavrilov f9f865cb90 Fix a compile error and signed/unsigned mismatch warnings. 2014-06-16 14:02:48 +04:00
JapaMala db2d59ac77 Started work on a generic visualizer socket client plugin. Currently only sends over inorganic and creature materials, nothing else. 2014-06-15 10:10:12 +05:30
Anuradha Dissanayake befab343a1 Add ability to auto allocate rooms to noble positions. 2014-06-15 16:19:15 +12:00
Pierre-David Bélanger a751df4219 Allow to toggle between Profession and Squad view instead of wasting screen space with a new column 2014-06-10 22:59:28 -04:00
lethosor 5999dc63da Use setupdwarfgame field names 2014-06-10 17:30:02 -04:00
lethosor f534c91fb8 Fix screen handling 2014-06-10 12:48:46 -04:00
lethosor 69c9353196 Merge branch 'develop' into tweak-confirm-embark 2014-06-10 12:43:03 -04:00
lethosor b11673e9b0 Use this instead of getCurViewscreen 2014-06-10 12:38:40 -04:00
lethosor 088eff05e5 Merge branch 'develop' into dev-embarktools-pr 2014-06-10 12:08:43 -04:00
Pierre-David Bélanger 044f958551 Squad column and squad info in Dwarf Manipulator (manipulator plugin) 2014-06-09 21:58:16 -04:00
lethosor cc07a373f3 Command-prompt history
Creates duplicate entries occasionally

Also disabled movies
2014-06-09 19:38:21 -04:00
lethosor aafcd6c43a Fix 4/6 behavior 2014-06-09 17:00:26 -04:00
lethosor 055afafedc command-prompt: Basic line editing
Left/right arrows, Ctrl-A, Ctrl-E
2014-06-09 16:50:06 -04:00
Anuradha Dissanayake b1f73b791c DwarfMonitor: Show current date and weather in border. 2014-06-07 15:12:19 +12:00
Quietust a1f9b1d1c4 Sync with structures change 2014-06-06 14:24:57 -05:00
Lethosor c29d61dca2 Use INTERPOSE_NEXT in key_conflict
See comment on 0a1d87c09f
2014-06-06 14:59:23 -04:00
lethosor 0a1d87c09f confirm-embark: Make esc work again 2014-06-04 23:18:19 -04:00
lethosor f29d1886ff tweak confirm-embark fixes
* Added a display of the total embark points remaining, for convenience
* Made 'esc' work by interposing key_conflict as well
* Rearranged to look more like DF's confirmations
2014-06-04 14:41:35 -04:00
Anuradha Dissanayake 5f611ec48b Add automelt plugin 2014-06-04 22:18:40 +12:00
Anuradha Dissanayake 9ddbd49e28 Add stockpile autodump functionality 2014-06-04 22:01:17 +12:00
lethosor 6ec0fd6589 New tweak: confirm-embark
Adds a confirmation when selecting [e]mbark on the "prepare carefully" screen.
Suggested in multiple threads on forums.
2014-06-03 18:29:13 -04:00
lethosor a7fd6c4783 Add embark-tools settings interface 2014-06-03 15:03:03 -04:00
Quietust 23acf276b4 Silence warning C4800 on Windows 2014-06-03 08:58:31 -05:00
Quietust 7de0b2dd39 Merge pull request #255 from quietust/develop
Fix problems with NONE for item types and subtypes
2014-06-03 08:44:19 -05:00
Anuradha Dissanayake df244aa7a4 Disable mouse query when linking levers.
Update mousequery plugin version.
2014-06-03 12:59:55 +04:00
Anuradha Dissanayake 4034df3560 Fix incorrect plugin name in version check 2014-06-03 12:59:55 +04:00
Alexander Gavrilov 63254df6dd Fix obvious issues in stockflow.
- Duplicate definition of a function now in uicommon.h
- Assertion failure due to missing core suspend claim.
- Incorrect way of accessing the civ entity.
- Accessing nil objects in the lua module if filter matches nothing.
- Lua module breaking on reload('plugins.stockflow').
2014-06-03 12:57:45 +04:00
Alexander Gavrilov e7292379f7 Merge branch 'stockflow' of git://github.com/eswald/dfhack into develop 2014-06-03 12:13:56 +04:00
Alexander Gavrilov 4831fb8a8c Merge branch 'patch-1' of git://github.com/BenLubar/dfhack into develop 2014-06-03 12:11:31 +04:00
Alexander Gavrilov 89269f76fd Merge remote-tracking branch 'warmist/cmd-prompt' into develop 2014-06-03 12:10:06 +04:00
Anuradha Dissanayake f07f2e1079 Fix autotrade plugin name in version string 2014-06-02 16:05:05 +12:00
Warmist 99659e7e00 cmd-prompt needs to work on ANY screen. This fixes it. 2014-05-26 18:42:42 +03:00
Quietust e483e7439f Fix problems with NONE for item types and subtypes 2014-05-22 08:18:01 -05:00
lethosor 2d778be956 Fix embark sidebar updating 2014-05-20 15:51:26 -04:00
lethosor fcb62ac7dd sticky: Fix handling of rapid input 2014-05-19 17:43:30 -04:00
lethosor da31bab419 Display embark label on all 5 map pages 2014-05-19 16:33:17 -04:00
lethosor bb5f7b475d Add sticky (equivalent of tweak stable-cursor) 2014-05-19 16:11:42 -04:00
lethosor 02811c773c Fix crash with child screens (e.g. saving a macro) 2014-05-19 15:53:29 -04:00
lethosor 96b70a93bc Update readme 2014-05-18 21:21:17 -04:00
lethosor 6519ac1bf8 Add sand indicator and allow enabling/disabling all tools 2014-05-18 20:03:59 -04:00
lethosor 0f5802af9f Add embark-tools
A collection of embark-related tools (currently implementations of
embark anywhere and nano embark)
2014-05-18 18:44:25 -04:00
Ben Lubar d1aee89491 remove space before hyphen 2014-05-18 13:01:07 -05:00
Ben Lubar 76ec3ba58c Fix English names containing the word "the"
See DFHack/dfhack#245
2014-05-17 18:40:15 -05:00
expwnent 8cc4bea0d4 Added petcapRemover plugin. 2014-05-17 17:59:41 -04:00
lethosor f852802270 Merge branches 'search-mouse-crash', 'cmdprompt' and '3dveins-check-mode' into dev-plugins 2014-05-16 21:23:34 -04:00
lethosor 293a535aa4 Fix crash with mouse input in search plugin 2014-05-16 20:53:36 -04:00
lethosor 9b1d393c1c Append newline to each section of output 2014-05-15 17:30:42 -04:00
lethosor 2074f7e78b Fix handling of newline characters in command-prompt output 2014-05-15 15:51:03 -04:00
lethosor d52a07ef76 Dismiss previous command prompt before creating a new one 2014-05-14 18:56:30 -04:00
lethosor a516811bb1 Only allow 3dveins to be run in fortress mode
Prevents crash from running in arena mode
2014-05-13 16:42:00 -04:00
Anuradha Dissanayake dbe903b5b7 Re-enable melting in stocks plugin. 2014-05-13 22:15:37 +12:00
Alexander Gavrilov 56903b9374 Merge branch 'tiletypes-blank-args' of git://github.com/lethosor/dfhack into develop 2014-05-12 21:44:31 +04:00
lethosor b166f51568 Handle missing arguments to filter/paint in tiletypes 2014-05-11 14:17:56 -04:00
Alexander Gavrilov e829b2eea4 Fix missing newline and update Readme.html 2014-05-11 16:05:00 +04:00
Alexander Gavrilov ae8d630cfa Merge remote-tracking branch 'warmist/dev-rendermax' into develop 2014-05-11 15:44:29 +04:00
Warmist a088219b3e Fixed ALL the bugs: zooming does not crash and fullscreening also does not crash now. 2014-05-11 14:19:02 +03:00
Alexander Gavrilov a3d7b54b9c Merge remote-tracking branch 'falconne/develop' into develop 2014-05-11 13:22:13 +04:00
Alexander Gavrilov 8989c06900 Merge branch 'tweak_changes' into develop 2014-05-11 13:19:44 +04:00
Japa 43064f41e3 Merge branch 'develop' of https://github.com/DFHack/dfhack
Conflicts:
	library/xml
2014-05-11 09:34:05 +05:30
Quietust 4b8f68dfa9 Add a few tweaks - fix wear on cloth/leather items, disable wear on adamantine clothes 2014-05-08 14:22:45 -05:00
Warmist b6b839c802 Fix for osx to build. 2014-05-06 21:59:11 +03:00
Warmist fef296110f Fixed friend class bug. 2014-05-06 07:17:02 +03:00
Anuradha Dissanayake f824e7f294 stocks plugin: added more filtering and display options. 2014-05-05 16:56:40 +12:00
Eric Wald 144eff4cf2 Clearing the center column.
The official order selection screen has an extra space to the left of the orders on the right-hand side.
2014-05-04 15:36:42 -06:00
Eric Wald 4fc850445d Magic Number Reduction: Display placement constants 2014-05-04 15:28:53 -06:00
Eric Wald 767badbfb9 Magic number reduction: Clothing flags
Bone and shell are used to construct BARRED and SCALED armor/clothing items, for some reason.
2014-05-04 15:13:25 -06:00
Eric Wald bdb22235af Magic number reduction: Job types 2014-05-04 15:02:12 -06:00
Eric Wald 2d5f7e4022 Magic number reduction: Persistent storage
Replaces explicit indices into the ints field of Stockflow persistent storage objects with enumerated values.
2014-05-04 12:55:00 -06:00
Eric Wald 723cfcf28e Attempting to repair an order object leak.
Now frees manager_order objects in the reaction_list when the plugin is disabled or the world unloaded.  However, there may still be orders leaked elsewhere.
2014-05-04 12:35:10 -06:00
Warmist e29e29d537 Updated readme, NEWS and changed where rendermax looks for it's config. 2014-05-04 21:00:16 +03:00
Alexander Gavrilov 13584f08c5 Merge remote-tracking branch 'warmist/dev-buildings' into develop 2014-05-04 19:52:01 +04:00
Anuradha Dissanayake 1f93b8e144 getplants: add autochop function to automate woodcutting. 2014-05-04 23:43:52 +12:00
Anuradha Dissanayake e9c7d502e2 dwarfmonitor: add screen to summarise preferences of fortress dwarfs. 2014-05-04 22:45:48 +12:00
Anuradha Dissanayake 5a3065fa80 Use shifted keys for buildingplan so as not to interfere with QuickFort. 2014-05-04 22:23:10 +12:00
Anuradha Dissanayake cba143c447 Add workshop profile search. 2014-05-04 22:04:03 +12:00
Anuradha Dissanayake 7fd7d3d48c mousequery: several usability improvements.
mousequery: show live overlay (in menu area) of what's on the tile under the mouse cursor.
2014-05-04 21:55:58 +12:00
Anuradha Dissanayake de9140336f autotrade: adds "(Un)mark All" options to both panes of trade screen. 2014-05-03 22:56:34 +12:00
Anuradha Dissanayake 5e52bb60f0 Update uicommon.h with new common display functions 2014-05-03 21:19:46 +12:00
Anuradha Dissanayake a14f31fbfe Show box select dimensions in Automaterial 2014-05-03 11:44:35 +12:00
Alexander Gavrilov 415cdad489 Make using new for allocating DF objects with vtables a compile-time error.
When done from plugins, it doesn't correctly initialize the vtable
because of some weird things MSVC does, so the only safe way is to
use df::allocate<df::foo>(). For consistency, it is also enforced
for code in the main library. It reveals the issue in the digging
invaders plugin, first found by warmist.

This change is linked to a modification in df-structures codegen.
2014-04-30 21:28:02 +04:00
Japa b74d0da872 Merge branch 'develop' of https://github.com/DFHack/dfhack
Conflicts:
	library/xml
2014-04-26 09:23:21 +05:30
Timothy Collett e4641c506f Replace a std::string method not implemented until C++11 with a C++0x-valid substitute 2014-04-21 09:34:42 +04:00
Eric Wald 5fb87c2ea9 Now accepts the new enable/disable commands. 2014-04-18 21:58:45 -06:00
Alexander Gavrilov 63d256c1e9 Adjust siege engine targeting weights.
Stop shooting at leaving caravan guards for one.
2014-04-17 22:10:43 +04:00
Alexander Gavrilov c27c38e4c0 Remove tired or hungry siege operators from duty when at peace.
The threshold is set at the level when they start to blink - normally
they would continue on with the job until they get a thirsty/hungry
thought, but immediately run off to eat if they lose the job (thus
refusing to load the engine after firing it). The code checks for
active sieges and whether there is a free replacement unit.
2014-04-15 21:52:39 +04:00
Alexander Gavrilov fc9826389b Account for meandering movement when predicting unit path in siege engine.
The movement is random, but there is an average slowdown coefficient.
2014-04-15 19:50:23 +04:00
Alexander Gavrilov 55cea36c76 Use the new API to produce combat reports for aimed siege engine attacks.
This requires exposing the actual operator unit to lua code.
2014-04-15 19:50:23 +04:00
Eric Wald 0a99bb0cae Now works when enabled is true by default. 2014-04-13 15:23:37 -06:00
Eric Wald b9ed7a5cc2 Stockflow plugin v1.0 2014-04-13 15:19:03 -06:00
Alexander Gavrilov 7aecffe0cd Update structures and fix broken things. 2014-04-04 22:34:39 +04:00
jj eac126c884 ruby: use placement-new instead of hack 2014-04-01 15:12:52 +02:00
Quietust 837da8ae98 Fix siege-engine to compile on Windows - don't have C++11, and pow() is picky about arg types 2014-03-25 13:30:45 -05:00
Alexander Gavrilov 36b069e981 Merge remote-tracking branch 'warmist/dev-cmdprompt' into develop 2014-03-24 20:10:58 +04:00
Alexander Gavrilov a01939fce6 Sync structures. 2014-03-24 19:45:27 +04:00
Alexander Gavrilov 827dd121d8 Make createitem default to the controlled unit in adventure mode. 2014-03-24 19:35:34 +04:00
Alexander Gavrilov 8963a49414 Forbid the items shot by siege engines if the forbid ammo order is set.
This only applies when targeting the engine, so you could still make
cheaty infinite ammo training units by using stock aiming mode.
2014-03-24 16:05:12 +04:00
Warmist 4cbab2b014 Small fix that got lost in rebase 2014-03-07 20:28:07 +02:00
Warmist 50963c73fa rendermax: added adv mode lights also more proc-expensive diffuse mode. 2014-03-07 20:08:48 +02:00
Warmist b5b01ea02b rendermax: mainly organizing
added comments, non-enabled code for adaptive eyes,
2014-03-07 20:08:11 +02:00
Warmist 372f861010 rendermax: fixed crashes (hopefully for real this time) 2014-03-07 20:08:10 +02:00
Warmist 72259c8eba Added creature lights and item lights. 2014-03-07 20:08:08 +02:00
Warmist 830d9900fb Fixed a bug that enabled rendermax even when it was supposed to be off. 2014-03-07 20:08:08 +02:00
Warmist a3d3c34671 Bug fixes, perf improvement, don't load until there is a world. (breaks arena mode) 2014-03-07 20:08:07 +02:00
Warmist c2db761a1b Rendermax: made it use unordered_map instead of map. 2014-03-07 20:07:21 +02:00
Warmist 5ad3a7570f Fixed a lot of disable lights bugs 2014-03-07 20:07:21 +02:00
Warmist f34a4ce34e Renamed lightCell to rgbf 2014-03-07 20:07:20 +02:00
Warmist ee1bad84fc Threading rewrite. 2014-03-07 20:07:20 +02:00
Japa b248eb3e52 Fixed broken buildings, also added floodgate functionality.
Merge branch 'master' of git://github.com/JapaMala/dfhack
2014-03-07 20:07:19 +02:00
Warmist 0cf5eedc2a Fixed potential error with building getting transparent on un-powering. 2014-03-07 20:07:17 +02:00
Warmist 48f855c499 Added occlusionON|occlusionOFF commands 2014-03-07 20:06:50 +02:00
Warmist 360b5d2e18 Fix for gems not getting right color. 2014-03-07 20:06:50 +02:00
Warmist 28985167c9 Fixed bug with buildings and added gems to material definition. 2014-03-07 20:06:49 +02:00
Japa b12fd5a4c5 Changed sun calculation direction. 2014-03-07 20:06:46 +02:00
Warmist d8b0b82122 Added antialiased lights. They kind of suck. So I disabled them. 2014-03-07 20:06:46 +02:00
Warmist b4091b5056 Added day colors and day speed parameters. 2014-03-07 20:06:45 +02:00
Warmist 70880897f6 Added sun time manipulation, updated helpstring. 2014-03-07 20:06:45 +02:00
Warmist 7c0a734c97 Added building size. Removed material flags (on by default) 2014-03-07 20:06:18 +02:00
Japa 70e1320e6f removed something I had for testing. 2014-03-07 20:06:18 +02:00
Warmist 740e3ebc51 Implemented building support. 2014-03-07 20:06:16 +02:00
Warmist 3433eb15fb fixed (?) ice and made dragon blood glow a little. 2014-03-07 20:06:16 +02:00
Japa 5b0cb86278 Made the lighting engine multithreaded. 2014-03-07 20:06:15 +02:00
Warmist 354ec37046 MAXIMUM SPEED UPDATE!!!!! 2014-03-07 20:06:12 +02:00
Warmist 048395a2cd Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels). 2014-03-07 20:06:12 +02:00
Japa 13228855eb added square light volume, and automatic light radius. 2014-03-07 20:05:52 +02:00
Japa b015149ac1 Added cmake info for the config lua. 2014-03-07 20:05:51 +02:00
Japa 0551661db2 Added more advanced sun light calculation 2014-03-07 20:05:51 +02:00
Warmist dceec6c6c7 Plantfix, viewport height fix, and fov viewport fix. 2014-03-07 20:05:47 +02:00
Warmist 4ccc95bc97 Major rewrite of opacity calculation. 2014-03-07 20:05:47 +02:00
Warmist 74bed5529b Made light plugin read configuration file (rendermax.lua) 2014-03-07 20:04:02 +02:00
jj 20d4707b00 rendermax: lights off when sleeping 2014-03-07 20:03:59 +02:00
jj de8a76e37f rendermax: sunlight travels down stairs 2014-03-07 20:03:59 +02:00
Warmist 4d7a7425d0 Prelimenary work on advmode 2014-03-07 20:03:56 +02:00
Japa 4abff416d9 Some performance fixes and tweaks. Opaque blocks can now emit light. 2014-03-07 20:03:56 +02:00
jj 9a8ee755f8 rendermax: basic daylight 2014-03-07 20:03:52 +02:00
jj 2058a822a3 rendermax: make citizen glow 2014-03-07 20:03:17 +02:00
Japa 0a413e179e Made the low water check actually use floats. 2014-03-07 20:03:17 +02:00
Japa 31de296f31 Added some fast checking for obstacles around lights, resulting in a huge speedup outside. 2014-03-07 20:03:16 +02:00
Warmist f173810e2a Fixed skylight 2014-03-07 20:03:14 +02:00
Warmist 2195c4fe28 Small fixes 2014-03-07 20:03:12 +02:00
Warmist f745de3aff Added transparency to ice walls 2014-03-07 20:03:10 +02:00
Warmist 83265efaa8 fix for map_block lights, fix for gem window color, dimmed the plant lights. 2014-03-07 20:03:06 +02:00
Warmist ee7902c529 Fixed unload/disable crash. Added glowing plants. 2014-03-07 20:02:08 +02:00
Warmist 471eb9c02d Torches for statues, candles on the tables. 2014-03-07 20:01:19 +02:00
Warmist 1c4b5c2d38 Update water a bit. 2014-03-07 20:01:18 +02:00
Warmist b3ba3b9107 Fixed non-circular light. Do not show hidden tiles. 2014-03-07 20:01:10 +02:00
Warmist f92e4c91b8 Performance improvements, added flickering cursor light. 2014-03-07 20:00:39 +02:00
Japa 14c494dbfe Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise. 2014-03-07 19:58:32 +02:00
Japa 2fef60708d Added some more operators to the cell color class. 2014-03-07 19:58:32 +02:00
Japa 04f2d4ea58 Made windows transmit colored light. 2014-03-07 19:58:31 +02:00
Warmist a19200fbfe C++ version of light engine. 2014-03-07 19:58:30 +02:00
Warmist 446b4b9d50 New line algo for lights 2014-03-07 19:58:28 +02:00
Warmist eb999cd0ad Another file forgotten 2014-03-07 19:58:27 +02:00
Warmist 843237d1c9 Fixed bug. 2014-03-07 19:58:27 +02:00
Warmist 39da5babee Implemented lua interface. 2014-03-07 19:58:25 +02:00
Warmist 584640f12c Added help for truecolor light testing thing. Also added colors. 2014-03-07 19:58:24 +02:00
Warmist f68852b721 Forgot to add the plugin itself. Also some improvements 2014-03-07 19:58:24 +02:00
Warmist 55d845992c rendermax: removed all the opengl and sdl stuff. Now it work with magic alone. 2014-03-07 19:58:23 +02:00
Warmist dec0b202ee Added rendermax plugin- a bunch of rendering hax in one. Small fix to skeleton. 2014-03-07 19:58:22 +02:00
Warmist a52451a97a eventful: added support for custom workshops and a convenience function to interpose side panel generation 2014-03-07 19:41:50 +02:00
Warmist 834350012f building-hacks: added lua convenience function, made impassible tile fix optional. 2014-03-07 19:41:50 +02:00
Warmist b1e7356e63 Added animation and on update callback. 2014-03-07 19:41:49 +02:00
Warmist 94b5961372 New plugin: building-hacks. Allows workshops to block liquids and consume mechanical power, connect to machines. 2014-03-07 19:41:49 +02:00
Warmist cec4c8cd30 Added an output stream, now response is visible in same window. Also added a way to start prompt pre-filled.
It's nice to bind it to e.g. ctrl-shift-o "command-prompt :lua"
2014-03-07 18:52:06 +02:00
Alexander Gavrilov 97ae857c38 Always shatter glass items within bins thrown by a catapult.
The glass materials have impact strength copied from compression
strength, so the items had 1/5 chance to survive without damage.
Since glass is infinite, it makes sense to make it single-use.
2014-03-07 17:42:49 +04:00
Alexander Gavrilov df22f25a69 Rewrite aiming error code to account for distance and engine quality.
Now the error is simulated by using an approximate normal distribution.
2014-03-07 17:35:04 +04:00
Alexander Gavrilov ef93f2ea4c Compute quality of siege engines and use it to extend firing range.
Since parts aren't there until it is built, it requires checking that.
2014-03-07 17:34:21 +04:00
Alexander Gavrilov 9827184ef7 Switch to the new random number generator class. 2014-03-07 17:34:21 +04:00
Alexander Gavrilov 983685de8d Squash uninitialized variable warnings. 2014-03-07 17:34:21 +04:00
Alexander Gavrilov 41bcd52c36 Make siege engine debug markings toggleable via lua.
Also check that the tile actually exists to avoid crashes.
2014-03-07 17:34:04 +04:00
Warmist 9576c47e18 Cmake fix 2014-03-04 19:00:12 +02:00
Warmist 904808b168 Command prompt plugin with docs and readme patch. 2014-03-04 18:51:23 +02:00
Quietust dd268d43d9 Merge branch 'master' of https://github.com/jjyg/dfhack 2014-02-27 15:49:18 -06:00
Quietust 5a158b21cf Update plugins to match fixed field names in cage/civzone 2014-02-27 14:51:45 -06:00
jj 6d0e6cf7d5 remove old unused code from when dfhack was out of process 2014-02-26 12:44:10 +01:00
Quietust 5ced804312 Merge branch 'master' of https://github.com/angavrilov/dfhack 2014-02-20 12:42:57 -06:00
Quietust 73a112e06c Update tubefill to skip hollow tubes by default, and update docs 2014-02-14 11:06:33 -06:00
Quietust 67b7681ba6 Fix reaction errors, make quantities more consistent 2014-02-13 11:37:04 -06:00
jj 387cc983f9 Merge branch 'osx_shenanigans' of git://github.com/tareqak/dfhack 2014-02-02 23:50:21 +01:00
jj c0d3e9189d showmood: fix item count for real 2014-01-27 12:40:21 +01:00
jj 7f411e1cbf Merge branch 'plant' 2014-01-27 10:45:30 +01:00
Quietust 56f935aea6 Add bugfix for #6420 2014-01-26 18:55:52 -06:00
Quietust 5c28d7eaf6 Not enough mood tickets given out 2014-01-25 09:15:43 -06:00
Tareq A Khandaker f0eeba93ce DFHack compiles under OS X now. 2014-01-25 03:21:56 -05:00
Quietust 7f14e109fa Use DF-compatible RNG for better randomness 2014-01-19 20:31:15 -06:00
Quietust 89b3c7bb67 Change syntax for specifying mood type, also allow overriding mood skill 2014-01-19 20:21:41 -06:00
Quietust baf377afba Meant to move this, not copy it 2014-01-18 22:56:56 -06:00
Quietust 24fbf570e6 Add "strangemood" plugin, lets you trigger a strange mood 2014-01-18 22:45:42 -06:00
jj 04f88ef8fb showmood: fix count of gotten items 2014-01-05 02:29:01 +01:00
jj 7adb6b2ee9 ruby: codegen unit.caste_tg helper 2014-01-04 15:04:56 +01:00
Quietust 91a7280ac3 Need to include tool_uses.h 2014-01-03 16:42:24 -06:00
Quietust 69fc2bec6d A bit of cleanup 2013-12-27 13:01:34 -06:00
Quietust 540bcc1f46 Enhance createitem, can now place items into containers or buildings 2013-12-27 12:53:33 -06:00
Japa 8917892473 Merge branch 'master' of https://github.com/peterix/dfhack
Conflicts:
	library/xml
	plugins/CMakeLists.txt
2013-11-19 04:15:04 +05:30
Quietust 5c51f7dd2a Merge branch 'master' of git://github.com/angavrilov/dfhack 2013-11-10 14:04:48 -06:00
Alexander Gavrilov 7ce5831257 Get rid of the std exception. 2013-11-07 11:58:11 +04:00
Quietust 4d2e5b80bf Use df::allocate here for proper compatibility with 40d and earlier 2013-11-04 14:55:31 -06:00
jj 883d89bb68 plants: move all commands as "plant" subcommands, update NEWS/Readme 2013-11-02 18:54:29 +01:00
Quietust 463bb8d498 Update plugins to use CR_WRONG_USAGE where appropriate 2013-10-30 15:58:14 -05:00
Quietust ff939e36bb Missed parameter in plugin command init 2013-10-30 14:25:35 -05:00
Quietust b97a13fa63 Update "plants" plugin
* Add "createplant" command, creates a shrub or sapling at the cursor.
* Put help text in command definitions so CR_WRONG_USAGE works properly
2013-10-30 14:19:52 -05:00
expwnent 8ccb04236f Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4 2013-10-25 11:47:03 -04:00
Alexander Gavrilov 54b45349c5 Improve pre-embark prospect using new knowledge about soil depth. 2013-10-25 14:37:37 +04:00
Alexander Gavrilov e4978a1da7 Relax 3dveins preconditions to account for soil quirks and volcanoes. 2013-10-25 12:51:06 +04:00
expwnent 329741f235 EventManager: added EQUIPMENT_CHANGE event and exposed it to lua. 2013-10-24 19:32:52 -04:00
expwnent c409289ee4 EventManager: TICK events should unregister correctly when requested and after they fire, other tweaks.
- fixed unregister to allow unregistering individual TICK events
 - make registerTick return the resulting freq you have to put back in to the handler in order for it to be unregisterable
- when TICK events fire, they now automatically remove themselves from handlers[TICK], as they should
- make sure manageTickEvent fires once per tick
2013-10-20 22:54:25 -04:00
expwnent a0ee74b3a5 eventful: no longer possible to disable an event type, event frequency is the minimum request frequency (most frequent), added array of event handler function pointers to simplify code 2013-10-20 19:56:48 -04:00
expwnent e81c060627 Added EVENT_MAX just in case someone wants it. 2013-10-20 15:24:31 -04:00
expwnent d4542b32fa eventful: removed extra EventManager::unregisterAll. 2013-10-20 15:24:04 -04:00
expwnent 6ef360f4d6 Merge remote-tracking branch 'warmist/dev-EventManager-lua' into 0.34.11-r4 2013-10-20 14:52:40 -04:00
Warmist d179812c22 Small bug fix for autolabor crashing on script created creatures. 2013-10-20 21:50:22 +03:00
Warmist 0dff26aa23 Added lua interface (in eventful) for EventManager module. 2013-10-20 21:44:07 +03:00
expwnent 39553cfb6d EventManager: fixed a problem with constructionHandler. 2013-10-20 14:14:02 -04:00
expwnent ee056f4422 Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
Conflicts:
	NEWS
2013-10-20 11:09:40 -04:00
Alexander Gavrilov b2d2a074c8 Validate vein types in the scan phase and leave unexpected ones alone. 2013-10-20 12:33:17 +04:00
expwnent 6805656dd0 Added enable/disable functionality to diggingInvaders. 2013-10-19 21:42:24 -04:00
expwnent 9d3ee11349 Merge branch 'diggingInvaders' into 0.34.11-r4
Conflicts:
	scripts/devel/invasion-now.lua
2013-10-19 21:26:50 -04:00
expwnent 0bf427c689 Added enable/disable functionality to new plugins. 2013-10-19 21:19:39 -04:00
expwnent ef9d3b1521 Merge remote-tracking branch 'jjyg/master' into 0.34.11-r4 2013-10-19 20:28:30 -04:00
expwnent 57fc0f3e89 Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
Conflicts:
	NEWS
	library/xml
	plugins/CMakeLists.txt
	plugins/autoSyndrome.cpp
2013-10-19 20:19:29 -04:00
jj 1bd6d5f96d ruby: add FEATURE/ice map tile materials 2013-10-14 01:58:55 +02:00
jj 3d7661e7e9 ruby: fix map tile material reading 2013-10-14 00:01:26 +02:00
Alexander Gavrilov 78de739d75 Update aquifers when generating 3D vein layout. 2013-10-11 19:23:32 +04:00
Alexander Gavrilov 5bcae49249 Implement generation of 3D veins that match the existing mineral counts.
Vein distributions may need some improvement.
2013-10-10 12:50:52 +04:00
Alexander Gavrilov 86d0022c58 Implement reading and writing the map for 3D veins plugin.
This should completely erase all veins from the map when run.
2013-10-10 12:15:50 +04:00
Alexander Gavrilov a273327c6a Remove "using namespace std" from MiscUtils.h. 2013-10-10 12:15:50 +04:00
Alexander Gavrilov 6852adbd91 Expose new MapCache features in probe and tiletypes. 2013-10-10 12:15:50 +04:00
jj 4ba4f90147 ruby: add support for enable/disable plugin 2013-10-07 13:58:28 +02:00
jj a18347608a ruby: vectors default to int32_t 2013-10-07 13:33:21 +02:00
Alexander Gavrilov 32a6073dad Remove lambdas from dwarfmonitor and resume. 2013-10-03 16:30:06 +04:00
Alexander Gavrilov f3be0ee187 Remove the use of lambdas in buildingplan. 2013-10-02 19:55:48 +04:00
Alexander Gavrilov 599af0a4d9 Fix linux and windows build issues.
- Linux makefile overrides and removes the optimization flags.
- Old linux gcc doesn't understand lambdas.
- MSVC doesn't like extern and explicit instantiation in same file.
2013-09-30 22:51:29 +04:00
Alexander Gavrilov d7e35c2d23 Add built-in enable and disable commands. 2013-09-30 13:19:51 +04:00
jj a487ede2b9 autodump: typo in errmsg 2013-09-23 21:28:27 +02:00
Alexander Gavrilov b885123d4e Fix a crash in beehive code if bees die with yet uncollected products.
http://www.bay12games.com/dwarves/mantisbt/view.php?id=6368
2013-08-26 16:55:30 +04:00
Alexander Gavrilov 896cd11fe9 Track readable names of vmethod hooks for diagnostic messages.
Note that this changes the ABI of all plugins that use hooks.
2013-08-22 12:14:45 +04:00
Alexander Gavrilov 70a2ab9141 Fix crash due to incorrect loop bounds in add-spatter.
This caused a buffer overrun bug if an ADD_SPATTER
reaction had any non-improvement outputs.
2013-08-22 11:22:18 +04:00
jj 308e7b6820 fix renamed pregnancy_ptr/mystery to pregnancy_genes/caste 2013-08-10 01:57:11 +02:00
Japa 279c4a48dc Started work on ramp generation, still needs work. 2013-07-22 19:05:09 +05:30
Japa 0bd627a6f6 Got basic mesh generation working for a unity Visualizer, as well as a block editor for the same. 2013-07-21 10:28:46 +05:30
jj 297fa86c34 follow df-structures change to drawBuilding 2013-07-07 17:40:28 +02:00
Warmist 34e5716cc0 Merge branch 'master' of git://github.com/JapaMala/dfhack 2013-06-28 23:52:51 +03:00
Warmist 647b14b471 Fixed potential error with building getting transparent on un-powering. 2013-06-28 23:51:52 +03:00
Warmist 269a2680c8 Added occlusionON|occlusionOFF commands 2013-06-28 23:34:47 +03:00
Japa 102b2ed450 Fixed broken buildings, also added floodgate functionality. 2013-06-28 23:47:54 +05:30
Warmist 368a326b40 Fix for gems not getting right color. 2013-06-28 17:22:24 +03:00
Warmist 26d557fc68 Fixed bug with buildings and added gems to material definition. 2013-06-27 18:11:50 +03:00
Warmist e2db468d3d Merge branch 'master' of git://github.com/JapaMala/dfhack 2013-06-27 16:18:46 +03:00
Warmist 7c190cd3f0 Added antialiased lights. They kind of suck. So I disabled them. 2013-06-27 16:11:29 +03:00
Japa 67859ada0a Changed sun calculation direction. 2013-06-27 02:49:18 +05:30
Warmist 7c9f0fd781 Added day colors and day speed parameters. 2013-06-27 00:14:03 +03:00
Warmist e1daa16d9e Added sun time manipulation, updated helpstring. 2013-06-26 22:05:22 +03:00
Warmist b7f28877a2 Added building size. Removed material flags (on by default) 2013-06-26 20:19:30 +03:00
Japa d90a7bfb88 removed something I had for testing. 2013-06-26 19:26:11 +05:30
Japa dc42fa2fa3 Merge branch 'master' of https://github.com/warmist/dfhack 2013-06-26 19:14:55 +05:30
Japa 689caa5039 Made the lighting engine multithreaded. 2013-06-26 19:12:14 +05:30
expwnent c1fef35b52 Renamed digSmart to digFlood. 2013-06-25 19:57:17 -04:00
Warmist fbbae3e900 Implemented building support. 2013-06-26 01:18:26 +03:00
Warmist 1d2accbe94 fixed (?) ice and made dragon blood glow a little. 2013-06-25 22:49:52 +03:00
Japa 539abff49a Merge branch 'master' of https://github.com/warmist/dfhack
Conflicts:
	plugins/rendermax/renderer_light.cpp
2013-06-25 23:23:52 +05:30
Japa f4923d6974 added square light volume, and automatic light radius. 2013-06-25 23:13:55 +05:30
Warmist 588ca8b8dd MAXIMUM SPEED UPDATE!!!!! 2013-06-25 20:36:53 +03:00
Warmist 3957fac531 Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels). 2013-06-25 19:34:38 +03:00
Japa 57e68aaee9 Added cmake info for the config lua. 2013-06-25 16:44:44 +05:30
Japa 5265f107b0 Added more advanced sun light calculation 2013-06-25 16:33:01 +05:30
Warmist ef7abaee14 Merge branch 'master' of git://github.com/JapaMala/dfhack 2013-06-25 01:25:56 +03:00
Warmist 87f151f441 Plantfix, viewport height fix, and fov viewport fix. 2013-06-25 01:25:38 +03:00
Warmist 4d9b7bd23d Major rewrite of opacity calculation. 2013-06-25 00:59:32 +03:00
Warmist cb767531cf Made light plugin read configuration file (rendermax.lua) 2013-06-24 18:18:57 +03:00
Japa 8271725320 Some performance fixes and tweaks. Opaque blocks can now emit light. 2013-06-24 14:20:22 +05:30
Warmist 8dcff9bc5d Merge branch 'rendermax' of git://github.com/jjyg/dfhack 2013-06-24 10:34:03 +03:00
Warmist 5a82270aa6 Merge branch 'master' of git://github.com/JapaMala/dfhack 2013-06-24 10:19:10 +03:00
Warmist abc9dc300e Prelimenary work on advmode 2013-06-24 03:47:42 +03:00
jj 19952b9139 rendermax: lights off when sleeping 2013-06-24 02:27:43 +02:00
jj b95683adb2 rendermax: sunlight travels down stairs 2013-06-24 02:22:30 +02:00
Japa ec913c2c5e Merge branch 'rendermax' of https://github.com/jjyg/dfhack 2013-06-24 05:37:59 +05:30
Japa b8d2ceb23b Made the low water check actually use floats. 2013-06-24 05:35:16 +05:30
jj 1a5169c70c Merge branch 'master' of git://github.com/JapaMala/dfhack into rendermax 2013-06-24 01:56:32 +02:00
jj fb5d248720 rendermax: basic daylight 2013-06-24 01:54:09 +02:00
Japa 2da136116d Added some fast checking for obstacles around lights, resulting in a huge speedup outside. 2013-06-24 05:10:01 +05:30
jj 50073ae406 rendermax: make citizen glow 2013-06-24 00:45:45 +02:00
Japa 30697ee115 Merge branch 'master' of https://github.com/warmist/dfhack 2013-06-24 03:58:23 +05:30
Japa a2cef2d86a Merge branch 'master' of https://github.com/warmist/dfhack
Conflicts:
	plugins/rendermax/renderer_light.cpp
2013-06-24 03:58:07 +05:30
Warmist 736f9e85fc Fixed skylight 2013-06-24 01:26:25 +03:00
Warmist 8c9de79812 Small fixes 2013-06-24 00:53:39 +03:00
Warmist f5f1328678 Merge branch 'master' of git://github.com/JapaMala/dfhack
Conflicts:
	plugins/rendermax/renderer_light.cpp
2013-06-24 00:53:03 +03:00
Japa fe41504952 Merge branch 'master' of https://github.com/warmist/dfhack
Conflicts:
	plugins/rendermax/renderer_light.cpp
Still broken. Needs boundary checking.
2013-06-24 03:11:46 +05:30
Warmist 3d6f4d3478 Added transparency to ice walls 2013-06-24 00:36:43 +03:00
Warmist 6cd926b67e fix for map_block lights, fix for gem window color, dimmed the plant lights. 2013-06-24 00:10:52 +03:00
Japa c675ca467a Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise. 2013-06-24 02:35:03 +05:30
Warmist 06915aeded Fixed unload/disable crash. Added glowing plants. 2013-06-23 23:56:01 +03:00
Warmist 82deeafe89 Torches for statues, candles on the tables. 2013-06-23 22:28:26 +03:00
Warmist 0473f89fa2 Update water a bit. 2013-06-23 21:49:17 +03:00
Warmist 84ed3797d4 Merge branch 'master' of git://github.com/JapaMala/dfhack 2013-06-23 21:46:58 +03:00
Japa fd0c053a80 Added some more operators to the cell color class. 2013-06-24 00:14:06 +05:30
Warmist 1361b38f27 Merge branch 'master' of git://github.com/JapaMala/dfhack
Conflicts:
	plugins/rendermax/renderer_light.cpp
2013-06-23 21:35:13 +03:00
Warmist 4f7df238ea Fixed non-circular light. Do not show hidden tiles. 2013-06-23 21:29:03 +03:00
Japa f415ea2100 Made windows transmit colored light. 2013-06-23 23:51:25 +05:30
Warmist cb6130066d Performance improvements, added flickering cursor light. 2013-06-23 20:45:05 +03:00
Japa 140371a0c7 Merge branch 'master' of https://github.com/warmist/dfhack 2013-06-23 22:05:02 +05:30
Warmist 2c49c9e83c C++ version of light engine. 2013-06-23 19:25:42 +03:00
Japa 25ab75137b Merge branch 'master' of https://github.com/warmist/dfhack 2013-06-23 15:27:04 +05:30
Warmist e3ee876a11 New line algo for lights 2013-06-23 12:20:35 +03:00
Japa be953ba4ab Merge branch 'master' of https://github.com/warmist/dfhack 2013-06-23 12:07:14 +05:30
Warmist 76f4c51a29 Another file forgotten 2013-06-23 09:36:04 +03:00
Japa bea2cd74d6 Merge branch 'master' of https://github.com/warmist/dfhack 2013-06-23 11:50:09 +05:30
Warmist b35ea4d10c Fixed bug. 2013-06-23 09:19:29 +03:00
Japa 77a301db27 Merge branch 'master' of https://github.com/warmist/dfhack 2013-06-23 02:45:14 +05:30
Warmist 4cc14641ac Implemented lua interface. 2013-06-22 17:40:52 +03:00
Warmist 906864feaa Added help for truecolor light testing thing. Also added colors. 2013-06-22 14:14:35 +03:00
Warmist c273377284 Forgot to add the plugin itself. Also some improvements 2013-06-22 13:29:58 +03:00
Warmist ea6a264fe2 rendermax: removed all the opengl and sdl stuff. Now it work with magic alone. 2013-06-22 03:45:42 +03:00
Warmist ebc51f1bd3 Added rendermax plugin- a bunch of rendering hax in one. Small fix to skeleton. 2013-06-21 22:47:23 +03:00
Japa dc78f16e2b Added a simple unity project that connects to DF and pulls a list of plugins. 2013-06-17 23:53:36 +05:30
expwnent f459bfc4f1 diggingInvaders: added per-creature dig times and differentiated between smooth and rough constructions. 2013-06-15 23:04:15 -04:00
Quietust 8c6881beb6 Cleanup 2013-06-14 14:46:10 -05:00
Quietust 4193d9b5b3 Add new plugin for cleaning up construction building materials 2013-06-14 14:40:02 -05:00
expwnent 776d088eb9 diggingInvaders: tweaks. 2013-06-11 07:25:07 -04:00
expwnent f557376c3a diggingInvaders: make invaders dig slowly, in a configurable way. 2013-06-11 05:14:56 -04:00
expwnent 0378bbb896 diggingInvaders: proper user interface. 2013-06-10 01:58:27 -04:00
expwnent 07a4839d8b diggingInvaders: made it easy to flip between int64 and int32 for distance cost. It did not make a significant difference in performance when I timed it. 2013-06-09 23:26:07 -04:00
expwnent 4e715ca44b diggingInvaders: made it only do a little work each frame instead of all at once with the pathfinding. 2013-06-09 23:07:51 -04:00
expwnent c4533dcb0c diggingInvaders: only path from one guy, and other minor tweaks. 2013-06-09 17:52:13 -04:00
expwnent d26b11eb40 diggingInvaders: cleaned up pick creation. 2013-06-09 17:20:23 -04:00
expwnent 638affee06 diggingInvaders: tweaked pick creation. Don't recreate if they already have one. 2013-06-09 16:23:41 -04:00
expwnent 08114cf574 diggingInvaders: more fixes. Still a few issues with ramps probably. 2013-05-31 20:39:43 -04:00
expwnent 2b7dfca21e diggingInvaders: cleanup, tweaks. Works for simple situations. 2013-05-31 19:27:22 -04:00
expwnent f8261348ff Merge branch 'master' into diggingInvaders
Also make edgeCost.cpp compile because I stopped midsentence for some reason.

Conflicts:
	library/modules/Maps.cpp
2013-05-31 16:28:05 -04:00
expwnent 909d686ae4 digSmart: remove print statement. 2013-05-31 13:41:31 -04:00
expwnent b82b3f2283 digSmart: added user interface and documentation. 2013-05-31 13:32:56 -04:00
expwnent b945b36016 digSmart: framework in place for finding the bug. When a tile is actively being dug, the dig designation is cleared. If you designate the tile again for digging, multiple dwarves might try to dig it at the same time, leading to job cancellation spam when one finishes. 2013-05-31 12:23:28 -04:00
expwnent 20fa38da7e digSmart: still doesn't working, but learning more. Something weird happens with dig designations. 2013-05-31 00:49:35 -04:00
expwnent 4ba73bc171 Merge branch 'master' into digSmart 2013-05-30 22:22:16 -04:00
expwnent 8982abc163 treefarm: automatically chop trees and dig obsidian 2013-05-30 22:18:08 -04:00
expwnent 594247b57e skeletonShort: slightly easier to copy+paste it to start new plugins, but is more illegible to new DFHackers. 2013-05-30 19:07:22 -04:00
expwnent ee9bddf831 autoSyndrome comment tweaks 2013-05-25 20:23:59 -04:00
expwnent 3403146461 Merge remote-tracking branch 'peterix/master'
Conflicts:
	plugins/CMakeLists.txt
	plugins/autoSyndrome.cpp
2013-05-25 20:08:56 -04:00
expwnent 83a9e5c837 autoSyndrome: added reset policies, allowing modders to specify what to do if a unit already has the syndrome in question. 2013-05-25 14:26:42 -04:00
expwnent 22f31ca3ad workNow tweaks 2013-05-25 12:23:38 -04:00
expwnent 5cca0b84a3 fastdwarf: made it work better when both fastdwarf and teledwarf are enabled. 2013-05-25 11:07:59 -04:00
expwnent 141043363d autoSyndrome: need to check JOB_COMPLETED very often to catch cancelled jobs properly. 2013-05-25 10:20:22 -04:00
expwnent b44cd86dc9 EventManager: completely overhauled JOB_COMPLETED event detection, and tweaked Job::cloneJobStruct. 2013-05-25 09:44:17 -04:00
expwnent 01c311cf13 Weird compilation error. 2013-05-24 15:55:40 -04:00
expwnent 170fe6a0ef autoSyndrome/syndromeTrigger: made things off by default. 2013-05-24 15:55:19 -04:00
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
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 f60e44c395 DiggingInvaders: minor changes. 2013-01-03 13:11:11 -05:00
Anuradha Dissanayake 7b561f108b Fix hotkey detection 2013-01-03 22:01:01 +13:00
expwnent 7586e62374 Digging Invaders: fixed a problem with removing constructions. 2013-01-02 22:35:05 -05:00
expwnent 5201870356 Digging Invaders: get rid of debug prints. 2013-01-02 22:13:23 -05:00
expwnent ae43865489 Digging Invaders: actually seems to basically work! 2013-01-02 22:11:05 -05: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 144e0b4dcb Digging Invaders: merged eventManager and recent. 2013-01-02 11:26:30 -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 46b9148277 Digging invaders: it still doesn't work, but now it's a lot simpler. 2012-12-20 00:35:45 -05:00
expwnent 9cb3f19630 Digging invaders: Minor changes. Still unstable. 2012-12-19 20:44:22 -05:00
expwnent ee4f37ff72 Merge branch 'canWalkBetween' into diggingInvaders 2012-12-19 20:31:17 -05:00
expwnent 7972902c81 stepBetween: named a few things better, and fixed a lot. 2012-12-19 20:30:37 -05:00
expwnent fcbc5d1cb0 Digging invaders. Temp commit. Unstable. 2012-12-19 18:46:46 -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 a09764e77b Digging Invaders: more optimizations. 2012-12-18 15:22:21 -05:00
expwnent 110a9a5579 Digging Invaders: a bit faster. 2012-12-17 20:44:35 -05:00
expwnent 937769874d Digging Invaders: kind of works, but WAAAAAY too slow. 2012-12-17 20:12:11 -05:00
expwnent 957a4da474 Minor changes. 2012-12-17 18:05:57 -05:00
expwnent ef80dbacde More fiddling. Almost kind of works. 2012-12-17 17:36:35 -05:00
expwnent 76fcf1c335 Digging invaders: multi-dimensional edge cost: always prefer walking over digging, no matter how far. 2012-12-17 14:22:45 -05:00
expwnent 94673e447d diggingInvaders: reimplemented path-based digging. Works kind of ok. 2012-12-17 13:37:02 -05:00
expwnent 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
expwnent bf25ea5129 diggingInvaders: fixed a major bug with edge sorting. 2012-12-17 00:17:07 -05:00
expwnent d79583a2c9 Merge branch 'canWalkBetween' into diggingInvaders 2012-12-16 23:39:36 -05: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
expwnent a61cbc661b diggingInvaders: starting a rewrite. Unstable 2012-12-16 21:44:23 -05:00
expwnent 9aa95ddca8 diggingInvaders: int -> int32_t 2012-12-16 17:06:46 -05:00
expwnent 2760484c37 diggingInvaders: cleanup. 2012-12-16 16:53:02 -05:00
expwnent 131d19e4cf Merge branch 'eventManager' into diggingInvaders 2012-12-16 16:43:58 -05:00
expwnent 8a242b3c0d Merge branch 'master' into diggingInvaders 2012-12-16 16:34:45 -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
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
Anuradha Dissanayake 745b347b5b Fix const correctness 2012-12-04 10:30:49 +13: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
Anuradha Dissanayake 6bc6f3e555 Merge branch 'search' 2012-12-01 10:21:37 +13: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
Anuradha Dissanayake 13666ec6e6 Merge remote-tracking branch 'remotes/origin/automaterial' 2012-11-30 20:27:32 +13:00
Anuradha Dissanayake d2a13ad2c7 Merge branch 'autopasture' 2012-11-30 19:53:14 +13:00
Anuradha Dissanayake d59d1c652e Fix gcc compile of search plugin 2012-11-30 19:50:42 +13:00
jj d7f7538d01 ruby: fix Pointer assignment 2012-11-29 17:11:29 +01:00
Anuradha Dissanayake 3095c43d26 Fix location of workshop ui, based on menu width 2012-11-29 23:15:24 +13:00
Warmist 57b69da1f0 Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-11-29 12:13:28 +02:00
Warmist 2c9b560872 Made dfusion not stop df on input. 2012-11-28 22:13:28 +02: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
Anuradha Dissanayake 7a2a746347 Add filtering to zone creature assignment menu. First steps towards adding autopasture functionality. 2012-11-29 00:31:39 +13:00
jj 76bb5f0196 ruby: items in containers are free 2012-11-26 20:09:56 +01:00
Warmist 2bbcfe912a Site spawner added to adv_tools 2012-11-26 21:04:17 +02:00
jj f091284a75 ruby: avoid crash on ArgumentError in onupdate 2012-11-25 17:29:03 +01:00
Anuradha Dissanayake 3db5684ae7 Fix handling of manipulator hotkey in unit search screen 2012-11-25 19:01:58 +13:00
Quietust e9141f34f6 Adjust minimum widths so they actually work at 80x25 without glitching out 2012-11-24 11:13:54 -06:00
Quietust c58f30ba00 Use teal background instead of red for no-labor cells 2012-11-24 10:37:22 -06:00
Quietust cdc44b74f2 Fix possible crash when using shift+enter on cells that don't have labors 2012-11-24 10:36:32 -06:00
jj 4dfe46e26f manipulator: fix column width calculations for 80x25 window 2012-11-24 16:52:21 +01:00
jj e73274d281 ruby: add description field to onupdate_register 2012-11-24 16:10:55 +01:00
Anuradha Dissanayake e750cbe5e9 MouseQuery Plugin 2012-11-25 04:02:49 +13:00
Quietust 139fd07df3 missed a spot 2012-11-23 19:23:06 -06:00
Quietust e3eb325d36 Minimize references to gps->dimx/dimy 2012-11-23 19:18:56 -06:00
Alexander Gavrilov 2a0d048040 Make tweak stable-cursor interact with the build menu properly. 2012-11-22 20:08:47 +04:00
Alexander Gavrilov e7905a5cff Add docs for the automaterial plugin, and use the new Painter class. 2012-11-22 19:38:45 +04:00
Alexander Gavrilov 2794143f77 Merge remote-tracking branch 'falconne/automaterial' 2012-11-22 18:27:31 +04:00
Anuradha Dissanayake 2a83d92290 Code cleanup 2012-11-21 23:45:26 +13:00
Anuradha Dissanayake 0d9efec062 Disable plugin in non construction menu 2012-11-21 20:17:36 +13:00
jj 5b5c674f6e ruby: update map_tile.mat_info for soil/stone special cases 2012-11-20 21:17:33 +01:00
Anuradha Dissanayake 9cb1a45855 Automaterial branch commit 2012-11-20 23:12:11 +13:00
Anuradha Dissanayake 5c18952caa Select by item name 2012-11-20 22:52:44 +13:00
expwnent fe2257427f workNow: plugin to make DF process jobs every time you pause. 2012-11-19 20:17:05 -05:00
Alexander Gavrilov f587d603e8 Allow the workflow goal gap in any range between 1..goal-1 2012-11-19 18:59:58 +04:00
Anuradha Dissanayake 0e2aa299b9 Auto material selection plugin - First push 2012-11-20 00:25:25 +13:00
Alexander Gavrilov 902d2d5597 Try reducing the replace with sparring chance due to xp gain overkill.
Also add more debug spam to make behavior tracking easier.
2012-11-18 22:06:47 +04:00
Alexander Gavrilov ae7bf5aca6 Check unit inventory when replacing skill demo with sparring.
E.g. if they have no shields, they won't gain that skill when sparring.
2012-11-18 13:02:49 +04:00
Warmist ee15086963 Some preparations for new plugin. 2012-11-18 01:52:46 +02:00
Alexander Gavrilov 2953e4c386 Implement a dialog to specify a workflow constraint with all features. 2012-11-17 20:32:39 +04:00
Alexander Gavrilov 0b568942f4 Follow changes in the xml defs. 2012-11-17 16:43:29 +04:00
Quietust 1ab48aa2de Merge https://github.com/ab9rf/dfhack 2012-11-16 21:15:38 -06:00
Quietust e2b9b703a0 Get rid of tabs 2012-11-16 15:33:36 -06:00
Kelly Martin fc1a1e1f0e Merge remote-tracking branch 'jjyg/master'
Conflicts:
	NEWS
2012-11-16 13:20:46 -06:00
Kelly Martin 2a0171a4ff Merge remote-tracking branch 'angavrilov/master' 2012-11-16 13:15:55 -06:00
Kelly Martin cbe3741751 Check all depots for trader requested, not just the last one. 2012-11-16 13:09:05 -06:00
Alexander Gavrilov d506dd7137 Add a tweak to speed up melee squad training. 2012-11-16 22:51:07 +04:00
jj 423c122424 ruby: fix unit_find for advmode 2012-11-16 17:59:39 +01:00
Quietust bbe94c006f Update for temperaturest 2012-11-12 11:54:21 -06:00
Quietust 55fcb7e3ca One more missed 2012-11-12 08:33:05 -06:00
Quietust 766aca4911 Rename general_ref vectors for consistency 2012-11-12 08:27:58 -06:00
Alexander Gavrilov c32f85d637 Merge remote-tracking branch 'warmist/master'
Conflicts:
	plugins/Dfusion/include/OutFile.h
2012-11-12 10:50:48 +04:00
Warmist ce8ada4419 More bug fixing 2012-11-11 22:14:00 +02:00
Warmist 3eb852a43b Added cheat commands to companion-order, (including rumrushers) 2012-11-11 21:18:59 +02:00
Warmist df3b791665 Fixed error in dfusion and added some readme. 2012-11-11 17:19:37 +02:00
Alexander Gavrilov 683da39636 Fix dfusion build on linux. 2012-11-11 17:24:25 +04:00
Alexander Gavrilov d5c31942b5 Add a way to only count locally-made items in workflow. 2012-11-11 15:56:31 +04:00
Warmist 0e4df55364 Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-11-11 12:46:55 +02:00
Warmist 33f674eee2 Removed dfusion lua files. Updated plugins. 2012-11-11 12:33:54 +02:00
Warmist f1d4eac700 Pre-class remove 2012-11-11 11:58:43 +02:00
Anuradha Dissanayake 7ee817b324 Add gcc compile fixes 2012-11-11 19:42:30 +13:00
Anuradha Dissanayake 6803a83e07 Refresh constraints on map reload 2012-11-11 18:18:54 +13:00