Commit Graph

2312 Commits (57f6a94133f714465cc1ff676ab386897a2f0a33)

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