Commit Graph

3099 Commits (346e8b91a9f6a8e505022bf741fcf2310afb6600)

Author SHA1 Message Date
lethosor 84b2f814e8 Disable some plugin output on startup
* tweak: Log tweak changes to stderr.log instead of the console
* stockflow: Use "enable stockflow" instead of "stockflow enable"
  in dfhack.init-example
2015-05-16 18:23:02 -04:00
lethosor a577248a38 Make memview output more readable 2015-05-09 19:41:13 -04:00
lethosor 6eb929b306 Move JSON files out of hack/ folder 2015-05-09 16:04:15 -04:00
lethosor a8f5e683f7 Merge remote-tracking branches 'RossM/autolabor-changes', 'RossM/workflow-changes' and 'lethosor/plugin-exports' into develop 2015-05-09 09:39:55 -04:00
lethosor d0ba6d7019 Fix tweak fps-min 2015-05-08 17:35:46 -04:00
lethosor 9c404a535d Make search plugin intercept MOVIES and HELP keys 2015-05-08 16:27:52 -04:00
Ross Morgan-Linial 3001053cef Change tabs to spaces. 2015-05-07 21:51:03 -07:00
Ross Morgan-Linial 7aac9a8fb8 Improve workflow handling of plant reactions
Makes workflow understand "seeds of any plant", "thread of any plant",
"drink of any plant", "powder of any plant", and "liquid of any plant"
when counting items.

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

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

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

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

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

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

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

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

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

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

This change is linked to a modification in df-structures codegen.
2014-04-30 21:28:02 +04:00
Japa b74d0da872 Merge branch 'develop' of https://github.com/DFHack/dfhack
Conflicts:
	library/xml
