Commit Graph

3058 Commits (0cc51f8d69f299a2170eb2385ceb18d4df4afb6a)

Author SHA1 Message Date
lethosor a1c25570df Move labormanager to plugins/, per request 2016-08-11 23:49:15 -04:00
lethosor 99813038e9 Update labormanager for unit.relations removal and fix warnings 2016-08-11 23:42:58 -04:00
lethosor bceeea39ba Merge remote-tracking branch 'ab9rf/develop' (labormanager) into develop 2016-08-11 23:37:22 -04:00
Kelly Kinkade a55ce5f1d9 labormanager: whitespace 2016-08-11 16:58:35 -05:00
Kelly Kinkade 5ab930ba4d labormanager: small tweaks
Handle cloth crafts correctly; handle pit jobs correctly; handle
bookcase construction correctly; deal with new break behavior better;
change assignment of clean labor; tweak hauling assignments slightly to
avoid overallocation; assign pull lever to everyone and clean to all
nonbusy dwarfs
2016-08-11 16:56:34 -05:00
lethosor 215afa34f3 Update for 64-bit unit changes
Includes xml, stonesense, scripts

Ref DFHack/df-structures@25cb373
2016-08-10 23:50:00 -04:00
lethosor 1b11c46a98 ruby.cpp: uint32_t -> uintptr_t 2016-08-10 15:24:07 -04:00
Lethosor 6e741b1a80 Merge pull request #969 from Qartar/win64
Minor fixes/updates for Visual Studio 2015 Win64
2016-08-10 15:15:44 -04:00
lethosor 53a0d73d23 Add new title-folder plugin 2016-08-09 20:09:50 -04:00
Carter Bray 5fef2ad075 Add windows container sizes to ruby codegen 2016-08-07 10:11:17 -07:00
lethosor ddbb1b5bb8 ruby: Update sizes for some types
Many are still incomplete on x64, especially on Windows
2016-08-05 17:29:24 -04:00
lethosor dbd2e71920 Ruby codegen integer improvements
- Add uint64_t
- Add special case for long on different platforms
- Require OS and architecture to be specified

NOTE: integer alignment on x64 is probably still incorrect
2016-08-05 17:12:07 -04:00
lethosor ef569dc5a1 Pass OS and architecture to ruby codegen explicitly
- Passing the architecture is needed to determine sizeof(long)
- Passing the OS prevents potential issues when cross-compiling between Windows
  and non-Windows (although this is unlikely)
2016-08-05 17:09:25 -04:00
Japa 697aa54fa6 Sent tree and stone layers through remotefortressreader.cpp, and correct town placement. 2016-08-05 00:40:10 +05:30
Japa 8a97b54bcd Send wall info 2016-08-03 16:32:51 +05:30
Japa 2fda01d90b Add support for site towers. 2016-08-03 10:22:30 +05:30
Japa 9189e3dc7e Send world buildings through remotefortressreader.cpp 2016-08-02 10:30:17 +05:30
Carter Bray 9da2dcb8a2 Fix raw_vcall on Win64 builds
MSVC's call conventions on x64 are the same for normal function calls and
member function calls (with the addition of the implicit 'this'
parameter).
2016-07-31 17:01:57 -07:00
lethosor 79377669a1 Merge remote-tracking branch 'NCommander/dwarfvet' into develop 2016-07-29 16:25:53 -04:00
lethosor afde73a673 memview: Fix pointer size on x64 2016-07-28 11:45:35 -04:00
lethosor eeb7f05483 vectors: Fix pointer parsing and display 2016-07-28 11:44:54 -04:00
lethosor 71e4f4ec62 Fix pointer-size-related compile errors in dev plugins 2016-07-28 11:40:17 -04:00
Japa 98230e9078 Send surface material with the worldmap in remotefortressreader.cpp 2016-07-28 20:52:14 +05:30
Vitaly Pronkin 8916aba3bf win64 fixes (partial)
cherry-picked from 2f734ae2317060edb83021f17cffc966c435ad7b
2016-07-27 19:46:49 -04:00
Vitaly Pronkin fe18f176f7 More 64-bit fixes
Cherry-picked from 7eb3ba6
- Lua update already done in e2c6350, 4dd411e
- Excluded library/modules/Buildings.cpp
2016-07-26 23:47:53 -04:00
Kelly Kinkade 74f6f3d416 labormanager: add labors for bookcase (de)construct 2016-07-11 22:39:41 -05:00
Kelly Kinkade 874a97ed9f labormanager: fix several job-to-labor mappings 2016-07-11 22:39:41 -05:00
Kelly Kinkade 808afca9f0 labormanager: add StoreItemInLocation labor, reduce tool churn
Note: this commit requires updated df-structures (77968973b28d0e828f880d119a700abb079f3521 or later)
2016-07-11 22:39:41 -05:00
Kelly Kinkade 0509c455dd labormanager: significant restructuring to use job posting list
Updated here to get potential jobs off the job posting lists, which is
apparently where certain map-designated live after being designated but
before they move to the actual job list. Also changes to how tools are
handled, and lever pulling is assigned by default to all idle dwarfs.
2016-07-11 22:39:41 -05:00
Kelly Kinkade 3a0ba332d9 labormanager: rework for better behavior with 43.03
The main thing here is that the process loop exits if the DF process_job
or process_dig flags are set since if these are set the job list is
going to change soon anyway. The plugin also sets these flags when it
changes any labors, which has the side effect of effectively disabling
the process loop while DF is paused, which prevents flapping  while
editing job preferences in-game, and also allows changing job
preferences in game (although such changes may not last when the clock
starts up again).
2016-07-11 22:39:41 -05:00
Kelly Kinkade dbc46c510f labormanager: fix stupid 2016-07-11 22:39:41 -05:00
Kelly Kinkade 705134975d labormanager: whitespace
MSVC is evil.
2016-07-11 22:39:41 -05:00
Kelly Kinkade f095e139aa labormanager: more tweaks to bring up to date
This update fixes some labors and attempts to address changes in the way
DF maintains the job list.
2016-07-11 22:39:41 -05:00
Kelly Kinkade 07e1c81969 labormanager improvements
Add some debugging facilities. Change some hauling, construction, and
deconstruction labors to reflect changes in DF since 34.11.
2016-07-11 22:39:41 -05:00
Kelly Kinkade 824275b23b Rename autolabor2 to labormanager and bring up to date with current 2016-07-11 22:39:41 -05:00
lethosor 2455e36510 Initial 64-bit support 2016-07-03 23:32:43 -04:00
Japa 13b328beeb Remove tabs 2016-06-30 15:14:20 +05:30
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