Commit Graph

2858 Commits (e6d2f4ea2eb198387c888f55502f662d30443034)

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