Commit Graph

2287 Commits (c069a87b47334c490aa0d4f6c5878ab3c6054159)

Author SHA1 Message Date
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