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
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
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
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