Japa Illo
b18bd72c05
Replace tab with spaces.
2017-02-06 10:12:20 +05:30
lethosor
7823d78cd9
Update xml and embark-tools field name
2017-02-04 14:49:21 -05:00
lethosor
f65a981099
Fix indentation
2017-02-04 14:46:38 -05:00
Japa Illo
c8e6845a7f
Send noble positions and professions along with Units.
2017-02-03 10:08:35 +05:30
Japa Illo
d97b0497b3
Add prosession and noble position info to units.
2017-02-02 12:12:28 +05:30
Japa Illo
c3c3f37b06
Added more descriptor types, and made it run on world load.
2017-01-26 15:58:43 +05:30
Japa Illo
24a653f77b
added ants and apes to the list.
2017-01-26 12:50:37 +05:30
Japa Illo
365624453e
Finish up the generated-creature-renamer plugin.
2017-01-26 12:45:40 +05:30
Japa
934d5b32bc
Fix creature listing and plugin name
2017-01-26 10:00:38 +05:30
Japa
c659b885b6
Start a plugin to rename generated creatures to have sensible IDs
2017-01-25 23:06:03 +05:30
Ben Rosser
f0d4a1f563
Add DOWNLOAD_RUBY option to Ruby plugin cmake, defaulting to ON
...
If DOWNLOAD_RUBY is set to OFF, the build will not attempt to download
a prebuilt libruby.so and not fire a warning that one is not present.
This may be desired if one wants to link dfhack against a newer system
libruby.so, now that dfhack supports ruby 2.x and also supports linking
against system libruby (at least, on Linux), as per the following commit:
df9b5bca73
This also allows the dfhack build to proceed without network access
(once all submodules have been fetched), which at least some Linux
distributions, like Fedora, require.
By default DOWNLOAD_RUBY is set to ON, so this should not change
the behavior of default builds.
I tested that when DOWNLOAD_RUBY is set to OFF, dfhack still launches
and that the Ruby plugin still functions, e.g. by running
```rb_eval puts('Hello world.')``` in the dfhack console.
2017-01-20 17:40:14 -05:00
lethosor
affcd658dc
title-version: Hide when loading a game (e.g. arena)
2017-01-04 12:30:59 -05:00
lethosor
cda4e7a300
title-version: add prerelease indicator
2016-12-30 18:03:28 -05:00
Kelly Kinkade
c99780aafd
Add support for shell crafts.
2016-12-27 23:40:53 -05:00
lethosor
cd0d9fed18
stocks: Support getSelectedItem()
2016-12-27 17:41:32 -05:00
Kelly Kinkade
3c7d2626e2
df::dfhack_material_category has no constructor, must be manually initialized
...
see #1047
2016-12-18 17:58:24 -06:00
Lethosor
ba48afe908
stockflow: Simplify calculation
...
See #1046
Use math.floor() for now until we can get Lua 5.3 working on Travis
2016-12-16 14:22:00 -05:00
Kelly Kinkade
1419d58b9a
stockflow: Use "floor division"
...
Per suggestion by @dscorbett
2016-12-16 13:04:51 -06:00
Kelly Kinkade
5be77fa63d
stockflow: Fix "integer expected" problem in stockflow
2016-12-16 08:09:53 -06:00
lethosor
a5eb5d2502
manipulator: Sort custom professions
...
Also use == instead of string::compare()
2016-12-15 19:18:07 -05:00
Kelly Kinkade
439e13643c
better hack to make ruby work on win64
2016-12-13 23:55:20 -06:00
lethosor
c8b7dbd255
Fix manipulator crash when selecting profession from empty list
...
Also add ListColumn::hasSelection()
Fixes #1040
2016-12-11 21:16:21 -05:00
lethosor
9e0221a44e
Merge remote-tracking branch 'dscorbett/bitfield-constructors' into develop
2016-12-11 17:52:00 -05:00
lethosor
e8c8953cbb
Re-add and update misery plugin
...
Closes #1037
Ref #1011
2016-12-10 18:22:32 -05:00
David Corbett
acdb369aa8
Avoid non-trivial bitfield constructors
2016-12-09 13:41:14 -05:00
lethosor
0c6c94b310
Merge branch 'develop' of gh:dfhack/dfhack into develop
2016-12-09 11:28:09 -05:00
lethosor
d6fda58ca0
Remove treefarm (PR #1011 )
...
Merge remote-tracking branch 'PeridexisErrant/remove-broken-plugins'
advtools and misery are still partially broken, but parts of them still work, so
repairing them is possible.
2016-12-09 11:20:35 -05:00
Lethosor
1545a4106b
Merge pull request #1035 from ab9rf/labormanager-0.43.05-r1
...
labormanager: fix StoreItemInVehicle labor inference
2016-12-09 11:07:00 -05:00
Kelly Kinkade
1a9d8629c5
labormanager: fix StoreItemInVehicle labor inference ( #8 )
...
* labormanager: add deconstruct labor for constructed instruments
* labormanager: fix StoreItemInVehicle labor inference
StoreItemInVehicle requires the labor appropriate to the item being
stashed
2016-12-09 09:54:20 -06:00
Lethosor
8012c5686b
Merge pull request #1034 from ab9rf/labormanager-0.43.05-r1
...
labormanager: add deconstruct labor for constructed instruments
2016-12-08 17:15:04 -05:00
Kelly Kinkade
50ce9942f4
labormanager: add deconstruct labor for constructed instruments ( #7 )
2016-12-08 16:01:14 -06:00
jj
8488b1a953
ruby: use correct raw string length with encodings
2016-12-05 10:29:16 +01:00
Lethosor
eaf9b75a18
Merge pull request #1026 from ab9rf/labormanager-0.43.05-r1
...
labormanager: fix deconstruction of buildings containing items
2016-12-01 18:41:10 -05:00
Kelly Kinkade
1eaa2033dc
Merge pull request #6 from ab9rf/labormanager-0.43.03-working
...
further tweak building construction labor identification
2016-12-01 14:38:21 -06:00
Kelly Kinkade
ad6d6fbaa6
further tweak building construction labor identification
...
It's always more complicated than you expect....
2016-12-01 14:36:46 -06:00
Kelly Kinkade
1fa997612f
Merge pull request #5 from ab9rf/labormanager-0.43.03-working
...
Mysteriously disappearing code reinserted
2016-12-01 11:12:39 -06:00
Kelly Kinkade
1d97638579
Mysteriously disappearing code reinserted
2016-12-01 11:10:52 -06:00
Kelly Kinkade
6856a7ebe0
Merge pull request #4 from ab9rf/labormanager-0.43.03-working
...
Fix deconstruction of buildings containing items
2016-12-01 11:07:36 -06:00
Kelly Kinkade
77a1264a94
Fix deconstruction of buildings containing items
2016-12-01 11:06:40 -06:00
Lethosor
ddf447d3de
Merge pull request #1022 from ab9rf/labormanager-0.43.05-r1
...
Use attributes in calculating assignment weight
2016-11-29 01:51:56 -05:00
Kelly Kinkade
0ab3005a89
Merge pull request #3 from ab9rf/labormanager-0.43.03-working
...
Incorporate more updates cherrypicked from nocico
2016-11-29 00:24:31 -06:00
Kelly Kinkade
d5d0775f1a
Remove redundant cast
2016-11-29 00:22:34 -06:00
nocico
5c16b5a2b7
labormanager: multimaterial constructions
2016-11-28 23:53:40 -06:00
nocico
d626990ac8
labormanager: trap components
2016-11-28 23:53:39 -06:00
Kelly Kinkade
7c0fecec14
Merge pull request #2 from ab9rf/labormanager-0.43.03-working
...
Pull working changes forward to 0.43.05
2016-11-27 22:53:29 -06:00
nocico
ae48612ebd
labormanager: support for jobs in bowyer's shop
2016-11-27 22:47:53 -06:00
nocico
5405c76746
labormanager: support for jobs in bowyer's shop
2016-11-28 05:40:03 +02:00
nocico
0acd1c9059
make labormanager know building instruments is furniture hauling
2016-11-26 21:09:31 -06:00
nocico
10384fe720
make labormanager know building instruments is furniture hauling
2016-11-26 21:07:02 -06:00
Kelly Kinkade
ad84217687
fix white space to make travis happy
2016-11-26 20:55:10 -06:00
Kelly Kinkade
47426e3e00
Use attributes in calculating assignment weight
2016-11-26 20:55:10 -06:00
Kelly Kinkade
cbcb148182
Better job assignment algorithm for labormanager.
2016-11-26 20:55:09 -06:00
Kelly Kinkade
491d53b76f
fix white space to make travis happy
2016-11-26 18:08:48 -06:00
Kelly Kinkade
8eb4f17b23
Use attributes in calculating assignment weight
2016-11-26 17:37:26 -06:00
nocico
f71d19578c
make labormanager know building instruments is furniture hauling
2016-11-26 13:39:20 +02:00
lethosor
dd28079f30
Fix ruby.cpp compilation on win64
2016-11-22 22:43:48 -05:00
lethosor
c7a35d7ece
fix remotefortressreader protobuf error in clean builds
2016-11-22 17:24:36 -05:00
lethosor
647ef4d556
Fix labormanager whitespace
2016-11-22 17:17:56 -05:00
lethosor
45d138191e
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
2016-11-17 23:02:05 -05:00
lethosor
df9b5bca73
Allow ruby plugin to try more than one library path, including libruby.so on Linux
2016-11-17 10:31:48 -05:00
lethosor
dce00a5034
Partial compilation fixes for advtools, misery
2016-11-16 15:21:13 -05:00
lethosor
8d9b888410
Revert "fixed MD5 hash of win64 ruby lib."
...
Unable to get anything other than 8a856 for the extracted library on my end
This reverts commit fbaf2697cb
.
2016-11-14 14:16:43 -05:00
Kelly Kinkade
80ff369059
Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1
2016-11-08 12:07:30 -06:00
Kelly Kinkade
8fec45696d
Better job assignment algorithm for labormanager.
2016-11-08 12:01:24 -06:00
Japa Illo
6895f3fbed
remove tabs
2016-11-08 15:13:43 +05:30
Japa Illo
5e204069ce
update stonesense
2016-11-08 15:13:06 +05:30
Japa Illo
20b9aab8db
moved remotefortressreader.cpp to its own directory.
2016-11-08 15:11:27 +05:30
Japa Illo
fbaf2697cb
fixed MD5 hash of win64 ruby lib.
2016-11-08 15:10:43 +05:30
Japa Illo
2935032a1e
Add .proto files to plugin sources when used, to make it conventient to open it from the IDE.
2016-11-08 15:10:01 +05:30
Japa
ebc1a6d85e
Add functions to get and set the pause state in DF
2016-11-08 13:40:08 +05:30
Japa Illo
99051f176b
Add a single bool dfproto message, to pausing and checking pause state
2016-11-06 10:08:28 +05:30
lethosor
939b177673
Merge branch 'develop' of dfhack/dfhack into develop
2016-11-02 16:26:33 -04:00
lethosor
04ad7a0a42
Replace some instances of "cmake -E copy_if_different" with a standalone script
...
@JapaMala reported that CMake < 3.5 doesn't support copy_if_different with
multiple source files.
https://cmake.org/cmake/help/v3.5/release/3.5.html#command-line
2016-11-02 16:23:32 -04:00
Japa
e769041983
Fix crash bug in remotefortressreader, that happened every time the user resumed.
2016-11-01 23:34:56 +05:30
Japa
a50af3e96c
Update stonesense
2016-10-31 22:52:45 +05:30
Japa
d8f3d7d8f9
Send dye color with items in remotefortressreader.cpp
2016-10-31 22:52:17 +05:30
Japa
8a66e22522
Merged branch develop into develop
2016-10-31 17:39:02 +05:30
Japa
335607d1f8
Update Stonesense.
2016-10-31 17:38:43 +05:30
lethosor
2e6c7a90be
fix whitespace
2016-10-31 01:58:40 -04:00
lethosor
30f4617abf
Merge remote-tracking branch 'ab9rf/labormanager-0.43.05-r1' into develop
2016-10-31 01:56:49 -04:00
lethosor
9e97ccbb50
Use system libruby on osx64 (since ruby 1.8 and 2 are supported now)
2016-10-29 19:08:54 -04:00
lethosor
8b7af8ba09
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 19:00:58 -04:00
lethosor
4e7f2b9579
win64 ruby 2
2016-10-29 19:00:28 -04:00
Jon Pamala Illo
82f42addcb
Merged branch develop into develop
2016-10-29 13:32:38 +05:30
Jon Pamala Illo
ea9992239b
Send building items, and send fake item types for boxes and bags.
2016-10-29 13:31:51 +05:30
lethosor
a84958a390
Merge branch 'develop' of dfhack/dfhack into develop
2016-10-29 02:40:14 -04:00
lethosor
ec222c0b24
Catch exceptions in stockpile (un)serialization
...
From #964 , protobuf exceptions in loadstock/savestock would either fail by only
logging an error to the console (when run from the Lua UI) or by crashing the
game entirely (when run from the console).
Figuring out what actually causes the exceptions in the first place (possibly a
misunderstood structure layout?) would be a better solution than this, but this
will at least stop crashes for now.
2016-10-29 02:35:27 -04:00
Japa
148202bcba
Use Binsearch for finding items.
2016-10-29 08:54:27 +05:30
Japa
0edce2b3ae
Merged branch develop into develop
2016-10-29 00:28:51 +05:30
Japa
30801697d9
Send items sitting on the floor through remoteFortressReader
2016-10-29 00:28:37 +05:30
jj
c640006069
ruby: some more updates for x64, fix df_flagarray size
2016-10-28 16:40:14 +02:00
PeridexisErrant
cdf24efe43
Remove plugins - all broken since 34.11
...
This changes nothing at all as far as any DFHack user is concerned, as
these plugins have not been possible to build since DF 34.11 - and would
have to be rewritten for compatiblity with new native-DF systems.
"treefarm" is additionally replaced by "autochop".
In the unlikely event that a developer wants the source code for
something... that's what version control is for!
2016-10-27 23:35:29 +11:00
lethosor
d62d263793
ruby: Fix potential onupdate crash when cur_year is missing
2016-10-26 20:55:16 -04:00
lethosor
cf329c7ceb
Ruby: fix Qnil and Qtrue constants with 64-bit Ruby 2.x
...
These have different values on x64 Ruby 2.x (see USE_FLONUM in ruby.h in the
ruby source). This was causing dump_rb_error to crash, since it was walking an
array until it got to Qnil (but thinking Qnil was 4 instead of 8) and trying to
print each element as a string. There were probably more subtle issues with
Qnil and Qtrue being wrong too.
2016-10-26 20:44:35 -04:00
lethosor
defedb351e
Fix raw_vcall crash on Linux/OS X x64
2016-10-26 09:34:14 -04:00
Kelly Kinkade
4e933316ca
Merge branch 'labormanager-0.43.03-r2' into labormanager-0.43.05-r1
2016-10-25 17:06:01 -05:00
Kelly Kinkade
a04ed641b7
SPACES not TABS
2016-10-25 17:03:45 -05:00
Kelly Kinkade
9aa6b84e24
alphabetical order
2016-10-25 16:55:37 -05:00
Kelly Kinkade
18235da9d6
add a misisng labor rule for leather crafts
2016-10-25 16:45:25 -05:00
Kelly Kinkade
cffd3be591
Move labormanager out of dev
2016-10-25 16:34:20 -05:00
lethosor
2c230f0d3e
Improve protobuf file regeneration (no longer uses a dummy status.txt file)
2016-10-24 22:51:27 -04:00
lethosor
4fdbba0207
Only touch protobuf generated files if they actually changed
2016-10-24 22:28:51 -04:00
lethosor
5c83c16a99
Fix memview x64 address display
2016-10-24 10:06:41 -04:00
Japa
25a64a2102
Merged branch develop into develop
2016-10-21 22:55:38 +05:30
Japa
a0b0c16a8b
Actually apply the designation changes in RemoteFortressReader
2016-10-21 22:55:28 +05:30
lethosor
3df74de021
Fix rb_dfget_vtable_ptr on x64
...
This was causing rb_dfget_rtti_classname to receive a truncated pointer and
crash
2016-10-21 11:46:53 -04:00
jj
97f29229cd
ruby: fix weird freeze when printing large strings to the console on linux64
2016-10-21 17:00:02 +02:00
jj
f586692ed6
plugins/ruby: update for 64bits
2016-10-21 14:52:26 +02:00
lethosor
e3ff89ba03
Fix compile error
2016-10-19 16:21:38 -04:00
Japa
701adc12b3
Add ability for remotefortressreader.cpp to accept dig designations.
2016-10-19 22:21:50 +05:30
Japa
919507d9a0
Send over dig designations from un-taken job postings in remotefortressreader.cpp.
2016-10-19 20:00:30 +05:30
lethosor
16c77efb43
Fix whitespace issues
2016-10-15 16:05:33 -04:00
lethosor
4c21bbd5ae
Add Lua::TableInsert() helper
2016-10-15 14:55:48 -04:00
lethosor
8a138fcc4c
Avoid polluting global namespace in MapCache.h
2016-10-15 14:53:10 -04:00
Japa
8d84b0d968
Merged branch v0.43.03 into develop
2016-10-13 19:27:06 +05:30
lethosor
1c20ebe62c
Make title-folder work without SDL_WM_GetCaption
2016-10-08 17:02:45 -04:00
lethosor
2806fe73a9
ruby: Support for loading Ruby 2.x libruby
...
Check for rb_float_new and rb_float_new_in_heap, as documented in #271
2016-10-08 17:01:52 -04:00
Japa
58ed20b25b
Send world map snow coverage over remotefortressreader.
2016-10-06 22:16:40 +05:30
lethosor
714ba1a030
Warn if ruby library is missing instead of breaking installation
2016-09-26 18:28:59 -04:00
lethosor
caa6a81669
Add ruby library for linux x64
...
Built by @dseguin: https://github.com/DFHack/dfhack/pull/989
Closes dfhack/dfhack#989
2016-09-26 17:46:50 -04:00
lethosor
7abb82b6d1
Switch to downloading 32-bit libruby on Linux and Windows
2016-09-26 17:36:57 -04:00
lethosor
888a09bed5
Switch to downloading OS X libruby
2016-09-26 17:24:35 -04:00
lethosor
8f2cc5bc4d
Fix and reorganize remotefortressreader includes
2016-09-04 16:06:26 -04:00
Japa
e205dc82a5
Merge pull request #991 from JapaMala/v0.43.03
...
Removed the other foreach.
2016-08-29 22:30:43 +05:30
Japa
1862106fd1
Removed the other foreach.
2016-08-29 22:29:40 +05:30
Japa
b09ee3407c
Merge branch 'v0.43.03' of https://github.com/JapaMala/dfhack into develop
...
Conflicts:
library/xml
plugins/remotefortressreader.cpp
2016-08-29 22:06:37 +05:30
Japa
af5d4ec5a8
removed foreach.
2016-08-29 21:43:20 +05:30
lethosor
bbaf129adf
Fix ruby codegen for bitfields/enums with long base-type
2016-08-27 15:24:53 -04:00
Japa
7d145de4a7
Translate histfig mats into creature mats, rather than sending the entire histfig population.
2016-08-26 23:48:32 +05:30
Japa
91cb734a25
Send histfig materials over remotefortressreader.cpp, using unique ids.
2016-08-26 12:23:50 +05:30
Japa
5c3260c382
Actually check spatter amounts properly
2016-08-26 08:49:54 +05:30
Japa
db7be082ef
Only copy spatters if they actually have any amount.
2016-08-25 23:56:30 +05:30
Japa
a3ab757642
Add spatters to remotefortressreader.cpp
2016-08-25 21:14:23 +05:30
lethosor
6ce470ad57
Add basic lua expression support to memview
...
Currently just supports basic field accesses (world.x, screen.y.z).
No support for world.x - 4, etc.
Closes #976
2016-08-24 16:26:34 -04:00
lethosor
f4b0c2fcfc
color-dfhack-text: Fix potential overflow issue
2016-08-22 23:18:58 -04:00
lethosor
93ac937cb9
Add new job types to autohauler
2016-08-21 22:24:41 -04:00
lethosor
9171149afb
Update submodule refs
2016-08-18 23:42:17 -04:00
lethosor
de731b0299
Move save_dir back into cur_savegame and update submodules
2016-08-14 12:41:09 -04:00
lethosor
e965f5318f
Replace many includes with forward declarations in modules/Maps.h
2016-08-13 21:44:01 -04:00
lethosor
a1c25570df
Move labormanager to plugins/, per request
2016-08-11 23:49:15 -04:00
lethosor
99813038e9
Update labormanager for unit.relations removal and fix warnings
2016-08-11 23:42:58 -04:00
lethosor
bceeea39ba
Merge remote-tracking branch 'ab9rf/develop' (labormanager) into develop
2016-08-11 23:37:22 -04:00
Kelly Kinkade
a55ce5f1d9
labormanager: whitespace
2016-08-11 16:58:35 -05:00
Kelly Kinkade
5ab930ba4d
labormanager: small tweaks
...
Handle cloth crafts correctly; handle pit jobs correctly; handle
bookcase construction correctly; deal with new break behavior better;
change assignment of clean labor; tweak hauling assignments slightly to
avoid overallocation; assign pull lever to everyone and clean to all
nonbusy dwarfs
2016-08-11 16:56:34 -05:00
lethosor
215afa34f3
Update for 64-bit unit changes
...
Includes xml, stonesense, scripts
Ref DFHack/df-structures@25cb373
2016-08-10 23:50:00 -04:00
lethosor
1b11c46a98
ruby.cpp: uint32_t -> uintptr_t
2016-08-10 15:24:07 -04:00
Lethosor
6e741b1a80
Merge pull request #969 from Qartar/win64
...
Minor fixes/updates for Visual Studio 2015 Win64
2016-08-10 15:15:44 -04:00
lethosor
53a0d73d23
Add new title-folder plugin
2016-08-09 20:09:50 -04:00
Carter Bray
5fef2ad075
Add windows container sizes to ruby codegen
2016-08-07 10:11:17 -07:00
lethosor
ddbb1b5bb8
ruby: Update sizes for some types
...
Many are still incomplete on x64, especially on Windows
2016-08-05 17:29:24 -04:00
lethosor
dbd2e71920
Ruby codegen integer improvements
...
- Add uint64_t
- Add special case for long on different platforms
- Require OS and architecture to be specified
NOTE: integer alignment on x64 is probably still incorrect
2016-08-05 17:12:07 -04:00
lethosor
ef569dc5a1
Pass OS and architecture to ruby codegen explicitly
...
- Passing the architecture is needed to determine sizeof(long)
- Passing the OS prevents potential issues when cross-compiling between Windows
and non-Windows (although this is unlikely)
2016-08-05 17:09:25 -04:00
Japa
697aa54fa6
Sent tree and stone layers through remotefortressreader.cpp, and correct town placement.
2016-08-05 00:40:10 +05:30
Japa
8a97b54bcd
Send wall info
2016-08-03 16:32:51 +05:30
Japa
2fda01d90b
Add support for site towers.
2016-08-03 10:22:30 +05:30
Japa
9189e3dc7e
Send world buildings through remotefortressreader.cpp
2016-08-02 10:30:17 +05:30
Carter Bray
9da2dcb8a2
Fix raw_vcall on Win64 builds
...
MSVC's call conventions on x64 are the same for normal function calls and
member function calls (with the addition of the implicit 'this'
parameter).
2016-07-31 17:01:57 -07:00
lethosor
79377669a1
Merge remote-tracking branch 'NCommander/dwarfvet' into develop
2016-07-29 16:25:53 -04:00
lethosor
afde73a673
memview: Fix pointer size on x64
2016-07-28 11:45:35 -04:00
lethosor
eeb7f05483
vectors: Fix pointer parsing and display
2016-07-28 11:44:54 -04:00
lethosor
71e4f4ec62
Fix pointer-size-related compile errors in dev plugins
2016-07-28 11:40:17 -04:00
Japa
98230e9078
Send surface material with the worldmap in remotefortressreader.cpp
2016-07-28 20:52:14 +05:30
Vitaly Pronkin
8916aba3bf
win64 fixes (partial)
...
cherry-picked from 2f734ae2317060edb83021f17cffc966c435ad7b
2016-07-27 19:46:49 -04:00
Vitaly Pronkin
fe18f176f7
More 64-bit fixes
...
Cherry-picked from 7eb3ba6
- Lua update already done in e2c6350
, 4dd411e
- Excluded library/modules/Buildings.cpp
2016-07-26 23:47:53 -04:00
Kelly Kinkade
74f6f3d416
labormanager: add labors for bookcase (de)construct
2016-07-11 22:39:41 -05:00
Kelly Kinkade
874a97ed9f
labormanager: fix several job-to-labor mappings
2016-07-11 22:39:41 -05:00
Kelly Kinkade
808afca9f0
labormanager: add StoreItemInLocation labor, reduce tool churn
...
Note: this commit requires updated df-structures (77968973b28d0e828f880d119a700abb079f3521 or later)
2016-07-11 22:39:41 -05:00
Kelly Kinkade
0509c455dd
labormanager: significant restructuring to use job posting list
...
Updated here to get potential jobs off the job posting lists, which is
apparently where certain map-designated live after being designated but
before they move to the actual job list. Also changes to how tools are
handled, and lever pulling is assigned by default to all idle dwarfs.
2016-07-11 22:39:41 -05:00
Kelly Kinkade
3a0ba332d9
labormanager: rework for better behavior with 43.03
...
The main thing here is that the process loop exits if the DF process_job
or process_dig flags are set since if these are set the job list is
going to change soon anyway. The plugin also sets these flags when it
changes any labors, which has the side effect of effectively disabling
the process loop while DF is paused, which prevents flapping while
editing job preferences in-game, and also allows changing job
preferences in game (although such changes may not last when the clock
starts up again).
2016-07-11 22:39:41 -05:00
Kelly Kinkade
dbc46c510f
labormanager: fix stupid
2016-07-11 22:39:41 -05:00
Kelly Kinkade
705134975d
labormanager: whitespace
...
MSVC is evil.
2016-07-11 22:39:41 -05:00
Kelly Kinkade
f095e139aa
labormanager: more tweaks to bring up to date
...
This update fixes some labors and attempts to address changes in the way
DF maintains the job list.
2016-07-11 22:39:41 -05:00
Kelly Kinkade
07e1c81969
labormanager improvements
...
Add some debugging facilities. Change some hauling, construction, and
deconstruction labors to reflect changes in DF since 34.11.
2016-07-11 22:39:41 -05:00
Kelly Kinkade
824275b23b
Rename autolabor2 to labormanager and bring up to date with current
2016-07-11 22:39:41 -05:00
lethosor
2455e36510
Initial 64-bit support
2016-07-03 23:32:43 -04:00
Japa
13b328beeb
Remove tabs
2016-06-30 15:14:20 +05:30
Japa
b37afa4591
Remove tabs
2016-06-30 15:12:28 +05:30
Japa
b196ecf351
Send over material tissues through RemoteFortressReader
2016-06-30 14:33:15 +05:30
Lethosor
421e7949e0
Merge pull request #951 from eswald/stockflow-43
...
Stockflow reaction updates
2016-06-26 21:37:15 -04:00
Eric Wald
060331de37
Stockflow reaction updates
...
SpinThread jobs now get the proper material category flag, and metal mechanisms can be ordered.
2016-06-26 19:22:53 -06:00
Japa
036c0f787c
Send creature adult size through remotefortressreader.cpp
2016-06-23 21:26:00 +05:30
Japa
74c9abcb47
Send color modifier raws through remotefortressreader.cpp
2016-06-22 13:36:36 +05:30
Japa
069d6b67d6
Send all size modifiers through remotefortressreader.
2016-06-21 22:42:47 +05:30
Japa
5fff0efec5
Send appearance info over remotefortressreader.cpp
2016-06-20 22:59:59 +05:30
Japa
9ef9a6b519
Send bodypart raws from RemoteFortressReader
2016-06-20 13:21:11 +05:30
Japa
980be6e2af
Added a cleaner format for sending over region info.
2016-06-16 21:36:35 +05:30
Michael Casadevall
39c96c474a
Fix ordering, news, and indentation
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-14 16:13:26 -04:00
lethosor
f07bc03c69
Update clsocket and Open()/Listen() usage
2016-06-14 13:21:51 -04:00
Lethosor
9021fcab2e
Merge pull request #946 from NCommander/fix-produce-structure
...
Modify DFHack to handle new produce() prototype. Major thanks to leth…
2016-06-13 17:24:22 -04:00
Michael Casadevall
a03b32846a
Modify DFHack to handle new produce() prototype. Major thanks to lethosor, and ragundo for their help in this
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-13 16:57:45 -04:00
lethosor
f908a1d1b6
Replace catsplosion plugin with a script
...
Closes #938 , #722
2016-06-11 21:44:15 -04:00
Michael Casadevall
fead8a80ff
Fix tabs to spaces
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 04:15:03 -04:00
Michael Casadevall
e45fbfc61d
Modified dwaftvet plugin to work with latest DFHack
...
Initial commit of the dwarfvet plugin
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 04:14:59 -04:00
Japa
8543121ece
add fog of war and traffic to probe.cpp
2016-06-03 00:32:11 +05:30
Japa
44b8433282
Make remotefortressreader.cpp mark blocks as hidden that aren't visible directly to the adventurer
2016-06-03 00:31:02 +05:30
Japa
b1072b65e4
Don't send designations in adventure mode
2016-05-31 22:53:48 +05:30
Japa
3dcd3e14f0
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-05-28 21:24:02 +05:30
Japa
569325823d
Send world name and time with world center in remotefortressreader.cpp
2016-05-28 21:23:26 +05:30
Japa
0867f3d311
Add dig designations to probe.cpp
2016-05-28 08:29:12 +05:30
Japa
c0419d919e
Add lake levels to remotefortressreader.cpp
2016-05-28 08:28:17 +05:30
carbohydratesn
9be928541c
Include math.h
...
3dveins.cpp won't build for me without math.h as a dependency - errors about 'fabsf' and other math functions
arch linux, gcc-multilib 6.1.1-1
2016-05-22 16:45:58 -04:00
lethosor
dabf443260
Merge remote-tracking branch 'eswald/stockflow-43' into develop
2016-05-17 23:29:01 -04:00
lethosor
d198bf547a
Unit list search: reset cursor position to 0 before switching pages
...
On empty lists, pressing "up" sets the cursor position to -1. This results in a
crash if the list is populated, which the search plugin does before switching
pages.
Fixes #928
2016-05-17 23:23:54 -04:00
Eric Wald
3f0857bff3
Incrementing the manager order id properly.
...
There's a chance that not doing so could lead to a crash, somehow.
2016-05-16 19:48:52 -06:00
lethosor
a8f9f912c9
Merge remote-tracking branch 'eswald/stockflow-43' into develop
2016-05-16 20:40:50 -04:00
Eric Wald
11a0bea002
Moving a search option to the bottom of the screen.
...
The list of workers in the workshop profile page can take nearly the full height of the screen.
2016-05-15 22:49:35 -06:00
Eric Wald
2df41e6bad
Clearing the active flag for new stockflow orders.
...
It's not entirely clear what this flag does when there aren't any conditions on the order, but new manual orders start as Ready instead of Active.
2016-05-15 22:06:20 -06:00
Eric Wald
0b1004f2b8
Notice resizing immediately, instead of on next key press
2016-05-15 09:14:30 -06:00
Eric Wald
6add87b358
Simplifying key strings
2016-05-15 08:58:45 -06:00
Eric Wald
6575f5f412
Removing the quantity limit on stockflow orders.
2016-05-14 23:40:01 -06:00
Eric Wald
3e8d4f9257
New command for clearing the stockpile order.
...
Shift-Space by default, using the SETUPGAME_SAVE_PROFILE_ABORT key.
2016-05-14 23:35:07 -06:00
Eric Wald
8c7d5366c9
Switching to the new manager order flags
2016-05-14 23:33:38 -06:00
Eric Wald
02e0b9e721
Manager interface now uses the full height.
...
Its navigation behavior has also changed, and it now has key hints for navigation.
2016-05-14 22:42:49 -06:00
Ben Lubar
3af24507a3
adjust autogems to work with the workshop profile changes
2016-05-14 20:15:49 -05:00
lethosor
55e58e5f06
Update handling of viewscreen_workshop_profilest in Gui module, search/sort plugins
2016-05-14 11:43:37 -04:00
lethosor
74898a5424
createitem: move all created items to cursor if applicable
2016-05-11 17:54:37 -04:00
lethosor
38051a5a48
remove tweak manager-quantity
2016-05-11 17:51:57 -04:00
lethosor
e0a0a26739
ANY_GENERIC35 -> 36
2016-05-10 17:57:15 -04:00
lethosor
d93cbd709e
Merge remote-tracking branches 'warmist/fixpositions', 'warmist/gm_editor_changes', 'rubybrowncoat/feature/fix-multiquality-gui-create-item' and 'AtomicChicken/item-trigger-fix' into develop
2016-05-09 20:55:14 -04:00
Japa
56f2603097
Send over rivers through remotefortressreader.cpp
2016-05-02 20:58:36 +05:30
Japa
b8f5496b24
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-04-25 22:39:18 +05:30
Japa
572d38e3db
Made remotefortressreader.cpp return the correct area of interest in the world when on the embark screen.
2016-04-25 22:38:47 +05:30
lethosor
f66dd77a72
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-04-23 20:33:25 -04:00
lethosor
5418233117
to_string -> int_to_string
2016-04-22 20:27:53 -04:00
lethosor
fd54003384
More make_pair replacements
2016-04-22 20:26:07 -04:00
lethosor
ec42967996
Use std::make_pair instead of initializer lists
2016-04-22 19:43:05 -04:00
lethosor
8784a133e8
Initialize maps in a MSVC 2010-compatible way
2016-04-22 18:45:32 -04:00
lethosor
52728babd4
Merge branch 'develop' into zone-unassign
2016-04-22 18:41:15 -04:00
PeridexisErrant
acac839371
Replace fixdiplomats, fixmerchants with scripts
2016-04-20 11:12:06 +10:00
Japa
856c3b06f4
Added dig designations to remotefortressreader.cpp
2016-04-19 19:15:33 +05:30
Japa
1317792cde
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-04-19 18:17:39 +05:30
Lethosor
50f2851772
Merge pull request #742 from PeridexisErrant/ls-cleanup
...
Ls cleanup
2016-04-17 17:59:22 -04:00
lethosor
8226134f67
Make can_trade() return true if at least one caravan can trade
...
Fixes #900
2016-04-16 17:13:00 -04:00
PeridexisErrant
ae81454786
Minor fixes, space no longer required
...
Thanks to 2882422
2016-04-15 16:28:41 +10:00
PeridexisErrant
273c22f606
Shorten "ls" help for plugins
...
I think that's all of them.
2016-04-15 16:28:41 +10:00
lethosor
0d37209063
use trade_state enum
2016-04-13 09:44:57 -04:00
lethosor
a92b67c80d
Add ability to edit min/max logs and remove cap
...
Closes #893
2016-04-12 19:52:51 -04:00
lethosor
999d89c5af
Fix tile background colors in CopyScreen
2016-04-12 17:10:54 -04:00
lethosor
daadc2ef85
Update stonesense
2016-04-10 20:11:52 -04:00
lethosor
2399539990
Merge remote-tracking branches 'warmist/patch-7', 'warmist/patch-8' and 'warmist/patch-9' into develop
2016-04-10 11:58:48 -04:00
Warmist
812f6df272
Fix building-hacks color for auto_gears option
...
Now it should select the gear color correctly
2016-04-10 16:55:08 +03:00
Warmist
c4c452c288
Show sidebar when moving from screen to screen
...
When both are from lua the old logic failed.
2016-04-10 16:51:58 +03:00
Warmist
29f08cd20d
Fix eventful trying to show sidebar
...
It should not try to do that if e.g. showing buildingitems. Maybe later we will have more valid focus strings (e.g. custom item view for some buildings) but for now just use vanilla (or callback function not a class)
2016-04-10 14:58:03 +03:00
Warmist
9c9f710d5b
Fix eventful not showing sidebar sometimes
...
E.g. when destroying buildings
2016-04-10 14:47:33 +03:00
lethosor
4c4b727a2e
Update stonesense
2016-04-09 20:09:41 -04:00
lethosor
33472b823b
createitem: fall back to units.active[0] if a cursor is available but no unit
2016-04-05 11:49:38 -04:00
lethosor
f5d10ecf61
vectors: attempt to identify instances of virtual classes
...
Also:
- don't restrict to heap ranges (e.g. allow globals)
- stylistic cleanup
2016-04-03 20:47:21 -04:00
Japa
39bcee11d8
fixed a crash in remotefortressreader.cpp that occured if Armok Vision is connected while saving.
2016-04-03 11:09:16 +05:30
Japa
4d95395afc
added a function to remotefortressreader.cpp to insert keyboard events
2016-03-21 22:56:48 +05:30
Japa
2f4a5e8449
Fix missing return
2016-03-20 22:04:21 +05:30
Japa
a3ddc63836
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
...
Conflicts:
plugins/remotefortressreader.cpp
2016-03-20 16:30:49 +05:30
Japa
14e61db99d
Add ability for remotefortressreader.cpp to send over the current screen
2016-03-20 16:27:05 +05:30
Ben Lubar
197e163a42
add follow_unit_id and follow_item_id to RemoteFortressReader
2016-03-14 13:54:46 -05:00
Japa
2f86683d37
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-03-13 18:31:52 +05:30
Japa
2fc784f825
Add world pole orientation to remotefortressreader.cpp.
2016-03-13 18:31:27 +05:30
expwnent
5bb98295b3
Merge pull request #810 from PeridexisErrant/colonies
...
Colonies as a script, + place feature by Warmist
2016-03-13 08:32:05 -04:00
expwnent
b71c1b9e7c
Merge pull request #751 from PeridexisErrant/remove-dfusion
...
Remove dfusion, df2mc, mapexport, dwarfexport
2016-03-13 08:22:07 -04:00
Warmist
bc02e2a844
Add auto-gears mode for building hacks for automatic animation and gear positions.
2016-03-13 13:37:36 +02:00
Warmist
5895621eec
Change eventful to have sane(r) callback for produce
2016-03-13 12:57:36 +02:00
Japa
4a5971966a
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-03-12 21:53:17 +05:30
sv-esk
6ab8c8b9b1
fix teledwarf bug (leaves babies lying on ground)
2016-03-10 13:54:38 +02:00
Japa
5ec03774b5
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-03-05 17:30:54 +05:30
sv-esk
198571dca3
fix manipulator bug (unable to apply last custom profession)
...
"selected" starts with 1, not 0
2016-03-03 01:24:18 +02:00
Japa
a5494f74a0
Added world pole direction to RemoteFortressReader.proto
2016-02-28 21:26:15 +05:30
lethosor
297bbd6f20
Merge remote-tracking branch 'warmist/develop' into develop ( closes #772 )
2016-02-24 17:24:03 -05:00
lethosor
78a7d7a43b
Merge remote-tracking branches 'sv-esk/autolabor_new_jobs' and 'sv-esk/manipulator' into develop
2016-02-24 16:36:57 -05:00
lethosor
9d0d4fd08b
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-02-24 16:34:29 -05:00
lethosor
79fde493e2
Merge remote-tracking branch 'eswald/autogems-bugfix' into develop
2016-02-24 16:33:54 -05:00
Lethosor
d479f30592
Merge pull request #826 from eswald/stockflow-4206
...
Updating Stockflow for version 42.06
2016-02-24 17:35:20 +01:00
Eric Wald
8ce115646a
Updating Stockflow for version 42.06
...
The manager can now specify each type of craft individually, as well as in general.
There may be a better justification for not allowing pearl and shell scepters, though.
2016-02-23 22:09:26 -07:00
sv-esk
20572fb667
add new jobs to autolabor
2016-02-23 19:01:14 +02:00
Japa
420eb5341b
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-02-20 01:31:12 +05:30
Japa
ac068b4738
Fixed DF color translation in remotefortressreader.cpp
2016-02-20 01:30:56 +05:30
Eric Wald
224d29de88
Reversing o-W-g autogems default setting
...
Starter pack users have complained that it's too big a change from
vanilla, particularly given that strange moods need rough gems.
2016-02-13 21:01:26 -07:00
Eric Wald
e160fec2b9
Ignoring forbidden rough gems
2016-02-13 20:59:08 -07:00
sv-esk
d2450c34ff
forbid manipulator editing ghosts
...
they are not flags1.dead
2016-02-12 13:47:58 +02:00
lethosor
f4ce45deae
Disable confirm note-delete in name entry
...
Fixes #820
2016-02-11 22:56:33 -05:00
sv-esk
83c70ccb0f
forbid manipulator editing non-citizens
2016-02-11 13:31:52 +02:00
sv-esk
ac070e49a4
forbid manipulator editing visitors
2016-02-11 06:24:18 +02:00
sv-esk
3cab865d58
fix manipulator racism
...
(allow editing non-dwarves)
2016-02-11 06:23:30 +02:00
sv-esk
ff4b2f8522
add new skill columns
2016-02-11 06:23:21 +02:00
James Gilles
5d8c2fd502
Fix whitespace
2016-02-02 01:14:04 -05:00
Warmist
3e402fa97c
Remove left over handlers from eventful
2016-02-01 22:23:31 +02:00
Warmist
e4ae1c11f5
Update eventful's produce hook to new vmethod. Also make all events use no-handler version thus removing lot of unused functions (and empty function calls).
2016-02-01 22:23:29 +02:00
James Gilles
0a670bb0db
Implement #804 , move some functions to Units, colorize zone output, a
...
little cleanup
2016-02-01 11:12:06 -05:00
Japa
297f441bd6
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-02-01 20:01:00 +05:30
Japa
054954a72a
Corrected the region details logic.
2016-02-01 20:00:25 +05:30
PeridexisErrant
e519313b70
Convert colonies plugin to script, add place feature
2016-02-01 18:12:38 +11:00
Ben Lubar
afa1199f98
Add support for grates and bars to Ruby.
...
See also: DFHack@248331a1967d2527a13bcf259f35bffe4dec86b8, DFHack#808
2016-01-31 15:19:58 -06:00
lethosor
248331a196
buildingplan: Support floodgates, grates, bars
...
See #808
2016-01-31 14:50:07 -05:00
Lethosor
d063155b87
Merge pull request #808 from BenLubar/benlubar-floodgate-alloc
...
Fix floodgate allocation in C++/Lua and well and pressure plate allocation in Ruby.
2016-01-31 14:20:46 -05:00
Japa
e49745d338
Added tile and material to growths in remotefortressreader.cpp
2016-02-01 00:41:13 +05:30
Ben Lubar
197e5ca2d9
update the name of the pressure plate field in ruby
...
https://github.com/DFHack/dfhack/blob/0.42.04-alpha2/library/modules/Buildings.cpp#L365-L371
2016-01-30 08:46:16 -06:00
Ben Lubar
aab5c61923
set well bucket z correctly when allocating it in ruby
...
https://github.com/DFHack/dfhack/blob/0.42.04-alpha2/library/modules/Buildings.cpp#L347-L352
2016-01-29 14:51:32 -06:00
Japa
7f3191352c
send growth info through remotefortressreader.cpp
2016-01-28 00:06:10 +05:30
Japa
4c4eda44f9
Added plant raw list to RemoteFortressReader.proto
2016-01-27 18:49:30 +05:30
lethosor
a7b2d5e38f
Fix autogems typedefs for MSVC and log errors to stderr
2016-01-16 11:45:04 -05:00
lethosor
15a9d7f491
Fix whitespace
2016-01-14 20:13:46 -05:00
Japa
f02a504a00
Added tree coords to remotefortressreader.cpp
2016-01-12 00:10:16 +05:30
Japa
ed62f0f554
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-01-10 12:47:03 +05:30
Japa
ebf2dada62
Increased DF version define
2016-01-10 12:37:52 +05:30
Lethosor
004f46fecc
Merge pull request #789 from eswald/autogems
...
New autogems plugin, automatically cutting rough gems.
2016-01-09 19:10:30 -05:00
Eric Wald
5f03bb743f
Increasing autogems checks to once per day.
...
A legendary gem cutter couldn't quite clear a full suite of jobs before the next check, but it was a close call sometimes.
2016-01-09 16:47:06 -07:00
Eric Wald
7c9002c4ea
Avoid overwriting dynamic lines.
...
Even vanilla DF has three additional workshop order lines that only show up with modded raws.
2016-01-09 14:47:00 -07:00
Lethosor
7041e49196
Merge pull request #785 from abbradar/develop
...
blueprint: fix compilation (i.e. undefined find)
2016-01-09 13:57:17 -05:00
Eric Wald
53780d8232
New autogems plugin, automatically cutting rough gems.
2016-01-08 23:18:41 -07:00
lethosor
d670ee8ab4
New tweak: block-labors
...
Prevents labors that can't be used from being toggled
Suggested at http://www.bay12forums.com/smf/index.php?topic=121451.msg6719464#msg6719464
2016-01-08 19:27:11 -05:00
lethosor
97fb50c28f
Add better support for default ListColumn values
...
This is only necessary for multiple-selection columns, and there aren't any
with non-pointer entry types currently, but casting nullptr to non-pointer types
isn't a great idea.
2016-01-06 17:30:07 -05:00
Nikolay Amiantov
da3c6404fa
blueprint: fix compilation (i.e. undefined find)
2016-01-06 03:03:19 +03:00
lethosor
3bcd58fca7
Use consistent key display
2016-01-04 19:31:57 -05:00
lethosor
2acdede03b
New tweak: hide-priority
...
Adds an option to hide designation priority indicators
2016-01-04 19:29:30 -05:00
lethosor
9e020bb8c1
Make title-version show git info for dev builds
2016-01-01 11:50:11 -05:00
PeridexisErrant
81b055ee93
Implement "weather" as a script
2016-01-01 11:35:58 -05:00
lethosor
d0c28d3f50
Prevent plugins with active viewscreens from being unloaded
...
This requires plugins to pass plugin_self to Screen::show(), but
avoids the need to implement special checks in plugin_onstatechange
for the SC_BEGIN_UNLOAD event.
2016-01-01 11:15:29 -05:00
lethosor
d775333c00
fix-unit-occupancy: Account for wagon occupancy correctly
...
Previously, non-central wagon tiles would have their occupancy flag
cleared.
2015-12-31 13:38:38 -05:00
lethosor
2ef24a3daf
Prevent nested command invocations in command-prompt
...
For example, running "devel/send-key SELECT" in command-prompt would
blow up the stack by recursively calling submit()
2015-12-27 22:35:14 -05:00
lethosor
e075a06486
Add search controls to all viewscreen_petst subpages
2015-12-27 15:49:10 -05:00
lethosor
05926d9734
New tweak: title-start-rename
...
Adds a safe rename option to the title screen "Start Playing" menu
2015-12-26 11:47:58 -05:00
lethosor
a9ad2f40f1
Add a location retirement confirmation
2015-12-25 11:18:55 -05:00
lethosor
de160de0e8
showmood: use correct console encoding
2015-12-24 21:34:38 -05:00
Japa
15a6eb90d4
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-12-24 22:14:18 +05:30
Japa
10eed10b63
Add genger do remotefortressreader.cpp
2015-12-24 22:13:25 +05:30
lethosor
e3e68a8df9
Add a search option to the location occupation menu
2015-12-23 16:57:43 -05:00
lethosor
2a2ab00ca9
Add "map" parameter to a lot of drawing functions
...
Ref #746
2015-12-22 11:42:51 -05:00
lethosor
c9eab65c96
Fix more produce() calls
2015-12-22 09:54:00 -05:00
Lethosor
e3420a5e67
Merge pull request #770 from eswald/instruments
...
Stockflow repairs
2015-12-19 23:11:55 -05:00
lethosor
f0013ced56
tabs to spaces
2015-12-19 11:16:43 -05:00
lethosor
5a1e5e1464
Expose Units::casteFlagSet()
2015-12-19 11:07:35 -05:00
lethosor
15d3815f26
Merge remote-tracking branch 'quietust/develop' into develop
2015-12-19 10:58:38 -05:00
lethosor
e7d8f9b2b3
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-12-18 18:42:39 -05:00
lethosor
55d5706a21
Update structures and fix various issues with plugins producing items
...
reaction_product::produce() takes a new unidentified vector<void*>*.
Passing a reference to an empty vector appears to work.
2015-12-18 18:40:11 -05:00
Eric Wald
4dc94a565f
Adjusting stockflow order numbers where possible.
...
Loading 0.40 saves in 0.42 results in a different list of reactions. Fortunately, all but the instruments should still work.
2015-12-18 07:02:29 -07:00
Eric Wald
45625318bb
Stockflow reaction list repairs.
...
Mostly, instruments and their pieces are made through generated custom reactions, instead of as tools.
Depends on df-structures commit e551233 for full potency.
2015-12-17 22:02:30 -07:00
Eric Wald
e4de341168
Preparing for MakeInstrument elimination.
...
Instruments are now made individually, so this type of job no longer happens. Therefore, it will probably be removed from the job_type enum.
2015-12-17 21:45:43 -07:00
Ben Lubar
270ff61fbd
add parentheses around || that should be inside &&
2015-12-13 12:23:56 -06:00
Quietust
7ef815afa8
apparently, casteFlagSet is a static function, despite its usefulness...
2015-12-12 17:58:58 -06:00
Quietust
eb1092da6e
Update strangemood plugin according to actual game code
2015-12-12 13:46:35 -06:00
lethosor
3083b01525
Add new labors to manipulator
2015-12-12 11:26:45 -05:00
lethosor
78d6b92127
Change strangemood permitted skill checks to job checks
...
permitted_skills was removed in 0.42 (dfhack/df-structures@6e2e8731 )
2015-12-12 11:17:00 -05:00
lethosor
817ea5e01c
Add new labors to autohauler/autolabor
2015-12-09 20:03:35 -05:00
lethosor
1668984585
UNITJOB_VIEW -> UNITJOB_VIEW_UNIT
2015-12-04 23:12:37 -05:00
Japa
23a5ce69bf
Send unit names over remotefortressreader
2015-11-29 00:03:26 +05:30
lethosor
df61233774
Merge remote-tracking branch 'PeridexisErrant/new-scripts' into develop
2015-11-26 16:13:27 -05:00
lethosor
55397425ef
Only call fix-job-postings automatically when workflow is enabled
...
Also, don't consider dead postings problematic
2015-11-26 10:34:46 -05:00
lethosor
2700b01765
Ensure that the correct job posting is kept (if there is one)
2015-11-25 23:35:19 -05:00
lethosor
428a0a4cfe
fix-unit-occupancy: Handle invalid coordinates instead of crashing
...
It appears that positions of caged units brought by traders can be
invalid, in particular.
2015-11-25 22:32:54 -05:00
lethosor
ff677d12ba
Merge remote-tracking branch 'lethosor/confirm-lua' into develop
2015-11-25 20:41:07 -05:00
lethosor
2aeac718cc
workflow: Account for job postings correctly and fix existing issues
...
Without removing postings correctly, it was possible to end up with
multiple workers assigned to a job that workflow had suspended
multiple times, which caused crashes if more than one worker was
assigned to the same job by DF.
This adds an additional command, fix-job-postings, that runs
automatically when loading a world and fixes:
- Multiple job postings that point to the same job
- Job postings that point to a job where posting_index == -1
(i.e. jobs that should have no posting assigned)
Fixes #741
2015-11-25 20:33:13 -05:00
lethosor
af92b3ae1f
Fix some confirm plugin issues and add a simple configuration UI
...
- Detect null pointers in trade-related functions
- Fix typo/issues pointed out by @dscorbett
- Reorder includes
2015-11-21 20:58:49 -05:00
lethosor
b7dd93b6e8
Implement most of the confirm plugin in Lua
...
This should make resolving future issues easier, although implementing
new confirmations in lua isn't possible yet (each one requires a line
in confirm.cpp).
This also resolves an issue with note-delete and route-delete, with
dfhack/df-structures@1bc4f61
2015-11-21 19:01:35 -05:00
lethosor
67aed56183
Allow adding plugins temporarily without modifying plugins/CMakeLists.txt
...
Useful to avoid issues when switching between branches that modify
plugins/CMakeLists.txt
2015-11-17 17:42:03 -05:00
PeridexisErrant
842b9c5191
Implement feature as a script, add magma option
...
Functionality is exactly equivalent to the plugin, but with a new option
for players who want to enable magma furnaces without spoilers.
2015-11-17 16:43:56 +09:30
PeridexisErrant
2ba9ef04e3
Replace drybuckets plugin with a script
...
Also closes #248 , by checking job and building flags.
2015-11-17 13:55:43 +09:30
lethosor
9c4fc64ac5
Fix display issue in tweak max-wheelbarrow
2015-11-16 21:47:29 -05:00
lethosor
16b2140dec
Merge remote-tracking branch 'lethosor/fix-unit-occ-speed' into develop
2015-11-16 21:39:46 -05:00
PeridexisErrant
5f8f0c72aa
Remove dwarfexport plugin (obsolete)
...
The Runesmith utility has long been replaced by Dwarf Therapist, and
it's attribute-editing functions are very well supported directly by
DFHack.
2015-11-17 11:13:22 +09:30
PeridexisErrant
836e1a3a37
Remove mapexport plugin (obsolete)
...
It's been disabled for more than a year, and nobody misses it. If that
changes, it'll still be in the git history!
2015-11-17 11:13:21 +09:30
PeridexisErrant
291787a019
Remove df2mc plugin (obsolete)
...
It's still got it's own repo, but it hasn't been compatible with
Minecraft for years and shouldn't be in the DFHack repo.
2015-11-17 11:13:20 +09:30
PeridexisErrant
80e4b8d3df
Remove DFusion plugin and script system
...
It's been four years since meaningful updates, and in that time
alternatives have emerged to almost everything. Any remaining
functionality to replace is on the issue tracker.
Simpler is better, for users and developers, and removing a legacy
system makes it easier to understand how DFHack works.
2015-11-17 11:13:19 +09:30
lethosor
7ea0e198b3
fix-unit-occupancy: Only check unit list once
...
Fixes #749
2015-11-16 17:25:21 -05:00
lethosor
610170b0b0
Add hooks for getDwarfmodeViewDims and getDepthAt (new)
2015-11-15 11:54:34 -05:00
lethosor
fcfffd1cb6
Track state of gui hooks
...
Also fix a bug in drawborder() and expand color-dfhack-text to test
multiple hooks
2015-11-15 11:54:34 -05:00
lethosor
fff9072b07
Add initial support for hooking into Gui-related functions
2015-11-15 11:54:34 -05:00
lethosor
928bcb6d95
military search: Don't try to pass selection in empty list to DF
...
Fixes #748
2015-11-15 11:15:05 -05:00
lethosor
9273c177c1
Add "confirm uniform-delete"
2015-11-11 23:14:58 -05:00
lethosor
07a310b0f2
Prevent "confirm squad-disband" from triggering unnecessarily
2015-11-11 23:14:30 -05:00
lethosor
e7c3b03ada
Misc. confirm plugin cleanup
...
This avoids the need to list newly-added classes in multiple places
(which could be extended to the search plugin) and gets rid of a few
ugly macros, along with a few other minor changes.
2015-11-11 23:00:20 -05:00
lethosor
7663a9a7a7
confirm haul-delete: Additional UI state restrictions
...
Fixes #744
2015-11-10 17:24:10 -05:00
lethosor
97e9312d2a
Update stonesense
2015-11-08 21:17:07 -05:00
Japa
79e1c4982e
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-11-08 13:54:14 +05:30
Japa
4db05cc8eb
Add Unit size info to remotefortressreader.cpp
2015-11-08 13:05:25 +05:30
lethosor
047168b702
Fix workshop/furnace sidebar events
2015-11-07 16:15:37 -05:00
lethosor
8117549175
Merge remote-tracking branch 'warmist/patch-6' into develop
...
Add furnace to fillsidebarmenu hook
2015-11-07 16:04:05 -05:00
lethosor
e176c3ea05
Merge remote-tracking branch 'PeridexisErrant/docs-again' into develop
2015-11-07 15:50:11 -05:00
lethosor
ba0ae9e487
Merge remote-tracking branch 'PeridexisErrant/init-flags' into develop
2015-11-07 15:23:17 -05:00
PeridexisErrant
0bb203e7c9
Replace initflags plugin with scripts
...
Progress towards #722
2015-11-07 23:42:14 +11:00
lethosor
3ebe59859b
box-select: Fix "tiles to fill" count
2015-11-06 20:04:54 -05:00
lethosor
d1cd5df314
Merge remote-tracking branch 'DoctorVanGogh/automats-floorfix' into develop
2015-11-06 19:54:06 -05:00
PeridexisErrant
7f212178ca
Move unused docs to plugin source files
...
This way they can easily be restored when the plugins are reactivated,
but don't confuse users until then.
2015-11-07 10:13:21 +11:00
DoctorVanGogh
e9be1aa657
Fix for construction over existing construction & on top of walls
...
Fix to allow constructions on top of (natural) down stairs
2015-11-06 19:00:43 +01:00
lethosor
5c4e28dbff
Fix initial cursor position with initial entry
2015-11-05 19:09:35 -05:00
lethosor
ac8038fa79
Update stonesense
2015-11-04 20:06:35 -05:00
lethosor
cbf31dcb37
Merge remote-tracking branch 'PeridexisErrant/NEWS-cleanup' into develop
2015-11-04 19:54:13 -05:00
Japa
ea38404727
Added bridge direction.
2015-11-03 22:38:07 +05:30
Warmist
0fa35aef3c
Update eventful.cpp
...
Fix furnace hook not being called.
2015-11-03 18:01:41 +02:00
Warmist
a503e54484
Add furnaces to sidebar fill event
2015-11-03 17:59:24 +02:00
Japa
3fd4b01829
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-11-03 18:50:00 +05:30
Japa
f5ca3f9e7b
Made the direction info more meaningful.
2015-11-03 18:49:17 +05:30
DoctorVanGogh
d692458038
Formatting
2015-11-03 10:07:27 +01:00
Lethosor
f7a5574e9a
Merge pull request #726 from DoctorVanGogh/zone-typo
...
zone: Fix typo in help text
2015-11-02 22:20:15 -05:00
DoctorVanGogh
923ce36323
zone: Fix typo in help text
2015-11-03 03:55:04 +01:00
Japa
b4b90465c2
Added building direction to remotefortressreader.cpp for those buildings that have it in a meaningful way.
2015-11-02 23:22:58 +05:30
DoctorVanGogh
a7fe1d9d73
Formatting
2015-11-02 05:05:17 +01:00
DoctorVanGogh
092979f362
Prevent building floor on top of constructed floor (mostly)
2015-11-02 02:51:52 +01:00
PeridexisErrant
e11ce3bff4
Merge develop
2015-10-31 15:46:41 +11:00
lethosor
ac71fa8070
Add isValidLabor() to Units module
...
Closes #711 and could avoid potential issues when editing units from
other civs with manipulator.
2015-10-30 18:41:09 -04:00
lethosor
ff4f7203c5
Update stonesense
2015-10-30 17:08:39 -04:00
lethosor
daf20c16bd
Indicate development builds
2015-10-24 14:52:00 -04:00
lethosor
8de710f1c1
Add Renderer module - safer way to install custom renderers
2015-10-21 17:18:39 -04:00
lethosor
757c05db86
buildingplan-lib: depend on dfhack
2015-10-18 17:46:37 -04:00
lethosor
dd32954cce
Make buildingplan-lib a static library
...
This avoids building buildingplan-lib.cpp multiple times
2015-10-18 13:08:48 -04:00
lethosor
c44ac8ec6e
Improve handling of fatal errors and errors in dfhack.lua
...
* Several fatal errors that occurred during core initialization didn't
stop initialization or set 'errorstate' properly, which caused
update hooks and other code to crash later. This has been fixed and
should address crashes like the one mentioned in #470 .
* Errors when loading dfhack.lua now cause Lua::Open() to fail, which
triggers a fatal error in Core::Init()
* Failure to initialize the console no longer results in a call to
fatal() (since it didn't actually stop initialization previously)
2015-10-17 21:18:04 -04:00
lethosor
38be023d5d
Fix TiletypeMaterial/tiletype_material comparison
2015-10-10 13:06:14 -04:00
Japa
46f6afada7
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-10-09 23:35:39 +05:30
Japa
30c14ed914
send stockpile and civzone extents in remotefortressreader.cpp
2015-10-09 23:35:12 +05:30
lethosor
5580a255f5
Update stonesense
2015-10-03 14:42:52 -04:00
lethosor
45d095cbab
Replace translate_socket_error() implementations with DescribeError()
2015-10-03 10:37:48 -04:00
lethosor
d343dfd8a0
Add a function to find viewscreens (or parents) of a given type
...
This makes it possible for some plugins to detect the game state more
reliably - for example, prospector would previously fail when
embarking if the viewscreen_choose_start_sitest instance had any
children.
2015-10-02 21:50:55 -04:00
Japa
449e0c7578
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-28 10:07:23 +05:30
Japa
5e43b6b2a6
Add buildigs to remotefortressreader.cpp
2015-09-28 10:06:04 +05:30
expwnent
e95aea90e0
Fix CMake warning over INTERFACE_LINK_LIBRARIES / policy CMP0022.
2015-09-27 04:30:46 -04:00
lethosor
62c903b7be
search: Fix crash when disabling a stockpile category
...
Closes #678
2015-09-21 19:25:20 -04:00
expwnent
b532a56790
Merge remote-tracking branch 'dfhack/develop' into develop
2015-09-21 17:48:34 -04:00
expwnent
47378d4b85
Merge branch 'luasocket' into develop
2015-09-21 17:46:47 -04:00
expwnent
fabcfcd921
Fixed trailing whitespace.
2015-09-21 17:42:30 -04:00
Japa
129218d5f8
fix whitespace.
2015-09-16 23:29:21 +05:30
Japa
ed07a8478b
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-16 23:27:04 +05:30
Japa
e49272854c
Add basic army info to RemoteFortressReader.proto
2015-09-16 23:26:52 +05:30
Japa
5ce6fceacc
Send the center with the world map, based off current embark if available, otherwise adventurer position.
2015-09-16 23:25:23 +05:30
Warmist
80fd4b1365
Some additions and fixes.
...
Added new functions: select, set(non)blocking, isBlocking.
Set default to non-blocking. Added "would block" to ignored errors.
2015-09-16 09:57:22 +03:00
expwnent
f9fce7e6a1
Convert tab to spaces in RemoteFortressReader.proto.
2015-09-15 03:21:09 -04:00
lethosor
b58ccc9e55
Fix embark-tools title alignment
2015-09-12 20:28:42 -04:00
lethosor
a852ca10d7
Merge remote-tracking branches 'warmist/luasocket' and 'warmist/advfort' into develop
2015-09-12 19:59:53 -04:00
Japa
3b36a23404
Add soldier state to remotefortressreader.cpp
2015-09-07 22:41:24 +05:30
Japa
07c601be99
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
...
Conflicts:
plugins/remotefortressreader.cpp
2015-09-05 15:00:03 +05:30
Japa
1a78cabd7c
Add profession color and unit flags to remotefortressreader
2015-09-05 14:54:12 +05:30
lethosor
1ea2da511b
Fix whitespace
2015-09-02 15:53:13 -04:00
Japa
44a670db4d
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-03 00:14:31 +05:30
Japa
6881aeac70
Enable sending of creature_raw in remotefortressreader.cpp
2015-09-03 00:13:48 +05:30
lethosor
7437400c18
command-prompt: Prevent unloading when prompt is active
2015-08-29 19:38:41 -04:00
lethosor
c6ae3e11fd
Rename remotefortressreader to RemoteFortressReader
2015-08-26 16:40:59 -04:00
lethosor
8292f56f63
New tweak: embark-profile-name
2015-08-25 10:12:31 -04:00
lethosor
ec4a3bda54
Merge branch 'develop' into plugin-manager
2015-08-17 08:17:56 -04:00
warmist
7639420455
Update luasocket.lua
2015-08-17 10:07:20 +03:00
Japa
bf7fc42710
Made remotefortressreader.cpp get the elevations from the next region over for the last line.
2015-08-17 00:11:52 +05:30
Japa
f60b3e8117
Added a function to get region tiles from remotefortressreader.cpp
2015-08-16 20:28:52 +05:30
Warmist
5bb69cfe04
Add luasocket to CMakeLists.txt
2015-08-15 15:12:13 +03:00
Warmist
d9c50d677f
A lua interface for csockets in a spirit of luasocket
2015-08-15 15:09:12 +03:00
lethosor
735498c3f9
Fix merge conflict
2015-08-14 16:23:39 -04:00
lethosor
4fc6cb6f17
Several PluginManager improvements
...
* load/unload/reload are no longer restricted to plugins that exist
on startup
* Names passed to DFHACK_PLUGIN must match the plugin's filename
(remotefortressreader vs RemoteFortressReader, counters vs probe)
* "plug" output lists all plugins and state/command information
* Deleted plugins can be reloaded again if they are replaced
* load/unload/reload don't fail silently with broken plugins
* Built-in commands are recognized internally (e.g. "help help"
does not display "help is not a recognized command"), although help
for them is not yet implemented
* New command: "type" (bash-like) - shows where/how a command is
implemented
* "plug" can accept multiple plugin names
* "ls" displays more information about unloaded/unrecognized plugins
* "load all" changed to "load -all" (or "load --all", "load -a", ...)
2015-08-14 16:11:23 -04:00
Japa
a71a6d45cc
Added a function to pull the world map from remotefortressreader.cpp
2015-08-14 15:36:36 +05:30
Japa
22374e6d86
Fixed remotefortressreader.cpp DF version detection.
2015-08-13 15:59:15 +05:30
Japa
e4ac25d1e0
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-08-13 11:26:33 +05:30
Japa
a60c8d8e7c
Added conditionals to remotefortressreader.cpp to make compiling for v 0.24.11 easier.
2015-08-13 11:25:59 +05:30
lethosor
05f36856f4
fix-unit-occupancy: Always provide feedback when running command
2015-08-10 11:30:21 -04:00
lethosor
9b5f42e3a9
tweak farm-plot-select: Only show controls when plots are fully built
...
Fixes #521
2015-08-10 10:41:47 -04:00
lethosor
fcd15bfd73
Move vshook plugin to title-version and enable by default
2015-08-09 13:37:26 -04:00
lethosor
bce9d98633
New plugin: fix-unit-occupancy (fixes bug 3499)
2015-08-07 14:33:38 -04:00
lethosor
44287fc3a0
remotefortressreader: Check map validity before reading map info
...
Fixes JapaMala/armok-vision#5
2015-08-06 13:42:13 -04:00
lethosor
090f542d49
Allow for per-plugin compile flags
2015-08-06 13:33:53 -04:00
Lethosor
bc5b46dce0
Merge pull request #660 from lethosor/jsoncpp
...
Replace jsonxx with jsoncpp
2015-08-06 12:37:51 -04:00
lethosor
e02815dc30
Fix manipulator crash when selecting from empty custom profession list
2015-07-31 16:46:00 -04:00
lethosor
01e04c24c5
Use a separate lua state in dwarfmonitor render hook
2015-07-31 14:25:33 -04:00
lethosor
d02e67267a
Replace jsonxx with jsoncpp
2015-07-29 15:50:33 -04:00
lethosor
a90f3c3d67
stockpiles: Restrict characters in filenames when saving
...
Previously, it was possible to save outside of the stocksettings
directory or fail to save in a nonexistent subdirectory (e.g. when
a stockpile name had slashes in it).
Resolves #621
2015-07-29 14:17:14 -04:00
lethosor
4e45cc5bbb
stocks: Use ^ and $ to match the beginning/end of item names
...
Closes #624
2015-07-29 13:44:32 -04:00
lethosor
7fc682b199
Fix dismissal of current screen when zooming to items
2015-07-29 11:22:38 -04:00
lethosor
825d46af51
Move ListColumn class to a separate header
2015-07-28 21:48:00 -04:00
lethosor
dd7c20c848
Add safer helpers to get STRING_X keys from interface_key sets
...
A few plugins were using input->rbegin() previously, which crashes
if input is empty and isn't strictly guaranteed to return a
STRING_X key.
2015-07-28 18:34:29 -04:00
lethosor
b73e859a37
Reorganize stocks viewscreen to fit a 25-row resolution
2015-07-28 14:37:49 -04:00
lethosor
5ca5feb855
Stop embark-tools from crashing on unload
...
Also enable sand indicator and mouse controls by default and refactor
2015-07-27 21:38:53 -04:00
lethosor
c3c625e7bd
Remove embark-tools nano (implemented in 0.40.24)
2015-07-27 18:22:18 -04:00
lethosor
889c76b147
buildingplan: Don't assume building and item type names match
...
There are a few building types (e.g. hatch covers) where this is not
the case.
Fixes #604
2015-07-27 14:10:55 -04:00
lethosor
6352a6e266
Expand confirm plugin and improve safety of adding/removing hooks
...
* New option: trade-select-all: Prompts when selecting all goods
when some goods are already selected
* Improved trade confirmation message depending on selected goods
* Made seize and offer confirmations only display when goods in the
appropriate columns are selected
* States of each option are now listed by "confirm help"
2015-07-27 12:03:29 -04:00
lethosor
ed3cbe2e60
Add several trade-related confirmations
2015-07-27 10:05:59 -04:00
lethosor
35f229c578
Add confirmations for hauling route/stop deletion and depot removal
2015-07-27 10:05:59 -04:00
lethosor
175edf501a
Add "confirm" plugin - implements a few confirmation dialogs
...
See #577
2015-07-27 10:05:59 -04:00
lethosor
f1a6e5fbe9
tweak farm-plot-select: Don't require crops to be discovered
...
Crops whose seeds haven't been discovered are still listed in
menus as of 0.40.10
2015-07-24 11:17:04 -04:00
lethosor
6c55164be4
Fix a potential crash in tweak farm-plot-select
...
Related to #396
2015-07-24 10:54:59 -04:00
Japa
867e78b6fd
Correctly identify ice material.
2015-07-04 09:22:41 +05:30
lethosor
87b1524aec
search: give text input priority over cursor keys
2015-06-30 16:45:45 -04:00
lethosor
8058472dd9
Check for null pointers in several places in the search plugin
...
Fixes #650 (and a few other potential issues)
2015-06-30 16:20:01 -04:00
lethosor
2c734233eb
New tweak: kitchen-keys
...
Fixes an issue where HOTKEY_KITCHEN_* bindings aren't used by DF:
http://www.bay12games.com/dwarves/mantisbt/view.php?id=614
See #526
2015-06-27 11:02:26 -04:00
lethosor
3795edb673
Fix colors in 'tweak kitchen-prefs-color'
2015-06-27 09:54:31 -04:00
lethosor
4246dbd02a
New tweak: kitchen-prefs-color
...
Disabled in default dfhack.init to avoid confusion
2015-06-26 23:19:53 -04:00
lethosor
8d21dd0a23
New tweak: kitchen-prefs-empty
...
Fixes a layout issue on the kitchen prefs viewscreen with empty tabs
http://www.bay12games.com/dwarves/mantisbt/view.php?id=9000
See #526
2015-06-26 23:19:39 -04:00
lethosor
38d377f4c4
Fix a few zone plugin crashes
...
* Avoid checking building types of null pointers
* Detect selected cages properly
Fixes #646
2015-06-23 21:21:21 -04:00
Lethosor
c9f7fcfd05
Merge pull request #640 from lethosor/search-look-list
...
Add look menu search
2015-06-22 08:44:34 -04:00
Japa
33cb5e951f
Fixed whitespace and returns.
2015-06-22 18:01:19 +05:30
Japa
a071f5bf6c
Added preliminary building list to remotefortressreader. Untested.
2015-06-22 00:40:17 +05:30
Japa
96640c837f
Made remotefortressreader send an item list, and the item that constructions are made from.
2015-06-20 22:17:35 +05:30
Japa
4182a30cc5
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-06-19 23:30:47 +05:30
Japa
4b05423e58
Made remotefortressreader send proper indices for inbuilt materials.
2015-06-19 23:28:32 +05:30
lethosor
a8480070a0
Add look menu search
2015-06-16 20:36:19 -04:00
lethosor
81cba0b0fc
Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop
2015-06-16 19:56:16 -04:00
lethosor
8145a04944
dwarfmonitor: Add mouse cursor widget
...
Suggested by @ragundo
2015-06-15 13:42:29 -04:00
lethosor
7581bda7d5
Update dwarfmonitor documentation and NEWS
2015-06-13 21:50:15 -04:00
lethosor
93c9a41a3a
Reimplement dwarfmonitor widgets in Lua (and improve customizability)
...
Widget positions and a few other options (e.g. date formats) can be
specified in dfhack-config/dwarfmonitor.json on a per-instance basis.
Related changes:
* Fixed an issue loading JSON files from Lua
* JSON files in dfhack-config (only dwarfmonitor.json currently) are
no longer copied into the DF directory when building DFHack. This
keeps developers' personal settings intact, but will require
copying over changes made to DFHack's copies manually.
* Fixed incorrect config path in dwarfmonitor help
2015-06-13 21:15:43 -04:00
Fukken-Saved
9a262ad013
Travis compliance
2015-06-13 14:19:14 -04:00
Fukken-Saved
d4c7cd2a4e
Update autohauler.cpp
2015-06-13 14:08:42 -04:00
lethosor
2d121caabc
Allow searching noble suggestions in liaison meetings
...
Closes #622
2015-06-11 21:37:58 -04:00
Lethosor
09db800f3d
Change tabs to spaces
2015-06-11 12:50:00 -04:00
Japa
eef9f49ae8
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-06-11 21:51:03 +05:30
Japa
cf13b677b6
Added all main tile flags to the list of sent stuff.
2015-06-11 21:49:42 +05:30
lethosor
84b0b48028
dwarfmonitor: Allow weather indicator to be configured separately
2015-06-10 23:09:01 -04:00
lethosor
eabcee38e5
dwarfmonitor: Get rid of "Clear" weather indicator
2015-06-10 23:05:33 -04:00
Adam Watkins
772ad0372d
Improved issue with workflow job being resumed but never being worked
...
Fixes #487
* This doesn't fix existing stuck jobs, in order to fix, remove repeat, cancel, add, repeat
* Most workshops worked great after this, however, I noticed my bone bolts and wood bolts still got stuck, not sure if it is the same issue
* The unk_v4020_1 field was not being reset to -1 when resuming the job.
* Updated to be reset only when the job is being resumed
** Setting it to -1 without checking sets this field on all workflow jobs, which causes a crash
* Made other calls to suspend call set_resumed rather than setting the suspend field
This is the behavior I saw for the unk_v4020_1 field:
Suspended jobs: -1
Jobs not in the top of the list but not suspended: -1
Jobs at the top of the list to work next, not suspended: A positive integer (priority of job?)
2015-05-22 22:26:58 -04:00
lethosor
0f1adeb3e7
Update stonesense
2015-05-17 12:47:43 -04:00
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