2014-04-26 09:23:21 +05:30
Timothy Collett e4641c506f Replace a std::string method not implemented until C++11 with a C++0x-valid substitute 2014-04-21 09:34:42 +04:00
Eric Wald 5fb87c2ea9 Now accepts the new enable/disable commands. 2014-04-18 21:58:45 -06:00
Alexander Gavrilov 63d256c1e9 Adjust siege engine targeting weights.
Stop shooting at leaving caravan guards for one.
2014-04-17 22:10:43 +04:00
Alexander Gavrilov c27c38e4c0 Remove tired or hungry siege operators from duty when at peace.
The threshold is set at the level when they start to blink - normally
they would continue on with the job until they get a thirsty/hungry
thought, but immediately run off to eat if they lose the job (thus
refusing to load the engine after firing it). The code checks for
active sieges and whether there is a free replacement unit.
2014-04-15 21:52:39 +04:00
Alexander Gavrilov fc9826389b Account for meandering movement when predicting unit path in siege engine.
The movement is random, but there is an average slowdown coefficient.
2014-04-15 19:50:23 +04:00
Alexander Gavrilov 55cea36c76 Use the new API to produce combat reports for aimed siege engine attacks.
This requires exposing the actual operator unit to lua code.
2014-04-15 19:50:23 +04:00
Eric Wald 0a99bb0cae Now works when enabled is true by default. 2014-04-13 15:23:37 -06:00
Eric Wald b9ed7a5cc2 Stockflow plugin v1.0 2014-04-13 15:19:03 -06:00
Alexander Gavrilov 7aecffe0cd Update structures and fix broken things. 2014-04-04 22:34:39 +04:00
jj eac126c884 ruby: use placement-new instead of hack 2014-04-01 15:12:52 +02:00
Quietust 837da8ae98 Fix siege-engine to compile on Windows - don't have C++11, and pow() is picky about arg types 2014-03-25 13:30:45 -05:00
Alexander Gavrilov 36b069e981 Merge remote-tracking branch 'warmist/dev-cmdprompt' into develop 2014-03-24 20:10:58 +04:00
Alexander Gavrilov a01939fce6 Sync structures. 2014-03-24 19:45:27 +04:00
Alexander Gavrilov 827dd121d8 Make createitem default to the controlled unit in adventure mode. 2014-03-24 19:35:34 +04:00
Alexander Gavrilov 8963a49414 Forbid the items shot by siege engines if the forbid ammo order is set.
This only applies when targeting the engine, so you could still make
cheaty infinite ammo training units by using stock aiming mode.
2014-03-24 16:05:12 +04:00
Warmist 4cbab2b014 Small fix that got lost in rebase 2014-03-07 20:28:07 +02:00
Warmist 50963c73fa rendermax: added adv mode lights also more proc-expensive diffuse mode. 2014-03-07 20:08:48 +02:00
Warmist b5b01ea02b rendermax: mainly organizing
added comments, non-enabled code for adaptive eyes,
2014-03-07 20:08:11 +02:00
Warmist 372f861010 rendermax: fixed crashes (hopefully for real this time) 2014-03-07 20:08:10 +02:00
Warmist 72259c8eba Added creature lights and item lights. 2014-03-07 20:08:08 +02:00
Warmist 830d9900fb Fixed a bug that enabled rendermax even when it was supposed to be off. 2014-03-07 20:08:08 +02:00
Warmist a3d3c34671 Bug fixes, perf improvement, don't load until there is a world. (breaks arena mode) 2014-03-07 20:08:07 +02:00
Warmist c2db761a1b Rendermax: made it use unordered_map instead of map. 2014-03-07 20:07:21 +02:00
Warmist 5ad3a7570f Fixed a lot of disable lights bugs 2014-03-07 20:07:21 +02:00
Warmist f34a4ce34e Renamed lightCell to rgbf 2014-03-07 20:07:20 +02:00
Warmist ee1bad84fc Threading rewrite. 2014-03-07 20:07:20 +02:00
Japa b248eb3e52 Fixed broken buildings, also added floodgate functionality.
Merge branch 'master' of git://github.com/JapaMala/dfhack
2014-03-07 20:07:19 +02:00
Warmist 0cf5eedc2a Fixed potential error with building getting transparent on un-powering. 2014-03-07 20:07:17 +02:00
Warmist 48f855c499 Added occlusionON|occlusionOFF commands 2014-03-07 20:06:50 +02:00
Warmist 360b5d2e18 Fix for gems not getting right color. 2014-03-07 20:06:50 +02:00
Warmist 28985167c9 Fixed bug with buildings and added gems to material definition. 2014-03-07 20:06:49 +02:00
Japa b12fd5a4c5 Changed sun calculation direction. 2014-03-07 20:06:46 +02:00
Warmist d8b0b82122 Added antialiased lights. They kind of suck. So I disabled them. 2014-03-07 20:06:46 +02:00
Warmist b4091b5056 Added day colors and day speed parameters. 2014-03-07 20:06:45 +02:00
Warmist 70880897f6 Added sun time manipulation, updated helpstring. 2014-03-07 20:06:45 +02:00
Warmist 7c0a734c97 Added building size. Removed material flags (on by default) 2014-03-07 20:06:18 +02:00
Japa 70e1320e6f removed something I had for testing. 2014-03-07 20:06:18 +02:00
Warmist 740e3ebc51 Implemented building support. 2014-03-07 20:06:16 +02:00
Warmist 3433eb15fb fixed (?) ice and made dragon blood glow a little. 2014-03-07 20:06:16 +02:00
Japa 5b0cb86278 Made the lighting engine multithreaded. 2014-03-07 20:06:15 +02:00
Warmist 354ec37046 MAXIMUM SPEED UPDATE!!!!! 2014-03-07 20:06:12 +02:00
Warmist 048395a2cd Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels). 2014-03-07 20:06:12 +02:00
Japa 13228855eb added square light volume, and automatic light radius. 2014-03-07 20:05:52 +02:00
Japa b015149ac1 Added cmake info for the config lua. 2014-03-07 20:05:51 +02:00
Japa 0551661db2 Added more advanced sun light calculation 2014-03-07 20:05:51 +02:00
Warmist dceec6c6c7 Plantfix, viewport height fix, and fov viewport fix. 2014-03-07 20:05:47 +02:00
Warmist 4ccc95bc97 Major rewrite of opacity calculation. 2014-03-07 20:05:47 +02:00
Warmist 74bed5529b Made light plugin read configuration file (rendermax.lua) 2014-03-07 20:04:02 +02:00
jj 20d4707b00 rendermax: lights off when sleeping 2014-03-07 20:03:59 +02:00
jj de8a76e37f rendermax: sunlight travels down stairs 2014-03-07 20:03:59 +02:00
Warmist 4d7a7425d0 Prelimenary work on advmode 2014-03-07 20:03:56 +02:00
Japa 4abff416d9 Some performance fixes and tweaks. Opaque blocks can now emit light. 2014-03-07 20:03:56 +02:00
jj 9a8ee755f8 rendermax: basic daylight 2014-03-07 20:03:52 +02:00
jj 2058a822a3 rendermax: make citizen glow 2014-03-07 20:03:17 +02:00
Japa 0a413e179e Made the low water check actually use floats. 2014-03-07 20:03:17 +02:00
Japa 31de296f31 Added some fast checking for obstacles around lights, resulting in a huge speedup outside. 2014-03-07 20:03:16 +02:00
Warmist f173810e2a Fixed skylight 2014-03-07 20:03:14 +02:00
Warmist 2195c4fe28 Small fixes 2014-03-07 20:03:12 +02:00
Warmist f745de3aff Added transparency to ice walls 2014-03-07 20:03:10 +02:00
Warmist 83265efaa8 fix for map_block lights, fix for gem window color, dimmed the plant lights. 2014-03-07 20:03:06 +02:00
Warmist ee7902c529 Fixed unload/disable crash. Added glowing plants. 2014-03-07 20:02:08 +02:00
Warmist 471eb9c02d Torches for statues, candles on the tables. 2014-03-07 20:01:19 +02:00
Warmist 1c4b5c2d38 Update water a bit. 2014-03-07 20:01:18 +02:00
Warmist b3ba3b9107 Fixed non-circular light. Do not show hidden tiles. 2014-03-07 20:01:10 +02:00
Warmist f92e4c91b8 Performance improvements, added flickering cursor light. 2014-03-07 20:00:39 +02:00
Japa 14c494dbfe Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise. 2014-03-07 19:58:32 +02:00
Japa 2fef60708d Added some more operators to the cell color class. 2014-03-07 19:58:32 +02:00
Japa 04f2d4ea58 Made windows transmit colored light. 2014-03-07 19:58:31 +02:00
Warmist a19200fbfe C++ version of light engine. 2014-03-07 19:58:30 +02:00
Warmist 446b4b9d50 New line algo for lights 2014-03-07 19:58:28 +02:00
Warmist eb999cd0ad Another file forgotten 2014-03-07 19:58:27 +02:00
Warmist 843237d1c9 Fixed bug. 2014-03-07 19:58:27 +02:00
Warmist 39da5babee Implemented lua interface. 2014-03-07 19:58:25 +02:00
Warmist 584640f12c Added help for truecolor light testing thing. Also added colors. 2014-03-07 19:58:24 +02:00