Commit Graph

3121 Commits (ac0134568ebd7d996ee10d43cba571ece9f39571)

Author SHA1 Message Date
Japa b37afa4591 Remove tabs 2016-06-30 15:12:28 +05:30
Japa b196ecf351 Send over material tissues through RemoteFortressReader 2016-06-30 14:33:15 +05:30
Lethosor 421e7949e0 Merge pull request #951 from eswald/stockflow-43
Stockflow reaction updates
2016-06-26 21:37:15 -04:00
Eric Wald 060331de37 Stockflow reaction updates
SpinThread jobs now get the proper material category flag, and metal mechanisms can be ordered.
2016-06-26 19:22:53 -06:00
Japa 036c0f787c Send creature adult size through remotefortressreader.cpp 2016-06-23 21:26:00 +05:30
Japa 74c9abcb47 Send color modifier raws through remotefortressreader.cpp 2016-06-22 13:36:36 +05:30
Japa 069d6b67d6 Send all size modifiers through remotefortressreader. 2016-06-21 22:42:47 +05:30
Japa 5fff0efec5 Send appearance info over remotefortressreader.cpp 2016-06-20 22:59:59 +05:30
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