2455e36510
Initial 64-bit support
2016-07-03 23:32:43 -04:00
13b328beeb
Remove tabs
2016-06-30 15:14:20 +05:30
b37afa4591
Remove tabs
2016-06-30 15:12:28 +05:30
b196ecf351
Send over material tissues through RemoteFortressReader
2016-06-30 14:33:15 +05:30
421e7949e0
Merge pull request #951 from eswald/stockflow-43
...
Stockflow reaction updates
2016-06-26 21:37:15 -04:00
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
036c0f787c
Send creature adult size through remotefortressreader.cpp
2016-06-23 21:26:00 +05:30
74c9abcb47
Send color modifier raws through remotefortressreader.cpp
2016-06-22 13:36:36 +05:30
069d6b67d6
Send all size modifiers through remotefortressreader.
2016-06-21 22:42:47 +05:30
5fff0efec5
Send appearance info over remotefortressreader.cpp
2016-06-20 22:59:59 +05:30
9ef9a6b519
Send bodypart raws from RemoteFortressReader
2016-06-20 13:21:11 +05:30
980be6e2af
Added a cleaner format for sending over region info.
2016-06-16 21:36:35 +05:30
39c96c474a
Fix ordering, news, and indentation
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-14 16:13:26 -04:00
f07bc03c69
Update clsocket and Open()/Listen() usage
2016-06-14 13:21:51 -04:00
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
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
f908a1d1b6
Replace catsplosion plugin with a script
...
Closes #938 , #722
2016-06-11 21:44:15 -04:00
fead8a80ff
Fix tabs to spaces
...
Signed-off-by: Michael Casadevall <mcasadevall@ubuntu.com>
2016-06-08 04:15:03 -04:00
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
8543121ece
add fog of war and traffic to probe.cpp
2016-06-03 00:32:11 +05:30
44b8433282
Make remotefortressreader.cpp mark blocks as hidden that aren't visible directly to the adventurer
2016-06-03 00:31:02 +05:30
b1072b65e4
Don't send designations in adventure mode
2016-05-31 22:53:48 +05:30
3dcd3e14f0
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-05-28 21:24:02 +05:30
569325823d
Send world name and time with world center in remotefortressreader.cpp
2016-05-28 21:23:26 +05:30
0867f3d311
Add dig designations to probe.cpp
2016-05-28 08:29:12 +05:30
c0419d919e
Add lake levels to remotefortressreader.cpp
2016-05-28 08:28:17 +05:30
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
dabf443260
Merge remote-tracking branch 'eswald/stockflow-43' into develop
2016-05-17 23:29:01 -04:00
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
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
a8f9f912c9
Merge remote-tracking branch 'eswald/stockflow-43' into develop
2016-05-16 20:40:50 -04:00
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
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
0b1004f2b8
Notice resizing immediately, instead of on next key press
2016-05-15 09:14:30 -06:00
6add87b358
Simplifying key strings
2016-05-15 08:58:45 -06:00
6575f5f412
Removing the quantity limit on stockflow orders.
2016-05-14 23:40:01 -06:00
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
8c7d5366c9
Switching to the new manager order flags
2016-05-14 23:33:38 -06:00
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
3af24507a3
adjust autogems to work with the workshop profile changes
2016-05-14 20:15:49 -05:00
55e58e5f06
Update handling of viewscreen_workshop_profilest in Gui module, search/sort plugins
2016-05-14 11:43:37 -04:00
74898a5424
createitem: move all created items to cursor if applicable
2016-05-11 17:54:37 -04:00
38051a5a48
remove tweak manager-quantity
2016-05-11 17:51:57 -04:00
e0a0a26739
ANY_GENERIC35 -> 36
2016-05-10 17:57:15 -04:00
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
56f2603097
Send over rivers through remotefortressreader.cpp
2016-05-02 20:58:36 +05:30
b8f5496b24
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-04-25 22:39:18 +05:30
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
f66dd77a72
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-04-23 20:33:25 -04:00
5418233117
to_string -> int_to_string
2016-04-22 20:27:53 -04:00
fd54003384
More make_pair replacements
2016-04-22 20:26:07 -04:00
ec42967996
Use std::make_pair instead of initializer lists
2016-04-22 19:43:05 -04:00
8784a133e8
Initialize maps in a MSVC 2010-compatible way
2016-04-22 18:45:32 -04:00
52728babd4
Merge branch 'develop' into zone-unassign
2016-04-22 18:41:15 -04:00
acac839371
Replace fixdiplomats, fixmerchants with scripts
2016-04-20 11:12:06 +10:00
856c3b06f4
Added dig designations to remotefortressreader.cpp
2016-04-19 19:15:33 +05:30
1317792cde
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-04-19 18:17:39 +05:30
50f2851772
Merge pull request #742 from PeridexisErrant/ls-cleanup
...
Ls cleanup
2016-04-17 17:59:22 -04:00
8226134f67
Make can_trade() return true if at least one caravan can trade
...
Fixes #900
2016-04-16 17:13:00 -04:00
ae81454786
Minor fixes, space no longer required
...
Thanks to 2882422
2016-04-15 16:28:41 +10:00
273c22f606
Shorten "ls" help for plugins
...
I think that's all of them.
2016-04-15 16:28:41 +10:00
0d37209063
use trade_state enum
2016-04-13 09:44:57 -04:00
a92b67c80d
Add ability to edit min/max logs and remove cap
...
Closes #893
2016-04-12 19:52:51 -04:00
999d89c5af
Fix tile background colors in CopyScreen
2016-04-12 17:10:54 -04:00
daadc2ef85
Update stonesense
2016-04-10 20:11:52 -04:00
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
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
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
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
9c9f710d5b
Fix eventful not showing sidebar sometimes
...
E.g. when destroying buildings
2016-04-10 14:47:33 +03:00
4c4b727a2e
Update stonesense
2016-04-09 20:09:41 -04:00
33472b823b
createitem: fall back to units.active[0] if a cursor is available but no unit
2016-04-05 11:49:38 -04:00
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
39bcee11d8
fixed a crash in remotefortressreader.cpp that occured if Armok Vision is connected while saving.
2016-04-03 11:09:16 +05:30
4d95395afc
added a function to remotefortressreader.cpp to insert keyboard events
2016-03-21 22:56:48 +05:30
2f4a5e8449
Fix missing return
2016-03-20 22:04:21 +05:30
a3ddc63836
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
...
Conflicts:
plugins/remotefortressreader.cpp
2016-03-20 16:30:49 +05:30
14e61db99d
Add ability for remotefortressreader.cpp to send over the current screen
2016-03-20 16:27:05 +05:30
197e163a42
add follow_unit_id and follow_item_id to RemoteFortressReader
2016-03-14 13:54:46 -05:00
2f86683d37
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-03-13 18:31:52 +05:30
2fc784f825
Add world pole orientation to remotefortressreader.cpp.
2016-03-13 18:31:27 +05:30
5bb98295b3
Merge pull request #810 from PeridexisErrant/colonies
...
Colonies as a script, + place feature by Warmist
2016-03-13 08:32:05 -04:00
b71c1b9e7c
Merge pull request #751 from PeridexisErrant/remove-dfusion
...
Remove dfusion, df2mc, mapexport, dwarfexport
2016-03-13 08:22:07 -04:00
bc02e2a844
Add auto-gears mode for building hacks for automatic animation and gear positions.
2016-03-13 13:37:36 +02:00
5895621eec
Change eventful to have sane(r) callback for produce
2016-03-13 12:57:36 +02:00
4a5971966a
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-03-12 21:53:17 +05:30
6ab8c8b9b1
fix teledwarf bug (leaves babies lying on ground)
2016-03-10 13:54:38 +02:00
5ec03774b5
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-03-05 17:30:54 +05:30
198571dca3
fix manipulator bug (unable to apply last custom profession)
...
"selected" starts with 1, not 0
2016-03-03 01:24:18 +02:00
a5494f74a0
Added world pole direction to RemoteFortressReader.proto
2016-02-28 21:26:15 +05:30
297bbd6f20
Merge remote-tracking branch 'warmist/develop' into develop ( closes #772 )
2016-02-24 17:24:03 -05:00
78a7d7a43b
Merge remote-tracking branches 'sv-esk/autolabor_new_jobs' and 'sv-esk/manipulator' into develop
2016-02-24 16:36:57 -05:00
9d0d4fd08b
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2016-02-24 16:34:29 -05:00
79fde493e2
Merge remote-tracking branch 'eswald/autogems-bugfix' into develop
2016-02-24 16:33:54 -05:00
d479f30592
Merge pull request #826 from eswald/stockflow-4206
...
Updating Stockflow for version 42.06
2016-02-24 17:35:20 +01:00
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
20572fb667
add new jobs to autolabor
2016-02-23 19:01:14 +02:00
420eb5341b
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-02-20 01:31:12 +05:30
ac068b4738
Fixed DF color translation in remotefortressreader.cpp
2016-02-20 01:30:56 +05:30
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
e160fec2b9
Ignoring forbidden rough gems
2016-02-13 20:59:08 -07:00
d2450c34ff
forbid manipulator editing ghosts
...
they are not flags1.dead
2016-02-12 13:47:58 +02:00
f4ce45deae
Disable confirm note-delete in name entry
...
Fixes #820
2016-02-11 22:56:33 -05:00
83c70ccb0f
forbid manipulator editing non-citizens
2016-02-11 13:31:52 +02:00
ac070e49a4
forbid manipulator editing visitors
2016-02-11 06:24:18 +02:00
3cab865d58
fix manipulator racism
...
(allow editing non-dwarves)
2016-02-11 06:23:30 +02:00
ff4b2f8522
add new skill columns
2016-02-11 06:23:21 +02:00
5d8c2fd502
Fix whitespace
2016-02-02 01:14:04 -05:00
3e402fa97c
Remove left over handlers from eventful
2016-02-01 22:23:31 +02:00
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
0a670bb0db
Implement #804 , move some functions to Units, colorize zone output, a
...
little cleanup
2016-02-01 11:12:06 -05:00
297f441bd6
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-02-01 20:01:00 +05:30
054954a72a
Corrected the region details logic.
2016-02-01 20:00:25 +05:30
e519313b70
Convert colonies plugin to script, add place feature
2016-02-01 18:12:38 +11:00
afa1199f98
Add support for grates and bars to Ruby.
...
See also: DFHack@248331a1967d2527a13bcf259f35bffe4dec86b8, DFHack#808
2016-01-31 15:19:58 -06:00
248331a196
buildingplan: Support floodgates, grates, bars
...
See #808
2016-01-31 14:50:07 -05:00
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
e49745d338
Added tile and material to growths in remotefortressreader.cpp
2016-02-01 00:41:13 +05:30
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
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
7f3191352c
send growth info through remotefortressreader.cpp
2016-01-28 00:06:10 +05:30
4c4eda44f9
Added plant raw list to RemoteFortressReader.proto
2016-01-27 18:49:30 +05:30
a7b2d5e38f
Fix autogems typedefs for MSVC and log errors to stderr
2016-01-16 11:45:04 -05:00
15a9d7f491
Fix whitespace
2016-01-14 20:13:46 -05:00
f02a504a00
Added tree coords to remotefortressreader.cpp
2016-01-12 00:10:16 +05:30
ed62f0f554
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2016-01-10 12:47:03 +05:30
ebf2dada62
Increased DF version define
2016-01-10 12:37:52 +05:30
004f46fecc
Merge pull request #789 from eswald/autogems
...
New autogems plugin, automatically cutting rough gems.
2016-01-09 19:10:30 -05:00
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
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
7041e49196
Merge pull request #785 from abbradar/develop
...
blueprint: fix compilation (i.e. undefined find)
2016-01-09 13:57:17 -05:00
53780d8232
New autogems plugin, automatically cutting rough gems.
2016-01-08 23:18:41 -07:00
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
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
da3c6404fa
blueprint: fix compilation (i.e. undefined find)
2016-01-06 03:03:19 +03:00
3bcd58fca7
Use consistent key display
2016-01-04 19:31:57 -05:00
2acdede03b
New tweak: hide-priority
...
Adds an option to hide designation priority indicators
2016-01-04 19:29:30 -05:00
9e020bb8c1
Make title-version show git info for dev builds
2016-01-01 11:50:11 -05:00
81b055ee93
Implement "weather" as a script
2016-01-01 11:35:58 -05:00
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
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
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
e075a06486
Add search controls to all viewscreen_petst subpages
2015-12-27 15:49:10 -05:00
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
a9ad2f40f1
Add a location retirement confirmation
2015-12-25 11:18:55 -05:00
de160de0e8
showmood: use correct console encoding
2015-12-24 21:34:38 -05:00
15a6eb90d4
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-12-24 22:14:18 +05:30
10eed10b63
Add genger do remotefortressreader.cpp
2015-12-24 22:13:25 +05:30
e3e68a8df9
Add a search option to the location occupation menu
2015-12-23 16:57:43 -05:00
2a2ab00ca9
Add "map" parameter to a lot of drawing functions
...
Ref #746
2015-12-22 11:42:51 -05:00
c9eab65c96
Fix more produce() calls
2015-12-22 09:54:00 -05:00
e3420a5e67
Merge pull request #770 from eswald/instruments
...
Stockflow repairs
2015-12-19 23:11:55 -05:00
f0013ced56
tabs to spaces
2015-12-19 11:16:43 -05:00
5a1e5e1464
Expose Units::casteFlagSet()
2015-12-19 11:07:35 -05:00
15d3815f26
Merge remote-tracking branch 'quietust/develop' into develop
2015-12-19 10:58:38 -05:00
e7d8f9b2b3
Merge branch 'develop' of https://github.com/dfhack/dfhack into develop
2015-12-18 18:42:39 -05:00
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
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
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
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
270ff61fbd
add parentheses around || that should be inside &&
2015-12-13 12:23:56 -06:00
7ef815afa8
apparently, casteFlagSet is a static function, despite its usefulness...
2015-12-12 17:58:58 -06:00
eb1092da6e
Update strangemood plugin according to actual game code
2015-12-12 13:46:35 -06:00
3083b01525
Add new labors to manipulator
2015-12-12 11:26:45 -05:00
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
817ea5e01c
Add new labors to autohauler/autolabor
2015-12-09 20:03:35 -05:00
1668984585
UNITJOB_VIEW -> UNITJOB_VIEW_UNIT
2015-12-04 23:12:37 -05:00
23a5ce69bf
Send unit names over remotefortressreader
2015-11-29 00:03:26 +05:30
df61233774
Merge remote-tracking branch 'PeridexisErrant/new-scripts' into develop
2015-11-26 16:13:27 -05:00
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
2700b01765
Ensure that the correct job posting is kept (if there is one)
2015-11-25 23:35:19 -05:00
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
ff677d12ba
Merge remote-tracking branch 'lethosor/confirm-lua' into develop
2015-11-25 20:41:07 -05:00
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
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
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
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
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
2ba9ef04e3
Replace drybuckets plugin with a script
...
Also closes #248 , by checking job and building flags.
2015-11-17 13:55:43 +09:30
9c4fc64ac5
Fix display issue in tweak max-wheelbarrow
2015-11-16 21:47:29 -05:00
16b2140dec
Merge remote-tracking branch 'lethosor/fix-unit-occ-speed' into develop
2015-11-16 21:39:46 -05:00
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
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
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
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
7ea0e198b3
fix-unit-occupancy: Only check unit list once
...
Fixes #749
2015-11-16 17:25:21 -05:00
610170b0b0
Add hooks for getDwarfmodeViewDims and getDepthAt (new)
2015-11-15 11:54:34 -05:00
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
fff9072b07
Add initial support for hooking into Gui-related functions
2015-11-15 11:54:34 -05:00
928bcb6d95
military search: Don't try to pass selection in empty list to DF
...
Fixes #748
2015-11-15 11:15:05 -05:00
9273c177c1
Add "confirm uniform-delete"
2015-11-11 23:14:58 -05:00
07a310b0f2
Prevent "confirm squad-disband" from triggering unnecessarily
2015-11-11 23:14:30 -05:00
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
7663a9a7a7
confirm haul-delete: Additional UI state restrictions
...
Fixes #744
2015-11-10 17:24:10 -05:00
97e9312d2a
Update stonesense
2015-11-08 21:17:07 -05:00
79e1c4982e
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-11-08 13:54:14 +05:30
4db05cc8eb
Add Unit size info to remotefortressreader.cpp
2015-11-08 13:05:25 +05:30
047168b702
Fix workshop/furnace sidebar events
2015-11-07 16:15:37 -05:00
8117549175
Merge remote-tracking branch 'warmist/patch-6' into develop
...
Add furnace to fillsidebarmenu hook
2015-11-07 16:04:05 -05:00
e176c3ea05
Merge remote-tracking branch 'PeridexisErrant/docs-again' into develop
2015-11-07 15:50:11 -05:00
ba0ae9e487
Merge remote-tracking branch 'PeridexisErrant/init-flags' into develop
2015-11-07 15:23:17 -05:00
0bb203e7c9
Replace initflags plugin with scripts
...
Progress towards #722
2015-11-07 23:42:14 +11:00
3ebe59859b
box-select: Fix "tiles to fill" count
2015-11-06 20:04:54 -05:00
d1cd5df314
Merge remote-tracking branch 'DoctorVanGogh/automats-floorfix' into develop
2015-11-06 19:54:06 -05:00
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
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
5c4e28dbff
Fix initial cursor position with initial entry
2015-11-05 19:09:35 -05:00
ac8038fa79
Update stonesense
2015-11-04 20:06:35 -05:00
cbf31dcb37
Merge remote-tracking branch 'PeridexisErrant/NEWS-cleanup' into develop
2015-11-04 19:54:13 -05:00
ea38404727
Added bridge direction.
2015-11-03 22:38:07 +05:30
0fa35aef3c
Update eventful.cpp
...
Fix furnace hook not being called.
2015-11-03 18:01:41 +02:00
a503e54484
Add furnaces to sidebar fill event
2015-11-03 17:59:24 +02:00
3fd4b01829
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-11-03 18:50:00 +05:30
f5ca3f9e7b
Made the direction info more meaningful.
2015-11-03 18:49:17 +05:30
d692458038
Formatting
2015-11-03 10:07:27 +01:00
f7a5574e9a
Merge pull request #726 from DoctorVanGogh/zone-typo
...
zone: Fix typo in help text
2015-11-02 22:20:15 -05:00
923ce36323
zone: Fix typo in help text
2015-11-03 03:55:04 +01:00
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
a7fe1d9d73
Formatting
2015-11-02 05:05:17 +01:00
092979f362
Prevent building floor on top of constructed floor (mostly)
2015-11-02 02:51:52 +01:00
e11ce3bff4
Merge develop
2015-10-31 15:46:41 +11:00
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
ff4f7203c5
Update stonesense
2015-10-30 17:08:39 -04:00
daf20c16bd
Indicate development builds
2015-10-24 14:52:00 -04:00
8de710f1c1
Add Renderer module - safer way to install custom renderers
2015-10-21 17:18:39 -04:00
757c05db86
buildingplan-lib: depend on dfhack
2015-10-18 17:46:37 -04:00
dd32954cce
Make buildingplan-lib a static library
...
This avoids building buildingplan-lib.cpp multiple times
2015-10-18 13:08:48 -04:00
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
38be023d5d
Fix TiletypeMaterial/tiletype_material comparison
2015-10-10 13:06:14 -04:00
46f6afada7
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-10-09 23:35:39 +05:30
30c14ed914
send stockpile and civzone extents in remotefortressreader.cpp
2015-10-09 23:35:12 +05:30
5580a255f5
Update stonesense
2015-10-03 14:42:52 -04:00
45d095cbab
Replace translate_socket_error() implementations with DescribeError()
2015-10-03 10:37:48 -04:00
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
449e0c7578
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-28 10:07:23 +05:30
5e43b6b2a6
Add buildigs to remotefortressreader.cpp
2015-09-28 10:06:04 +05:30
e95aea90e0
Fix CMake warning over INTERFACE_LINK_LIBRARIES / policy CMP0022.
2015-09-27 04:30:46 -04:00
62c903b7be
search: Fix crash when disabling a stockpile category
...
Closes #678
2015-09-21 19:25:20 -04:00
b532a56790
Merge remote-tracking branch 'dfhack/develop' into develop
2015-09-21 17:48:34 -04:00
47378d4b85
Merge branch 'luasocket' into develop
2015-09-21 17:46:47 -04:00
fabcfcd921
Fixed trailing whitespace.
2015-09-21 17:42:30 -04:00
129218d5f8
fix whitespace.
2015-09-16 23:29:21 +05:30
ed07a8478b
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-16 23:27:04 +05:30
e49272854c
Add basic army info to RemoteFortressReader.proto
2015-09-16 23:26:52 +05:30
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
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
f9fce7e6a1
Convert tab to spaces in RemoteFortressReader.proto.
2015-09-15 03:21:09 -04:00
b58ccc9e55
Fix embark-tools title alignment
2015-09-12 20:28:42 -04:00
a852ca10d7
Merge remote-tracking branches 'warmist/luasocket' and 'warmist/advfort' into develop
2015-09-12 19:59:53 -04:00
3b36a23404
Add soldier state to remotefortressreader.cpp
2015-09-07 22:41:24 +05:30
07c601be99
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
...
Conflicts:
plugins/remotefortressreader.cpp
2015-09-05 15:00:03 +05:30
1a78cabd7c
Add profession color and unit flags to remotefortressreader
2015-09-05 14:54:12 +05:30
1ea2da511b
Fix whitespace
2015-09-02 15:53:13 -04:00
44a670db4d
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-09-03 00:14:31 +05:30
6881aeac70
Enable sending of creature_raw in remotefortressreader.cpp
2015-09-03 00:13:48 +05:30
7437400c18
command-prompt: Prevent unloading when prompt is active
2015-08-29 19:38:41 -04:00
c6ae3e11fd
Rename remotefortressreader to RemoteFortressReader
2015-08-26 16:40:59 -04:00
8292f56f63
New tweak: embark-profile-name
2015-08-25 10:12:31 -04:00
ec4a3bda54
Merge branch 'develop' into plugin-manager
2015-08-17 08:17:56 -04:00
7639420455
Update luasocket.lua
2015-08-17 10:07:20 +03:00
bf7fc42710
Made remotefortressreader.cpp get the elevations from the next region over for the last line.
2015-08-17 00:11:52 +05:30
f60b3e8117
Added a function to get region tiles from remotefortressreader.cpp
2015-08-16 20:28:52 +05:30
5bb69cfe04
Add luasocket to CMakeLists.txt
2015-08-15 15:12:13 +03:00
d9c50d677f
A lua interface for csockets in a spirit of luasocket
2015-08-15 15:09:12 +03:00
735498c3f9
Fix merge conflict
2015-08-14 16:23:39 -04:00
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
a71a6d45cc
Added a function to pull the world map from remotefortressreader.cpp
2015-08-14 15:36:36 +05:30
22374e6d86
Fixed remotefortressreader.cpp DF version detection.
2015-08-13 15:59:15 +05:30
e4ac25d1e0
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-08-13 11:26:33 +05:30
a60c8d8e7c
Added conditionals to remotefortressreader.cpp to make compiling for v 0.24.11 easier.
2015-08-13 11:25:59 +05:30
05f36856f4
fix-unit-occupancy: Always provide feedback when running command
2015-08-10 11:30:21 -04:00
9b5f42e3a9
tweak farm-plot-select: Only show controls when plots are fully built
...
Fixes #521
2015-08-10 10:41:47 -04:00
fcd15bfd73
Move vshook plugin to title-version and enable by default
2015-08-09 13:37:26 -04:00
bce9d98633
New plugin: fix-unit-occupancy (fixes bug 3499)
2015-08-07 14:33:38 -04:00
44287fc3a0
remotefortressreader: Check map validity before reading map info
...
Fixes JapaMala/armok-vision#5
2015-08-06 13:42:13 -04:00
090f542d49
Allow for per-plugin compile flags
2015-08-06 13:33:53 -04:00
bc5b46dce0
Merge pull request #660 from lethosor/jsoncpp
...
Replace jsonxx with jsoncpp
2015-08-06 12:37:51 -04:00
e02815dc30
Fix manipulator crash when selecting from empty custom profession list
2015-07-31 16:46:00 -04:00
01e04c24c5
Use a separate lua state in dwarfmonitor render hook
2015-07-31 14:25:33 -04:00
d02e67267a
Replace jsonxx with jsoncpp
2015-07-29 15:50:33 -04:00
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
4e45cc5bbb
stocks: Use ^ and $ to match the beginning/end of item names
...
Closes #624
2015-07-29 13:44:32 -04:00
7fc682b199
Fix dismissal of current screen when zooming to items
2015-07-29 11:22:38 -04:00
825d46af51
Move ListColumn class to a separate header
2015-07-28 21:48:00 -04:00
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
b73e859a37
Reorganize stocks viewscreen to fit a 25-row resolution
2015-07-28 14:37:49 -04:00
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
c3c625e7bd
Remove embark-tools nano (implemented in 0.40.24)
2015-07-27 18:22:18 -04:00
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
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
ed3cbe2e60
Add several trade-related confirmations
2015-07-27 10:05:59 -04:00
35f229c578
Add confirmations for hauling route/stop deletion and depot removal
2015-07-27 10:05:59 -04:00
175edf501a
Add "confirm" plugin - implements a few confirmation dialogs
...
See #577
2015-07-27 10:05:59 -04:00
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
6c55164be4
Fix a potential crash in tweak farm-plot-select
...
Related to #396
2015-07-24 10:54:59 -04:00
867e78b6fd
Correctly identify ice material.
2015-07-04 09:22:41 +05:30
87b1524aec
search: give text input priority over cursor keys
2015-06-30 16:45:45 -04:00
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
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
3795edb673
Fix colors in 'tweak kitchen-prefs-color'
2015-06-27 09:54:31 -04:00
4246dbd02a
New tweak: kitchen-prefs-color
...
Disabled in default dfhack.init to avoid confusion
2015-06-26 23:19:53 -04:00
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
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
c9f7fcfd05
Merge pull request #640 from lethosor/search-look-list
...
Add look menu search
2015-06-22 08:44:34 -04:00
33cb5e951f
Fixed whitespace and returns.
2015-06-22 18:01:19 +05:30
a071f5bf6c
Added preliminary building list to remotefortressreader. Untested.
2015-06-22 00:40:17 +05:30
96640c837f
Made remotefortressreader send an item list, and the item that constructions are made from.
2015-06-20 22:17:35 +05:30
4182a30cc5
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-06-19 23:30:47 +05:30
4b05423e58
Made remotefortressreader send proper indices for inbuilt materials.
2015-06-19 23:28:32 +05:30
a8480070a0
Add look menu search
2015-06-16 20:36:19 -04:00
81cba0b0fc
Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop
2015-06-16 19:56:16 -04:00
8145a04944
dwarfmonitor: Add mouse cursor widget
...
Suggested by @ragundo
2015-06-15 13:42:29 -04:00
7581bda7d5
Update dwarfmonitor documentation and NEWS
2015-06-13 21:50:15 -04:00
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
9a262ad013
Travis compliance
2015-06-13 14:19:14 -04:00
d4c7cd2a4e
Update autohauler.cpp
2015-06-13 14:08:42 -04:00
2d121caabc
Allow searching noble suggestions in liaison meetings
...
Closes #622
2015-06-11 21:37:58 -04:00
09db800f3d
Change tabs to spaces
2015-06-11 12:50:00 -04:00
eef9f49ae8
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-06-11 21:51:03 +05:30
cf13b677b6
Added all main tile flags to the list of sent stuff.
2015-06-11 21:49:42 +05:30
84b0b48028
dwarfmonitor: Allow weather indicator to be configured separately
2015-06-10 23:09:01 -04:00
eabcee38e5
dwarfmonitor: Get rid of "Clear" weather indicator
2015-06-10 23:05:33 -04:00
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
0f1adeb3e7
Update stonesense
2015-05-17 12:47:43 -04:00
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
a577248a38
Make memview output more readable
2015-05-09 19:41:13 -04:00
6eb929b306
Move JSON files out of hack/ folder
2015-05-09 16:04:15 -04:00
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
d0ba6d7019
Fix tweak fps-min
2015-05-08 17:35:46 -04:00
9c404a535d
Make search plugin intercept MOVIES and HELP keys
2015-05-08 16:27:52 -04:00
3001053cef
Change tabs to spaces.
2015-05-07 21:51:03 -07:00
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
3da939bb02
Change tabs to spaces.
2015-05-07 20:41:11 -07:00
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
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
a1fd1d9219
Document dwarfmonitor and allow date format to be modified
2015-04-19 12:38:37 -04:00
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
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
9b6d8d2799
Allow dev plugins to be skipped on startup
2015-04-01 17:50:22 -04:00
82d72007fc
Move zoom-related commands to a separate dev plugin
2015-04-01 17:24:52 -04:00
7913517b2c
Add "nyan stop" command
2015-04-01 17:02:33 -04:00
6779849bc6
This requires a return value in Windows, and really should have one anyway.
2015-03-29 14:21:59 -04:00
88c3a629d5
Fix vshook
2015-03-26 19:27:22 -04:00
f8d8baef39
Remove explicit tokens and use ENUM_KEY_STR for profession templates
2015-03-25 15:04:52 -04:00
d182b6c1c3
only create the stocksettings directory when it is requested
2015-03-24 17:46:49 -05:00
a5b2b92b30
Merge remote-tracking branch 'eswald/stockflow' into develop
2015-03-24 16:05:48 -04:00
ff38a60d56
Merge remote-tracking branch 'lethosor/ui-tweaks' into develop
2015-03-24 15:53:36 -04:00
4fac0aff0d
Fix compile: missing include in plugins/manipulator.cpp.
2015-03-24 12:25:50 -04:00
4f963233f4
Enticing the bookkeeper to work more often
2015-03-20 19:23:04 -06:00
caed509d0b
Simply maniuplator professions by adding the text token to the SkillColumn entries
2015-03-19 03:30:03 -04:00
23707db1d3
Fixed ballistic arrow head orders
2015-03-15 16:38:59 -06:00
6bfaa8d35d
Better way to handle obsolete job types.
2015-03-15 16:37:35 -06:00
81c2a6e79f
Refactoring a table insert into reaction_entry.
2015-03-15 16:02:29 -06:00
11d65b4f2d
Always clear reactions when loading.
...
This removes a minor potential for memory leaks.
2015-03-15 15:43:46 -06:00
d18bd3e2a5
Preventing a stockflow error message in Arena mode
2015-03-15 14:08:47 -06:00
3639920a50
Merge pull request #575 from lethosor/game-type
...
Add gametype checks to World module
2015-03-13 22:25:37 -04:00
48b7c51027
Merge pull request #574 from melkor217/master
...
Negative autolabor pool size uses most unskilled dwarves.
2015-03-10 19:58:18 -04:00
0c5b5c691a
Use gametype checks in plugins
2015-03-09 20:17:18 -04:00
c2eba99cb9
Create professions folder if necessary
2015-03-05 16:57:58 -05:00
efa9224eef
Merge remote-tracking branch 'lethosor/manipulator-expansion' into develop
2015-03-05 16:55:30 -05:00
6f276ac419
Shorten option width to stay within 80 columns
2015-03-05 16:48:11 -05:00
4c06e022a6
Negative autolabor pool size uses most unskilled dwarves.
2015-03-06 00:47:18 +03:00
be2349d67d
Revert "Expose manipulator columns to Lua"
...
This reverts commit 1d8b2d8cea
2015-03-05 16:32:57 -05:00
8459959124
Add fps-min to dfhack.init-example and plugin help
2015-03-05 16:29:36 -05:00
83cb7b48f9
Add "fps-min" tweak and allow onupdate-based tweaks
2015-03-04 19:03:39 -05:00
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
499ac05ad3
Merge pull request #569 from Fukken-Saved/master
...
Small update (autohauler)
2015-03-04 15:08:52 -05:00
7a26e633e9
Update autohauler.cpp
2015-03-04 07:06:24 -05:00
36cee730f1
Update autohauler.cpp
2015-03-04 06:59:29 -05:00
0b912f54be
Fix field name in lua/stockflow.lua
...
From DFHack/df-structures#39
2015-03-01 17:32:25 -05:00
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
1ebb1f1d11
Add current job as a view mode in manipulator
2015-02-28 17:09:58 -05:00
87867b96b9
Add autohauler to plugins/CMakeLists.txt
2015-02-27 23:18:26 -05:00
fdfebf4d4e
Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop
2015-02-27 23:15:49 -05:00
cdf211d437
Merge remote-tracking branch 'PeridexisErrant/autobutcher-export' into develop
2015-02-27 23:13:06 -05:00
64123d8fea
Merge remote-tracking branch 'warmist/dev_building_hacks' into develop
2015-02-27 23:09:56 -05:00
ac5909ad2a
Update autohauler.cpp
...
Some small text changes
2015-02-25 07:47:15 -05:00
a228977976
Update autohauler.cpp
...
Final whitespace fixes?
2015-02-25 07:26:54 -05:00
53c88bab56
Update autohauler.cpp
2015-02-25 07:22:25 -05:00
68d088eeb5
Revert "Add autohauler plugin to cmakelist"
...
This reverts commit a13c9b0310
2015-02-25 07:13:29 -05:00
6e0c7d6a4e
Revert "whoops"
...
This reverts commit 5f498b1b78
2015-02-25 07:13:09 -05:00
2549f116a0
Custom Profession Templates in manipulator!
2015-02-24 15:51:24 -05:00
c2c8ae6a44
Add current job as a view mode in manipulator
2015-02-24 15:51:24 -05:00
1d8b2d8cea
Expose manipulator columns to Lua
2015-02-24 15:50:27 -05:00
70824ade14
Allow shift to extend selection
2015-02-24 15:50:27 -05:00
e2d7a7395e
Add several additional format options
...
Also set do_refresh_names and call calcIDs() when needed
2015-02-24 15:50:27 -05:00
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
5a92080cc1
Add various ID formatting options, allow editing a single dwarf
2015-02-24 15:50:27 -05:00
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
21e96ba369
Implement batch operation callbacks and a basic string formatter
2015-02-24 15:50:26 -05:00
dd17f90dcd
Add a flag to allow mouse clicks to select ListColumn items
2015-02-24 15:50:26 -05:00
9d600f00a0
Add batch operations menu
2015-02-24 15:50:26 -05:00
990ab9c76b
Typecast nullptr in ListColumn::getFirstSelectedElem()
2015-02-24 15:50:26 -05:00
481e5cc19e
Implement dwarf selection
2015-02-24 15:50:25 -05:00
17fda7ffa0
Fixed whitespace.
2015-02-24 20:28:49 +02:00
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
cebfa603e0
Update isoworld, stonesense
2015-02-22 16:51:37 -05:00
5f498b1b78
whoops
2015-02-22 14:45:15 -05:00
a13c9b0310
Add autohauler plugin to cmakelist
2015-02-22 14:43:08 -05:00
250bc0a58d
Autohauler - An alternative to Autolabor
2015-02-22 14:41:45 -05:00
100fce0419
Update submodules
2015-02-21 23:06:15 -05:00
6a64525284
Include a ruby library for OS X
...
See #560
2015-02-21 21:53:08 -05:00
d7897caec7
Display a more user-friendly error message when the ruby library is not available
2015-02-21 21:50:25 -05:00
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
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
2921879be8
Improve error detection and only list creatures when necessary
2015-02-17 14:33:58 -05:00
645c2a7f86
Make catsplosion work on any specified creature(s)
...
Also add a "list" option
2015-02-17 14:16:50 -05:00
3750b8c589
Add "DFHack" indicator to trackstop menus
2015-02-17 14:13:53 -05:00
661eacf223
Always show trackstop menus when visible
2015-02-17 14:13:37 -05:00
f2461254d4
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-02-17 22:52:39 +05:30
8423710c2f
Made remotefortressreader.cpp return a specified number of map blocks, spiraling out from the center.
2015-02-17 22:51:33 +05:30
bc505952a3
Change autobutcher export format a little
2015-02-17 14:15:33 +11:00
b7f15ef2d6
Update xml, stonesense for 0.40 ui_advmode_menu changes
...
Closes #552
2015-02-16 19:10:15 -05:00
9ef25f33a9
Update submodules (whitespace changes)
2015-02-14 23:28:16 -05:00
10cfef0553
Fix whitespace issues
2015-02-14 22:53:06 -05:00
3f9d3dc110
Use unix line endings in isoworldremote.proto
2015-02-13 15:14:31 -05:00
5dab36948a
Merge branch 'master' of https://github.com/JapaMala/dfhack into develop
2015-02-13 19:55:00 +05:30
6e7b543414
Added liquids
2015-02-13 18:38:02 +05:30
8e8f88f3db
initflags: Remove debug output
2015-02-09 22:01:12 -05:00
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
9c4dbea392
Re-enabled fix-armory plugin
2015-02-09 00:22:19 +02:00
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
43d6a7b5d4
tradereq-pet-gender: Fix MSVC build error
2015-02-08 09:33:37 -05:00
50770f8cdd
Clean up whitespace in zone.cpp
2015-02-06 19:13:34 -05:00
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
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
69dfec88cb
Merge remote-tracking branch 'dfhack/develop' into develop
2015-02-03 01:12:34 -05:00
5a93de3f31
New tweak (tradereq-pet-gender): Displays pet genders on trade agreement screen
...
Closes #515
2015-02-02 10:04:31 -05:00
e5e0d93ef1
Added modtools/reaction-product-trigger.
2015-02-02 02:39:05 -05:00
e34178e367
Fix add-spatter crash
...
Hopefully fixes #205
2015-02-01 21:31:05 -05:00
5b3e5b533e
Make zone compile on Windows.
2015-01-31 21:04:12 -05:00
e9b4fc513a
Merge remote-tracking branch 'cdombroski/zone-plugin-cleanup' into temp
...
Conflicts:
NEWS
plugins/zone.cpp
2015-01-31 21:01:41 -05:00
1d8fd55a4a
Merge remote-tracking branch 'cdombroski/dfhack-484' into develop
...
Conflicts:
NEWS
2015-01-31 20:22:17 -05:00
6b2e7cfe3e
Merge pull request #511 from lethosor/stocksettings-create-dir
...
Create `stocksettings` directory on startup
2015-01-31 20:17:22 -05:00
ab01e7d102
Eventful no longer requires LUA_HOOK to do reaction events.
2015-01-31 20:10:06 -05:00
f608235b1e
Fix some Lua things
2015-01-29 19:56:50 -05:00
f2eec3198c
Rename findPenPitAtCoord
2015-01-29 15:02:54 -05:00
48b6cf1beb
Export functions to Buildings.h
2015-01-29 13:57:50 -05:00
4199728ba6
Cleanup building methods before extracting to Buildings.h
2015-01-29 13:57:50 -05:00
c179f5b913
Extract some stuff from zone.cpp to plugins/Units.{h,cpp}
2015-01-28 21:28:32 -05:00
789cc01e93
Remove gcc warnings
2015-01-28 21:28:32 -05:00
10ec5f1330
Use auto to reduce vector iteration redundancy
2015-01-28 21:17:37 -05:00
5f9fe871b3
Add isGelded() to the priority butcher checks
...
Fixes #484
2015-01-28 21:17:37 -05:00
26ad797c43
isGelded function
2015-01-28 21:17:37 -05:00
58f896d569
Create `stocksettings` directory on startup
2015-01-26 16:28:57 -05:00
ae2e4f99eb
Merge branch 'develop' of https://github.com/DFHack/dfhack
2015-01-19 20:02:19 +05:30
8efac385cc
changed tile direction to a string, rather than a hard to understand int.
2015-01-19 19:58:09 +05:30
53a8032f8a
Fix compile of blueprint plugin on Linux.
2015-01-16 03:27:14 -05:00
06c4755168
Merge branch 'blueprint' of https://github.com/cdombroski/dfhack into temp
...
Conflicts:
NEWS
Readme.html
2015-01-15 22:45:57 -05:00
da2224b0ba
Changed how parameters are parsed.
2015-01-14 14:58:15 -05:00
106612f386
Use alternate qf syntax for output.
2015-01-14 14:08:54 -05:00
d0273b8eff
Now puts room designations in the query blueprint
2015-01-13 16:15:54 -05:00
f315ee43a4
Added stockpiles
2015-01-13 14:28:28 -05:00
3489c2f39a
Buildings complete
2015-01-13 09:40:24 -05:00
3e91d34ab3
remotefortressreader.cpp only sends map changes now.
2015-01-11 16:16:53 +05:30
ea313b6bf5
plugins/blueprint.cpp: Buildings hopefully
2015-01-09 16:00:47 -05:00
aa332e18e2
Remove stray whitespace
2015-01-08 16:59:37 -05:00
859fdd60d6
annoucnement -> announcement
2015-01-08 16:59:25 -05:00
b627240943
Dig mode complete
2015-01-08 12:17:18 -05:00
819327348b
Blueprint plugin basic structure
...
It should be able to load and make empty blueprint files.
2015-01-08 08:28:54 -05:00
c39cf1fb49
Add room assignment search
2015-01-05 21:09:30 -05:00
448404a465
Fix buildingplan stuff on Windows.
2015-01-05 20:02:54 -05:00
1519d8e9ea
Disable fortplan and buildingplan for now because it doesn't compile on Windows.
2015-01-05 19:34:01 -05:00
cd64fb84b7
Make fortplan use Filesystem::getcwd()
2015-01-05 17:37:41 -05:00
f451cfb3a5
Merge remote-tracking branches 'cdombroski/autobutcher' and 'cdombroski/siren.lua'
...
Also update NEWS
2015-01-05 16:59:08 -05:00
67f0aa774c
Merge remote-tracking branch 'lethosor/tweaks-2'
...
Conflicts:
NEWS
2015-01-05 16:54:24 -05:00
e9fd8cf231
Merge remote-tracking branch 'lethosor/embark-tools-mouse'
...
Also update NEWS
2015-01-05 16:53:06 -05:00
0c768796e2
Merge remote-tracking branch 'danaris/fortplan'
...
Conflicts:
plugins/buildingplan.cpp
2015-01-05 16:47:35 -05:00
7da9ab8f80
Merge remote-tracking branch 'lethosor/0.40.22-plugins'
...
Also update NEWS
2015-01-05 16:37:34 -05:00
1d0b4deef6
Merge remote-tracking branch 'eswald/trackstop'
...
Conflicts:
NEWS
2015-01-05 16:22:18 -05:00
ad6b19f1b2
Merge remote-tracking branch 'PeridexisErrant/needs_porting-cleanup'
...
Conflicts:
NEWS
2015-01-05 16:21:24 -05:00
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
ca0860c3bd
Merge remote-tracking branch 'lethosor/plugin-globals'
2015-01-05 16:05:40 -05:00
929f63ee2e
Fix error in WatchedRace::SortUnitsByAge
2015-01-05 15:57:34 -05:00
c069a87b47
Update isGay(df::unit) with better determination
2015-01-05 14:59:32 -05:00
1cdf61908e
Collapse ProcessUnits_* methods.
2015-01-05 14:25:44 -05:00
084bbc3162
Add isGay(df::unit*) method
2015-01-05 13:54:17 -05:00
5626bb8da7
layer and vein materials were being set wrong.
2015-01-04 19:05:48 +05:30
47d6e111c8
New tweak: "max-wheelbarrow"
2015-01-01 14:36:49 -05:00
ffac2f1795
New tweak: "eggs-fertile"
2015-01-01 13:48:11 -05:00
cade0d9723
Add local area mouse controls to embark-tools
2015-01-01 11:06:50 -05:00
c373e57c02
Added world names.
2014-12-31 17:50:43 +05:30
efc42c253e
Fix remaining issues with mousequery
2014-12-27 11:03:06 -05:00
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
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
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
bc58b0a822
Added map location to info.
2014-12-17 19:42:40 +05:30
0b7f890d87
Trackstop bugfix: No longer prevents cancelling building removal.
...
Thanks to Ramblurr for pointing this out.
2014-12-16 21:10:18 -07:00
cc5a78f848
Added function to get the map size, and fixed a stupid material bug.
2014-12-17 08:40:29 +05:30
5fc8a1f51f
digFlood CLEAR error.
2014-12-15 13:41:22 -05:00
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
6982de88bd
Added very basic viewport size and position sending.
2014-12-12 21:04:23 +05:30
d11df5b87f
Added a simple unit listing to remotefortressreader.cpp. Updated stonesense.
2014-12-11 20:10:49 +05:30
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
09681cf029
Update skeleton plugin
2014-12-06 20:55:57 -05:00
88b51fcb5b
Allow strangemood to work if debug_nomoods is not available
2014-12-06 20:29:08 -05:00
a615723b38
Update remaining plugins to use REQUIRE_GLOBAL
2014-12-06 19:30:05 -05:00
5de3e6110a
Merge remote-tracking branch 'origin/develop' into plugin-globals
2014-12-06 17:32:44 -05:00
b9a2ecb440
stockpiles: properly initialize quality arrays
...
Props to @fricy for identifying this bug.
2014-12-05 17:39:29 +01:00
b0e0bbda9b
stockpiles: show proper cased names in filter list
2014-12-05 16:53:19 +01:00
52f4cb3fc1
stockpiles: load prompt uses typing + filtering
2014-12-05 14:49:40 +01:00
332566f6a1
stockpiles: disable gui/script when plugin is disabled
2014-12-05 13:27:58 +01:00
0f06eb7f6f
stockpiles: quiet debug
2014-12-05 12:42:59 +01:00
346f397bca
stockpiles: fix loading crash
2014-12-05 12:35:24 +01:00
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
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
1525823948
Create stocksettings directory on startup if necessary
2014-12-05 12:35:24 +01:00
b6118d272c
stockpiles: integrate gui plugin into dfhack.init-example
2014-12-05 12:35:24 +01:00
1cde8cffa4
stockpiles: implement GUI controls
2014-12-05 12:35:19 +01:00
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
19e977528c
Merge branch 'autolabor-artisans' of https://github.com/pkdawson/dfhack into develop
...
Conflicts:
NEWS
2014-12-04 23:49:13 -05:00
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
cac2245438
Update some plugins to use REQUIRE_GLOBAL
2014-12-03 23:26:54 -05:00
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
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
2d7ea52c40
Clarify autolabor initialization failure
2014-12-02 17:58:30 -05:00
e3c13fc555
Add gelding to autolabor and manipulator
2014-12-02 17:30:16 -05:00
7859da7d77
Update stonesense.
2014-11-30 12:31:29 -05:00
921f0dd06a
Merge remote-tracking branch 'quietust/develop' into develop
2014-11-30 11:31:59 -05:00
9dbe639919
Merge pull request #402 from Ramblurr/stockpiles
...
plugin: Stockpile Settings Serialization
2014-11-28 23:15:46 -05:00
a6ae6d4c28
autolabor: Fix compile on Windows.
...
VC10 wants an explicit return type for lambdas.
2014-11-28 00:55:26 +01:00
794e1ee6f0
autolabor: Document and improve the talent pool parameter.
2014-11-27 21:13:20 +01:00
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
8b1b32a499
autolabor: Add a talent pool parameter.
2014-11-27 15:56:14 +01:00
d352d0f42d
stockpiles: remove dependency on full protobuf
2014-11-27 14:23:54 +01:00
de919050b1
Revert "install the full protobuf library"
...
This reverts commit 443a9676e1
2014-11-27 13:40:11 +01:00
7cbb1ed043
Revert "use full protobuf library project wide"
...
This reverts commit f100d30f56
2014-11-27 13:39:30 +01:00
b6f5bcb7dc
stockpiles: fix compilation on windows
...
VS2010 only supports a subset of C++11
2014-11-27 13:28:17 +01:00
445640f80c
Allow commands invoked through command-prompt to access selected items/units/buildings
...
Fixes #273
2014-11-25 20:25:31 -05:00
84d24ca13f
Fix Hold->HoldTerrain, also use a proper fix for Attack
2014-11-25 11:30:25 -06:00
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
063b669f6b
stockpiles: cleanup output and add docs
2014-11-22 18:57:56 +01:00
00c1676744
stockpiles: correct typo
2014-11-22 18:54:22 +01:00
e599f4b1e1
stockpiles: more user documentation
2014-11-22 18:33:49 +01:00
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
869a92dfc5
stockpiles: handle all metals and stones
2014-11-22 18:33:49 +01:00
0e8832f05d
stockpiles: overwrite existing files
2014-11-22 18:33:49 +01:00
f1ce575be3
stockpiles: animals list still shown even when disabled
2014-11-22 18:33:49 +01:00
4f2851199e
stockpiles: handle animal cages and prepared meals
2014-11-22 18:33:49 +01:00
e525b47815
stockpiles: make gem other mats more robust
2014-11-22 18:33:49 +01:00
eb3a71c739
stockpiles: fix finished goods quality
2014-11-22 18:33:48 +01:00
12b27e09bb
stockpiles: handle furniture sand_bags field
2014-11-22 18:33:48 +01:00
98a1278128
stockpiles: fix quality unserialization
2014-11-22 18:33:48 +01:00
cc1e4d16a2
stockpiles: allow loading without file extension
2014-11-22 18:33:48 +01:00
e66732f731
stockpiles: add missing protobuf field
2014-11-22 18:33:48 +01:00
79c65e0fcf
stockpiles: fix male/female creature mat lookups
2014-11-22 18:33:48 +01:00
44af084e8e
stockpiles: import from disk and write to memory
2014-11-22 18:33:48 +01:00
543a88d03d
stockpiles: pass correct filename
2014-11-22 18:33:48 +01:00
c251aeabe3
stockpiles: add optional debug output
2014-11-22 18:33:48 +01:00
86ba81a3a9
stockpiles: format with ANSI style and 4 spaces
2014-11-22 18:33:48 +01:00
a4d19070e8
stockpiles: write some documentation
2014-11-22 18:33:48 +01:00
f7ed821ef9
stockpiles: serialization complete
...
* working file import/export
2014-11-22 18:33:48 +01:00
224a19295d
stockpiles: serialize through weapons+trap components
...
* generalize itemdefs
2014-11-22 18:33:48 +01:00
25f6c440d8
stockpiles: serialize through cloth
2014-11-22 18:33:47 +01:00
d74ac1b3a6
stockpiles: serialize through leather
...
* more code reuse!
2014-11-22 18:33:47 +01:00
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
dc5f0fed1a
stockpiles: serialize ammo and coins
2014-11-22 18:33:47 +01:00
d167b3f385
stockpiles: basic serialization for animals - stone
2014-11-22 18:33:47 +01:00
443a9676e1
install the full protobuf library
...
required to access text_format (needed by stockpiles plugin)
2014-11-22 18:33:47 +01:00
ebb1345332
stockpiles: add settings protobuf message format
2014-11-22 18:33:47 +01:00
4922c36ada
Prevent farm-plot-select from selecting crops when no crops are listed
...
Fixes #396
2014-11-18 19:57:29 -05:00
889bd06ffc
ruby: fix windows platform detection
2014-11-16 13:00:38 +01:00
9fd6e9f03c
Expand dwarfmonitor weather indicator
2014-11-15 17:29:19 -05:00
bc73319333
Make rain indicator LIGHTBLUE for better visibility
2014-11-15 16:39:19 -05:00
9b0d0eba45
Merge remote-tracking branch 'falconne/plugin_dwarfmonitor' into update-falconne-plugins
2014-11-15 16:36:35 -05:00
4513fa4ab2
Merge remote-tracking branch 'falconne/plugin_stocks' into update-falconne-plugins
2014-11-15 16:34:59 -05:00
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
f7fcb342ed
Fix buildingplan compiling with GCC
2014-11-15 16:21:47 -05:00
578ac08999
Merge remote-tracking branch 'falconne/plugin_buildingplan' into update-falconne-plugins
2014-11-15 16:18:00 -05:00
3c1e07252b
Update autotrade stockpile controls
2014-11-15 16:16:32 -05:00
d62305b69e
Merge remote-tracking branch 'falconne/plugin_autodump' into update-falconne-plugins
...
Conflicts:
plugins/autotrade.cpp
2014-11-15 15:56:44 -05:00
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
8042c5d342
ruby: load arch-specific ruby-autogen
2014-11-14 12:49:08 +01:00
696380e749
ruby: distinguish ruby-autogen.rb name based on architecture
2014-11-14 12:47:42 +01:00
e2229f6a6a
ruby: remove DL_RUBY cmake option
2014-11-14 12:38:24 +01:00
be1d411b83
Add missing <functional> include for std::greater
2014-11-09 11:19:51 +01:00
1b0a2ecb8a
Merge remote-tracking branch 'eswald/tradescreen' into develop
...
Conflicts:
NEWS
2014-11-09 00:42:50 -05:00
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
267d0837ad
Merge pull request #381 from lethosor/update-cmakelists
...
Re-enable rendermax in CMakeLists.txt
2014-11-09 00:34:23 -05:00
7929d44030
Merge pull request #382 from PeridexisErrant/autolabor-fixes
...
Autolabor fixes
2014-11-09 00:33:46 -05:00
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
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
2484f89542
Update dwarfmonitor's happiness display
2014-11-08 15:08:56 -05:00
04ceb64bad
Merge remote-tracking branch 'origin/develop' into mousequery-z-level-fix
...
Conflicts:
NEWS
2014-11-08 14:36:20 -05:00
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
ec580cdfa5
Re-enable rendermax in CMakeLists.txt
2014-11-07 16:43:50 -05:00
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
46ebeaa722
Adding Shift-Up to the fast-trade tweak.
2014-11-06 22:22:02 -07:00
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
777b2f6416
Moving trade screen search options to match the new column size
2014-11-06 22:05:05 -07:00
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
2ebc318daa
Removing autotrade's obsolete Mark All
2014-11-06 21:47:14 -07:00
e9e8b83656
Update stonesense.
2014-11-05 20:57:57 -05:00
b81346fa21
Merge pull request #349 from lethosor/tweak-reorganization
...
'tweak' plugin cleanup/reorganization, new tweaks
2014-11-02 12:24:41 -05:00
5232bffb53
farm-plot-select: Actually check for crop validity
2014-11-02 12:21:51 -05:00
29d6bba669
Fix trackstop ambiguity complaints, update df-structures.
2014-11-02 11:55:01 -05:00
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
87443035a9
Merge remote-tracking branch 'quietust/develop' into develop
...
Conflicts:
plugins/manipulator.cpp
2014-11-02 04:05:51 -05:00
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
bfac2b97cc
Merge pull request #352 from eswald/trackstop
...
New trackstop plugin
2014-11-02 03:34:22 -05:00
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
6c356b5ae9
Merge pull request #359 from lethosor/embark-tools-oo-pr
...
embark-tools cleanup
2014-11-02 03:30:38 -05:00
0fa2cab5ac
Merge pull request #360 from eswald/automelt
...
Faster automelt
2014-11-02 03:29:01 -05:00
0fd15cc1e4
Merge pull request #365 from eswald/stable-sorting
...
Stable sorting for Dwarf Manipulator
2014-11-02 03:26:14 -05:00
49939ccb9c
Merge pull request #369 from warmist/fix-rendermax
...
Update rendermax
2014-11-02 03:25:04 -05:00
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
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
f08a32f4e2
Update Manipulator to display stress level instead of happiness
2014-10-31 13:33:35 -05:00
ed225de365
Update strangemood to check stress level for fell/macabre moods
2014-10-31 13:33:18 -05:00
f683395cae
Comment out more of military-training tweak, which no longer compiles
2014-10-31 13:33:04 -05:00
d05f249619
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-10-31 13:32:49 -05:00
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
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
ac73c0eeba
Allowing non-labor skills to sort stably.
2014-10-21 22:49:50 -06:00
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
f3626c1004
embark-tools cleanup
...
Fix #358 : Disable "s" keybinding for settings on notes screen
2014-10-12 13:35:20 -04:00
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
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
aafa3a5f91
Expanding on the rollers menu.
...
As requested by fricy.
2014-10-02 22:00:40 -06:00
d2fb51f99e
New tweak: nestbox-color
2014-10-01 20:14:41 -04:00
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
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
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
425d81ea2d
New tweak: civ-view-agreement
2014-09-28 13:13:53 -04:00
da72848b0b
Fixes for fastdwarf combat speed and attack retargeting.
2014-09-27 19:47:27 -05:00
d34b22b2c2
New tweak: farm-plot-select
2014-09-27 19:56:31 -04:00
999d265d50
New tweak: import-priority-category
2014-09-27 18:14:25 -04:00
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
e46a27c8a4
Switching automelt to the stockpile iterator.
2014-09-27 11:07:26 -06:00
eed684a8df
fix superdwarf
2014-09-26 11:39:05 +02:00
0766538ecd
ruby: add df.print_color(col, string)
2014-09-25 15:53:03 +02:00
1a38c72763
ruby: add stl-fstream to codegen
2014-09-25 13:19:00 +02:00
beb5216640
Fix selection behavior of mousequery on lowest z-level
2014-09-24 17:48:49 -04:00
c894346639
ruby: call RUBY_INIT_STACK
2014-09-19 21:38:22 +02:00
d75c01b0ff
merge git://github.com/hobotron-df/dfhack
2014-09-19 21:37:28 +02:00
e6901a87d3
Update to 0.40.13 structures and fix compilation.
2014-09-19 00:05:15 +04:00
c927f0fa3c
Merge remote-tracking branch 'lethosor/patch-5'
2014-09-16 17:25:28 -04:00
fde49176fe
Merge remote-tracking branch 'lethosor/update-search-keys'
2014-09-16 17:23:45 -04:00
040acd166b
Merge remote-tracking branch 'eswald/automelt'
...
Conflicts:
dfhack.init-example
2014-09-16 17:20:50 -04:00
a225984bc5
Merge remote-tracking branch 'eswald/hotkeys'
2014-09-16 17:11:15 -04:00
5a1d88307f
Merge remote-tracking branch 'eswald/stockpile-iterator'
2014-09-16 17:05:02 -04:00
1ea1b50790
job_material_category -> dfhack_material_category
...
Fixes #330 - submitted by @finndibaenn
2014-09-14 11:13:26 -04:00
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
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
8bc2f02aee
Moving the automelt hotkey next to autotrade.
2014-09-09 20:51:58 -06:00
757491f112
Add automelt plugin
2014-09-09 20:31:55 -06:00
07de1ce3f6
Add hotkeys plugin
2014-09-08 22:42:04 -06:00
4800794ba6
Merge remote-tracking branch 'dfhack/develop'
2014-09-08 13:23:28 -04:00
f5039b37b8
Merge remote-tracking branch 'lethosor/osx-plug-dylib'
...
Conflicts:
NEWS
2014-09-08 13:14:28 -04:00
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
52d0f1c3f6
Merge remote-tracking branch 'lethosor/autotrade-usage-newline'
2014-09-08 13:00:11 -04:00
0f311a7606
Removing dead duplicate code.
2014-09-07 15:11:11 -06:00
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
1ce07c063d
Canonical way to find the stockpile by id.
2014-09-07 14:55:34 -06:00
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
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
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
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
cf06dc3503
Update to 0.40.11, fix a few devel plugins to build again
2014-09-04 08:26:45 -05:00
92946e5fbc
Minor reveal fix - only preallocate unreveal data for existing map blocks
2014-08-31 11:43:19 -05:00
9aee476c6e
Make plugins use ".plug.dylib" extension on OS X
2014-08-30 09:21:19 -04:00
76ecc9b347
Add newline to autotrade usage
...
Fixes #304
2014-08-30 08:47:37 -04:00
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
948fbb48f6
Updated stonesense
2014-08-29 18:45:25 +05:30
b98b6f61d2
Merge branch 'remote_reader' of github.com:JapaMala/dfhack into develop
2014-08-29 18:39:57 +05:30
96a0bd0de0
Added growth locations to the fake growth materials
2014-08-29 17:08:21 +05:30
79b572ba65
Update stonesense.
2014-08-29 05:26:07 -04:00
5c0588dd34
Merge pull request #299 from eswald/stockflow-40
...
Stockflow Repairs
2014-08-28 14:56:04 -05:00
f0c52a9a73
Merge pull request #289 from eswald/trade-search
...
Moving trade screen search lines
2014-08-28 14:54:00 -05:00
5ccd7dbb8f
Merge pull request #296 from lethosor/embark-tools-render
...
embark-tools fix
2014-08-28 14:53:22 -05:00
8bfc0e93ec
Merge pull request #298 from eswald/stockpile-lines
...
Stockpile lines
2014-08-28 14:53:09 -05:00
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
17a23796c8
Fix embark-tools render() behavior
2014-08-25 13:08:11 -04:00
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
8495bddc2d
Removing an obsolete workaround
2014-08-23 17:46:35 -06:00
eb221e1165
Fix some blatant bugs in somebody else's additions to showmood
2014-08-21 15:23:05 -05:00
33f4f9fdcb
Update cleanmap to optionally also clean up item spatters such as leaves
2014-08-20 10:54:00 -05:00
ae80ca9ec9
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-08-20 10:32:59 -05:00
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
c95ad05a7e
Switching new stockpile menu keys from green to red.
2014-08-17 16:01:42 -06:00
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
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
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
2b59f0edca
Switching Mark/Unmark all hotkeys to red
...
Following the policy described in the Readme.
2014-08-17 12:38:13 -06:00
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
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
59e6607d8c
Merge remote-tracking branch 'warmist/dev_building_hacks' into develop
2014-08-16 10:26:24 -04:00
f04b93210a
Bug fixing.
...
Fixes for "tab" in hacked buildings.
2014-08-16 16:58:09 +03:00
6868cab1fe
Exposed dfhack.jobs.linkIntoWorld. Simplified eventful and gui.dwarfmode for sidebar use/creation.
2014-08-16 16:58:01 +03:00
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
287301b682
Update autolabor to work with 0.40
2014-08-15 14:12:57 -05:00
13bffed647
Update isoworld to a commit that actually exists
2014-08-15 09:44:52 -05:00
493dd47383
Updated df-structures and isoworld
2014-08-15 19:28:03 +05:30
5add8c433d
Merge branch 'develop' of github.com:DFHack/dfhack into remote_reader
...
Conflicts:
plugins/remotefortressreader.cpp
2014-08-15 19:15:00 +05:30
ebda2d8472
Fix ageItem to work correctly, and update XML
2014-08-15 08:13:15 -05:00
ce4d1db5a0
More removing unneeded fixes.
2014-08-15 04:23:54 -04:00
820839fa8d
Remove stuff that doesn't exist anymore from dfhack.init-example and documentation.
2014-08-15 03:03:25 -04:00
b2dc4bd104
autolabor doesn't load properly in windows.
2014-08-15 02:19:24 -04:00
c1ed62ad64
Merge branch 'develop' of git://github.com/DFHack/dfhack into develop
...
Conflicts:
plugins/stockflow.cpp
2014-08-14 22:49:37 -05:00
28d89db1fd
Merge pull request #275 from eswald/stockflow-40
...
Stockflow Improvements
2014-08-14 16:33:46 -05:00
cfefc23e6a
Add new labors to Manipulator
2014-08-11 15:21:24 -05:00
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
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
002bd5240b
Bump version to v0.40.07 and update find-offsets to new pressure plate UI.
2014-08-11 14:14:42 +04:00
0f99ea0ccb
ruby: fix spawn_liquid for 40.06
2014-08-11 01:11:46 +02:00
9d460d506e
Probably a fix to rendermax for 0.40.xx
2014-08-09 22:14:55 +03:00
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
756485c4db
Added support for getting a list of plant growths with fake material names.
2014-08-08 20:35:57 +05:30
55ebca4a7a
Plant immolate/extirpate no longer work, but create/grow are still good
2014-08-06 10:03:34 -05:00
9956b4a5ef
Update getplants, plants, and prospector, and isolate autochop
2014-08-06 09:31:42 -05:00
0463021823
Merge branch '0.40-plugin-updates' of github.com:lethosor/dfhack into develop
2014-08-06 08:27:29 -05:00
f34d68e567
Actual correct fix here
2014-08-05 20:28:09 -05:00
86c036b7d3
Add an extra check that was missing
2014-08-05 20:19:31 -05:00
1bcfcd36f6
Avoid buffer overrun on mouse clicks
2014-08-05 19:59:53 -05:00
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
19133ff327
Documenting the new Stockflow option.
2014-08-03 16:40:03 -06:00
1aba6a6739
Faster stockflow mode, ignoring the bookkeeper.
2014-08-03 15:14:20 -06:00
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
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
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
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
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
2928f15629
Update fastdwarf to work properly in 0.40
2014-08-01 08:45:23 -05:00
1450298484
assumed_identity -> identity
2014-07-29 16:30:22 -05:00
88dfb1faef
criminal_case -> crime
2014-07-29 16:27:16 -05:00
d6162cd189
death_info -> incident
2014-07-29 16:26:14 -05:00
bc5e0f6ad6
Made DFHack buildable. Also added plant proto definitions
2014-07-23 19:57:47 +05:30
e711605413
Some minor corrections
2014-07-21 13:26:34 -05:00
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
b598cbb0dd
Merge branch 'develop' of github.com:DFHack/dfhack into develop
2014-07-20 16:43:00 +05:30
216019e5af
Disconnected the RemoteReader values from the DF enums.
2014-07-17 17:46:00 +05:30
48e714b65b
Merge branch 'develop' of github.com:DFHack/dfhack into remote_reader
2014-07-15 17:50:11 +05:30
2d5ec9e45d
remotefortressreader can send over more info over the sockets.
2014-07-15 17:48:12 +05:30
0a16bc2e12
Merge remote-tracking branch 'origin/perSaveScripts' into scriptOrganization
...
Conflicts:
plugins/CMakeLists.txt
2014-07-07 09:01:07 -04:00
6652074644
Delete the syndromeTrigger plugin.
2014-07-03 09:03:26 -04:00
81c87d0921
EventManager: INTERACTION event for unit interactions.
2014-07-03 04:55:12 -04:00
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
e04ab11659
Merge branch 'develop' of github.com:DFHack/dfhack into develop
...
Conflicts:
library/xml
plugins/stonesense
2014-07-02 23:18:55 +05:30
d765de4546
Merge remote-tracking branch 'lethosor/lua-runcommand2' into scriptOrganization
2014-07-01 02:05:14 -04:00
fe875f7c02
Cleaned up eventful.lua.eventType.
2014-06-30 03:16:45 -04:00
c7636ae442
Deleted devel/printArgs because there's a script for that.
2014-06-30 02:56:07 -04:00
2894b406ac
Sorted devel CMakeList.
2014-06-30 02:54:15 -04:00
deb755fd57
Sorted the plugins CMakeList.
2014-06-30 02:51:23 -04:00
0aa2dc149f
Converted outsideOnly plugin to Lua script.
2014-06-30 02:21:58 -04:00
961d033ade
EventManager: unload event for convenience.
2014-06-29 10:03:55 -04:00
f88c176dd3
Removed autoSyndrome.
2014-06-29 06:16:52 -04:00
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
8e7e87ac73
Added UNIT_ATTACK event to EventManager and exposed it to Lua.
2014-06-28 02:31:34 -04:00
fc7ac9b47f
Update XML and sync plugin
2014-06-27 13:01:46 -05:00
92c4514286
Merge branch 'embarktools-finder' of git://github.com/lethosor/dfhack into develop
2014-06-26 17:22:56 +04:00
4f9479cce5
Fixed a bug where remotefortressreader was using min_x for min_z.
2014-06-25 18:49:00 +05:30
3c8ba091f2
Disable "stable position" when site finder is active
2014-06-24 10:08:50 -04:00
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
7313c18a2a
EventManager/eventful: added ON_REPORT event and exposed it to Lua.
2014-06-23 09:15:46 -04:00
9afc861a2a
syndromeTrigger: use DFHACK_PLUGIN_IS_ENABLED properly.
2014-06-23 09:14:56 -04:00
247bd212f3
Update stonesense.
2014-06-21 13:28:59 -04:00
3f717af0b7
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
...
Conflicts:
library/xml
2014-06-21 16:43:44 +05:30
f94fc5846d
outsideOnly: allow checking periodically in case a building was made outside and then became inside.
2014-06-20 19:48:56 -04:00
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
12d18ca64d
Fix compile issues on windows.
2014-06-19 22:32:02 -04:00
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
cca605d8b4
Prevent blank lines from being stored in history
2014-06-17 17:21:30 -04:00
0c144b821d
Reimplement command-prompt history
...
Also add shift-left/right for back/forward one word
2014-06-17 17:11:45 -04:00
1684eced8a
Remove (broken) command history
...
This reverts commit cc07a373f3
2014-06-17 12:45:57 -04:00
6f74d60521
Merge branch 'develop' into cmdprompt-lineedit
2014-06-17 12:33:04 -04:00
b8e7c8a946
Merge branch 'develop' into cmdprompt-lineedit
2014-06-17 12:28:46 -04:00
ce849312c7
remotefortressreader now can send over sets of MapBlocks
2014-06-17 21:47:16 +05:30
2db73a407d
Merge branch 'manipulator_show_squad' from git://github.com/pierredavidbelanger/dfhack.git into develop
2014-06-17 10:39:26 +04:00
86131781da
Merge branch 'dev-embarktools-pr' of git://github.com/lethosor/dfhack into develop
2014-06-16 14:03:28 +04:00
f9f865cb90
Fix a compile error and signed/unsigned mismatch warnings.
2014-06-16 14:02:48 +04:00
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
befab343a1
Add ability to auto allocate rooms to noble positions.
2014-06-15 16:19:15 +12:00
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
5999dc63da
Use setupdwarfgame field names
2014-06-10 17:30:02 -04:00
f534c91fb8
Fix screen handling
2014-06-10 12:48:46 -04:00
69c9353196
Merge branch 'develop' into tweak-confirm-embark
2014-06-10 12:43:03 -04:00
b11673e9b0
Use this instead of getCurViewscreen
2014-06-10 12:38:40 -04:00
088eff05e5
Merge branch 'develop' into dev-embarktools-pr
2014-06-10 12:08:43 -04:00
044f958551
Squad column and squad info in Dwarf Manipulator (manipulator plugin)
2014-06-09 21:58:16 -04:00
cc07a373f3
Command-prompt history
...
Creates duplicate entries occasionally
Also disabled movies
2014-06-09 19:38:21 -04:00
aafcd6c43a
Fix 4/6 behavior
2014-06-09 17:00:26 -04:00
055afafedc
command-prompt: Basic line editing
...
Left/right arrows, Ctrl-A, Ctrl-E
2014-06-09 16:50:06 -04:00
b1f73b791c
DwarfMonitor: Show current date and weather in border.
2014-06-07 15:12:19 +12:00
a1f9b1d1c4
Sync with structures change
2014-06-06 14:24:57 -05:00
c29d61dca2
Use INTERPOSE_NEXT in key_conflict
...
See comment on 0a1d87c09f
2014-06-06 14:59:23 -04:00
0a1d87c09f
confirm-embark: Make esc work again
2014-06-04 23:18:19 -04:00
f29d1886ff
tweak confirm-embark fixes
...
* Added a display of the total embark points remaining, for convenience
* Made 'esc' work by interposing key_conflict as well
* Rearranged to look more like DF's confirmations
2014-06-04 14:41:35 -04:00
5f611ec48b
Add automelt plugin
2014-06-04 22:18:40 +12:00
9ddbd49e28
Add stockpile autodump functionality
2014-06-04 22:01:17 +12:00
6ec0fd6589
New tweak: confirm-embark
...
Adds a confirmation when selecting [e]mbark on the "prepare carefully" screen.
Suggested in multiple threads on forums.
2014-06-03 18:29:13 -04:00
a7fd6c4783
Add embark-tools settings interface
2014-06-03 15:03:03 -04:00
23acf276b4
Silence warning C4800 on Windows
2014-06-03 08:58:31 -05:00
7de0b2dd39
Merge pull request #255 from quietust/develop
...
Fix problems with NONE for item types and subtypes
2014-06-03 08:44:19 -05:00
df244aa7a4
Disable mouse query when linking levers.
...
Update mousequery plugin version.
2014-06-03 12:59:55 +04:00
4034df3560
Fix incorrect plugin name in version check
2014-06-03 12:59:55 +04:00
63254df6dd
Fix obvious issues in stockflow.
...
- Duplicate definition of a function now in uicommon.h
- Assertion failure due to missing core suspend claim.
- Incorrect way of accessing the civ entity.
- Accessing nil objects in the lua module if filter matches nothing.
- Lua module breaking on reload('plugins.stockflow').
2014-06-03 12:57:45 +04:00
e7292379f7
Merge branch 'stockflow' of git://github.com/eswald/dfhack into develop
2014-06-03 12:13:56 +04:00
4831fb8a8c
Merge branch 'patch-1' of git://github.com/BenLubar/dfhack into develop
2014-06-03 12:11:31 +04:00
89269f76fd
Merge remote-tracking branch 'warmist/cmd-prompt' into develop
2014-06-03 12:10:06 +04:00
f07f2e1079
Fix autotrade plugin name in version string
2014-06-02 16:05:05 +12:00
99659e7e00
cmd-prompt needs to work on ANY screen. This fixes it.
2014-05-26 18:42:42 +03:00
e483e7439f
Fix problems with NONE for item types and subtypes
2014-05-22 08:18:01 -05:00
2d778be956
Fix embark sidebar updating
2014-05-20 15:51:26 -04:00
fcb62ac7dd
sticky: Fix handling of rapid input
2014-05-19 17:43:30 -04:00
da31bab419
Display embark label on all 5 map pages
2014-05-19 16:33:17 -04:00
bb5f7b475d
Add sticky (equivalent of tweak stable-cursor)
2014-05-19 16:11:42 -04:00
02811c773c
Fix crash with child screens (e.g. saving a macro)
2014-05-19 15:53:29 -04:00
96b70a93bc
Update readme
2014-05-18 21:21:17 -04:00
6519ac1bf8
Add sand indicator and allow enabling/disabling all tools
2014-05-18 20:03:59 -04:00
0f5802af9f
Add embark-tools
...
A collection of embark-related tools (currently implementations of
embark anywhere and nano embark)
2014-05-18 18:44:25 -04:00
d1aee89491
remove space before hyphen
2014-05-18 13:01:07 -05:00
76ec3ba58c
Fix English names containing the word "the"
...
See DFHack/dfhack#245
2014-05-17 18:40:15 -05:00
8cc4bea0d4
Added petcapRemover plugin.
2014-05-17 17:59:41 -04:00
f852802270
Merge branches 'search-mouse-crash', 'cmdprompt' and '3dveins-check-mode' into dev-plugins
2014-05-16 21:23:34 -04:00
293a535aa4
Fix crash with mouse input in search plugin
2014-05-16 20:53:36 -04:00
9b1d393c1c
Append newline to each section of output
2014-05-15 17:30:42 -04:00
2074f7e78b
Fix handling of newline characters in command-prompt output
2014-05-15 15:51:03 -04:00
d52a07ef76
Dismiss previous command prompt before creating a new one
2014-05-14 18:56:30 -04:00
a516811bb1
Only allow 3dveins to be run in fortress mode
...
Prevents crash from running in arena mode
2014-05-13 16:42:00 -04:00
dbe903b5b7
Re-enable melting in stocks plugin.
2014-05-13 22:15:37 +12:00
56903b9374
Merge branch 'tiletypes-blank-args' of git://github.com/lethosor/dfhack into develop
2014-05-12 21:44:31 +04:00
b166f51568
Handle missing arguments to filter/paint in tiletypes
2014-05-11 14:17:56 -04:00
e829b2eea4
Fix missing newline and update Readme.html
2014-05-11 16:05:00 +04:00
ae8d630cfa
Merge remote-tracking branch 'warmist/dev-rendermax' into develop
2014-05-11 15:44:29 +04:00
a088219b3e
Fixed ALL the bugs: zooming does not crash and fullscreening also does not crash now.
2014-05-11 14:19:02 +03:00
a3d7b54b9c
Merge remote-tracking branch 'falconne/develop' into develop
2014-05-11 13:22:13 +04:00
8989c06900
Merge branch 'tweak_changes' into develop
2014-05-11 13:19:44 +04:00
43064f41e3
Merge branch 'develop' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
2014-05-11 09:34:05 +05:30
4b8f68dfa9
Add a few tweaks - fix wear on cloth/leather items, disable wear on adamantine clothes
2014-05-08 14:22:45 -05:00
b6b839c802
Fix for osx to build.
2014-05-06 21:59:11 +03:00
fef296110f
Fixed friend class bug.
2014-05-06 07:17:02 +03:00
f824e7f294
stocks plugin: added more filtering and display options.
2014-05-05 16:56:40 +12:00
144eff4cf2
Clearing the center column.
...
The official order selection screen has an extra space to the left of the orders on the right-hand side.
2014-05-04 15:36:42 -06:00
4fc850445d
Magic Number Reduction: Display placement constants
2014-05-04 15:28:53 -06:00
767badbfb9
Magic number reduction: Clothing flags
...
Bone and shell are used to construct BARRED and SCALED armor/clothing items, for some reason.
2014-05-04 15:13:25 -06:00
bdb22235af
Magic number reduction: Job types
2014-05-04 15:02:12 -06:00
2d5f7e4022
Magic number reduction: Persistent storage
...
Replaces explicit indices into the ints field of Stockflow persistent storage objects with enumerated values.
2014-05-04 12:55:00 -06:00
723cfcf28e
Attempting to repair an order object leak.
...
Now frees manager_order objects in the reaction_list when the plugin is disabled or the world unloaded. However, there may still be orders leaked elsewhere.
2014-05-04 12:35:10 -06:00
e29e29d537
Updated readme, NEWS and changed where rendermax looks for it's config.
2014-05-04 21:00:16 +03:00
13584f08c5
Merge remote-tracking branch 'warmist/dev-buildings' into develop
2014-05-04 19:52:01 +04:00
1f93b8e144
getplants: add autochop function to automate woodcutting.
2014-05-04 23:43:52 +12:00
e9c7d502e2
dwarfmonitor: add screen to summarise preferences of fortress dwarfs.
2014-05-04 22:45:48 +12:00
5a3065fa80
Use shifted keys for buildingplan so as not to interfere with QuickFort.
2014-05-04 22:23:10 +12:00
cba143c447
Add workshop profile search.
2014-05-04 22:04:03 +12:00
7fd7d3d48c
mousequery: several usability improvements.
...
mousequery: show live overlay (in menu area) of what's on the tile under the mouse cursor.
2014-05-04 21:55:58 +12:00
de9140336f
autotrade: adds "(Un)mark All" options to both panes of trade screen.
2014-05-03 22:56:34 +12:00
5e52bb60f0
Update uicommon.h with new common display functions
2014-05-03 21:19:46 +12:00
a14f31fbfe
Show box select dimensions in Automaterial
2014-05-03 11:44:35 +12:00
415cdad489
Make using new for allocating DF objects with vtables a compile-time error.
...
When done from plugins, it doesn't correctly initialize the vtable
because of some weird things MSVC does, so the only safe way is to
use df::allocate<df::foo>(). For consistency, it is also enforced
for code in the main library. It reveals the issue in the digging
invaders plugin, first found by warmist.
This change is linked to a modification in df-structures codegen.
2014-04-30 21:28:02 +04:00
b74d0da872
Merge branch 'develop' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
2014-04-26 09:23:21 +05:30
e4641c506f
Replace a std::string method not implemented until C++11 with a C++0x-valid substitute
2014-04-21 09:34:42 +04:00
5fb87c2ea9
Now accepts the new enable/disable commands.
2014-04-18 21:58:45 -06:00
63d256c1e9
Adjust siege engine targeting weights.
...
Stop shooting at leaving caravan guards for one.
2014-04-17 22:10:43 +04:00
c27c38e4c0
Remove tired or hungry siege operators from duty when at peace.
...
The threshold is set at the level when they start to blink - normally
they would continue on with the job until they get a thirsty/hungry
thought, but immediately run off to eat if they lose the job (thus
refusing to load the engine after firing it). The code checks for
active sieges and whether there is a free replacement unit.
2014-04-15 21:52:39 +04:00
fc9826389b
Account for meandering movement when predicting unit path in siege engine.
...
The movement is random, but there is an average slowdown coefficient.
2014-04-15 19:50:23 +04:00
55cea36c76
Use the new API to produce combat reports for aimed siege engine attacks.
...
This requires exposing the actual operator unit to lua code.
2014-04-15 19:50:23 +04:00
0a99bb0cae
Now works when enabled is true by default.
2014-04-13 15:23:37 -06:00
b9ed7a5cc2
Stockflow plugin v1.0
2014-04-13 15:19:03 -06:00
7aecffe0cd
Update structures and fix broken things.
2014-04-04 22:34:39 +04:00
eac126c884
ruby: use placement-new instead of hack
2014-04-01 15:12:52 +02:00
837da8ae98
Fix siege-engine to compile on Windows - don't have C++11, and pow() is picky about arg types
2014-03-25 13:30:45 -05:00
36b069e981
Merge remote-tracking branch 'warmist/dev-cmdprompt' into develop
2014-03-24 20:10:58 +04:00
a01939fce6
Sync structures.
2014-03-24 19:45:27 +04:00
827dd121d8
Make createitem default to the controlled unit in adventure mode.
2014-03-24 19:35:34 +04:00
8963a49414
Forbid the items shot by siege engines if the forbid ammo order is set.
...
This only applies when targeting the engine, so you could still make
cheaty infinite ammo training units by using stock aiming mode.
2014-03-24 16:05:12 +04:00
4cbab2b014
Small fix that got lost in rebase
2014-03-07 20:28:07 +02:00
50963c73fa
rendermax: added adv mode lights also more proc-expensive diffuse mode.
2014-03-07 20:08:48 +02:00
b5b01ea02b
rendermax: mainly organizing
...
added comments, non-enabled code for adaptive eyes,
2014-03-07 20:08:11 +02:00
372f861010
rendermax: fixed crashes (hopefully for real this time)
2014-03-07 20:08:10 +02:00
72259c8eba
Added creature lights and item lights.
2014-03-07 20:08:08 +02:00
830d9900fb
Fixed a bug that enabled rendermax even when it was supposed to be off.
2014-03-07 20:08:08 +02:00
a3d3c34671
Bug fixes, perf improvement, don't load until there is a world. (breaks arena mode)
2014-03-07 20:08:07 +02:00
c2db761a1b
Rendermax: made it use unordered_map instead of map.
2014-03-07 20:07:21 +02:00
5ad3a7570f
Fixed a lot of disable lights bugs
2014-03-07 20:07:21 +02:00
f34a4ce34e
Renamed lightCell to rgbf
2014-03-07 20:07:20 +02:00
ee1bad84fc
Threading rewrite.
2014-03-07 20:07:20 +02:00
b248eb3e52
Fixed broken buildings, also added floodgate functionality.
...
Merge branch 'master' of git://github.com/JapaMala/dfhack
2014-03-07 20:07:19 +02:00
0cf5eedc2a
Fixed potential error with building getting transparent on un-powering.
2014-03-07 20:07:17 +02:00
48f855c499
Added occlusionON|occlusionOFF commands
2014-03-07 20:06:50 +02:00
360b5d2e18
Fix for gems not getting right color.
2014-03-07 20:06:50 +02:00
28985167c9
Fixed bug with buildings and added gems to material definition.
2014-03-07 20:06:49 +02:00
b12fd5a4c5
Changed sun calculation direction.
2014-03-07 20:06:46 +02:00
d8b0b82122
Added antialiased lights. They kind of suck. So I disabled them.
2014-03-07 20:06:46 +02:00
b4091b5056
Added day colors and day speed parameters.
2014-03-07 20:06:45 +02:00
70880897f6
Added sun time manipulation, updated helpstring.
2014-03-07 20:06:45 +02:00
7c0a734c97
Added building size. Removed material flags (on by default)
2014-03-07 20:06:18 +02:00
70e1320e6f
removed something I had for testing.
2014-03-07 20:06:18 +02:00
740e3ebc51
Implemented building support.
2014-03-07 20:06:16 +02:00
3433eb15fb
fixed (?) ice and made dragon blood glow a little.
2014-03-07 20:06:16 +02:00
5b0cb86278
Made the lighting engine multithreaded.
2014-03-07 20:06:15 +02:00
354ec37046
MAXIMUM SPEED UPDATE!!!!!
2014-03-07 20:06:12 +02:00
048395a2cd
Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels).
2014-03-07 20:06:12 +02:00
13228855eb
added square light volume, and automatic light radius.
2014-03-07 20:05:52 +02:00
b015149ac1
Added cmake info for the config lua.
2014-03-07 20:05:51 +02:00
0551661db2
Added more advanced sun light calculation
2014-03-07 20:05:51 +02:00
dceec6c6c7
Plantfix, viewport height fix, and fov viewport fix.
2014-03-07 20:05:47 +02:00
4ccc95bc97
Major rewrite of opacity calculation.
2014-03-07 20:05:47 +02:00
74bed5529b
Made light plugin read configuration file (rendermax.lua)
2014-03-07 20:04:02 +02:00
20d4707b00
rendermax: lights off when sleeping
2014-03-07 20:03:59 +02:00
de8a76e37f
rendermax: sunlight travels down stairs
2014-03-07 20:03:59 +02:00
4d7a7425d0
Prelimenary work on advmode
2014-03-07 20:03:56 +02:00
4abff416d9
Some performance fixes and tweaks. Opaque blocks can now emit light.
2014-03-07 20:03:56 +02:00
9a8ee755f8
rendermax: basic daylight
2014-03-07 20:03:52 +02:00
2058a822a3
rendermax: make citizen glow
2014-03-07 20:03:17 +02:00
0a413e179e
Made the low water check actually use floats.
2014-03-07 20:03:17 +02:00
31de296f31
Added some fast checking for obstacles around lights, resulting in a huge speedup outside.
2014-03-07 20:03:16 +02:00
f173810e2a
Fixed skylight
2014-03-07 20:03:14 +02:00
2195c4fe28
Small fixes
2014-03-07 20:03:12 +02:00
f745de3aff
Added transparency to ice walls
2014-03-07 20:03:10 +02:00
83265efaa8
fix for map_block lights, fix for gem window color, dimmed the plant lights.
2014-03-07 20:03:06 +02:00
ee7902c529
Fixed unload/disable crash. Added glowing plants.
2014-03-07 20:02:08 +02:00
471eb9c02d
Torches for statues, candles on the tables.
2014-03-07 20:01:19 +02:00
1c4b5c2d38
Update water a bit.
2014-03-07 20:01:18 +02:00
b3ba3b9107
Fixed non-circular light. Do not show hidden tiles.
2014-03-07 20:01:10 +02:00
f92e4c91b8
Performance improvements, added flickering cursor light.
2014-03-07 20:00:39 +02:00
14c494dbfe
Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise.
2014-03-07 19:58:32 +02:00
2fef60708d
Added some more operators to the cell color class.
2014-03-07 19:58:32 +02:00
04f2d4ea58
Made windows transmit colored light.
2014-03-07 19:58:31 +02:00
a19200fbfe
C++ version of light engine.
2014-03-07 19:58:30 +02:00
446b4b9d50
New line algo for lights
2014-03-07 19:58:28 +02:00
eb999cd0ad
Another file forgotten
2014-03-07 19:58:27 +02:00
843237d1c9
Fixed bug.
2014-03-07 19:58:27 +02:00
39da5babee
Implemented lua interface.
2014-03-07 19:58:25 +02:00
584640f12c
Added help for truecolor light testing thing. Also added colors.
2014-03-07 19:58:24 +02:00
f68852b721
Forgot to add the plugin itself. Also some improvements
2014-03-07 19:58:24 +02:00
55d845992c
rendermax: removed all the opengl and sdl stuff. Now it work with magic alone.
2014-03-07 19:58:23 +02:00
dec0b202ee
Added rendermax plugin- a bunch of rendering hax in one. Small fix to skeleton.
2014-03-07 19:58:22 +02:00
a52451a97a
eventful: added support for custom workshops and a convenience function to interpose side panel generation
2014-03-07 19:41:50 +02:00
834350012f
building-hacks: added lua convenience function, made impassible tile fix optional.
2014-03-07 19:41:50 +02:00
b1e7356e63
Added animation and on update callback.
2014-03-07 19:41:49 +02:00
94b5961372
New plugin: building-hacks. Allows workshops to block liquids and consume mechanical power, connect to machines.
2014-03-07 19:41:49 +02:00
cec4c8cd30
Added an output stream, now response is visible in same window. Also added a way to start prompt pre-filled.
...
It's nice to bind it to e.g. ctrl-shift-o "command-prompt :lua"
2014-03-07 18:52:06 +02:00
97ae857c38
Always shatter glass items within bins thrown by a catapult.
...
The glass materials have impact strength copied from compression
strength, so the items had 1/5 chance to survive without damage.
Since glass is infinite, it makes sense to make it single-use.
2014-03-07 17:42:49 +04:00
df22f25a69
Rewrite aiming error code to account for distance and engine quality.
...
Now the error is simulated by using an approximate normal distribution.
2014-03-07 17:35:04 +04:00
ef93f2ea4c
Compute quality of siege engines and use it to extend firing range.
...
Since parts aren't there until it is built, it requires checking that.
2014-03-07 17:34:21 +04:00
9827184ef7
Switch to the new random number generator class.
2014-03-07 17:34:21 +04:00
983685de8d
Squash uninitialized variable warnings.
2014-03-07 17:34:21 +04:00
41bcd52c36
Make siege engine debug markings toggleable via lua.
...
Also check that the tile actually exists to avoid crashes.
2014-03-07 17:34:04 +04:00
9576c47e18
Cmake fix
2014-03-04 19:00:12 +02:00
904808b168
Command prompt plugin with docs and readme patch.
2014-03-04 18:51:23 +02:00
dd268d43d9
Merge branch 'master' of https://github.com/jjyg/dfhack
2014-02-27 15:49:18 -06:00
5a158b21cf
Update plugins to match fixed field names in cage/civzone
2014-02-27 14:51:45 -06:00
6d0e6cf7d5
remove old unused code from when dfhack was out of process
2014-02-26 12:44:10 +01:00
5ced804312
Merge branch 'master' of https://github.com/angavrilov/dfhack
2014-02-20 12:42:57 -06:00
73a112e06c
Update tubefill to skip hollow tubes by default, and update docs
2014-02-14 11:06:33 -06:00
67b7681ba6
Fix reaction errors, make quantities more consistent
2014-02-13 11:37:04 -06:00
387cc983f9
Merge branch 'osx_shenanigans' of git://github.com/tareqak/dfhack
2014-02-02 23:50:21 +01:00
c0d3e9189d
showmood: fix item count for real
2014-01-27 12:40:21 +01:00
7f411e1cbf
Merge branch 'plant'
2014-01-27 10:45:30 +01:00
56f935aea6
Add bugfix for #6420
2014-01-26 18:55:52 -06:00
5c28d7eaf6
Not enough mood tickets given out
2014-01-25 09:15:43 -06:00
f0eeba93ce
DFHack compiles under OS X now.
2014-01-25 03:21:56 -05:00
7f14e109fa
Use DF-compatible RNG for better randomness
2014-01-19 20:31:15 -06:00
89b3c7bb67
Change syntax for specifying mood type, also allow overriding mood skill
2014-01-19 20:21:41 -06:00
baf377afba
Meant to move this, not copy it
2014-01-18 22:56:56 -06:00
24fbf570e6
Add "strangemood" plugin, lets you trigger a strange mood
2014-01-18 22:45:42 -06:00
04f88ef8fb
showmood: fix count of gotten items
2014-01-05 02:29:01 +01:00
7adb6b2ee9
ruby: codegen unit.caste_tg helper
2014-01-04 15:04:56 +01:00
91a7280ac3
Need to include tool_uses.h
2014-01-03 16:42:24 -06:00
69fc2bec6d
A bit of cleanup
2013-12-27 13:01:34 -06:00
540bcc1f46
Enhance createitem, can now place items into containers or buildings
2013-12-27 12:53:33 -06:00
8917892473
Merge branch 'master' of https://github.com/peterix/dfhack
...
Conflicts:
library/xml
plugins/CMakeLists.txt
2013-11-19 04:15:04 +05:30
5c51f7dd2a
Merge branch 'master' of git://github.com/angavrilov/dfhack
2013-11-10 14:04:48 -06:00
7ce5831257
Get rid of the std exception.
2013-11-07 11:58:11 +04:00
4d2e5b80bf
Use df::allocate here for proper compatibility with 40d and earlier
2013-11-04 14:55:31 -06:00
883d89bb68
plants: move all commands as "plant" subcommands, update NEWS/Readme
2013-11-02 18:54:29 +01:00
463bb8d498
Update plugins to use CR_WRONG_USAGE where appropriate
2013-10-30 15:58:14 -05:00
ff939e36bb
Missed parameter in plugin command init
2013-10-30 14:25:35 -05:00
b97a13fa63
Update "plants" plugin
...
* Add "createplant" command, creates a shrub or sapling at the cursor.
* Put help text in command definitions so CR_WRONG_USAGE works properly
2013-10-30 14:19:52 -05:00
8ccb04236f
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
2013-10-25 11:47:03 -04:00
54b45349c5
Improve pre-embark prospect using new knowledge about soil depth.
2013-10-25 14:37:37 +04:00
e4978a1da7
Relax 3dveins preconditions to account for soil quirks and volcanoes.
2013-10-25 12:51:06 +04:00
329741f235
EventManager: added EQUIPMENT_CHANGE event and exposed it to lua.
2013-10-24 19:32:52 -04:00
c409289ee4
EventManager: TICK events should unregister correctly when requested and after they fire, other tweaks.
...
- fixed unregister to allow unregistering individual TICK events
- make registerTick return the resulting freq you have to put back in to the handler in order for it to be unregisterable
- when TICK events fire, they now automatically remove themselves from handlers[TICK], as they should
- make sure manageTickEvent fires once per tick
2013-10-20 22:54:25 -04:00
a0ee74b3a5
eventful: no longer possible to disable an event type, event frequency is the minimum request frequency (most frequent), added array of event handler function pointers to simplify code
2013-10-20 19:56:48 -04:00
e81c060627
Added EVENT_MAX just in case someone wants it.
2013-10-20 15:24:31 -04:00
d4542b32fa
eventful: removed extra EventManager::unregisterAll.
2013-10-20 15:24:04 -04:00
6ef360f4d6
Merge remote-tracking branch 'warmist/dev-EventManager-lua' into 0.34.11-r4
2013-10-20 14:52:40 -04:00
d179812c22
Small bug fix for autolabor crashing on script created creatures.
2013-10-20 21:50:22 +03:00
0dff26aa23
Added lua interface (in eventful) for EventManager module.
2013-10-20 21:44:07 +03:00
39553cfb6d
EventManager: fixed a problem with constructionHandler.
2013-10-20 14:14:02 -04:00
ee056f4422
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
...
Conflicts:
NEWS
2013-10-20 11:09:40 -04:00
b2d2a074c8
Validate vein types in the scan phase and leave unexpected ones alone.
2013-10-20 12:33:17 +04:00
6805656dd0
Added enable/disable functionality to diggingInvaders.
2013-10-19 21:42:24 -04:00
9d3ee11349
Merge branch 'diggingInvaders' into 0.34.11-r4
...
Conflicts:
scripts/devel/invasion-now.lua
2013-10-19 21:26:50 -04:00
0bf427c689
Added enable/disable functionality to new plugins.
2013-10-19 21:19:39 -04:00
ef9d3b1521
Merge remote-tracking branch 'jjyg/master' into 0.34.11-r4
2013-10-19 20:28:30 -04:00
57fc0f3e89
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
...
Conflicts:
NEWS
library/xml
plugins/CMakeLists.txt
plugins/autoSyndrome.cpp
2013-10-19 20:19:29 -04:00
1bd6d5f96d
ruby: add FEATURE/ice map tile materials
2013-10-14 01:58:55 +02:00
3d7661e7e9
ruby: fix map tile material reading
2013-10-14 00:01:26 +02:00
78de739d75
Update aquifers when generating 3D vein layout.
2013-10-11 19:23:32 +04:00
5bcae49249
Implement generation of 3D veins that match the existing mineral counts.
...
Vein distributions may need some improvement.
2013-10-10 12:50:52 +04:00
86d0022c58
Implement reading and writing the map for 3D veins plugin.
...
This should completely erase all veins from the map when run.
2013-10-10 12:15:50 +04:00
a273327c6a
Remove "using namespace std" from MiscUtils.h.
2013-10-10 12:15:50 +04:00
6852adbd91
Expose new MapCache features in probe and tiletypes.
2013-10-10 12:15:50 +04:00
4ba4f90147
ruby: add support for enable/disable plugin
2013-10-07 13:58:28 +02:00
a18347608a
ruby: vectors default to int32_t
2013-10-07 13:33:21 +02:00
32a6073dad
Remove lambdas from dwarfmonitor and resume.
2013-10-03 16:30:06 +04:00
f3be0ee187
Remove the use of lambdas in buildingplan.
2013-10-02 19:55:48 +04:00
599af0a4d9
Fix linux and windows build issues.
...
- Linux makefile overrides and removes the optimization flags.
- Old linux gcc doesn't understand lambdas.
- MSVC doesn't like extern and explicit instantiation in same file.
2013-09-30 22:51:29 +04:00
d7e35c2d23
Add built-in enable and disable commands.
2013-09-30 13:19:51 +04:00
a487ede2b9
autodump: typo in errmsg
2013-09-23 21:28:27 +02:00
b885123d4e
Fix a crash in beehive code if bees die with yet uncollected products.
...
http://www.bay12games.com/dwarves/mantisbt/view.php?id=6368
2013-08-26 16:55:30 +04:00
896cd11fe9
Track readable names of vmethod hooks for diagnostic messages.
...
Note that this changes the ABI of all plugins that use hooks.
2013-08-22 12:14:45 +04:00
70a2ab9141
Fix crash due to incorrect loop bounds in add-spatter.
...
This caused a buffer overrun bug if an ADD_SPATTER
reaction had any non-improvement outputs.
2013-08-22 11:22:18 +04:00
308e7b6820
fix renamed pregnancy_ptr/mystery to pregnancy_genes/caste
2013-08-10 01:57:11 +02:00
279c4a48dc
Started work on ramp generation, still needs work.
2013-07-22 19:05:09 +05:30
0bd627a6f6
Got basic mesh generation working for a unity Visualizer, as well as a block editor for the same.
2013-07-21 10:28:46 +05:30
297fa86c34
follow df-structures change to drawBuilding
2013-07-07 17:40:28 +02:00
34e5716cc0
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-28 23:52:51 +03:00
647b14b471
Fixed potential error with building getting transparent on un-powering.
2013-06-28 23:51:52 +03:00
269a2680c8
Added occlusionON|occlusionOFF commands
2013-06-28 23:34:47 +03:00
102b2ed450
Fixed broken buildings, also added floodgate functionality.
2013-06-28 23:47:54 +05:30
368a326b40
Fix for gems not getting right color.
2013-06-28 17:22:24 +03:00
26d557fc68
Fixed bug with buildings and added gems to material definition.
2013-06-27 18:11:50 +03:00
e2db468d3d
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-27 16:18:46 +03:00
7c190cd3f0
Added antialiased lights. They kind of suck. So I disabled them.
2013-06-27 16:11:29 +03:00
67859ada0a
Changed sun calculation direction.
2013-06-27 02:49:18 +05:30
7c9f0fd781
Added day colors and day speed parameters.
2013-06-27 00:14:03 +03:00
e1daa16d9e
Added sun time manipulation, updated helpstring.
2013-06-26 22:05:22 +03:00
b7f28877a2
Added building size. Removed material flags (on by default)
2013-06-26 20:19:30 +03:00
d90a7bfb88
removed something I had for testing.
2013-06-26 19:26:11 +05:30
dc42fa2fa3
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-26 19:14:55 +05:30
689caa5039
Made the lighting engine multithreaded.
2013-06-26 19:12:14 +05:30
c1fef35b52
Renamed digSmart to digFlood.
2013-06-25 19:57:17 -04:00
fbbae3e900
Implemented building support.
2013-06-26 01:18:26 +03:00
1d2accbe94
fixed (?) ice and made dragon blood glow a little.
2013-06-25 22:49:52 +03:00
539abff49a
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-25 23:23:52 +05:30
f4923d6974
added square light volume, and automatic light radius.
2013-06-25 23:13:55 +05:30
588ca8b8dd
MAXIMUM SPEED UPDATE!!!!!
2013-06-25 20:36:53 +03:00
3957fac531
Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels).
2013-06-25 19:34:38 +03:00
57e68aaee9
Added cmake info for the config lua.
2013-06-25 16:44:44 +05:30
5265f107b0
Added more advanced sun light calculation
2013-06-25 16:33:01 +05:30
ef7abaee14
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-25 01:25:56 +03:00
87f151f441
Plantfix, viewport height fix, and fov viewport fix.
2013-06-25 01:25:38 +03:00
4d9b7bd23d
Major rewrite of opacity calculation.
2013-06-25 00:59:32 +03:00
cb767531cf
Made light plugin read configuration file (rendermax.lua)
2013-06-24 18:18:57 +03:00
8271725320
Some performance fixes and tweaks. Opaque blocks can now emit light.
2013-06-24 14:20:22 +05:30
8dcff9bc5d
Merge branch 'rendermax' of git://github.com/jjyg/dfhack
2013-06-24 10:34:03 +03:00
5a82270aa6
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-24 10:19:10 +03:00
abc9dc300e
Prelimenary work on advmode
2013-06-24 03:47:42 +03:00
19952b9139
rendermax: lights off when sleeping
2013-06-24 02:27:43 +02:00
b95683adb2
rendermax: sunlight travels down stairs
2013-06-24 02:22:30 +02:00
ec913c2c5e
Merge branch 'rendermax' of https://github.com/jjyg/dfhack
2013-06-24 05:37:59 +05:30
b8d2ceb23b
Made the low water check actually use floats.
2013-06-24 05:35:16 +05:30
1a5169c70c
Merge branch 'master' of git://github.com/JapaMala/dfhack into rendermax
2013-06-24 01:56:32 +02:00
fb5d248720
rendermax: basic daylight
2013-06-24 01:54:09 +02:00
2da136116d
Added some fast checking for obstacles around lights, resulting in a huge speedup outside.
2013-06-24 05:10:01 +05:30
50073ae406
rendermax: make citizen glow
2013-06-24 00:45:45 +02:00
30697ee115
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-24 03:58:23 +05:30
a2cef2d86a
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-24 03:58:07 +05:30
736f9e85fc
Fixed skylight
2013-06-24 01:26:25 +03:00
8c9de79812
Small fixes
2013-06-24 00:53:39 +03:00
f5f1328678
Merge branch 'master' of git://github.com/JapaMala/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-24 00:53:03 +03:00
fe41504952
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
Still broken. Needs boundary checking.
2013-06-24 03:11:46 +05:30
3d6f4d3478
Added transparency to ice walls
2013-06-24 00:36:43 +03:00
6cd926b67e
fix for map_block lights, fix for gem window color, dimmed the plant lights.
2013-06-24 00:10:52 +03:00
c675ca467a
Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise.
2013-06-24 02:35:03 +05:30
06915aeded
Fixed unload/disable crash. Added glowing plants.
2013-06-23 23:56:01 +03:00
82deeafe89
Torches for statues, candles on the tables.
2013-06-23 22:28:26 +03:00
0473f89fa2
Update water a bit.
2013-06-23 21:49:17 +03:00
84ed3797d4
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-23 21:46:58 +03:00
fd0c053a80
Added some more operators to the cell color class.
2013-06-24 00:14:06 +05:30
1361b38f27
Merge branch 'master' of git://github.com/JapaMala/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-23 21:35:13 +03:00
4f7df238ea
Fixed non-circular light. Do not show hidden tiles.
2013-06-23 21:29:03 +03:00
f415ea2100
Made windows transmit colored light.
2013-06-23 23:51:25 +05:30
cb6130066d
Performance improvements, added flickering cursor light.
2013-06-23 20:45:05 +03:00
140371a0c7
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 22:05:02 +05:30
2c49c9e83c
C++ version of light engine.
2013-06-23 19:25:42 +03:00
25ab75137b
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 15:27:04 +05:30
e3ee876a11
New line algo for lights
2013-06-23 12:20:35 +03:00
be953ba4ab
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 12:07:14 +05:30
76f4c51a29
Another file forgotten
2013-06-23 09:36:04 +03:00
bea2cd74d6
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 11:50:09 +05:30
b35ea4d10c
Fixed bug.
2013-06-23 09:19:29 +03:00
77a301db27
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 02:45:14 +05:30
4cc14641ac
Implemented lua interface.
2013-06-22 17:40:52 +03:00
906864feaa
Added help for truecolor light testing thing. Also added colors.
2013-06-22 14:14:35 +03:00
c273377284
Forgot to add the plugin itself. Also some improvements
2013-06-22 13:29:58 +03:00
ea6a264fe2
rendermax: removed all the opengl and sdl stuff. Now it work with magic alone.
2013-06-22 03:45:42 +03:00
ebc51f1bd3
Added rendermax plugin- a bunch of rendering hax in one. Small fix to skeleton.
2013-06-21 22:47:23 +03:00
dc78f16e2b
Added a simple unity project that connects to DF and pulls a list of plugins.
2013-06-17 23:53:36 +05:30
f459bfc4f1
diggingInvaders: added per-creature dig times and differentiated between smooth and rough constructions.
2013-06-15 23:04:15 -04:00
8c6881beb6
Cleanup
2013-06-14 14:46:10 -05:00
4193d9b5b3
Add new plugin for cleaning up construction building materials
2013-06-14 14:40:02 -05:00
776d088eb9
diggingInvaders: tweaks.
2013-06-11 07:25:07 -04:00
f557376c3a
diggingInvaders: make invaders dig slowly, in a configurable way.
2013-06-11 05:14:56 -04:00
0378bbb896
diggingInvaders: proper user interface.
2013-06-10 01:58:27 -04:00
07a4839d8b
diggingInvaders: made it easy to flip between int64 and int32 for distance cost. It did not make a significant difference in performance when I timed it.
2013-06-09 23:26:07 -04:00
4e715ca44b
diggingInvaders: made it only do a little work each frame instead of all at once with the pathfinding.
2013-06-09 23:07:51 -04:00
c4533dcb0c
diggingInvaders: only path from one guy, and other minor tweaks.
2013-06-09 17:52:13 -04:00
d26b11eb40
diggingInvaders: cleaned up pick creation.
2013-06-09 17:20:23 -04:00
638affee06
diggingInvaders: tweaked pick creation. Don't recreate if they already have one.
2013-06-09 16:23:41 -04:00
08114cf574
diggingInvaders: more fixes. Still a few issues with ramps probably.
2013-05-31 20:39:43 -04:00
2b7dfca21e
diggingInvaders: cleanup, tweaks. Works for simple situations.
2013-05-31 19:27:22 -04:00
f8261348ff
Merge branch 'master' into diggingInvaders
...
Also make edgeCost.cpp compile because I stopped midsentence for some reason.
Conflicts:
library/modules/Maps.cpp
2013-05-31 16:28:05 -04:00
909d686ae4
digSmart: remove print statement.
2013-05-31 13:41:31 -04:00
b82b3f2283
digSmart: added user interface and documentation.
2013-05-31 13:32:56 -04:00
b945b36016
digSmart: framework in place for finding the bug. When a tile is actively being dug, the dig designation is cleared. If you designate the tile again for digging, multiple dwarves might try to dig it at the same time, leading to job cancellation spam when one finishes.
2013-05-31 12:23:28 -04:00
20fa38da7e
digSmart: still doesn't working, but learning more. Something weird happens with dig designations.
2013-05-31 00:49:35 -04:00
4ba73bc171
Merge branch 'master' into digSmart
2013-05-30 22:22:16 -04:00
8982abc163
treefarm: automatically chop trees and dig obsidian
2013-05-30 22:18:08 -04:00
594247b57e
skeletonShort: slightly easier to copy+paste it to start new plugins, but is more illegible to new DFHackers.
2013-05-30 19:07:22 -04:00
ee9bddf831
autoSyndrome comment tweaks
2013-05-25 20:23:59 -04:00
3403146461
Merge remote-tracking branch 'peterix/master'
...
Conflicts:
plugins/CMakeLists.txt
plugins/autoSyndrome.cpp
2013-05-25 20:08:56 -04:00
83a9e5c837
autoSyndrome: added reset policies, allowing modders to specify what to do if a unit already has the syndrome in question.
2013-05-25 14:26:42 -04:00
22f31ca3ad
workNow tweaks
2013-05-25 12:23:38 -04:00
5cca0b84a3
fastdwarf: made it work better when both fastdwarf and teledwarf are enabled.
2013-05-25 11:07:59 -04:00
141043363d
autoSyndrome: need to check JOB_COMPLETED very often to catch cancelled jobs properly.
2013-05-25 10:20:22 -04:00
b44cd86dc9
EventManager: completely overhauled JOB_COMPLETED event detection, and tweaked Job::cloneJobStruct.
2013-05-25 09:44:17 -04:00
01c311cf13
Weird compilation error.
2013-05-24 15:55:40 -04:00
170fe6a0ef
autoSyndrome/syndromeTrigger: made things off by default.
2013-05-24 15:55:19 -04:00
63e1f61f4f
autoSyndrome/syndromeTrigger: deal with overlap better for commands.
2013-05-12 12:43:45 -04:00
c127ad052e
autoSyndrome and syndromeTrigger documentation.
2013-05-11 19:20:02 -04:00
29b5e20575
autoSyndrome should now work with syndromeTrigger.
2013-05-11 16:46:37 -04:00
dd739313b1
ruby: tweak item_isfree
2013-04-30 18:38:52 +02:00
f3e357d161
Fix detection of GET_MATERIAL_FROM_REAGENT results in workflow.
...
Dereference pointer to strings. Also just return undefined
material instead of skipping the product if it still fails.
2013-04-30 19:42:51 +04:00
18a91ef221
Merge https://github.com/ab9rf/dfhack
...
Conflicts:
library/xml
plugins/stonesense
2013-04-24 18:00:40 +02:00
c39f4bc182
Fix build bug in automaterial.
2013-04-24 17:49:18 +02:00
222c61ab25
Merge branch 'IsoRemote' of https://github.com/JapaMala/dfhack
2013-04-24 17:36:22 +02:00
2e379c4d3f
Merge https://github.com/Falconne/dfhack
...
Conflicts:
plugins/CMakeLists.txt
plugins/stonesense
2013-04-24 17:24:03 +02:00
df6355a092
Merge https://github.com/jjyg/dfhack
2013-04-24 16:24:14 +02:00
0efbc74ac2
Merge https://github.com/quietust/dfhack
...
Conflicts:
NEWS
2013-04-24 16:21:59 +02:00
aad5296f91
Merge branch 'master' of https://github.com/rampaging-poet/dfhack
2013-04-24 16:14:30 +02:00
3e59794733
Merge branch 'master' of https://github.com/cherrydev/dfhack
...
Conflicts:
Readme.html
2013-04-24 16:13:27 +02:00
ce47033190
fix in zone UI filters: lower case 'f' conflicted as hotkey with toggling between pit and pond in the pit screen. So now the filter keys use upper case letters instead.
2013-04-24 23:37:05 +12:00
024a3d766b
Added some more commands to autobutcher UI script.
...
Changed autobutcher behavior a bit:
now protected units count towards the target quota,
units available for adoption are considered as protected.
Added filters for caged, male and female to assignement UI
for cages, pastures and pits.
2013-04-24 23:37:05 +12:00
fd265b37d6
Added lua GUI front-end for autobutcher.
2013-04-24 23:37:05 +12:00
80de3c05fa
Stocks plugin: Add keywords to search for flags.
2013-04-24 23:31:37 +12:00
eb8b2faf66
Stocks plugin: fix inventory check, add trade assignments, better hotkets.
2013-04-23 22:15:25 +12:00
c9776f481c
ruby: add construction/siegeengine bld subtypes in building_alloc
2013-04-21 22:29:51 +02:00
e70d7b404a
Don't exclude webs, check for items in inventory before discarding those without a valid position.
2013-04-20 12:09:07 +12:00
de5e713c51
ruby: add rb dfhack command shortcut
2013-04-16 21:54:03 +02:00
811bd191d5
Add wear filter
2013-04-15 20:43:13 +12:00
d99b930f58
Better Stocks - Quality & Wear filters
2013-04-14 16:39:21 +12:00
13451bd487
ruby: fix crash on Compound#_cpp_delete
2013-04-14 01:17:44 +02:00
17513283d4
Better Stocks screen - WIP
2013-04-14 00:45:06 +12:00
40f9f06360
dig: ignore tile shape if hidden
2013-04-12 15:23:16 +02:00
b2e22a2c42
ruby: add facility to queue dfhack commands
2013-04-12 15:23:13 +02:00
d0ba4f5881
Better Stocks screen - WIP
2013-04-11 20:52:46 +12:00
399fd107e4
Make createitem create shoes in pairs (as well as gloves)
2013-04-08 08:29:50 -05:00
658e64c1b2
Fix allegro, stonesense/deplibs is now hack/libs, sync isoworld and stonesense
2013-04-07 20:25:38 +02:00
fc6cb3ae42
Merge branches 'autoSyndrome', 'outsideOnly' and 'syndromeTrigger'
2013-04-07 14:00:24 -04:00
959321ec22
syndromeTrigger: logic tweak.
2013-04-07 13:56:12 -04:00
1c78f06a1c
syndromeTrigger: only complain once.
2013-04-07 13:22:38 -04:00
b057a0d82a
Merge branch 'once' into syndromeTrigger
2013-04-07 13:19:18 -04:00
ddc4cad73b
autoSyndrome: fixed a bug when a reaction didn't have a valid mat_index.
2013-04-07 13:17:00 -04:00
329538edfd
digsmart temp commit.
2013-04-07 13:08:32 -04:00
3b921feb61
Skip ice and brook floors.
2013-04-06 17:07:46 +05:30
efaa247d2a
Stocks start
2013-04-06 17:40:07 +13:00
660ce50542
Floors are loaded one level below solid blocks.
2013-04-06 02:42:51 +05:30
541e4f0947
Changed liquids to use an enum.
2013-04-04 14:28:43 +05:30
f1410c10c6
digcircle: fix bug #181 (help: radius -> diameter)
2013-04-03 22:16:36 +02:00
575b1c45fc
Sync isoworld, linux fixes
2013-04-03 01:10:06 +02:00
3580409cc1
Sync isoworld, some protobuf building changes
2013-04-02 22:37:41 +02:00
c361ba7bf4
Sync, fix isoworld in .gitmodules
2013-04-02 19:19:29 +02:00
5ff9947a06
Merge branch '0.34.11-r3-bugfixes'
2013-04-02 19:17:32 +02:00
fe922e3528
Merge branch 'IsoRemote' of https://github.com/JapaMala/dfhack
2013-04-02 19:01:46 +02:00
33f0f0d3f3
Isoworldremote plugin now gives material lists, and verifies weather a map block has anything in it.
2013-04-02 22:03:32 +05:30
9d6f202988
Fix the search plugin crashing the military screen.
...
The cause of the crash is that the right list is used for multiple
different things in different pages, so when cleaning up after a
page switch it is not acceptable to mess with it in any way. However
the search plugin changed its length, thus causing a crash if the
new contents were shorter than the original candidate list.
2013-04-02 22:42:55 +13:00
462a08a4ea
Fix the search plugin crashing the military screen.
...
The cause of the crash is that the right list is used for multiple
different things in different pages, so when cleaning up after a
page switch it is not acceptable to mess with it in any way. However
the search plugin changed its length, thus causing a crash if the
new contents were shorter than the original candidate list.
2013-04-02 12:03:37 +04:00
c0a4db32e9
Fixed the single tile reported coordinates.
2013-04-02 11:57:30 +05:30
b2f4029f42
Added in more sanity checks.
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-04-02 02:58:06 +05:30
29a2f36e4a
Fix small bug in the tweak plugin
2013-04-01 17:42:02 +02:00
b0ee4fe9d9
Update stonesense
2013-04-11 21:08:33 +02:00
d7c91975c0
Fix warnings
2013-04-01 20:02:39 +13:00
1070eec016
Make planned doors pet passable
2013-04-01 19:52:34 +13:00
1550df496f
Right align happiness monitor to avoid interference with announcements
2013-04-01 19:52:13 +13:00
c020c0271c
Respect export mandates
2013-04-01 19:21:10 +13:00
86a02952f8
Changed coords to embark tiles instead of blocks.
2013-04-01 04:39:30 +05:30
4bb80d9865
Added some sanity checks to isoworldremote.cpp
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-03-31 12:31:44 +05:30
39390e2749
Got a working connection with Isoworld.
2013-03-31 02:42:06 +05:30
135289e89a
ruby: add MapTile#burrow
2013-03-30 20:22:25 +01:00
0397912353
Merge branch 'master' into digSmart
...
Conflicts:
plugins/CMakeLists.txt
2013-03-30 12:46:10 -04:00
a3de35c32e
Added isoworld to the build list.
2013-03-30 15:27:37 +05:30
9981d21965
Merge branch 'IsoRemote' of github.com:JapaMala/dfhack into IsoRemote
...
Conflicts:
plugins/CMakeLists.txt
plugins/isoworldremote.cpp
2013-03-30 13:03:22 +05:30
14369d18dc
Initial work on the isoworldremote plugin, which sends sections of the map to isoworld.
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-03-30 12:38:42 +05:30
2027416997
Merge pull request #1 from zkf/overlay-position
...
Right-align happiness monitor overlay.
2013-03-29 20:59:54 -07:00
a5b9848271
Clean up
2013-03-30 16:38:21 +13:00
edc305db69
AutoTrade plugin: Automatically send items in marked stockpiles to trade depot, when trading is possible.
2013-03-30 16:38:03 +13:00
323c56a641
Right-align happiness monitor overlay.
...
The overlay was blocking game messages which are displayed on the left side.
2013-03-29 15:03:09 +01:00
6e9de245c2
Started work on isoworld remote
2013-03-27 01:24:13 +05:30
637daad83d
Outside only: new plugin. Buildings that start with OUTSIDE_ONLY get destroyed instantly before they can be created.
2013-03-24 00:15:20 -04:00
52480b155b
autoSyndrome: made it only print each error message at most once per DF run.
2013-03-23 22:46:43 -04:00
32e321c704
Merge branch 'once' into autoSyndrome
2013-03-23 22:39:57 -04:00
b4092f62e6
New module: Once. Intended to help prevent debug error message spam.
2013-03-23 22:38:33 -04:00
dc9a62fd1d
Fix crash when using right mouse button
2013-03-22 23:08:33 +13:00
cd00213e66
autoSyndrome: fixed a bug where it complains because can't find the worker because it didn't get a copy of the job quickly enough. It can still happen, it just doesn't complain anymore.
2013-03-17 11:02:31 -04:00
cf57fba58e
autoSyndrome: reorganize everything, make it make more sense.
2013-03-17 01:18:12 -04:00
83f7ad1700
syndromeTrigger: renamed from trueTransformation and generalized it to allow for triggering commands on any syndrome infection.
2013-03-17 00:23:08 -04:00
16b64b9fc3
workNow: added option to look for jobs every time a dwarf finishes or cancels a job.
2013-03-16 22:43:57 -04:00
4fe37b4bd5
ruby: fix DfFlagarray.inspect when no indexenum
2013-03-16 21:06:31 +01:00
49024809ce
Update NEWS, build DFusion by default
2013-03-16 18:37:16 +01:00
ffa9c50486
autoSyndrome: stop spam, and disable by default
2013-03-16 13:26:59 +01:00
59ec9bfc57
Update versions
2013-03-16 22:13:01 +13:00
a85d6bd2dd
Merge branch 'mousequery'
2013-03-16 20:40:20 +13:00
4bd5e3db77
Add mousequery to build
2013-03-16 20:35:53 +13:00
c16bd3d71a
Apply r3 name changes
2013-03-16 18:25:02 +13:00
cc5d354a59
Merge branch 'master' of github:jjyg/dfhack
2013-03-16 01:04:29 +01:00
b961cb6a09
Merge branch 'master' of https://github.com/peterix/dfhack
2013-03-16 12:51:31 +13:00
f69f245732
Allow planned constructions orthogonal to stairs
2013-03-16 12:26:37 +13:00
5a92eabb6b
Add all fortress dwarves to happiness monitor.
2013-03-16 10:29:17 +13:00
6a31abc60f
Another update to stonesense :-P
2013-03-15 14:30:21 -04:00
d87bfd7f26
Update to Stonesense
2013-03-15 14:28:46 -04:00
c93cb693c8
Merge branch 'master' of http://github.com/peterix/dfhack
2013-03-14 13:35:28 -04:00
9a58c5b7b3
Stonesense updates
2013-03-14 13:33:01 -04:00
2b675c80ce
Fix createitem to not leak memory
2013-03-14 12:00:16 -05:00
c5aa808737
Sync submodules
2013-03-14 05:07:30 +01:00
b5806f7278
Copy fixes from r3 to fix search issues in Nobles screen.
2013-03-13 22:21:30 +13:00
215a2e78af
Fix crash when persistent data refers to missing buildings. Can only happen if planned buildings are removed with the plugin removed, then the game is reloaded after the plugin is put back.
2013-03-13 21:44:33 +13:00
bc0c493b7c
Workaround for strange crash in accelerated mod
2013-03-12 21:18:29 +13:00
8e9fc235a9
Adding a debug mode to track down an elusive bug.
2013-03-10 16:14:00 +13:00
3ed5f06f49
Fix for eventful and a advfort not to show worn items.
2013-03-09 12:54:07 +02:00
63707471f4
WIP - More logical categories and variable windows
2013-03-07 22:27:06 +13:00
0b31fbafea
Remove the "assign random labors to random dwarfs" nonsense that I put in while drunk or something.
2013-03-02 23:05:09 -06:00
701b7b7d9b
Multiple data averaging windows and gcc fixes.
2013-03-02 15:14:56 +13:00
b07f2fc33f
Get entity from unit->civ_id instead of from ui (so it works in advmode), and only get site in fortress mode
2013-02-28 10:00:00 -06:00
9bd999ebc1
Update createitem to allow specifying quantity, also allow it to auto-detect whether it needs to create extra gloves and assign handedness
2013-02-28 09:23:48 -06:00
4afe74efa6
Add DwarfMonitor plugin to monitor activities and happiness levels in a fort.
2013-02-28 23:39:22 +13:00
f55030909f
Add createItem plugin, spawns an item at the selected unit's feet
2013-02-27 11:09:06 -06:00
03b91ca26c
Fix a problem in binpatch.lua and comment out debug messages in tweak.
2013-02-26 12:29:02 +04:00
2bbe6824fb
fix tweak/stable-cursor for low z-levels
2013-02-21 15:26:35 +01:00
6b70a89321
ruby: typo in autogen/int8_t
2013-02-17 02:05:01 +01:00
db98b06c6e
Added documentation of autolabor exemption from burrowed dwarves
2013-02-15 19:16:26 -08:00
b0528d283b
Merge branch 'master' of git://github.com/peterix/dfhack
2013-02-15 20:23:39 +02:00
ab6a993689
friendship.lua: removed debug printing
2013-02-15 20:21:33 +02:00
bb5d98e895
friendship fixes.
2013-02-15 20:19:55 +02:00
fe70df593b
Sync submodules
2013-02-14 18:36:21 -06:00
ac2e45c843
Compatibility with older GCC versions in the search plugin
2013-02-14 12:45:58 +01:00
8de172f1c8
Binsearch in units.active can't possibly work, ever.
2013-02-14 13:13:25 +04:00
a8f5e54e37
Sync submodules
2013-02-14 09:53:14 +01:00
e35a1c7720
Correct autolabor2 for changes in structures.
2013-02-13 16:00:09 -06:00
8d278a87db
Merge branch 'master' of https://github.com/angavrilov/dfhack.git
...
Conflicts:
plugins/devel/CMakeLists.txt
2013-02-13 13:52:02 -06:00
f9a3450aca
Reinstate old autolabor in its original place.
2013-02-13 13:34:39 -06:00
ff0012c91f
Move new autolabor to autolabor2 in devel.
2013-02-13 13:33:32 -06:00
27f5dc7631
Autolabor: add in the rest of the building construct and deconstruct labors. Also handle wood crafts at the craftdwarf's shop.
2013-02-13 13:07:54 -06:00
a17760af4f
Communicate the Plugin pointer to the plugin in a decent sort of way.
2013-02-13 14:45:24 +04:00
a5c21745eb
Enable all plan modes when entering quickfort mode
2013-02-09 16:49:36 +13:00
2f4979d3fa
Add Quickfort mode
2013-02-08 00:04:52 +13:00
1956f8b92d
Lock selection mode toggle
2013-02-07 22:57:07 +13:00
0e384ada75
Sync submodules
2013-02-05 05:34:34 +01:00
dff16c3c1d
Define nullptr for gcc < 4.6
2013-02-02 02:24:05 +13:00
ecf255243f
Plugin to easily find and resume suspended constructions
2013-02-02 02:24:05 +13:00
056bde451a
Remove some leftover code
2013-01-29 21:22:17 +13:00
ae8bb7c9f8
Fix for gcc errors.
2013-01-29 20:44:56 +13:00
58125a57a7
Merge remote-tracking branch 'remotes/github/buildingplan'
2013-01-27 23:42:28 +13:00
6546af94ee
Clear persistent data after item assigned. Fix some material selection screen functionality.
2013-01-24 20:16:18 +13:00
f036360688
Add filters for quality, material and decorations.
2013-01-23 23:25:38 +13:00
675e92f350
Autolabor: add build floor grate labor, add unbuild screwpump labor, protect pump operators, do not clear labors on already busy dwarfs
2013-01-22 16:34:51 -06:00
f5a0644b45
Fix bad refactor
2013-01-18 23:29:08 +13:00
192baa5638
Building plan plugin: place furniture before it's built. Initial checkin.
2013-01-18 23:28:45 +13:00
e1a2e6ece4
Block and grey out the trade screen actions when search is active.
...
After actually trying the search in game, it is obvious that
clearing search upon pressing the trade button is confusing,
because if you don't pay enough attention, it looks exactly
like as if the trade actually happened.
2013-01-16 20:42:41 +04:00
597074498f
Fix various issues with updated search.
...
- Priority conflict with tweak military-stable-assign.
- The noble screen misbehaves if only one list item is left.
- Noble screen search string not reset after Enter/Esc.
2013-01-16 20:30:11 +04:00
14d41b8eda
Update search to the newer structure definitions.
2013-01-16 18:55:05 +04:00
309f162566
Fix line endings again.
2013-01-16 18:54:35 +04:00
ed0baa3f69
Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin.
2013-01-16 18:48:59 +04:00
4257c9fe84
Ignore vermin in animals screen search
2013-01-16 18:48:55 +04:00
8741983aaa
Fix for gcc errors. It seems calls to base class members in a templated class must be fully template qualified.
2013-01-16 18:48:49 +04:00
655cd3602c
Merge remote-tracking branch 'falconne/search'
2013-01-16 18:30:29 +04:00
940d5fe891
Merge https://github.com/expwnent/dfhack
2013-01-15 23:49:10 +01:00
0073c1bec2
Track xml and stonesense
2013-01-15 23:16:15 +01:00
90a62a82f7
Autolabor: add screw pump build labor
2013-01-14 12:12:56 -06:00
c031a7e081
Merge branch 'infiniteSky'
2013-01-13 15:28:31 -05:00
44662de601
Infinite sky: bug with z level flags.
2013-01-13 15:28:17 -05:00
fdcb248ea0
Merge branch 'automaterial_box'
2013-01-12 23:39:50 +13:00
83ef94774b
A better format for toggle strings.
2013-01-12 23:32:30 +13:00
4c2dfdf772
Dig smart: dig out minerals as you discover them. Very rough draft.
2013-01-09 15:15:11 -05:00
3c6ddc2a8c
Merge branch 'master' of https://github.com/expwnent/dfhack
...
Conflicts:
NEWS
library/xml
2013-01-09 10:09:58 -06:00
476afafb3c
Merge branch 'autoSyndrome' into recent
2013-01-07 12:09:55 -05:00
6fd9ce339d
Autosyndrome: fixed the rules on when syndromes apply.
2013-01-07 12:09:39 -05:00
1990e2caf7
Small fix to adv site creation, now it's really centered around you
2013-01-07 02:01:59 +02:00
553a312266
Autolabor: add deconstruct bridge labor
2013-01-06 10:59:20 -06:00
6d6d55a937
Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin.
2013-01-06 18:32:49 +13:00
140f78c8a0
Ignore vermin in animals screen search
2013-01-06 18:14:25 +13:00
0fa27d6c34
Fix for gcc errors. It seems calls to base class members in a templated class must be fully template qualified.
2013-01-06 14:59:39 +13:00
3ffbef2396
Merge branch 'canStepBetween' into recent
2013-01-05 18:10:29 -05:00
f8abd5c595
StepBetween: renamed stuff back to the way it was. Thought I had already done that.
2013-01-05 18:09:50 -05:00
47b20ea301
Infinite sky: added glyphs and made it print status when no arguments given.
2013-01-05 17:32:23 -05:00
86c3c385bd
Autolabor: exclude hauling labors from clawback
2013-01-05 16:27:57 -06:00
4d57a053fc
Infinite sky: added helpful print statements.
2013-01-05 16:51:29 -05:00
151ff0f296
Infinite sky: rename from sky eternal.
2013-01-05 16:34:33 -05:00
4920293c2d
Infinite sky: get it to compile.
2013-01-05 16:30:48 -05:00
471e82a88a
Merge branch 'skyEternal' into infiniteSky
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 16:18:01 -05:00
9246ac9b05
Merge branch 'workNow' into recent
2013-01-05 13:36:24 -05:00
cf3ac48518
Merge in autoSyndrome, trueTransformation, ...
2013-01-05 13:35:49 -05:00
6622e9e06f
Merge branch 'canStepBetween' into recent
...
Conflicts:
library/modules/Maps.cpp
2013-01-05 13:32:29 -05:00
5fc466ef7e
Work now: also update dig on pause.
2013-01-05 12:50:44 -05:00
d2a2a63d01
Merge branch 'recent' into workNow
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 12:45:34 -05:00
874dfbdc4f
Merge branch 'eventManager' into autoSyndrome
2013-01-05 11:40:55 -05:00
bc5cdf8877
Auto syndrome: got rid of allow multiple syndromes option that didn't make any sense, and made sure that if allowing multiple targets it doesn't attach the syndrome to the worker twice.
2013-01-05 11:37:56 -05:00
3c7ca2ad71
Digging invaders: buildings can only be destroyed orthogonally, made path cost deal with hatches and raised bridges, but did NOT yet make job assignment deal with them.
2013-01-05 11:06:46 -05:00
4bef70ab6f
Merge branch 'search'
2013-01-06 02:27:57 +13:00
91ee8ac020
Refactor search to handle more types of screens cleanly.
...
Added search to screens:
* Animals
* Military positions assignment
* Announcements
* Room list
* Job list
* Burrow assignment
2013-01-06 00:26:16 +13:00
a7d6cf5157
Digging invaders: fixed a few problems involving digging and stairs, added a way to debug path cost, added a way to set the cost of each type of invasion job, made invaders only pathfind to one local instead of all of them.
2013-01-04 21:02:09 -05:00
fd05d30733
Digging invaders: improved edge cost evaluation.
2013-01-04 18:11:38 -05:00
9404267c1f
Autolabor: Tell DF to immediately process jobs after each run.
2013-01-04 13:14:20 -06:00
2ca943ae20
Digging invaders: comment out debug print statements.
2013-01-04 00:43:39 -05:00
038cc91fcd
Digging invaders: fixed a bug where it would reassign long-lasting jobs, making them take forever. Also added a check for the case that invaders cannot dig to any locals.
2013-01-04 00:35:47 -05:00
b6f0ae5b14
Digging invaders: keep track of who's working on the job, and check periodically to see if they quit.
2013-01-04 00:08:54 -05:00
47eca42f68
Digging invaders: made it possible to customize which races can dig.
2013-01-03 23:18:40 -05:00
0fecdfadb1
Digging Invaders: when assigning a job, get rid of old one. Handle loading and unloading. Optimizations for when invaders can already reach someone.
2013-01-03 22:46:17 -05:00
ed6dcf9589
DiggingInvaders: made invaders dig automatically, instead of on request.
2013-01-03 21:25:50 -05:00
f145f8d528
Merge branch 'eventManager' into diggingInvaders-unstable
2013-01-03 19:32:12 -05:00
715f191c26
EventManager: made the frequency part of EventHandler.
2013-01-03 19:31:29 -05:00
b82d6940b6
Digging invaders: started on making invaders keep digging until done.
2013-01-03 18:45:53 -05:00
1d6dec54c7
Digging Invaders: reorganized the files to make it easier to work with.
2013-01-03 18:14:16 -05:00
84b8fae326
Merge branch 'eventManager' into diggingInvaders-unstable
2013-01-03 15:53:06 -05:00
910e398a7b
EventManager: added invasion event.
2013-01-03 15:52:56 -05:00
34d9785ce5
Digging Invaders: minor changes.
2013-01-03 14:38:05 -05:00
b62e50f2e1
DiggingInvaders: get rid of the framework for assigning multiple dig/deconstruct/etc operations at the same time.
2013-01-03 14:16:10 -05:00
0b68e66dc9
DiggingInvaders: fixed a problem with deconstructing hatches.
2013-01-03 13:32:50 -05:00
c22c4d009c
Added convenience functions to eventful (see Lua API.rst)
2013-01-03 20:30:51 +02:00
796e387398
Add a guard against an invalid item pointer, and don't try to deduce construction labor for item_lost jobs
2013-01-03 12:24:32 -06:00
f60e44c395
DiggingInvaders: minor changes.
2013-01-03 13:11:11 -05:00
7b561f108b
Fix hotkey detection
2013-01-03 22:01:01 +13:00
7586e62374
Digging Invaders: fixed a problem with removing constructions.
2013-01-02 22:35:05 -05:00
5201870356
Digging Invaders: get rid of debug prints.
2013-01-02 22:13:23 -05:00
ae43865489
Digging Invaders: actually seems to basically work!
2013-01-02 22:11:05 -05:00
4e4e382b8f
EventManager: added syndrome event.
2013-01-02 18:30:15 -05:00
8b5e847dfa
New event for eventful. postWorkshopFillSidebarMenu for tweaking the sidebar menu on workshops.
2013-01-02 23:43:38 +02:00
38ef75418a
AutoSyndrome: added an option to delete boiling rocks as they are created (on by default).
2013-01-02 14:09:16 -05:00
5e2877be23
AutoSyndrome: added options for worker only (vs all in building), allow multiple targets, and allow multiple syndromes.
2013-01-02 13:47:59 -05:00
bf0f0e910b
Merge branch 'eventManager' into autoSyndrome
2013-01-02 12:40:20 -05:00
144e0b4dcb
Digging Invaders: merged eventManager and recent.
2013-01-02 11:26:30 -05:00
c3b2ae2137
EventManager: allowed plugins to specify how often they need events to be checked, in the event that monitoring is necessary.
2013-01-02 11:07:56 -05:00
581a8dd955
Prevent material selection cursor from going past its bounds
2013-01-02 22:27:26 +13:00
fa78d6ccfc
Merge branch 'recent' into eventManager-unstable
...
Conflicts:
library/modules/Job.cpp
2013-01-02 03:16:45 -05:00
b320fb25f3
AutoSyndrome: added smart arguments for location, worker id, and reaction id.
2013-01-02 00:07:23 -05:00
1fe3a0e343
Merge branch 'automaterial_box'
2013-01-02 14:01:11 +13:00
41615d0446
Autolabor: adjust idle clawback to deal with "pickup equipment" for miners.
2013-01-01 17:53:24 -06:00
d50aa24ebf
Autolabor: fix idle stepdown (seems to work much better), change some scoring weights, change autolabor list output to include busy and idle counters
2013-01-01 16:35:09 -06:00
3a24565728
Autolabor: add construction labor for hatch.
2013-01-01 15:12:45 -06:00
7df7b1758c
Merge branch 'automaterial' of https://github.com/Falconne/dfhack into automaterial_box
2013-01-01 19:51:29 +13:00
a1eadd0f08
Allocate sky blocks when needed.
...
Allow stairs to be designated on top of each other in open space.
2013-01-01 19:46:11 +13:00
0572e87d7b
SkyEternal: allocates new z-levels of sky as needed, or on request.
2012-12-31 13:57:59 -05:00
6ab8c8c30e
Autolabor: change fishery build labor to CLEAN_FISH to control random acts of fish extermination; add build labor for wells.
2012-12-28 07:58:29 -06:00
6d4c003748
Autolabor: fix dig-from-below bug regaring mining jobs, add overallocation detection and remediation, fix fishing and hunting
2012-12-27 02:52:54 -06:00
5d04148aad
Make gcc happy
2012-12-27 20:15:32 +13:00
1ed129e1a7
Allow placing constructions in unconnected open space, with sensible restrictions
2012-12-26 01:02:57 +13:00
40e25b6a1f
Better handling of open space construction placement
2012-12-25 18:08:41 +13:00
5e54c9919a
Improved check for figuring out what tiles can have constructions.
2012-12-24 00:59:12 +13:00
e4f4943b10
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-12-23 12:34:05 +02:00
2f48ed5d9a
Added restrictliquids and restrictice commands.
2012-12-23 01:09:21 -08:00
03aedf6895
Enabling designation like rectangular selection for constructions, with unlimited selection size and auto skipping of tiles that can't be built on.
2012-12-23 03:04:41 +13:00
a4dc79565a
AutoSyndrome: allowed for triggering DFHack commands from in game reactions.
2012-12-22 00:13:07 -05:00
786149a630
Added new event to eventful: onWorkshopFillSidebarMenu
2012-12-21 00:42:15 +02:00
46b9148277
Digging invaders: it still doesn't work, but now it's a lot simpler.
2012-12-20 00:35:45 -05:00
9cb3f19630
Digging invaders: Minor changes. Still unstable.
2012-12-19 20:44:22 -05:00
ee4f37ff72
Merge branch 'canWalkBetween' into diggingInvaders
2012-12-19 20:31:17 -05:00
7972902c81
stepBetween: named a few things better, and fixed a lot.
2012-12-19 20:30:37 -05:00
fcbc5d1cb0
Digging invaders. Temp commit. Unstable.
2012-12-19 18:46:46 -05:00
555c754636
EventManager: added construction and building events.
2012-12-18 18:34:38 -05:00
a9fec84c72
Autolabor: add paved roads.
2012-12-18 16:23:02 -06:00
a09764e77b
Digging Invaders: more optimizations.
2012-12-18 15:22:21 -05:00
110a9a5579
Digging Invaders: a bit faster.
2012-12-17 20:44:35 -05:00
937769874d
Digging Invaders: kind of works, but WAAAAAY too slow.
2012-12-17 20:12:11 -05:00
957a4da474
Minor changes.
2012-12-17 18:05:57 -05:00
ef80dbacde
More fiddling. Almost kind of works.
2012-12-17 17:36:35 -05:00
76fcf1c335
Digging invaders: multi-dimensional edge cost: always prefer walking over digging, no matter how far.
2012-12-17 14:22:45 -05:00
94673e447d
diggingInvaders: reimplemented path-based digging. Works kind of ok.
2012-12-17 13:37:02 -05:00
ed1766936b
diggingInvaders: sadly, it seems that minimum spanning tree is a terrible heuristic for vertex Steiner tree in this case.
2012-12-17 00:54:39 -05:00
bf25ea5129
diggingInvaders: fixed a major bug with edge sorting.
2012-12-17 00:17:07 -05:00
d79583a2c9
Merge branch 'canWalkBetween' into diggingInvaders
2012-12-16 23:39:36 -05:00
01e5e93825
Renamed Maps::canWalkBetween to Maps::canPathBetween and added Maps::canWalkBetween, which does what it says.
2012-12-16 23:26:50 -05:00
a61cbc661b
diggingInvaders: starting a rewrite. Unstable
2012-12-16 21:44:23 -05:00
9aa95ddca8
diggingInvaders: int -> int32_t
2012-12-16 17:06:46 -05:00
2760484c37
diggingInvaders: cleanup.
2012-12-16 16:53:02 -05:00
131d19e4cf
Merge branch 'eventManager' into diggingInvaders
2012-12-16 16:43:58 -05:00
8a242b3c0d
Merge branch 'master' into diggingInvaders
2012-12-16 16:34:45 -05:00
4ac6d9c0c3
Autolabor: add a number of destroy furniture labors (all "haul furniture")
2012-12-16 00:03:26 -06:00
8bf359ba02
Autolabor: add labor for ivory & horn crafts (yawn)
2012-12-15 21:18:06 -06:00
75db99a3c7
autoSyndrome: deleted an unused constant.
2012-12-15 18:52:05 -05:00
3e5537e321
autoSyndrome: made it use EventManager.
2012-12-15 18:47:51 -05:00
dae162a0b4
Merge branch 'eventManager' into autoSyndrome
2012-12-15 18:18:59 -05:00
935058f0a5
EventManager: moved files around, made eventExample not run by default, and got rid of the silly NONE event type.
2012-12-15 17:43:41 -05:00
86e002f3ff
EventManager: added item creation event.
2012-12-15 16:49:13 -05:00
b0314755e0
EventManager: added unit death event.
2012-12-15 14:40:11 -05:00
4af6b728b7
Small fix to gm-editor. Added proj_itemst and proj_unitst to eventful. Now you can make custom projectiles (e.g. rockets?)
2012-12-15 13:27:16 +02:00
155a4d044c
EventManager: fiddled with time events. Made it possible to register for time events before a world is loaded. Also added some files I forgot to add to the previous commit.
2012-12-14 23:29:28 -05:00
cf619a519e
EventManager: made event handlers unregister when plugins are unloaded. Also changed PluginManager so that plugins can call core.getPluginManager() during plugin_init.
2012-12-14 22:14:38 -05:00
747723187f
EventManager: first draft.
2012-12-14 21:05:38 -05:00
cd7c39f2db
Autolabor: add deconstruct labor for cages
2012-12-14 09:34:03 -06:00
08f454cc81
Removed old reactionhooks.lua
2012-12-14 16:41:59 +02:00
e46d434c25
Missing lua file for eventful.
2012-12-14 16:33:26 +02:00
af7f11fdfa
autoSyndrome: made the syndrome logic make more sense.
2012-12-13 11:30:37 -05:00
bba96494f3
ruby: add unit_hostiles to list hostiles units (duh)
2012-12-13 17:20:21 +01:00
a28fc65e6d
autoSyndrome now deals with creature_class.
2012-12-13 11:13:56 -05:00
2535b50bfc
Autolabor: add construct chain labor, add destruct trap labor, change overbroad test for military status (was catching uniformed reservists, who are eligible to do civilian labor)
2012-12-12 22:25:23 -06:00
3a541e26be
autoSyndrome: automatically detects boiling rock syndromes better, and checks if each syndrome is applicable to the unit that finished the job.
2012-12-12 23:01:05 -05:00
82031092a9
Autolabor: rework tool management to try to reduce tool litter
2012-12-12 14:28:11 -06:00
ddceabbfb7
Merge branch 'master' of git://github.com/jjyg/dfhack
2012-12-12 18:58:11 +02:00
3b9f21a1ea
Autolabor: do not count designations in hidden squares (since your dwarves can't reach them anyway). Also apply an assignment penalty for assigning a dwarf to a labor other than the one the dwarf is doing
2012-12-12 10:37:09 -06:00
0fc01c48e1
Autolabor: add construct labor for GearAssembly, AxleHorizonal, and AxleVertical (the last is a guess, but probably right)
2012-12-12 09:52:13 -06:00
b75c1da95e
Autolabor: add build waterwheel.
2012-12-12 08:46:52 -06:00
662d3101c7
ruby: fix onupdate tick limiting + advmode, add pageprotect, add :script_finished
2012-12-11 17:25:51 +01:00
bd1756e5d0
Autolabor: change the fallback labor (for dwarfs for which nothing seems appropriate) from NONE to CLEAN. Fiddle with weights in assignment algorithm.
2012-12-11 09:29:03 -06:00
3e8ba2dd06
Autolabor: fix bring-crutch labor
2012-12-11 09:19:38 -06:00
017b986987
Autolabor: fix wound cleaning labor.
2012-12-11 09:06:37 -06:00
966deb4647
Fix crash and confusing behavior in automaterial.
2012-12-11 22:05:00 +13:00
6bc791d985
follow df-structure rename unit.unknown8 + able_stand_*
2012-12-10 22:50:33 +01:00
a914f8e8e0
Autolabor: busy dwarfs may be reassigned now, but with a strong preference for their current job; armed dwarfs are given preference for outside jobs; include experience gained toward next level in preference weighting
2012-12-10 08:34:11 -06:00
e85f4eb880
First draft of autoSyndrome: a tool for replacing boiling rock syndromes with something more reliable. Uses non-df-recognized tags in material definition raws.
2012-12-09 21:19:40 -05:00
6c4f163a5e
Merge branch 'master' of https://github.com/angavrilov/dfhack
...
Conflicts:
NEWS
2012-12-09 14:25:31 +02:00
6d0e505fd2
Added onItemContaminate to eventful and readme/news for eventful
2012-12-09 14:15:39 +02:00
a0a566dbf2
Tidy up eventful.cpp
2012-12-09 13:00:49 +02:00
0ef4522f95
Merge branch 'master' into autolabor
2012-12-08 21:26:50 -06:00
468412b9fc
Autolabor: fix unitialized variable bug causing broker to be inappropriately excluded from work
2012-12-08 21:14:23 -06:00
72921fbfd5
Made workNow only check jobs when the game becomes paused instead of constantly when paused. Also made it enable/disable on command.
2012-12-08 12:50:33 -05:00
412a004751
Autolabor: identify labors that may involve going outside and apply an assignment penalty for such labors to dwarfs who have minor children (in order to keep the kids inside)
2012-12-08 10:55:44 -06:00
6ae82187d2
Autolabor: more tweaks to hauling labor decoding, fix heap corruption due to array underflow
2012-12-08 03:51:07 -06:00
e7d3fbe97b
Autolabor: track labors actually being used (to avoid "gone fishing" bug); fix several wrong labor map entries; add several special cases for hauling (still not all there yet); add debug warning if job deduction appears wrong; flail about mightily trying to resolve heap corruption on unload
2012-12-08 02:42:22 -06:00
7307f4e870
Fix crash and confusing behavior in automaterial.
2012-12-08 09:51:35 +04:00
42670f0233
Autolabor: only care about skills that are used for labors, when determining a dwarf's highest skill.
2012-12-07 15:41:39 -06:00
ebc2625d97
ditch the unused Vegetation module
2012-12-06 23:47:25 +01:00
fa9b71adc5
autolabor: add archery targets, improve JobLaborMapper's destructor
2012-12-06 09:39:14 -06:00
e1b70d171c
ruby: tweak is_citizen test
2012-12-06 12:48:16 +01:00
cd6eb9edd3
If training ammo is forbidden for all use, don't move it to combat chests.
2012-12-06 12:00:18 +04:00
0df60a0b4f
Autolabor: slabs, animal trainers
2012-12-06 01:38:43 -06:00
f8d6b83088
Add 'allow fishing' and 'allow hunting' config options. Protect against accidentially trying to set or unset the NONE labor or any other invalid labor value (which corrupts DF). Add traction benches. Change prioritization around quite a bit.
2012-12-04 20:23:19 -06:00
74ebe7d207
ruby: add df-static-flagarray
2012-12-04 17:55:29 +01:00
0b80dff09d
ruby: add d-float support
2012-12-04 17:18:09 +01:00
0f1aaa6ec4
Autolabor: Items marked for dump now generate haul refuse demand. Also corrected labor for dump item jobs.
2012-12-04 01:59:44 -06:00
745b347b5b
Fix const correctness
2012-12-04 10:30:49 +13:00
287ee2bc04
Autolabor: allow multiple simultaneous jobs at farms.
2012-12-03 14:20:57 -06:00
3953112eb9
dump Vegetation::t_plant, fix plant.is_burning
2012-12-03 19:03:07 +01:00
208b9915ea
Autolabor: splints and crutches are furniture (at least at a forge); remove test that excludes pet owners from being given jobs when they're idle; add test for hungry/thirsty dwarves to trigger a feed/water civilians requirement; add a vehicle hauling requirement based on the existence of hauling routes
2012-12-03 04:28:08 -06:00
9563dae5d7
Autolabor: add labors for construct bridge, construct nestbox, construct trap, deconstruct wagon; fix error in labor for deconstruct furnace/tradedepot/construction; actually update the "active dwarf" numbers displayed in "autolabor list"; increase assignment penalty for dwarfs using skills lower than their best skill; increase assignment bonus for continuing in the same labor and for having the right tool for the job.
2012-12-03 01:41:02 -06:00
44bb965c97
Autolabor: add more building labors
2012-12-02 18:41:20 -06:00
4cd217b782
to new assignment algorithm. Add priority boost for labors based on how long it's been since they were last used, to avoid labor starvation. Move persistent configuration to "autolabor/2.0" to avoid conflicting with older versions.
2012-12-02 14:27:13 -06:00
b743f4f42d
Autolabor: remove some debug spam, and fix an error in computing preference scoring
2012-12-02 09:47:15 -06:00
dc7f9f56cd
Implement a low stock level announcement as suggested by falconne.
2012-12-02 15:31:43 +04:00
799da41f70
Autolabor: Add debugging messages from the labor deduction module; add deduction rules for some building destroy jobs; automatically exclude handless dwarfs from labor poor; use DF's own hauling job counts to compute hauling demand (and arrange for the "hauling canary" so that this always works)
2012-12-02 02:02:16 -06:00
45564ca0cb
Autolabor: generating haulers based on unstockpiled items (less than ideal). Fix wrong build labor for Farmer's workshop. Add build labor function for constructions (also works for furnaces and trade depots). Add architect detection. Use a different mechanism for selecting dwarfs for labors.
2012-12-01 23:12:41 -06:00
15f7ffa0e2
autolabor: add ConstructBuilding (Farm); change priority calculation
2012-12-01 17:39:01 -06:00
bb2b97baa3
autolabor: exclude "item lost" jobs, exclude jobs that are not first-in-queue at workshop, improve debug messages
2012-12-01 16:09:52 -06:00
201430ed08
Autolabor: add health awareness, fix initialization crash, fix idle dwarf loop crash
2012-12-01 14:08:15 -06:00
df2e9f00e1
Document that search now works in the stockpile settings screen.
2012-12-01 17:21:06 +04:00
fd5b19fe8d
Merge remote-tracking branch 'falconne/search'
...
Conflicts:
plugins/search.cpp
2012-12-01 16:55:52 +04:00
afb6d8ef79
Autolabor: improve (hopefully) the functionality for mapping jobs to labors. Still some gaps to fill, but not many.
2012-12-01 02:26:06 -06:00
d2ec52fa0b
Merge branch 'master' into autolabor
2012-11-30 21:47:30 -06:00
05dce0d2f1
Fix inadvertently prematurely terminated block comment.
2012-11-30 21:24:18 -06:00
384a667e97
Assorted progress on new autolabor. Still lots of issues.
2012-11-30 20:22:58 -06:00
6bc6f3e555
Merge branch 'search'
2012-12-01 10:21:37 +13:00
5f3328dcb2
Merge branch 'master' into autolabor
...
Conflicts:
plugins/autolabor.cpp
2012-11-30 11:25:41 -06:00
eecb604800
Sync submodules
2012-11-30 11:23:58 -06:00
210c1650ec
Add stockpile screen searching capability
2012-12-01 01:01:04 +13:00
2cb594ba89
Tweak the workflow lua api: include history in output of listConstraints.
2012-11-30 14:48:05 +04:00
abe027c940
Copy changes from ag fork
2012-11-30 22:44:05 +13:00
13666ec6e6
Merge remote-tracking branch 'remotes/origin/automaterial'
2012-11-30 20:27:32 +13:00
d2a13ad2c7
Merge branch 'autopasture'
2012-11-30 19:53:14 +13:00
d59d1c652e
Fix gcc compile of search plugin
2012-11-30 19:50:42 +13:00
d7f7538d01
ruby: fix Pointer assignment
2012-11-29 17:11:29 +01:00
3095c43d26
Fix location of workshop ui, based on menu width
2012-11-29 23:15:24 +13:00
57b69da1f0
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-11-29 12:13:28 +02:00
2c9b560872
Made dfusion not stop df on input.
2012-11-28 22:13:28 +02:00
771a5ac50b
ruby: tweak flagarray#inspect
2012-11-28 20:08:34 +01:00
614225cc5f
follow rename itemst.flags.artifact1 -> artifact
2012-11-28 19:48:47 +01:00
bfc11cf946
Add persistent history of per-constraint item counts in workflow.
...
This will be needed for properly merging or integrating the status
screen by falconne. The history is maintained as a circular buffer
of up to 28 entries, and persists in save files.
2012-11-28 19:25:01 +04:00
593dc4f554
Fix handling of manipulator hotkey in unit search screen
2012-11-28 17:18:38 +04:00
8f0d552556
ruby: add DFHack::VERSION
2012-11-28 13:33:07 +01:00
7a2a746347
Add filtering to zone creature assignment menu. First steps towards adding autopasture functionality.
2012-11-29 00:31:39 +13:00
76bb5f0196
ruby: items in containers are free
2012-11-26 20:09:56 +01:00
2bbcfe912a
Site spawner added to adv_tools
2012-11-26 21:04:17 +02:00
f091284a75
ruby: avoid crash on ArgumentError in onupdate
2012-11-25 17:29:03 +01:00
3db5684ae7
Fix handling of manipulator hotkey in unit search screen
2012-11-25 19:01:58 +13:00
e9141f34f6
Adjust minimum widths so they actually work at 80x25 without glitching out
2012-11-24 11:13:54 -06:00
c58f30ba00
Use teal background instead of red for no-labor cells
2012-11-24 10:37:22 -06:00
cdc44b74f2
Fix possible crash when using shift+enter on cells that don't have labors
2012-11-24 10:36:32 -06:00
4dfe46e26f
manipulator: fix column width calculations for 80x25 window
2012-11-24 16:52:21 +01:00
e73274d281
ruby: add description field to onupdate_register
2012-11-24 16:10:55 +01:00
e750cbe5e9
MouseQuery Plugin
2012-11-25 04:02:49 +13:00
139fd07df3
missed a spot
2012-11-23 19:23:06 -06:00
e3eb325d36
Minimize references to gps->dimx/dimy
2012-11-23 19:18:56 -06:00
2a0d048040
Make tweak stable-cursor interact with the build menu properly.
2012-11-22 20:08:47 +04:00
e7905a5cff
Add docs for the automaterial plugin, and use the new Painter class.
2012-11-22 19:38:45 +04:00
2794143f77
Merge remote-tracking branch 'falconne/automaterial'
2012-11-22 18:27:31 +04:00
2a83d92290
Code cleanup
2012-11-21 23:45:26 +13:00
0d9efec062
Disable plugin in non construction menu
2012-11-21 20:17:36 +13:00
5b5c674f6e
ruby: update map_tile.mat_info for soil/stone special cases
2012-11-20 21:17:33 +01:00
9cb1a45855
Automaterial branch commit
2012-11-20 23:12:11 +13:00
5c18952caa
Select by item name
2012-11-20 22:52:44 +13:00
fe2257427f
workNow: plugin to make DF process jobs every time you pause.
2012-11-19 20:17:05 -05:00
f587d603e8
Allow the workflow goal gap in any range between 1..goal-1
2012-11-19 18:59:58 +04:00
0e2aa299b9
Auto material selection plugin - First push
2012-11-20 00:25:25 +13:00
902d2d5597
Try reducing the replace with sparring chance due to xp gain overkill.
...
Also add more debug spam to make behavior tracking easier.
2012-11-18 22:06:47 +04:00
ae7bf5aca6
Check unit inventory when replacing skill demo with sparring.
...
E.g. if they have no shields, they won't gain that skill when sparring.
2012-11-18 13:02:49 +04:00
ee15086963
Some preparations for new plugin.
2012-11-18 01:52:46 +02:00
2953e4c386
Implement a dialog to specify a workflow constraint with all features.
2012-11-17 20:32:39 +04:00
0b568942f4
Follow changes in the xml defs.
2012-11-17 16:43:29 +04:00
1ab48aa2de
Merge https://github.com/ab9rf/dfhack
2012-11-16 21:15:38 -06:00
e2b9b703a0
Get rid of tabs
2012-11-16 15:33:36 -06:00
fc1a1e1f0e
Merge remote-tracking branch 'jjyg/master'
...
Conflicts:
NEWS
2012-11-16 13:20:46 -06:00
2a0171a4ff
Merge remote-tracking branch 'angavrilov/master'
2012-11-16 13:15:55 -06:00
cbe3741751
Check all depots for trader requested, not just the last one.
2012-11-16 13:09:05 -06:00
d506dd7137
Add a tweak to speed up melee squad training.
2012-11-16 22:51:07 +04:00
423c122424
ruby: fix unit_find for advmode
2012-11-16 17:59:39 +01:00
bbe94c006f
Update for temperaturest
2012-11-12 11:54:21 -06:00
55fcb7e3ca
One more missed
2012-11-12 08:33:05 -06:00
766aca4911
Rename general_ref vectors for consistency
2012-11-12 08:27:58 -06:00
c32f85d637
Merge remote-tracking branch 'warmist/master'
...
Conflicts:
plugins/Dfusion/include/OutFile.h
2012-11-12 10:50:48 +04:00
ce8ada4419
More bug fixing
2012-11-11 22:14:00 +02:00
3eb852a43b
Added cheat commands to companion-order, (including rumrushers)
2012-11-11 21:18:59 +02:00
df3b791665
Fixed error in dfusion and added some readme.
2012-11-11 17:19:37 +02:00
683da39636
Fix dfusion build on linux.
2012-11-11 17:24:25 +04:00
d5c31942b5
Add a way to only count locally-made items in workflow.
2012-11-11 15:56:31 +04:00
0e4df55364
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-11-11 12:46:55 +02:00
33f674eee2
Removed dfusion lua files. Updated plugins.
2012-11-11 12:33:54 +02:00
f1d4eac700
Pre-class remove
2012-11-11 11:58:43 +02:00
7ee817b324
Add gcc compile fixes
2012-11-11 19:42:30 +13:00
6803a83e07
Refresh constraints on map reload
2012-11-11 18:18:54 +13:00
f86371cfc3
Try blocking any use of stockpiles for squad stuff in fix-armory.
2012-11-10 18:06:41 +04:00
b16bbdd6df
Generate correct constraint string for persistence
2012-11-11 03:00:55 +13:00
56ef33ea0e
Support building steam engines on top of brooks without any down stairs.
2012-11-10 17:33:05 +04:00
eb936c4ce0
Support milking and shearing in workflow.
2012-11-10 17:06:54 +04:00
0222b93bb0
Fix bug with non-repeating jobs getting protected
2012-11-10 03:47:15 +13:00
69bb6a5b3b
Finished dashboard, colour coding, trend calculation and charts, material selection screen, mouse support
2012-11-09 20:05:16 +13:00
a7bf526f41
Make workflow consider squad-assigned items busy.
2012-11-08 21:27:56 +04:00
0c70a448d0
Update submodules
2012-11-07 23:06:02 +01:00
f6b6d730a0
Fix fix-armory constantly trying to store ammo already stored in chest.
2012-11-07 22:49:40 +04:00
b089221400
Inventory Monitor - first checkin
2012-11-06 06:59:51 +13:00
edf80ff748
Show the sex of the unit in the bottom line of Dwarf Manipulator.
2012-11-04 18:03:02 +04:00
9bf24bde10
More various updates for search.
...
- Keep the search state as long as the screen is alive.
- Properly forget saved state when clearing search.
- Fix the start column in render for stocks screen.
- Allow search by profession in all Units pages.
- Dismiss search when trying to trade.
2012-11-03 15:34:04 +04:00
8bccfb1e9a
Fix gcc compiler errors and warnings in search, reindent plugin_init, etc.
2012-11-03 14:31:07 +04:00
43ab172652
Merge remote-tracking branch 'falconne/master'
...
Conflicts:
plugins/zone.cpp
2012-11-03 14:07:42 +04:00
71c1ba84e3
Merge remote-tracking branch 'q-github/master'
2012-11-03 14:05:15 +04:00
3257eb80a1
Add checks to avoid crashing if we encounter a soulless unit
2012-11-02 16:28:48 -05:00
e887c60e93
Removed unused buffers.
2012-11-02 21:00:35 +02:00
86e4a42bdd
Small fix due to vmethod change
2012-11-02 20:59:05 +02:00
6be65690f7
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-11-02 20:29:27 +02:00
5295be5fdb
More work done. Only bin-plugs left (and docs)
2012-11-02 20:28:08 +02:00
296d1cf090
More scripts for dfusion. Only fixes left, and updating bin-plugins (friendship and migrants(??))
2012-11-02 00:50:20 +02:00
ba071468dc
New way of doing things!
...
Now using a class for menus, also no (non script) way to use bin-plugins.
2012-11-02 00:28:16 +02:00
209d593f21
Another day, another commit.
2012-11-01 16:00:00 +02:00
0a78064467
ruby: raise on invalid enum symbols
2012-10-31 16:11:06 +01:00
69bdb0f8b8
Update fix-armory documentation and comments.
2012-10-31 11:31:31 +04:00
05b73af9bb
Extend fix-armory with support for storing ammo in barracks.
2012-10-30 23:20:34 +04:00
c4f544d796
Fix stupid MSVC
2012-10-30 13:50:14 -05:00
b46885bb3c
Fix compile
2012-10-30 11:48:28 -05:00
4fa826d2b9
Block instant creation of store in stockpile jobs when removing uniforms.
2012-10-30 13:11:57 +04:00
3ff5d38a5c
Add a few utility functions to the main library.
2012-10-30 12:40:26 +04:00
dc2805b1f3
Link the renderer vtable from libgraphics on linux.
2012-10-30 10:38:32 +04:00
cd14bdfd43
Disable dfstream by default
2012-10-29 22:29:07 -05:00
3a6b0357a2
Fix compilation on Windows, incorporate latest df-structures data
2012-10-29 16:56:22 -05:00
c69ae2fc4a
Merge https://github.com/Mortal/dfhack
2012-10-29 16:34:26 -05:00
7646fa6aa3
Add dfstream plugin. Broadcasts the Dwarf Fortress display on TCP port 8008. For use with https://github.com/Mortal/dfstream
2012-10-29 22:18:50 +01:00
7219200d17
Split the armory tweak into a separate plugin - it is too big now.
2012-10-28 22:05:00 +04:00
ed4904fb66
Add a tweak that makes dwarves haul equipment from stockpiles to the armory.
2012-10-28 21:13:28 +04:00
fa88ee5f17
Update the armory tweak to protect other potential squad equipment.
...
Specifically clothing in cabinets and flasks/backpacks/quivers in boxes.
2012-10-28 15:37:16 +04:00
4c2c6a1911
Fix handling of Collect Webs jobs in workflow.
2012-10-26 23:53:18 +04:00
c5d8bd9db6
Add a tweak to stop stockpiling items on weapon racks and armor stands.
2012-10-26 23:30:44 +04:00
b976e01b8c
Follow the change in the base-type of job_skill.
2012-10-26 20:29:21 +04:00
1b9d11090f
ruby: ANY_FREE/IN_PLAY
2012-10-25 13:44:01 +02:00
1f994295b8
Consider assigned vehicles in use, and tweak text color rendering.
2012-10-25 13:20:41 +04:00
79d2cb1a5c
Remove the C++ version of the job output deduction code and switch to lua.
2012-10-25 12:44:23 +04:00
8eebfa007c
Tweak the workflow gui script to make the UI operate smoother.
2012-10-25 12:15:18 +04:00
a7f1ceb75d
Link lua to workflow.
2012-10-24 23:01:31 +04:00
59ec9b304e
Implement adding workflow constraints from gui/workflow.
2012-10-24 21:49:30 +04:00
616c57257d
Support changing the constraint ranges from the workflow gui script.
...
TODO: implement creating completely new constraints.
2012-10-24 19:25:06 +04:00
cd852e2240
Fix one more place that was using ANY_FREE.
2012-10-24 17:51:47 +04:00
7b67df4b4e
Merge remote-tracking branch 'q-github/master'
2012-10-24 16:49:12 +04:00
09f8e8e419
Start working on gui for workflow.
2012-10-23 21:42:03 +04:00
27c7dfde4f
ANY_FREE -> IN_PLAY, to match terminology used in DF's error messages
2012-10-23 12:14:21 -05:00
94898a73fb
Add Search plugin comments
2012-10-23 21:20:51 +13:00
cfbdf47f6e
follow rename Carried->Hauled in df-structures unit inventory mode
2012-10-22 19:37:12 +02:00
2fcceaa65e
Set priority over manipulator plugin
...
Include animal type is search
2012-10-22 21:44:02 +13:00
c433a8eeff
Better handling of Trade screen. Tracks marked items and handles re-orders is sort plugin is used to sort filtered list.
2012-10-22 19:54:36 +13:00
59ece3d4f1
Merge branch 'master' into autolabor
2012-10-21 17:25:14 -05:00
f501ae0748
Bug fix on unit sort
2012-10-22 01:09:10 +13:00
bf01ecd206
Added Trade screen
2012-10-22 00:48:27 +13:00
a3f6e9e305
Small error fix
2012-10-21 13:46:12 +03:00
86ec66c0fb
More work on dfusion. Embark anywhere script separated.
2012-10-21 13:42:55 +03:00
c5b38a24eb
Refactoring to use templates
2012-10-21 20:57:03 +13:00
67674a7676
Merge remote-tracking branch 'jjyg/master'
2012-10-21 11:12:32 +04:00
1f7a01d685
follow rename unit.military.squad_index to squad_id in df-structures
2012-10-20 22:35:39 +02:00
fd60db44ab
Search plugin, early work. Unit and stocks screen.
2012-10-21 00:49:46 +13:00
687dc7105f
Merge remote-tracking branch 'kmartin/master'
2012-10-20 15:39:20 +04:00
6a54878a6b
Fix autobutcher resume
2012-10-20 01:38:08 +13:00
da92fb9a1c
Start of dfusion module. Fixed small error in memscan.lua and start of custom embark command.
2012-10-17 21:43:44 +03:00
5f4f540bfa
Fix "fastdwarf" command to print syntax where appropriate, silence warning
2012-10-17 07:57:14 -05:00
ffe70e9ee7
ruby: unregister onupdate callback on exception
2012-10-17 14:40:28 +02:00
0003fe0b2a
Merge remote-tracking branch 'jjyg/master'
2012-10-12 20:33:07 -05:00
c089534f73
ruby: fix assigning value to pointer to number
2012-10-12 13:33:58 +02:00
1f88c0eeed
ruby: codegen: avoid bad vector_reftg accessor
2012-10-12 11:42:42 +02:00
0547ee7f83
ruby: add magic "nolock " prefix to run ruby without Suspending main df
2012-10-12 11:12:31 +02:00
12eeb9e5c0
Correct wrong variable use in start_autonestbox.
2012-10-12 00:38:45 -05:00
424c37c0ea
ruby: fix codegen to handle composite vtables
2012-10-11 17:51:49 +02:00
9148079745
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-10-10 19:47:01 +02:00
46a24a83fb
ruby: fix item_find(:selected) in item details screen
2012-10-10 18:01:57 +02:00
41de37a5c1
Add a special workshop for add spatter reactions into example raws.
2012-10-10 18:29:59 +04:00
7c969f774f
Split the liquipowder fix-dimensions hook into separate liquid and powder.
...
The item_liquipowder vtable is completely optimized out by MSVC.
2012-10-10 18:22:01 +04:00
5cf42fd6f8
ruby: add Matinfo#===
2012-10-10 14:57:45 +02:00
ab90e3eefe
Manipulator - take false identities into account
2012-10-07 17:35:41 -05:00
49476818c4
Dfusion rebuild start (lua script side plugins)
2012-10-07 20:45:14 +03:00
923ea3f4b0
Reactionhooks more usefull and gm-editor minor tweaks (e.g. search in containers)
2012-10-07 20:44:18 +03:00
459c69046b
Dissolve the World module class into a namespace.
...
It made accessing persistent data way too cumbersome.
2012-10-06 13:46:20 +04:00
696cc4a911
Stop autobutcher and autonestbox crashing if started without world.
2012-10-06 13:07:11 +04:00
6fefd09072
Fix re-enabling autobutcher after being disabled.
2012-10-06 12:51:34 +04:00
5396a67465
Some tweaking and edited NEWS.
2012-10-06 12:40:46 +04:00
cbbb164dad
ruby: add MapTile distance_to and spiral_search
2012-10-05 20:44:29 +02:00
ddcc2ee90d
Should use "break" in this construct, not "continue"
2012-10-04 20:20:35 -05:00
6b3d85eb0f
Don't make teledwarf skip everything after it if there's a problem
2012-10-04 20:17:33 -05:00
faa131942c
Partial rewrite of 'fastdwarf' plugin:
...
* add "fastdwarf 2" to use DF builtin "turbo speed" debug setting
* use Units::isCitizen() instead of race/civ check
* only scan active units, not all of them
* do both fastdwarf and teledwarf in the same loop
* teledwarf: don't use MapCache - it's faster to do it directly
* teledwarf: don't clear both occupancy flags - check unit 'prone' flag
* teledwarf: set proper unit occupancy flag at destination tile
* teledwarf: if destination tile has standing unit, make dwarf lie down
* cleanup 'fastdwarf' command
* improve help text
2012-10-04 20:14:50 -05:00
9f687f64a4
Fix build.
2012-10-03 12:58:05 +04:00
7962f24cce
Display actual key bindings for Manipulator
2012-10-02 10:20:54 -05:00
43532e4871
Progress commit of a rewrite of autolabor to draw from the jobs list and other world information. A lot still to do on this.
...
DO NOT MERGE INTO THE MAIN BRANCH. This code is incomplete and only vaguely tested.
2012-10-01 17:48:47 -05:00
150704f1af
ruby: raise when using unknown symbols in viewscreen.feed
2012-10-01 16:05:07 +02:00
fbc2d85609
ruby: rename building_isitemfree to item_isfree, add trader flag check
2012-10-01 11:14:00 +02:00
4de245d691
ruby: install generated autogen after copying *.rb
2012-09-30 17:08:03 +02:00
6fd002382f
ruby: fix cmake dependency on codegen.out.xml
2012-09-29 12:13:04 +02:00
7a74088287
Make backspace seek to top left corner in manipulator.
2012-09-29 13:01:11 +04:00
1bac22884e
xMerge https://github.com/jjyg/dfhack
2012-09-29 01:58:29 +02:00
12f5e6028c
manipulator: avoid NULL deref with unassigned job in unit list
2012-09-29 01:38:32 +02:00
4258d1eb83
Merge branch 'experimental' of https://github.com/expwnent/dfhack
2012-09-29 01:31:12 +02:00
0e124bf62b
Merge branch 'teledwarf' into experimental
2012-09-28 19:17:56 -04:00
d41c4849f9
Fixed unit_grounded in teleporting dwarf tile.
2012-09-28 19:17:12 -04:00
4b99d096da
Merge branch 'teledwarf' into experimental
2012-09-28 19:07:29 -04:00
1bde32fa5b
Fixed a tile occupancy problem with teleporting dwarves.
2012-09-28 19:06:22 -04:00
44a74ddc38
ruby: remove unused var
2012-09-28 22:58:26 +02:00
ce7e21f869
Merge branches 'digAll', 'misery' and 'teledwarf' into experimental
2012-09-28 16:44:08 -04:00
79ac1a81b9
It was backwards when calling fastdwarf with just one argument. Also made it print the current status of fastdwarf when no arguments are given.
2012-09-28 16:36:37 -04:00
53c6ee4673
Track structures and stonesense
2012-09-28 21:57:12 +02:00
687657f2da
manipulator: show full group when navigating labor groups
2012-09-28 19:48:28 +02:00
4a495c2c7f
manipulator: make cursor_down_z go to beginning of next group
2012-09-28 19:20:10 +02:00
ca0097b910
manipulator: better screen width usage
2012-09-28 19:20:10 +02:00
c4f26d0aa8
manipulator: make up/down keys wrap around
2012-09-28 19:20:04 +02:00
783b218eec
Try a different color scheme when highlighting squad members in tweak.
2012-09-28 18:50:01 +04:00
ba763b773d
New tweaks for the military assign to position screen.
2012-09-28 18:01:17 +04:00
bd7cd690aa
Implement the common suggestion of Shift-Enter in trade screens.
2012-09-28 13:32:41 +04:00
164c61b638
Forbid stuff from bins in siege-engine, if forbid ammo standing order set.
2012-09-27 10:43:42 +04:00
7cc29250f8
fix for updated viewlist_petst
2012-09-26 18:22:07 +02:00
d975ce5135
ruby: add onstatechange_register_once
2012-09-26 15:08:54 +02:00
ddc83a0a72
Another dfusion nuking (not much left :) )
2012-09-25 11:30:38 +03:00
0bee8c360e
Reaction hooks experimentation.
2012-09-25 10:25:47 +03:00
bd2f3a9998
Moved lua out of dfusion.
...
Now lua is a script. supports --file (or -f) flag, usage: lua <command> or lua --file <filename> or just "lua" for interactive interpreter.
2012-09-25 00:24:37 +03:00
f628c3732a
ruby: avoid smoothing grass/trees
2012-09-24 19:19:34 +02:00
a622ee52e9
ruby: fix building_alloc Trap, and init Floodgates as closed
2012-09-24 19:11:42 +02:00
a2bb322344
ruby: item_find now works in z/stocks
2012-09-24 15:40:35 +02:00
962a057ffa
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-23 23:31:05 +02:00
aefedb9887
ruby: MapTile#offset, tweak #dig to check for existing jobs
2012-09-23 23:26:57 +02:00
6385128c28
Sort by units.active (arrival), and seek to top/bottom in manipulator.
2012-09-23 16:41:14 +04:00
f2199c2951
ruby: fix activity zone_num
2012-09-23 11:44:27 +02:00
f7272e4a8f
ruby: use cursor as default map_tile_at arg
2012-09-23 10:58:31 +02:00
ebd4b94c2d
ruby: add onupdate_register_once
2012-09-22 11:57:33 +02:00
038d62367e
Implement explicit hook priority in vmethod interpose.
...
This resolves a getName order conflict between power-meter and rename.
2012-09-22 13:14:06 +04:00
b115edcf68
ruby: return selected zone in building_find
2012-09-20 19:57:43 +02:00
e2d6a14720
Make manipulator re-read names and professions if change is suspected.
...
Namely, if it either invoked View Unit itself, or was queried
(possibly by the rename plugin) via getSelectedUnit.
2012-09-20 12:27:03 +04:00
1f7c10252e
Support renaming activity zones.
...
This one required hooking the dwarfmode render method.
2012-09-20 11:48:53 +04:00
462bedb757
Fix the rename plugin and script to use the new getSelectedBuilding API.
2012-09-20 11:11:59 +04:00
c39a337223
Add unit/item/job/building getter hook vmethods to dfhack_viewscreen.
2012-09-20 11:11:20 +04:00
1fd0654d63
Restore stonesense to the proper revision
2012-09-19 22:55:38 -05:00
e154d5447b
ruby: fix building linking more
2012-09-20 01:33:10 +02:00
2d5942d5d7
ruby: fix building linking
2012-09-20 00:33:22 +02:00
bef9e9af7c
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-09-19 20:24:38 +03:00
b6d9863172
ruby: allow Civzone constants in building_alloc
2012-09-19 19:19:58 +02:00
a80f574be8
Only initialize siege engine in dwarf mode.
2012-09-19 19:52:57 +04:00
b5ede66224
Switch some plugins to using world load/unload instead of map.
...
Otherwise they apply and remove hooks every time fast travel is used.
2012-09-19 19:46:54 +04:00
19e1711a2f
Several Manipulator updates
...
* Add documentation to README, cleanup some docs for other plugins
* Preserve existing unit list order and cursor/scroll position
* Adjust mouse input handling, don't move cursor on left-click
2012-09-19 10:20:18 -05:00
27fd3f5fc7
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-19 15:05:42 +02:00
45c057b3d2
ruby: handle ptr-strings in df-structures
2012-09-19 14:25:14 +02:00
65a382a2d7
Document some of the new stuff in the readme.
2012-09-19 15:55:08 +04:00
a02a120e2d
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
...
Conflicts:
dfhack.init-example
library/xml
plugins/CMakeLists.txt
2012-09-18 23:46:16 +03:00
69e8fcce91
Add mouse input to Manipulator, along with column labels
2012-09-18 13:57:06 -05:00
b470abed90
ruby: misc tweaks
2012-09-18 18:13:22 +02:00
a7998f71a2
Add a tweak workaround for the issue with container reactions in advmode.
2012-09-18 17:39:37 +04:00
f2e7ee4756
Tweak the add spatter plugin.
2012-09-18 13:15:25 +04:00
d70a79deb9
Follow changes in XML defs.
2012-09-18 13:11:11 +04:00
57d01f0008
ruby: use ui.follow_item/unit in unit_find, show non-english names by default
2012-09-18 10:17:33 +02:00
72141a3c9b
ruby: use implicit init-value -1 for ref-target/refers-to in codegen
2012-09-18 10:17:32 +02:00
eacca723e0
ruby: fix building subtype/customtype init value
2012-09-18 10:17:32 +02:00
36e44c682c
Add a plugin implementing 'add spatter to item' reactions.
2012-09-17 21:15:51 +04:00
613063cef4
Add a tweak to fix subtractDimension of small amounts.
2012-09-17 17:19:24 +04:00
82e870c8dd
Move siege engine out of devel.
2012-09-17 14:59:59 +04:00
f2fde21b10
Implement a slightly more sensible aiming AI in siege engine.
2012-09-17 14:45:22 +04:00
c1e20c6f05
Follow changes to structures.
2012-09-17 12:47:18 +04:00
58fda716e6
Explicit cast is required for MSVC.
2012-09-16 17:06:31 -05:00
847dadd3f5
Merge remote-tracking branch 'angavrilov/master'
2012-09-16 16:37:08 -05:00
38f920dd65
Merge remote-tracking branch 'q/master'
2012-09-16 16:36:51 -05:00
b6d9a3c3ad
More useless stuff removed
2012-09-16 13:20:55 +03:00
2f131178d8
Removed unused triggers folder
2012-09-15 18:05:53 +03:00
4f9732bfda
Useless files removed, small bugfix
2012-09-15 15:44:15 +03:00
000e3baf27
Implement skill-based miss probability in siege engine.
2012-09-14 20:57:03 +04:00
811c096c0e
Vaporize liquids from barrels, and destroy bin contents in siege engine.
2012-09-14 20:22:49 +04:00
5474ccacb6
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-14 14:30:25 +02:00
b05905a0ba
ruby: basic stl::set<uint32> support, add Viewscreen.feed_keys
2012-09-14 13:55:22 +02:00
d22591e240
Fix a file descriptor leak and a crash in linux getMemRanges.
2012-09-14 12:35:55 +04:00
aaf5d181bd
Add yet one more performance-oriented tweak for temperature updates.
2012-09-14 12:14:36 +04:00
c927623050
Rework handling of column positions, and insert a new "Happiness" column
2012-09-13 15:42:51 -05:00
1325b70e41
Cleanup autolabor+cleanowned, fix depends/clsocket
2012-09-13 14:42:17 -05:00
1d8c9a6a5f
Merge https://github.com/danaris/dfhack
2012-09-13 14:30:44 -05:00
cae01250ff
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-09-13 14:08:26 -05:00
a9ce19b826
ruby: add raw_rtti_classname to read real classname from RTTI info
2012-09-13 19:07:37 +02:00
881fed41de
Support setting workshop profile for siege engines.
...
Since can't use built-in viewscreen, UI limited to skills only.
2012-09-13 20:20:56 +04:00
5690a26439
On second thought, remove stockpile->engine links; keep only reverse.
...
Bi-directional links involve the risk of crashes if the plugin
is unloaded, and the engine subsequently deconstructed.
2012-09-13 17:49:41 +04:00
ae6e0f617d
Make it clear that this is from DFHack, and properly name it Dwarf Manipulator
2012-09-13 08:27:28 -05:00
19a150fb38
ruby: fix dig smooth overdigging
2012-09-12 20:59:37 +02:00
c9d73cb6fb
Fix crash bug when using manipulator in Arena mode
2012-09-12 13:42:16 -05:00
f06f9af6b8
Throw items from bins around in siege engine, like minecarts do.
2012-09-12 20:57:25 +04:00
448d7e3633
Support linking siege engines to stockpiles.
...
Since they can't do that natively, the links object has to
be maintained in dfhack memory, and with dfhack persistence.
2012-09-12 12:15:12 +04:00
cda17954c8
ruby: add MapTile.dig(:Smooth)
2012-09-12 01:07:19 +02:00
b0938d7e0d
Allow specifying arbitrary items to use in catapults.
2012-09-11 22:46:17 +04:00
3a075f4bc7
Trivial siege engine aiming at units, with logic in lua.
2012-09-11 19:17:24 +04:00
ccefd02ee3
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-10 11:56:23 -04:00
96abc903ab
Merge branch 'master' of http://github.com/peterix/dfhack
2012-09-10 11:54:56 -04:00
274d6038ad
Merge further changes (???)
2012-09-10 09:19:21 -04:00
270351f510
Merge branch 'master' of https://github.com/danaris/dfhack
2012-09-10 09:18:24 -04:00
8ab615f6d0
Implement unit path prediction in siege engine.
2012-09-09 20:54:12 +04:00
9679b7729c
Clean up the movement speed calculation function and move into the core.
2012-09-09 17:04:58 +04:00
ec3d489bda
Move curse-affected attribute value getters to the core.
2012-09-09 12:51:08 +04:00
a36fe25e72
Finish the effective skill computation function, and move to core.
2012-09-09 12:27:40 +04:00
fb88aad51d
Reverse-engineer unit speed computation from DF code.
2012-09-08 21:07:18 +04:00
003c3391d1
Implement aiming projectiles at random points in the designated area.
2012-09-08 15:49:46 +04:00
bfa6ed3e08
Support setting the target area for the siege engine.
2012-09-08 13:46:02 +04:00
325e294af2
Start the siege engine plugin with code to highlight obstacles on screen.
2012-09-07 19:54:32 +04:00
85fc3384dd
Little cleanup and update to gm-editor
2012-09-07 17:25:39 +03:00
0db873493a
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
...
Conflicts:
dfhack.init-example
2012-09-07 17:24:38 +03:00
d0e630d4c3
Move steam engine out of devel, since it should be fully functional.
2012-09-06 17:10:58 +04:00
d5ea05ebb8
Implement a pressure plate sensitive to machine power.
...
When built next to a gearbox, it will monitor its powered state.
2012-09-06 12:37:29 +04:00
3dcaee7cb9
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-09-05 21:55:17 +03:00
6fc10fc268
Fixed embark anywhere to use more sane code segment search
2012-09-05 21:52:54 +03:00
e09b98216f
ruby: fix vector[length+50] = 0 segfault
2012-09-05 20:39:13 +02:00
8d876cc7d9
Support renaming some buildings, and arbitrary units, via gui script.
2012-09-05 21:27:42 +04:00
afbace8af6
ruby: alloc_building(:Furnace, :Smelter)
2012-09-05 19:18:21 +02:00
9c6fcee9a9
Add steam engine documentation, and use barrel quality in efficiency calc.
2012-09-05 11:23:00 +04:00
96fec768c7
Merge remote-tracking branch 'angavrilov/master'
2012-09-04 12:05:05 -05:00
aa449a2180
Add a tweak to work around the endless temperature update bug.
...
This obsoletes fix/stable-temp.lua, which only fixes items once.
2012-09-03 21:11:35 +04:00
1618ccf5bb
Fix steam-engine build on msvc, and add a script for listing mem ranges.
2012-09-03 10:28:17 +04:00
2249cb14fa
Require level 3 both for water & magma, and indicate level 5 by brightness.
2012-09-02 18:57:10 +04:00
3b08ee44d1
Vary the internal power consumption of the engine depending on quality.
2012-09-02 17:32:44 +04:00
67630776ee
Tweak steam engine raws.
2012-09-02 17:17:18 +04:00
9c3843c1d4
Use new API in steam engine; always explode if destroyed with steam inside.
2012-09-02 14:59:13 +04:00
3713c5ea9e
Add some APIs required by steam engine to the core.
2012-09-02 14:10:58 +04:00
a4c028b3b7
ruby: buildings tweaks
2012-09-02 01:38:58 +02:00
2574bb1e3d
embark anywhere upgrade.
2012-09-01 21:58:01 +03:00
8536785d1d
Boilers made out of unsuitable materials should explode!
2012-09-01 20:46:34 +04:00
bae85ac77d
Make the steam engine consume liquids from Z level below.
2012-09-01 17:52:51 +04:00
74501d3197
Try preventing "boiling water" from freezing, and dump steam on destroy.
2012-09-01 14:42:19 +04:00
532839a4d5
Embark anywhere ported
2012-09-01 10:54:45 +03:00
f158e1894d
Further work on steam engine.
...
- Display water inside as 'boiling' by hooking item_liquid_miscst.
- Store current power in flags to avoid mess if items disappear etc.
- Suspend/unsuspend stoke jobs depending on steam level.
- Implement intelligent steam use rate and boiler capacity cap.
- Modify appearance of special tiles to display status.
2012-09-01 11:29:05 +04:00
acdf0ffb42
ruby: fix create building map occupancy
2012-09-01 03:35:47 +02:00
c68afdaad2
Display command key helper for Manipulator on Unit List, various tweaks
2012-08-31 20:35:35 -05:00
dcc9498dbc
ruby: tweak apis
2012-09-01 03:22:48 +02:00
262233aa33
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-08-31 23:53:31 +03:00
ece0833c93
Prototype steam engine workshop :)
...
Very broken and incomplete still.
2012-09-01 00:22:55 +04:00
ce608e4f6a
ruby: yield announcements for further customization
2012-08-31 19:16:13 +02:00
54780cac3f
ruby: allow vmethod call with 6 args, use direct fptr
2012-08-31 15:51:22 +02:00
90021b4e5e
simple_embark/plugin.lua sanitized
2012-08-30 20:41:10 +03:00
e6b2cb73af
Add a tweak for pressure plate creature weight limit rendering.
...
Print them as readable "???K", instead of the normal truncated numbers.
2012-08-30 20:48:06 +04:00
6b7594dbd7
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-08-30 18:52:48 +03:00
c414aafc59
Add "Toggle Group" key
2012-08-30 10:03:12 -05:00
1dee51abb0
Use generic DOCTOR tile for wound dresser labor.
2012-08-30 19:01:43 +04:00
7676f07b06
Display creature graphics tiles beneath the column headers
2012-08-30 09:46:09 -05:00
a8158cb19a
Merge remote-tracking branch 'q/master'
2012-08-30 09:25:26 -05:00
604cf80832
Repurpose the nestboxes plugin as a watcher that automatically forbids fertile eggs.
2012-08-30 09:23:11 -05:00
4e169558f5
Tweak column labels a bit
2012-08-28 15:52:26 -05:00
b2587c1e6d
Fix skill sort
2012-08-28 15:33:22 -05:00
fee3cfda96
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-08-28 20:18:12 +03:00
834d7fa1fa
Tweak prospector: try using the biome elevation for soil depth.
...
Until a better idea presents itself (or maybe it is the right way).
Soil depth computation affects which soil layers are reported, and
Z level alignment of the layer stack.
2012-08-28 11:52:54 +04:00
d69a7c63e3
Tabs to spaces.
2012-08-27 16:05:23 -04:00
1a5f05768f
Made it not run every tick.
2012-08-27 15:06:41 -04:00
c587ea2c74
Add new tweak command to make Train orders no longer count as patrol duty
2012-08-27 14:06:10 -05:00
f73cebff68
Account for caves and magma sea in pre-embark prospector.
2012-08-27 23:03:17 +04:00
f1915915b4
Follow change in xml again.
2012-08-27 23:03:02 +04:00
e12e7ddd40
Fixed some memory leaks.
2012-08-27 14:42:00 -04:00
5ad9b82ace
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-08-27 09:17:27 -05:00
faf3bdf2b7
Adjust grid display - labors without skills use different tiles, and skills without labors have a red background
2012-08-27 09:04:32 -05:00
5fed060d7d
Follow field rename in xml.
2012-08-27 16:01:11 +04:00
f562871867
Add ViewCre and Zoom-Cre to Manipulator (by forwarding them to Unitlist)
2012-08-26 13:58:37 -05:00
84f6663a07
Add a tweak to save the cursor position of dwarfmode between menus.
2012-08-26 21:19:56 +04:00
8171652323
Support permaflow in liquids, including the gui.
2012-08-26 20:08:28 +04:00
bee33fd486
Add a performance test for location caching in general refs.
2012-08-26 14:43:14 +04:00
f6e4969e19
Key names are bright green, not dark green
2012-08-25 11:07:42 -05:00
da6567e374
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-08-25 11:02:28 -05:00
bd9800055d
Link to the lua library in the liquids plugin.
2012-08-25 20:01:03 +04:00
dcdff40c85
Add sorting, command help; replace filtering with just using the current page of the UnitList viewscreen (and don't close it)
2012-08-25 10:57:50 -05:00
41ad42d0fd
Expose the liquids plugin engine to lua, and make a wrapper gui script.
2012-08-25 10:37:03 +04:00
21904fd607
Merge https://github.com/jjyg/dfhack
2012-08-24 22:30:39 +02:00
9154564e71
Sync up submodules
2012-08-24 21:56:16 +02:00
45efcfc763
Warning: does not work. Temp commit!
2012-08-24 11:40:51 -04:00
cb24f1e53a
Converted tabs to spaces.
2012-08-23 22:25:25 -04:00
15adb17559
Converted tabs to spaces.
2012-08-23 22:21:09 -04:00
76cd941084
Added teledwarf: teleports dwarves to their destination instantly.
2012-08-23 22:17:28 -04:00
6de9049dcc
Very rough draft. Invaders tend to overdestroy buildings. They also overdig. Also they only do it on user request. Also it happens instantly. Also they can't dig through constructions. Also I have tabs in the indentation.
2012-08-23 22:12:07 -04:00
eac2f3f5d1
Added misery plugin: multiply effects of negative thoughts.
2012-08-23 22:05:35 -04:00
27bdc9f2df
Start gutting dfusion.
2012-08-23 21:38:38 +03:00
c339c7085a
ruby: add memory_check / memory_patch native methods
2012-08-23 18:44:03 +02:00
5b0f37276f
Merge branch 'master' of git://github.com/quietust/dfhack
2012-08-23 17:19:15 +02:00
7046a6abbc
Manipulator - store unit 'summary' objects so names/professions can be cached (for faster sorting), and properly display skill level when it's exactly at the level threshold
2012-08-22 20:52:19 -05:00
132491e868
Use Units module to get unit colors, fix initial scroll position
2012-08-22 16:54:34 -05:00
92c0b555dc
Use Units module to get profession strings
2012-08-22 11:15:05 -05:00
83214ccb72
Fix bugs in window resizing, cleanup some other stuff
2012-08-22 10:43:26 -05:00
7987ea9a98
Put some compatibility features into the base dfhack viewscreen.
2012-08-22 18:18:19 +04:00
8969fc9435
manipulator: Inherit from dfhack_viewscreen, and don't use itoa.
2012-08-22 12:23:56 +04:00
b6e5786b4f
Manipulator - display summary of selected unit + skill/labor
2012-08-21 16:41:20 -05:00
2c0a42296c
New plugin: Dwarf Manipulator - enter the [u]nits list and press [l]abors to get a DwarfTherapist-style labor editor
2012-08-21 15:43:32 -05:00
6d12368724
Added digtype to dig.cpp. Digtype allows designation of all veins of a given type.
2012-08-19 22:45:47 -04:00
b8ee52131b
Add a module for painting tiles into the gps global.
2012-08-19 09:31:09 +04:00
fd0bf2ef92
Extract the color enum from color_ostream to toplevel.
2012-08-19 09:21:25 +04:00
8ed219d4e0
Add "clean plants", currently just removes water from rain (and lets you set them on fire)
2012-08-18 19:21:40 -05:00
01ba2a31fc
Tweak the interpose API, and fix a couple of bugs.
2012-08-18 11:48:07 +04:00
236ffd578b
Add experimental support for interposing vmethods of known classes.
...
The hairiest bit is the abuse of compiler-specific pointer-to-member
internals in order to provide more or less transparent API.
2012-08-17 22:40:53 +04:00
cde97bba6f
Fix workflow some more
2012-08-13 07:42:02 +02:00
4eedd6f5f0
Fix workflow.
2012-08-13 07:39:11 +02:00
e659d845ab
ruby: fix LinkList.next=
2012-08-13 02:06:56 +02:00
53a0536506
ruby: typo in building_deconstruct
2012-08-13 00:46:27 +02:00
5a880d619c
ruby: add MapTile#dig, tweak unit_iscitizen
2012-08-12 22:36:54 +02:00
7cc100b26e
Merge https://github.com/jjyg/dfhack
2012-08-12 01:10:37 +02:00
030bd8ab57
fix/loyaltycascade: clear the enemy status cache, dont require a save/reload anymore
2012-08-12 00:24:34 +02:00
2362bb8eea
ruby: add popup_announcement method
2012-08-11 22:25:08 +02:00
4c720c7504
ruby: add explicit paths everywhere for ruby-autogen
2012-08-11 20:11:00 +02:00
942b245461
ruby: add method to check if an item is free for use as construction material
2012-08-11 20:08:33 +02:00
8f4c39d3f5
showmood: fix fetched/needed quantity calculation
2012-08-09 17:07:20 +02:00
7a03f93dbd
ruby: add raw stl::string allocation, add _cpp_delete, tweak readme
2012-08-09 14:50:52 +02:00
2abb9a898c
One more autolabor cleanup
2012-08-08 10:50:07 +02:00
4039d2c0b7
Don't disable autolabor when you input "autolabor 1|enable" and it's
...
already enabled.
2012-08-08 10:47:02 +02:00
2c703ffbca
Remove unnecessary whitespace
2012-08-06 16:59:09 +02:00
bb760bd376
Added quality constraints to workflow plugin
2012-08-06 16:55:55 +02:00
c1bcd270e9
ruby: add spawn_water/spawn_magma methods to MapTile
2012-08-03 17:00:02 +02:00
f400591080
ruby: use enums in single-bit values too
2012-08-03 16:53:54 +02:00
81ea0345ad
Fix cage-related bug in the sort plugin.
2012-08-03 16:09:51 +02:00
160487f7eb
ruby: move all generated/downloaded stuff in the build/ directory
2012-08-03 15:19:43 +02:00
61195859e3
fix autolabor compilation error
2012-08-03 03:28:29 +02:00
1ed6d6e7e0
Merge https://github.com/ab9rf/dfhack
...
Conflicts:
plugins/autolabor.cpp
2012-08-02 10:32:25 -05:00
144802e3ef
Merge https://github.com/hashaash/dfhack
2012-08-02 14:44:52 +02:00
8a8b45d840
Merge https://github.com/warmist/dfhack
2012-08-02 14:44:31 +02:00
d8cb6e2c4e
Fixed seedwatch not working on reclaim
...
Just needed to add a check for game_type::DWARF_RECLAIM in two places
2012-08-01 19:52:50 -05:00
78fc850ce2
Autolabor: dwarves who are scheduled for a meeting are automatically cleared of all labors.
...
Labor to skill map is now generated at plugin start rather than with every iteration.
Also partially refactored the code; no behavioral changes from that.
2012-07-22 12:16:50 -05:00
9f53f6296d
Removed Console module from dfusion.
2012-07-18 21:07:27 +03:00
9705497a7e
Merge branch 'master' of git://github.com/peterix/dfhack
2012-07-17 10:39:20 -05:00
2695d55090
Make indentation consistent (spaces), only display "not enabled" error if you actually try to do something
2012-07-17 10:27:30 -05:00
671f8cc1ff
Synchronize with changes to df-structures
2012-07-16 20:56:46 -05:00
ab4c4b63c0
Merge remote-tracking branch 'jjyg/master'
2012-07-16 20:52:15 -05:00
70ac2ffa17
Merge remote-tracking branch 'upstream/master'
2012-07-16 20:52:03 -05:00
6be752454d
Check zone plugin parameters better
2012-07-12 02:16:08 +02:00
0615a27663
ruby: refix unit_idlers, make unit_find handle 'u'nitlist viewscreen
2012-07-12 00:44:07 +02:00
d8e55196c2
ruby: better handling of errors in onupdate callbacks
2012-07-11 23:25:55 +02:00
b0edb33023
ruby: fix unit_idlers
2012-07-11 23:24:53 +02:00
b2623e68a3
Track submodules
2012-07-11 14:38:04 -05:00
79ca632f64
Merge remote-tracking branch 'jjyg/master'
2012-07-11 14:37:19 -05:00
08469abd09
Merge branch 'master' of https://github.com/angavrilov/dfhack.git
2012-07-11 14:37:06 -05:00
0f23aba89d
Sync with df-structures
2012-07-11 14:31:47 -05:00
4c7c38df93
* Autolabor: really exclude the broker from all labors when trader requested
...
* Autolabor: add 'haulpct' config option to control percentage of non-idle dwarfs assigned to hauling labors (default is 33)
* Zones: allow nontamed birds to be nestboxes. warning: does not check for 'hostile to civilization' birds, so if you try to tame a hostile elk bird, !!fun!! will happen
* Stripcaged: changed default behavior to keep armor, reduced noisiness
2012-07-11 14:30:47 -05:00
a5977db443
Merge https://github.com/jjyg/dfhack
2012-07-09 01:13:07 +02:00
6975f643fc
Fixage, syncing with structures
2012-07-09 01:05:40 +02:00
c20951c30b
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-07-06 20:37:14 +02:00
4bbb185f7b
Fix build and allow autodump to any walkable tile (e.g. a stair).
2012-07-06 20:11:20 +04:00
d645d6b046
ruby: better message on out of bounds array access
2012-07-06 13:32:39 +02:00
bef5079d43
ruby: add vector.first/last
2012-07-06 13:25:47 +02:00
8e17ebbefc
add SC_PAUSED / SC_UNPAUSED onStateChange events
2012-07-05 18:03:02 +02:00
45456b2230
Enable building Stonesense and Ruby support
2012-07-05 11:39:27 -04:00
068542d58a
Submodule changes
2012-07-05 11:39:08 -04:00
6f4f3039e1
Merge remote-tracking branch 'jjyg/master'
2012-07-05 10:04:28 -05:00
fb2d901e01
Merge remote-tracking branch 'angavrilov/master'
2012-07-05 10:01:04 -05:00
217ef18aef
Merge remote-tracking branch 'upstream/master'
2012-07-05 10:00:36 -05:00
83f00e5583
Autolabor: allow setting the nonidle hauler percentage at runtime.
...
Stripcaged: add keeparmor option
2012-07-05 09:59:28 -05:00
b718912184
Fix Ruby build
2012-07-05 10:31:55 -04:00
7074048146
showmood: display number of items already collected
2012-07-05 16:17:41 +02:00
7732901b6e
ruby: tweak onupdate to allow tick rate-limiting
2012-07-05 15:35:37 +02:00
f560d2de11
ruby: add MapTile class
2012-07-05 14:15:34 +02:00
e4d4bf23ae
update xml, fix autolabor with new trade depot flags name
2012-07-04 19:05:44 +02:00
f80ca239d0
ruby: allow coords arguments to *_find, add building_find
2012-07-04 18:34:41 +02:00
7c4f60df1d
ruby: extend item_find to work on constructed coffers
2012-07-04 17:48:44 +02:00
15cfc1d00b
ruby: handle constructed beds in item_find in LookAround mode
2012-07-04 17:24:46 +02:00
edf0a9cb3d
ruby: add decode_mat method for mat_type/mat_index
2012-07-04 17:24:03 +02:00
cb17bde8f4
ruby: refix codegen for refers-to without key-field, add translate_name
2012-07-04 15:18:36 +02:00
877b879e57
ruby: item_find handle v/i unit inventory
2012-07-03 23:57:15 +02:00
2e42e31754
ruby: add curview, fix item_find/unit_find wrt gview mode, fix refers-to to use binsearch
2012-07-03 19:51:52 +02:00
501fd43dda
ruby: fix handling of <pointer to unknown data struct>
2012-07-03 18:40:10 +02:00
a7a25b80a0
ruby: use the color_ostream argument from dfhack to output to dfhack-run
2012-07-03 16:13:15 +02:00
0bdff401ca
ruby: fix codegen align int64_t on windows
2012-07-03 15:24:35 +02:00
b9425474a1
ruby: fix codegen for darwin
2012-07-02 21:57:53 +02:00
c24333515b
Merge branch 'master' of https://github.com/jjyg/dfhack
...
Conflicts:
library/Core.cpp
Starting to merge in Ruby stuffs
2012-07-02 11:07:30 -04:00
421e5fd82c
Swap order of includes to work around silly compiler/assembler bug on OS X
2012-07-02 11:02:48 -04:00
554683929f
ruby: allow explicit target-os override in codegen
2012-07-01 14:20:55 +02:00
bd5aea994b
Merge remote-tracking branch 'q-github/master'
2012-06-30 15:51:49 +04:00
31a5495031
ruby: osx support (maybe)
2012-06-29 17:51:26 +02:00
592c0a41ac
ruby: remove useless raise in unit_find
2012-06-29 11:29:36 +02:00
56ff129ee0
ruby: fix enum + base-type
2012-06-29 11:25:41 +02:00
f0d4d799d8
Don't index world_data->region_map beyond its bounds
2012-06-27 16:38:39 -05:00
24aa3827c1
ruby: generate accessors for refers-to and vector of ref-target
2012-06-27 14:52:34 +02:00
85f9d35f6f
Temporary fix for memory accessor.
2012-06-25 22:26:08 +03:00
4e4e375122
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-06-25 22:23:37 +03:00
1c013486d5
Removed non-working onfunction.
2012-06-25 22:22:20 +03:00
c2c29af959
ruby: fix deadlock on df exit due to BEGIN_UNLOAD + Core.Suspend()
2012-06-25 19:16:35 +02:00
412e8608d8
ruby: add method for basic xml ref-target support, tweak scripts/slayrace
2012-06-25 19:05:50 +02:00
17d06b969b
ruby: move all ruby invocations inside a CoreSuspend lock, remove ruby suspend method
2012-06-25 17:06:37 +02:00
8fb139a2f4
ruby: document mutex use, load ruby-autogen in the background
2012-06-25 01:45:50 +02:00
d5ae1fc4f2
Merge branch 'master' of https://github.com/danaris/dfhack
...
Conflicts:
depends/clsocket
package/darwin/dfhack
package/darwin/dfhack-run
Fixed.
2012-06-24 18:41:24 -04:00
d1762e3cb8
ruby: add growcrops script, add doc for methods in README
2012-06-24 21:44:40 +02:00
552da8417e
ruby: handle .rb files in df/hack/scripts/
2012-06-24 20:24:46 +02:00
3f4d2e4792
ruby: split ruby.rb in modules
2012-06-24 17:30:26 +02:00
4c2d4d4b86
ruby: clean stuff up, install ruby modules in df/hack/ruby/
2012-06-24 16:09:31 +02:00
ad1ba9bf6b
ruby: try msvc workaround for __thiscall
2012-06-24 02:59:56 +02:00
1327b4954a
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-06-18 10:04:45 -05:00
db91850464
Sync to the change in gamemode/gametype globals.
2012-06-16 14:42:56 +04:00
0bdae68294
ruby: fix codegen enum base-types
2012-06-15 21:02:04 +02:00
93662034fe
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-06-15 13:08:46 +03:00
cfdf941c52
ruby: fix windows build warnings/load ruby.rb
2012-06-14 22:35:59 +02:00
6bd67cc055
ruby: try to fix msvc build (use fastcall for thiscall fptr)
2012-06-14 14:25:16 +02:00
2781723f7b
Linux build works again.
2012-06-14 02:25:15 +02:00
5f33ebde41
Merge https://github.com/Rinin/dfhack
2012-06-14 00:01:38 +02:00
52f9fe4a6a
Merge https://github.com/danaris/dfhack
...
Conflicts:
depends/clsocket
2012-06-14 00:00:36 +02:00
0285448367
ruby: fix download url, cmake doesnt handle HTTP 301
2012-06-13 00:20:52 +02:00
3c1cb24d9f
ruby: download lib from github as tgz, switch to ruby18, simply log to stderr.log if cannot load libruby
2012-06-12 18:51:33 +02:00
95606ee3dc
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-06-11 16:00:00 +02:00
c0e7295f22
ruby: fix cmake to rebuild ruby-autogen.rb only when necessary
2012-06-10 23:42:58 +02:00
7ee8d79014
ruby: download libruby with cmake
2012-06-10 02:06:22 +02:00
bc734619b4
ruby: use ruby1.9.1 on linux
2012-06-10 01:45:30 +02:00
2aace670ea
ruby: dlopen libruby -- currently segfaults with rb1.9 ...
2012-06-02 23:44:52 +02:00
e143c312bf
Sync with df-structures changes
2012-05-31 19:13:11 -05:00
884cf53b0b
body_part_raw has its own set of flags which do NOT match body_part_template
2012-05-30 08:02:53 -05:00
3e61452f15
ruby: codegen code cleanup, move ruby-memstruct in ruby.rb, handle bool struct fields, rename Enum.to_sym/to_i to sym()/int(), define nested compound sizeof()
2012-05-29 18:30:18 +02:00
bcb698a5b4
ruby: have codegen compute struct offsets directly
2012-05-29 16:10:33 +02:00
e72bf1ac9a
Sync to changes in df-structures.
2012-05-26 14:49:27 +04:00
8644ea4dc0
Merge remote-tracking branch 'q-github/master'
2012-05-26 14:41:36 +04:00
800cbca578
Some improvements to showmood - show relevant skill, cleanup messages
2012-05-25 21:31:47 -05:00
44c3afc306
Merge git://github.com/quietust/dfhack
...
Gotta get the changes that prevent DFHack from crashing.
2012-05-24 15:39:11 -04:00
24d221052b
Initial changes to get dfhack building on the Mac
2012-05-24 11:31:20 -04:00
ae41ddc04a
Don't crash if world is undefined
2012-05-23 13:43:41 -05:00
9a73ea9f14
Cleanup World module to use df::global, and fix crashes when control_mode/game_mode are missing
2012-05-23 12:51:03 -05:00
705b60ca27
Fixed BrewDrink products counting
2012-05-22 19:22:36 +04:00
65349039f0
Fix workflow bug: properly deduce the output material of BrewDrink jobs.
2012-05-22 17:50:48 +04:00
81022451c2
Support sorting items in stocks, and correct unit sorting in joblist.
2012-05-21 22:29:03 +04:00
8ef1423ee7
Merge https://github.com/angavrilov/dfhack
2012-05-20 23:01:44 +02:00
8ff4f1a78e
Disable ruby plugin by default.
2012-05-20 22:58:02 +02:00
b992b04f0b
Remove stuff that shouldn't be in the core, and expose to lua what's left.
...
Specifically, any "if (verbose) { Core::printerr("blah") }" kind
of stuff definitely doesn't belong in the common API functions.
Also, ref->getUnit() is very expensive.
On the other hand, checks for crash-inducing conflicts with the
ui should be in the core api, and not in client plugins.
2012-05-20 21:57:45 +04:00
489f22e550
Merge branch 'ruby' of https://github.com/jjyg/dfhack
2012-05-20 17:37:13 +02:00
3fa155e8e6
Merge https://github.com/angavrilov/dfhack
2012-05-20 17:33:09 +02:00
d28d240dbd
Merge remote-tracking branch 'kmartin/master'
2012-05-20 11:03:41 +04:00
51f06c78fc
Merge https://github.com/playfordh/dfhack
...
Conflicts:
library/include/modules/Items.h
library/modules/Items.cpp
2012-05-19 19:09:13 +02:00
b8ce3b45e1
Merge https://github.com/jaxad0127/dfhack
2012-05-19 18:37:02 +02:00
d0de575a2b
Merge https://github.com/jjyg/dfhack
2012-05-19 18:27:57 +02:00
7774f5f2c1
Add a mechanism converting ui focus to a string representation.
...
The idea is to make ui handling more modular, dispensing with
huge functions that switch or if/else on lots of variables.
For now, used to split up functions in the sort plugin.
2012-05-19 19:50:36 +04:00
b851ee2d22
Merge branch 'master' of git://github.com/peterix/dfhack
2012-05-19 12:53:23 +02:00
e2f39368b1
Sync submodules
2012-05-18 17:43:22 +02:00
4aa6dbdd00
Support sorting items in the trade screens.
...
Caveat: sorts items in containers independently from the container.
2012-05-18 19:18:49 +04:00
e77c9dc730
Add new PUSH_HAUL_VEHICLES labor to autolabor.
...
This commit will only work with 0.34.08 (or later).
2012-05-15 13:42:48 -05:00
0d2849ca5a
Modified autodump to enable extraction of equipped items from unit inventory
...
Signed-off-by: playfordh <harlanplayford@gmail.com>
2012-05-15 06:32:09 -04:00
689cf3ee51
Added ForceEquip plugin to project
...
Signed-off-by: playfordh <harlanplayford@gmail.com>
2012-05-15 06:03:29 -04:00
27cc2dc92c
Add dwarf state table entries for the new jobs from .34.7 and .34.8. Also add a warning message for a dwarf who is doing an unknown job (instead of just reading random nonsense from off the end of the dwarf_states array).
...
This code is backward-compatible (the extra job entries will simply be unused in pre-.8).
2012-05-14 21:54:11 -05:00
e078c75737
Track submodules
2012-05-14 13:44:03 -05:00
86dc2d9855
Merge remote-tracking branch 'angavrilov/master'
...
Conflicts:
library/xml
2012-05-12 19:49:27 -05:00
bd2b55c490
Merge remote-tracking branch 'upstream/master'
2012-05-12 19:43:02 -05:00
2629db5ed1
ruby: add building creation code
2012-05-13 01:40:44 +02:00
ea6e207290
Merge upstream
2012-05-12 23:52:13 +02:00
3da787c5c9
Merge upstream
2012-05-12 23:51:49 +02:00
c6b52067bd
Request designation rescan in auto-growing burrows.
...
This improves performance of burrowed miners digging 1-wide tunnels.
2012-05-12 20:54:26 +04:00
ccbae58365
Set default beekeeper max to 1 in autolabor (see http://www.bay12games.com/dwarves/mantisbt/view.php?id=3981 )
2012-05-12 11:21:12 -05:00
60bb486aba
Add api for enabling liquid and temperature updates for blocks.
...
Now updates also have to be enabled for the z level to work.
2012-05-12 20:12:09 +04:00
af3e389093
Update submodules.
2012-05-12 18:50:22 +04:00
92f069e209
Brush output lists numbers, update xml.
2012-05-11 07:00:18 +02:00
f3ca3addbf
Merge remote-tracking branch 'upstream/master'
2012-05-10 22:06:43 -06:00
dfe86f9bd7
ruby: interpret types in vmethod signatures
2012-05-11 01:34:03 +02:00
607cd9c8f2
ruby: tweak enums
2012-05-10 23:41:50 +02:00
d30573a0e0
probe: fix gcc warning
2012-05-10 22:57:11 +02:00
987cf697db
Merge upstream
2012-05-09 15:44:32 +02:00
dce7f17fe7
Merge remote-tracking branch 'upstream/master'
2012-05-08 07:32:35 -06:00
5bd90e28b8
Add a missing return in tiletypes
2012-05-07 19:30:33 -06:00
833bf518d9
Fix some issues
2012-05-07 18:31:28 -06:00
7ee4c584b9
ruby: tweak enums, pointerary
2012-05-06 22:42:06 +02:00
bfb26f1c1f
ruby: deconstructbld
2012-05-06 01:02:21 +02:00
96a62a8865
ruby: fix buildbed sample
2012-05-06 00:13:53 +02:00
f18aa9d947
ruby: add link_job
2012-05-05 23:56:26 +02:00
e2a978a4fa
ruby: avoid infinite recursion in inspect
2012-05-05 22:43:12 +02:00
e3440126a3
Fix missing switch case warnings.
2012-05-05 19:36:22 +04:00
4e084d0df7
Merge remote-tracking branch 'rh73/master'
2012-05-05 19:28:19 +04:00
1b5ce7b717
Merge remote-tracking branch 'ab9rf/master'
2012-05-05 19:26:56 +04:00
d4d6349f48
Expose builtin commands to dfhack-run, and add lua script support.
...
Move builtin command implementation to Core methods, and fall
back to hack/scripts/*.lua for otherwise unrecognized commands.
2012-05-04 19:47:18 +04:00
138461634e
ruby: fix vtable for linux destructor
2012-05-03 19:19:58 +02:00
ba1e3c4b23
ruby: vmethod call
2012-05-03 18:49:12 +02:00
5afe2ca002
Update dfhack for specific_ref.
2012-05-03 11:47:04 +04:00
8952eabd62
ruby: typo
2012-05-03 03:33:50 +02:00
5fdeac9913
ruby: fix StaticArray#inspect with indexenum, allow df.cursor = [x, y, z]
2012-05-03 02:52:53 +02:00
6903f3877f
Devel plugin nestboxes scans all nestboxes for unhatchable eggs and optionally dumps them.
2012-05-01 10:58:12 -05:00
4cffb6428d
Update building creation code with new knowledge, and fix zone.
...
Also, document new lua api, and add a more convenient wrapper.
2012-05-01 18:55:30 +04:00
e7c55ab6e1
Also exclude trader from hauling when requested at depot.
2012-04-30 09:01:48 -05:00
2303a25bde
Implement unconstructed building instance creation and linking into world.
...
For more flexibility, the base api is split into 3 phases:
alloc, setSize, and construct. No support for non-actual
buildings like stockpiles and activity zones at the moment.
2012-04-29 21:07:39 +04:00
a56f1549a9
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-04-28 22:21:57 +03:00
519ea08e8f
Typo fix
2012-04-28 22:21:35 +03:00
3d277823eb
Misc stuff needed for unreleased unfunctional stuff
2012-04-28 22:20:49 +03:00
ec8b090abe
ruby: add plugins/buildbed.rb (segfaults)
2012-04-27 18:50:27 +02:00
a7afe04f3b
ruby: name nested compounds, to allow cpp_new etc
2012-04-27 17:59:54 +02:00
bc218db596
ruby: more minor tweaks
2012-04-27 17:46:51 +02:00
3446fd024e
ruby: tweak inspect
2012-04-27 17:38:31 +02:00
9bceb7a443
ruby: typo in enumerable
2012-04-27 17:31:39 +02:00
6800f459f5
ruby: fix bitfield looking for enum value
2012-04-27 17:24:15 +02:00
fcfd7062eb
ruby: tweak inspect, autodereference pointers
2012-04-27 17:11:01 +02:00
22628fe9bb
codegen: all class-type have a vtable
2012-04-27 14:13:44 +02:00
551df9bb73
ruby: use binsearch in find_unit/find_item
2012-04-27 03:07:03 +02:00
2cc5333157
ruby: cleanup codegen enum
2012-04-27 03:02:37 +02:00
51ecd15fa8
ruby: use symbols for enums everywhere
2012-04-26 20:55:52 +02:00
7c606da636
Autolabor will exclude the trade broker from all labors if the "trader requested" flag is on at the trade depot.
2012-04-26 13:46:38 -05:00
ba7d4f8edd
ruby: extract additional info for enums
2012-04-26 20:03:56 +02:00
53e0ba8b8d
Actually write the noble penalty to the dwarf_info structure....
2012-04-26 12:54:10 -05:00
2ee1887870
ruby: add plugins/unit exemple
2012-04-26 19:38:15 +02:00
461c7e20cd
ruby: add vector#binsearch
2012-04-26 19:37:58 +02:00
02e43428ee
Sync to changes in the data structure definitions.
2012-04-26 12:36:29 -05:00
b4a8bcd8d0
Refactor MapCache: make it parse everything that is known re tiles & mats.
...
Conflicts:
library/xml
2012-04-26 12:21:59 -05:00
82a0e52a3e
Add api to check the walkable cache, and update flow_forbid in liquids.
2012-04-26 18:51:39 +04:00
5f5152f449
Autolabor: Instead of guessing who the nobles are based on noble skills, actually find out who they are and behave appropriately. Certain responsibilities are assigned various penalties to increase their holders' availability to perform noble functions. Also, holders of the "manage health" responsibility are always assigned the diagnose labor.
...
The responsibility penalties are first-approximation and will likely need tuning.
2012-04-26 09:38:25 -05:00
9b7fbcc477
ruby: fix warning in codegen with initvalue
2012-04-26 15:37:10 +02:00
03925c923a
ruby: fix new c++ obj initialization, use xml init-value
2012-04-26 14:16:47 +02:00
16ee049664
Split off the burrows api from Maps and Units.
2012-04-26 12:56:28 +04:00
6ab270d129
Retrieve unit noble position info, and use it in getProfessionName.
2012-04-26 12:03:56 +04:00
7a8db179ab
ruby: fix plugin/plant.rb, add onstatechange hook, use console proxy, general cleanup, enable build by default
2012-04-25 20:21:09 +02:00
bd2e6e74de
ruby: add manual c++ object allocator
2012-04-25 19:22:04 +02:00
b0acad6d59
ruby: use index-enum xml attr, fix bitfield[i] = 0
2012-04-25 17:18:24 +02:00
23a0b17ff3
Make liquids and tiletypes force rebuild of pathfinding data.
2012-04-25 18:38:43 +04:00
1cd802d426
Implement unit sorting for the pen zone assignment interface.
2012-04-25 18:28:00 +04:00
d1ea97c272
ruby: README
2012-04-25 01:20:35 +02:00
bf64c3e23c
ruby/plugin: tweak plants, add growcrops
2012-04-24 19:08:14 +02:00
7a71204b82
ruby: guard against undefined globals, fix inspect for inherited classes
2012-04-24 19:07:54 +02:00
eca17fff53
ruby: add sample plugin (cuttrees, growtrees)
2012-04-24 00:57:07 +02:00
c1baebd083
ruby: rename find_map_block to map_block_at, add other helper methods
2012-04-24 00:47:10 +02:00
8a05db7a1b
ruby: add map block iterators, fix FlagArray.length
2012-04-23 21:12:24 +02:00
763a301b4f
Add a few more lua api functions, documentation, and unit sort orders.
...
Units::getProfessionName appears to work correctly for
everything except nobles.
2012-04-23 21:30:53 +04:00
ac0e4a15e8
Rprobe can now be used to change any of the region_map paremeters. Use at your own peril, as strangeness may ensue.
2012-04-23 09:46:57 -05:00
e06c80f690
Fix minor ostream munging glitch in rprobe.
2012-04-22 23:36:13 -05:00
e1770fa62b
regrass: leaves tiles with the no_grow flag alone (avoids regrassing roads etc you embark on)
2012-04-23 00:34:19 +02:00
045b7b6a20
Merge branch 'master' of git://github.com/ab9rf/dfhack
2012-04-22 20:26:12 +02:00
760bc8b09f
regrass: ignore furrowed tiles (dirt roads)
2012-04-22 20:25:10 +02:00
125cd6622a
Support sorting units in many more ui contexts.
2012-04-22 19:22:00 +04:00
26cec5f60c
Probe now displays the "surroundings" name for the biome (e.g. Joyous Wilds, or Terrifying).
...
Rprobe can be used from the embark screen to set the evilness of the selected biome; use with due care.
2012-04-22 10:17:14 -05:00
af12e83ac4
Merge branch 'master' of git://github.com/ab9rf/dfhack
2012-04-22 15:25:22 +02:00
f5644f385b
Probe now displays biome savagery and evilness.
...
Devel plugin bprobe (also in this commit) goes digging around in region data at embark screen, not really useful for public consumption.
2012-04-21 23:22:21 -05:00
6fc17b3e1f
ruby: clean helper with offsetof
2012-04-21 21:20:51 +02:00
c104f822a4
Move stripcaged to master branch, works fine.
2012-04-21 12:53:46 -05:00
567b3e2a52
Fix range on tiletypes and make it saner for both plugins.
2012-04-21 11:26:40 -06:00
9317143909
ruby: officially dont support stl::deque, add class sizeof
2012-04-21 15:04:52 +02:00
4af051bab3
Add a few more unit orderings, and a way to reverse direction.
2012-04-21 16:53:17 +04:00
3282ac3db2
Add a hotkey command that sorts units in lists using lua comparators.
2012-04-21 15:43:52 +04:00
709536c6c3
Merge branch 'master' of git://github.com/ab9rf/dfhack
2012-04-21 11:53:19 +02:00
a282c9dede
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-21 11:52:25 +02:00
2d19514fbc
probe: minor change
2012-04-21 11:52:03 +02:00
adbd351462
Rename units.other[0] to units.active.
2012-04-21 12:46:55 +04:00
ad73b8c737
Add "tamable" for animals that can be tamed (PET or PET_EXOTIC in raws)
2012-04-20 14:38:50 -05:00
e0bb5bf53b
Add "naked" (has no inventory) predicate to zone (useful for mass pitting)
2012-04-20 14:22:20 -05:00
826e0b7dcf
ruby: iterate in LinkedList
2012-04-20 20:43:18 +02:00
417356c3cb
ruby: add df-linked-list support (also, xml could be simplified)
2012-04-20 18:20:24 +02:00
f57d63ed95
ruby: df_flagarray support
2012-04-20 17:57:41 +02:00
66891fd23c
ruby: tweak onupdate, fix some inspects, add inverse ENUM
2012-04-20 17:33:48 +02:00
fb2dcf55ca
ruby: fix DfArray, add #inspect, fix ruby.rb
2012-04-20 15:30:15 +02:00
0a6982f404
Enable warnings correctly on linux and fix a lot of them.
2012-04-20 13:30:37 +04:00
52138d8998
Improve the range function of tiletypes a bit and add the functionality to liquids.
2012-04-19 21:13:07 -06:00
f97e2bf410
Make tiletypes more useful
...
* Add any option to clear paint/filter
* Add aquifer bit
* Stop filtering process killing execute early
* Filter on all bits, not just dig
2012-04-19 17:44:26 -06:00
0952b76173
ruby: add df_array, pointer_ary, move generated classes in DFHack
2012-04-20 01:29:52 +02:00
0b32d374db
Implement SOIL/STONE substitution logic, and add compat in mapexport.
2012-04-19 23:02:30 +04:00
a450e9ddeb
ruby: fix vectors, add bitvector
2012-04-19 19:35:55 +02:00
4b87f1bcac
Refactor MapCache: make it parse everything that is known re tiles & mats.
2012-04-19 19:17:07 +04:00
f655a0986d
Sync to changes in the data structure definitions.
2012-04-19 11:03:29 +04:00
0e10a8edff
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-18 18:50:48 +02:00
3ad3d1af46
ruby: use rtti info to cast Item/etc subclasses
2012-04-18 18:46:33 +02:00
b7b27ebb9e
Merge remote-tracking branch 'upstream/master'
2012-04-18 11:35:32 -05:00
2dc3aa1b89
danger of rotting)
2012-04-18 11:33:17 -05:00
9e1e34f69b
Created new stockcheck plugin
2012-04-18 00:16:44 -05:00
c17529a794
Track stonesense
2012-04-18 05:09:22 +02:00
6d53ab37e0
Mass fixage
...
Updated readme.rst
Fixed up some help strings of plugin commands
Moved catsplosion and regrass to normal plugin folder
Fixed tiletypes and liquids not keeping command history properly
2012-04-18 04:12:11 +02:00
3b54cf4657
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-17 22:42:29 +02:00
3339fdfea8
ruby: fix anon unions, add some find_* helpers in ruby.rb
2012-04-17 22:42:23 +02:00
d0e9ab49e7
Merge https://github.com/jaxad0127/dfhack
2012-04-17 21:46:57 +02:00
bdd697f1a0
Merge https://github.com/rh73/dfhack
2012-04-17 21:46:40 +02:00
299510f0d9
zone: don't assign to cages which are designated but not yet placed (minor fix, it's not like bad things happen without it)
2012-04-17 18:11:14 +02:00
40f36c1912
minor stuff, use building->is_room instead of building->isRoom() which returns unexpected values
2012-04-17 16:57:41 +02:00
d901dd28cf
ruby: merge upstream
2012-04-17 14:40:59 +02:00
ebd21e9249
Fix some issues with last commit
2012-04-16 20:48:08 -06:00
7946cafc86
Merge https://github.com/jaxad0127/dfhack
2012-04-16 22:37:07 +02:00
d2dde361ad
Merge https://github.com/rh73/dfhack
2012-04-16 22:35:46 +02:00
ccf10a1428
Merge https://github.com/warmist/dfhack
2012-04-16 22:30:55 +02:00
6d180d61c4
autopasture: only process domesticated own units to avoid problems with wild animals forgetting their training and going on a rampage
2012-04-16 21:37:48 +02:00
45f9f756f0
Merge https://github.com/rh73/dfhack
...
Conflicts:
plugins/stonesense
2012-04-16 20:33:30 +02:00
862fa9d675
Track stonesense
2012-04-16 20:19:45 +02:00
70ebd26e6c
Merge branch 'master' of git://github.com/ab9rf/dfhack
2012-04-16 17:37:09 +02:00
43e4814147
Mod workflow to properly handle custom reactions that produce CRAFTS
2012-04-16 10:34:12 -05:00
9560fc641c
zone: mass-assign nicknames, assign units to multiple cages inside a pasture. autobutcher: some fixes regarding autowatch and butchering caged units.
2012-04-16 16:31:12 +02:00
e6ed81508d
autobutcher: only ignore built cages which are defined as rooms/zoos.
...
zone: allow mass-assigning of nicknames (to protect a pasture/cage from autobutcher)
2012-04-16 10:15:37 +02:00
9c67250729
regrass: pick random grass event if tile is soil instead of always using the first one found
2012-04-16 07:03:27 +02:00
e58a46b42b
zone: fixed filter 'trained' so it now finds war/hunting creatures (who strangely don't have a training level)
2012-04-16 03:31:49 +02:00
4b3c8d46c1
zone: don't assign owned pets to a cage. the owner will release them, resulting into infinite hauling (df bug)
2012-04-15 23:21:36 +02:00
7aefae17d1
autonestbox: don't assign to nestboxes which are already claimed or contain eggs.
...
bprobe: look a bit closer at nestboxes
2012-04-15 21:45:15 +02:00
a1756a864c
Implement a way to do prompts from core context.
...
The trick obviously is doing it without forcing DF to wait suspended.
Fortunately, lua has built-in coroutine support, so the interactive
prompt can simply yield and rely on the external loop to do the job.
To use this however the REPL had to be replaced with lua code.
2012-04-15 21:50:22 +04:00
6197c4e739
zone: added keyword 'not' which negates the filter followed by it (e.g. 'not grazer')
2012-04-15 19:49:50 +02:00
8bbd43f2c9
zone: added filters to search for creatures who can be trained for war/hunting
2012-04-15 17:40:39 +02:00
14709e5d45
Add an official core lua context, and allow plugins to send events to it.
...
- This context requires core suspend lock and asserts it in a few places.
- Special 'event' objects are introduced. They can be invoked as
functions, in which case they iterate all their fields and call
them as functions. Errors are printed and consumed.
- When a plugin is opened by the core context, events registered in
a special array are linked to it. The system is organized so as to
avoid even trying to pass the event to lua if the module isn't loaded.
2012-04-15 19:09:25 +04:00
f3c7a685f5
Make tiletypes more useful
...
* Paint, filter, and brush state is now saved between calls.
* Added 'all' paint option to set material, shape, special, and variant at
the same time.
* Added tiletypes-here (like liquids here, except is uses the saved brush
settings)
* Added tiletypes-here-point (like liquids here, always only the tile under
the cursor)
* Added tiletypes-command: runs tiletypes commands seperated by ';' tokens
(affects saved state)
* Make the internal workings match liquids a bit more
* Give brush objects a descriptor string
* Make Core::cheap_tokenise available
2012-04-15 08:40:19 -06:00
be580592ce
Merge branch 'master' of git://github.com/ab9rf/dfhack
2012-04-15 16:07:43 +02:00
005658a9cd
Add noegglayer zone filter
2012-04-15 09:04:19 -05:00
cf0d45be78
merged stuff from peterix
2012-04-15 12:32:25 +02:00
c69af6ab9e
Fix missing lua linkage in burrows plugin.
2012-04-15 01:58:02 +02:00
fa063e2936
Track structures, fix trivial problem in zone plugin
2012-04-15 00:35:59 +02:00
45ca8c6ac1
Merge https://github.com/angavrilov/dfhack
2012-04-15 00:13:39 +02:00
c52eb517b0
Merge https://github.com/rh73/dfhack
2012-04-15 00:12:38 +02:00
fa6ecacda9
Merge https://github.com/warmist/dfhack
2012-04-15 00:12:06 +02:00
9f95e67c75
tweak makeown: converts MERCHANT to TRADER (otherwise you can't assign jobs to kidnapped merchants.
...
zone: fixed a bug which could lead to units being assigned to more than one cage and/or accidentally marked for slaughter
2012-04-14 19:06:03 +02:00
cb49c92b99
Allow plugins to export functions to lua with safe reload support.
...
- To ensure reload safety functions have to be wrapped. Every call
checks the loaded state and locks a mutex in Plugin. If the plugin
is unloaded, calling its functions throws a lua error. Therefore,
plugins may not create closures or export yieldable functions.
- The set of function argument and return types supported by
LuaWrapper is severely limited when compared to being compiled
inside the main library.
Currently supported types: numbers, bool, std::string, df::foo,
df::foo*, std::vector<bool>, std::vector<df::foo*>.
- To facilitate postponing initialization until after all plugins
have been loaded, the core sends a SC_CORE_INITIALIZED event.
- As an example, the burrows plugin now exports its functions.
2012-04-14 19:44:07 +04:00
bbf28eb33d
Disable df2minecraft again.
2012-04-14 14:15:46 +02:00
2100a95ad5
zone: fixed major derp (assign commands would accidentally free caged creatures). tweak: added cheat to kidnap caravan escorts (works fine even for other races, does NOT work for traders because they can't be assigned any labors for whatever reason)
2012-04-14 13:36:22 +02:00
a2a47c5d63
Fix to init (no need to add " around). Added experimental (crashy as hell) tools.project
2012-04-14 13:30:48 +03:00
7a34a89f53
Add burrow subcommands to modify burrow unit and tile sets.
2012-04-14 14:12:59 +04:00
2f54a48e63
Add a plugin that makes selected burrows auto-grow on digging.
2012-04-13 21:41:42 +04:00
f85810c1e2
ruby: move enum constants up one level, allow pointer arithmetic (world.map.block_index), fix StaticArray, add map test
2012-04-13 19:31:12 +02:00
bf4bd1f034
ruby: fix vectors of pointers, fix global enum fields
2012-04-13 17:19:53 +02:00
3044da5887
ruby: add global-objects, add bitfield._whole, make StlVector enumerable
2012-04-13 16:17:56 +02:00
09608467c1
tweak fixmigrant: updated help text
2012-04-12 22:44:53 +02:00
f503bf36f4
ruby: set everything up
2012-04-12 19:12:46 +02:00
2d8611a480
Add core api for moving items between ground and containers.
2012-04-12 18:37:27 +04:00
7331485b46
removed tweak-merchant and tweak-resident, combined both commands into tweak-migrant. added worn items to their uniform so they don't drop their clothes instantly
2012-04-12 14:40:39 +02:00
2caf3fb064
tweak: removed stuff, added new command 'fixmigrants' which will deal with merchants (traders) and other types of bugged migrants. having more than one command for a bug which is basically the same makes no sense.
2012-04-11 22:29:56 +02:00
d874c3b538
Track stonesense
2012-04-11 21:33:45 +02:00
42e4fa79c7
tweak clear-merchant, clear-resident: mark the clothes the migrants wear as "owned" (they still drop them, though. needs more fixes)
2012-04-11 21:07:54 +02:00
09aad951a6
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-04-11 18:23:01 +02:00
2cf078419b
cprobe: list items worn by unit and checks if they are owned or not
2012-04-11 18:22:39 +02:00
5d5502ae34
Update the item owner modification api and export it to lua.
2012-04-11 20:10:31 +04:00
e8e8f29328
regrass: fix
2012-04-11 17:01:20 +02:00
ae7ce9e5d7
zone: fixed assigning to pit/pond. regrass: look for grass events in the map block, increase amount of grass at map position instead of simply changing the tile type
2012-04-11 14:08:47 +02:00
c7b922250b
More maps api refactoring and renaming.
...
getBlockAbs is a very confusing name; getTileBlock is better.
2012-04-11 12:01:27 +04:00
59ddbfacb7
Implement item occupancy tracking in MapCache.
2012-04-10 20:19:41 +04:00
b15d2da819
Get rid of some obsolete api functions, and restructure MapCache.
2012-04-10 18:21:19 +04:00
7d0cfb7e80
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-04-10 10:18:38 +02:00
93c795cfc3
Job module api tweaks: add a namespace to match others and some funcs.
2012-04-10 11:43:36 +04:00
f8123c3b40
zone: can now assign to and from built cages. autobutcher: fixed initializing when getting SC_MAP_LOADED event while a map is currently running
2012-04-10 09:15:38 +02:00
b2d976b06b
zone tool: added new filter 'nograzer'
2012-04-10 04:10:07 +02:00
674337e3ae
added tweak clear-resident which fixes bugged migrants and makes them proper members of the fortress. added tweak clear-merchant which assimilates merchants who linger at the map edge into the fortress. updated readme.rst
2012-04-10 00:22:38 +02:00
37f3056fdd
autobutcher: fixed behaviour of keywords 'all' and 'new'. (didn't work properly with watch, unwatch and forget)
2012-04-09 18:36:01 +02:00
8ae774fbd5
fixed wrong description of the behaviour for using keyword 'all' in autobutcher (affects all races on the watchlist, not all races in your fort)
2012-04-09 16:02:03 +02:00
afba284283
autobutcher: added a forgotten ';'
2012-04-09 15:35:25 +02:00
b6adfaaf0a
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-09 15:09:39 +02:00
a9ff1d0423
autonestbox and autobutcher store settings in the savegame. added command list_export to autobutcher which prints the current settings and watchlist in a batch file format (to allow importing settings to other savegames). updated readme.rst
2012-04-09 15:03:26 +02:00
e5213d77f6
Merge https://github.com/angavrilov/dfhack
2012-04-09 00:55:31 +02:00
f609aa0db7
zone: can now search for merchants (to allow pitting them). autobutcher: ignore merchant animals, ignore war/hunting creatures, fixed autowatch, stop spamming the console if there is nothing to report. updated readme.rst
2012-04-08 12:51:03 +02:00
53118bc986
Merge remote-tracking branch 'rossm/master'
2012-04-08 01:45:16 -05:00
ad657c68a3
Leave merchant stuff alone, even if they're certainly dwarfs.
2012-04-08 01:07:29 -05:00
de960e65f5
Stealing animals from traders is bad.
2012-04-07 23:25:40 -05:00
2e6ee0ac84
Don't assign dead animals to pastures.
2012-04-07 20:36:29 -05:00
dac84080c0
Exclude grazing units from autonestbox to avoid starving da poor boids
2012-04-07 20:26:56 -05:00
c89416a3f8
Merge remote-tracking branch 'rh73/master'
2012-04-07 12:23:31 -05:00
f931060dd9
Exclude worn items from counts for workflow
2012-04-07 12:11:53 -05:00
45ae2ed67f
Pull a few utility functions into the core and publish to lua.
2012-04-07 19:08:30 +04:00
55e059c40f
autobutcher: added keywords 'all' and 'new' for handling the whole watchlist. added option 'autowatch' which will put all new tame animal races onto the watchlist using the current default settings
2012-04-07 11:15:49 +02:00
e3fb922f53
fixed handling of units in cages who have an invalid map pos.
2012-04-07 06:47:32 +02:00
c5fc8aab9f
autobutcher: now accepts list of races in one command
2012-04-07 05:05:42 +02:00
e8ccbb4b2c
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-07 02:49:39 +02:00
eff5189acb
added autobutcher: watch lifestock, mark excess animals for slaughter. Not quite done yet (doesn't save config etc) but already works fine.
2012-04-07 02:31:10 +02:00
ac0d878b69
ruby: include memstruct in autogen
2012-04-06 19:59:11 +02:00
52007e0d4f
ruby: patron for memory primitives
2012-04-06 19:30:58 +02:00
284ada9432
Better config persistence.
2012-04-05 20:34:06 -07:00
fb1b424cbf
fix various crash with gcc autogen.cpp. all seems well
2012-04-05 22:15:43 +02:00
689cc50409
multistage autogen en route
2012-04-05 22:15:43 +02:00
3f39e285d0
codegen: gen cpp helper
2012-04-05 22:15:43 +02:00
872eebe7ef
rbcodegen: hop
2012-04-05 22:15:43 +02:00
780d7a8b18
codegen ++
2012-04-05 22:15:43 +02:00
ca528fff35
rb codegen: generate ruby
2012-04-05 22:15:43 +02:00
57f2e189ee
ruby: rm silly debug statement
2012-04-05 22:15:43 +02:00
f46e1ee518
ruby: link libruby, fix stuff, it works
2012-04-05 22:15:43 +02:00
b2846492f4
ruby: compiles
2012-04-05 22:15:43 +02:00
577e333ac9
some cleanup in zone tool, added slaughter option, autonestbox is now an own command which can be set to run every X ticks
2012-04-05 20:32:44 +02:00
df98d67ad7
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-05 10:00:56 -07:00
109edc5e77
Track stonesense
2012-04-05 16:15:41 +02:00
28a741082f
Encode & decode names in utf-8 for transfer in remote messages.
...
That's the encoding required by the protobuf spec.
2012-04-05 18:10:16 +04:00
511fceff0a
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-05 11:41:01 +02:00
33ceee8310
zone tool: some cleanup, added 'slaughter' command
2012-04-05 11:40:27 +02:00
b1c41c2c9f
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-04 23:33:49 -07:00
564150bb19
Persist autolabor config in the savefile.
2012-04-04 23:33:26 -07:00
330118ee27
Fix zone tool
2012-04-05 03:00:10 +02:00
b8ccb0424d
Merge https://github.com/rh73/dfhack
2012-04-05 02:55:42 +02:00
659dca0640
Merge https://github.com/RossM/dfhack
2012-04-05 02:47:19 +02:00
aaffdd56d8
Fixes to all of the new stuff.
2012-04-04 19:06:56 +03:00
796bc18fb0
zone plugin: fixed bug when parsing options
2012-04-04 16:48:22 +02:00
5ce0e7dbf2
zone tool: added lots of filters, added mass-assigning of nestboxes
2012-04-04 14:58:53 +02:00
a76de8b777
Fix detection of military dwarves. Add overview comments explaining why
...
autolabor works how it does.
2012-04-03 23:26:15 -07:00
9707939f2c
whoops, now it actually swaps souls :)
2012-04-04 02:13:48 +03:00
179c6e4025
Revived adv_tools, with new reincarnate command.
2012-04-04 02:06:35 +03:00
6a6ca516c3
Stupid bug with nemesis...
2012-04-04 00:18:40 +03:00
26f5e0dfb5
Fixed a lot of bugs, mostly in dfusion->tools.
...
Embark anywhere now works (in windows atleast), all other tools should work in both linux and windows.
TODO: should move embark anywhere somewhere else (as it is code changing tool)
2012-04-03 23:51:54 +03:00
6d4ef1fd38
Started rework lua files to be more hotkey friendly and adv/fort mode independant.
2012-04-03 23:16:29 +03:00
3a0bd73315
Fix for getSelectedCreature in adv mode.
2012-04-03 21:47:54 +03:00
8e1d26ff97
Added ability to call dfuse as a hotkey.
...
E.g. calling dfuse "tools.empregnate()" now works.
2012-04-03 16:17:43 +03:00
285afa2594
Autolabor tweaks.
2012-04-03 00:12:13 -07:00
288acf4b79
Tweak autolabor.
2012-04-02 23:40:56 -07:00
3bd499ff93
Limit number of dwarves assigned when idle dwarves are available.
2012-04-02 22:47:26 -07:00
18a0c80d5d
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-02 22:31:00 -07:00
1afd3d07ca
Add commands to change how autolabor handles specific jobs, and to
...
list the current settings. Changes are not saved with the current
world (yet).
2012-04-02 22:12:06 -07:00
ecb1ca0972
Large change to how autolabor assigns labors. Military dwarves and
...
children/nobles will never be assigned labors. Labor assignments are
more understandable.
2012-04-02 20:55:02 -07:00
707aee82bd
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-02 20:33:29 +02:00
9cc2040a6b
minor fix in zone tool: ignore dead units
2012-04-02 16:58:12 +02:00
772c6b1cbb
Added plugin 'zone'. Helps with assigning units to pens/pastures and pits.
2012-04-02 16:07:23 +02:00
a9a6fbd8b5
Lua tweaks: a couple of functions, dfusion tweak, backtrace metadata.
2012-04-01 12:50:56 +04:00
73cf822a13
Merge remote-tracking branch 'warmist/master'
2012-04-01 11:43:09 +04:00
2b4044f3f2
Tweaks!
...
Check map presence in autolabor and fastdwarf onupdate() functions
Game state tracking in kittens plugin now respects on/off switch
2012-04-01 03:46:17 +02:00
7ff728b6fc
Track world and map changes separately for plugin_onstatechange
2012-04-01 02:56:54 +02:00
4bac6edd79
Merge https://github.com/rh73/dfhack
2012-04-01 00:29:00 +02:00
9d6e26fa5f
Fix crashing color_ostream::printerr due to vfprintf vs fprintf mixup.
...
Also enable heap clearing in gdb mode, and fix a few newlines.
2012-03-31 22:26:41 +04:00
39787e9cd5
Renamed digging commands to uniformly start with 'dig*'(vdig -> digv etc). Added command digl, diglx (dig layerstone instead of veins). Updated readme.rst.
2012-03-31 15:41:55 +02:00
0f41608ed4
Pull console output support and REPL out of dfusion into core lib.
2012-03-31 15:40:54 +04:00
5a90e71c87
Fixes for lua5.2
2012-03-31 12:12:16 +03:00
9384f0c842
Update lua to 5.2 and fix obvious breakage due to obsolete api.
2012-03-31 12:11:43 +04:00
10b610669f
Give some sensible looking names to the arrays in pregnancy_ptr.
2012-03-31 10:31:45 +04:00
8665d1b195
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-30 19:41:00 -05:00
f8d96d1d26
Merge https://github.com/warmist/dfhack
2012-03-31 01:32:16 +02:00
387d0fd062
Track stonesense
2012-03-31 00:34:09 +02:00
95947a8635
Reworked to use start_dwarf_count offset from version info
2012-03-31 01:27:26 +03:00
c0cd5b9212
New offset for embark/simple-embark (starting dwarfs)
2012-03-31 00:54:37 +03:00
0f3ae4499f
New devel plugin - list counters for selected creature
2012-03-30 16:39:19 -05:00
a4c41bf64c
Merge https://github.com/rh73/dfhack
2012-03-30 23:34:51 +02:00
4d5aade389
Update changeitem, allow attempting to change item subtype
2012-03-30 16:34:07 -05:00
1da914fb87
Fix init.lua
2012-03-30 21:59:35 +02:00
5d8415c8d9
Merge https://github.com/warmist/dfhack
...
Conflicts:
plugins/Dfusion/luafiles/init.lua
2012-03-30 20:32:57 +02:00
61fe605676
Merge https://github.com/RossM/dfhack
2012-03-30 20:30:28 +02:00
590ea629f3
Don't try to give labors to merchant guards or dead dwarves.
2012-03-30 10:01:33 -07:00
063099e535
Set '_' to the first result value for both interactive shortcuts.
...
Makes it behave sort of like a general 'last result' reference.
2012-03-30 12:17:09 +04:00
e989ca58db
Enhance the interactive interpreter mode of dfusion.
...
1. Reimplement Console.print* to behave exactly as the standard print
function, and apply print = Console.println from c++ init code.
2. Add a couple of convenience shortcuts to save some manual typing
when poking around data structures using the interactive prompt.
3. Change the prompt string to a more distinguished shape.
2012-03-30 11:57:27 +04:00
81bc73f435
Follow a typo fix in flag name.
2012-03-30 10:44:52 +04:00
6a7e7241b8
Fix bug in changevein - if multiple veins overlap the same tile, pick the LAST one rather than the first one
2012-03-29 19:05:53 -05:00
531704da8c
print (after dfuse/dfusion) no longer needs tostring
2012-03-29 22:08:45 +03:00
7d47208c65
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-29 21:33:41 +03:00
0c2c94fa92
Remove random bad asserts
2012-03-29 20:18:14 +02:00
69b1bbe59e
Turn sorting lambdas into functors in autolabor.
2012-03-29 20:00:26 +02:00
5f53388890
Track stonesense
2012-03-29 19:03:51 +02:00
541e0ca205
Merge https://github.com/rh73/dfhack
...
Conflicts:
plugins/changelayer.cpp
2012-03-29 18:42:45 +02:00
004acdad4e
Tweaks!
...
Strip commands.clear() from all plugins
Fix changeitem - a variable name has changed in item flags
2012-03-29 18:37:22 +02:00
2446fb7abf
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-29 18:27:40 +02:00
a4995d7681
minor: return CR_WRONG_USAGE if user forgot to specify material and/or quality
2012-03-29 18:26:10 +02:00
ce69cdb5df
New way of doing assignments used in tools/empregnate.
2012-03-29 18:39:11 +03:00
836d8de73e
minor: commands.clear() is not needed in plugin_init() anymore. (done by pluginManager now)
...
removed some useless comments
2012-03-29 17:20:25 +02:00
e249ef1377
minor fix (forgot a line break in helpstring)
2012-03-29 17:14:41 +02:00
4525bee58f
Merge branch 'master' of git://github.com/ab9rf/dfhack
...
Conflicts:
library/xml
2012-03-29 16:10:31 +02:00
9b75373403
Merge branch 'master' of git://github.com/peterix/dfhack
...
Conflicts:
library/xml
2012-03-29 16:03:12 +02:00
88c914142b
added plugin changeitem (change material type and base quality)
2012-03-29 15:33:54 +02:00
453141920f
Merge remote-tracking branch 'upstream/master'
2012-03-28 23:22:28 -05:00
fea34bfdde
autolabor: set reequip flag when appropriate. also tweaked scoring to reduce job clumping.
2012-03-28 21:57:08 -05:00
d82120a3db
More fixes
...
Include unistd.h in linux process file
Fix assert in autolabor
Don't print 'script missing' error on DF start
2012-03-29 02:49:44 +02:00
166392af62
Make autolabor accept "enable" and "disable" as well as "0" or "1".
...
Add ability to set target number of miners in autolabor with "autolabor miners".
2012-03-28 10:25:36 -05:00
cebdbff46d
minor updates in readme.rst; moved changelayer plugin to main plugin folder
2012-03-28 17:00:33 +08:00
9604be2701
Fix crash in autolabor that happens when all dorfs decide to tipple at the same time
2012-03-28 16:59:38 +08:00
13d7beda4b
Dfusion crash fix
2012-03-28 16:58:52 +08:00
d2d16271f0
Track stonesense
2012-03-27 01:30:46 +02:00
3761426ef5
Extern "C" mess fixed, bitlib mess fixed, bitlib added to autoload.
2012-03-26 18:48:24 +03:00
18c94f8000
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-26 18:14:14 +03:00
61f0bc66af
small changes to tools(lua)
2012-03-26 18:12:32 +03:00
b4d458b47f
Track stonesense
2012-03-26 16:16:19 +02:00
517fc310bf
documented changelayer plugin
2012-03-26 12:27:32 +02:00
af344e57bd
Merge remote-tracking branch 'upstream/master'
2012-03-26 04:17:06 +02:00
e63ba6f87d
added changelayer plugin
2012-03-26 04:15:42 +02:00
1a19e17695
Track structures, stonesense
2012-03-26 03:39:14 +02:00
85c3fbedcc
Merge https://github.com/warmist/dfhack
2012-03-26 03:38:16 +02:00
96064da6ba
remove cursedump, use api instead
2012-03-25 12:11:00 +02:00
b790909950
Merge remote-tracking branch 'upstream/master'
2012-03-25 11:57:13 +02:00
63634de8d5
Fixed empregnate, and some other tools...
2012-03-25 11:48:53 +03:00
def7e51564
Merge https://github.com/warmist/dfhack
2012-03-25 03:27:26 +02:00
e36ed9ac07
Fixed more plugins (embark/friendship/simple_embark)
2012-03-25 01:31:58 +02:00
ee66731d63
Remove Qt and server plugins.
2012-03-25 00:28:29 +01:00
b8210a4cc7
Commented non working parts... Not very much left...
2012-03-25 01:16:41 +02:00
b56917f91b
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-03-24 16:49:17 +02:00
99da37ae46
Moving to new LuaWrapper.
2012-03-24 14:47:51 +02:00
5453521da2
Make liquids and tiletypes reference Brushes.h in the build system
...
This should cause the header to show up in MSVC
2012-03-24 13:22:43 +01:00
8a847dbaba
Tweaks and cleanups
...
Removed t_virtual.
Made lua use C++ compiler
Removed many silly exception types from Error.h and renamed the rest.
Removed Brush classes from tiletypes plugin.
2012-03-24 12:13:51 +01:00
106aedbaa5
Merge remote-tracking branch 'upstream/master'
2012-03-24 12:02:50 +01:00
9c38b1e6b5
minor: changed comment
2012-03-24 12:02:41 +01:00
7fe5fc9a90
autolabor fixage
2012-03-24 01:33:29 +01:00
e90da2bff1
Move autolabor to main plugin folder
2012-03-24 01:29:09 +01:00
13cf648634
Merge https://github.com/RossM/dfhack
2012-03-24 01:26:36 +01:00
addb5c87aa
liquids vs liquidsgo: FIGHT!
...
liquidsgo WINS, renamed to liquids to not confuse users.
2012-03-24 00:13:16 +01:00
078caf363f
Move merged plugins into main plugin folder.
2012-03-23 23:49:28 +01:00
2f76a52959
Merge https://github.com/rh73/dfhack
2012-03-23 23:06:48 +01:00
90de6a1b62
Track submodules
2012-03-23 22:59:40 +01:00
e10b1a50a3
Onfunction start
2012-03-23 11:07:54 +02:00
61eef26c92
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-03-23 11:06:44 +02:00
f25d15ce9c
Stupid mistake fixed
2012-03-22 23:27:25 +02:00
8f72a642b2
Fixed getxyz(), getCreatureAtPos() (also returns nil/creature) and empregnate to work with look/talk
2012-03-22 21:47:33 +02:00
aa807343cc
vampcheck is now generic cursecheck, added tweak clear-ghostly
2012-03-22 16:30:15 +01:00
c48c7cf874
Make logic closer to C# version. Address code comments from peterix.
2012-03-22 00:33:18 -07:00
cf029e0a2e
fixed memory leak in liquids.cpp
2012-03-21 13:57:55 +01:00
38686765a6
added plugin liquidsgo (like liquids but can run from hotkey)
2012-03-21 12:40:07 +01:00
9277dfebb9
minor: added spaces between firstname, restofname and details (they got lost somehow when I wrote the check if firstname and first part of restofname is equal)
2012-03-20 11:55:11 +01:00
c9701b536a
minor indentation fix
2012-03-20 11:41:17 +01:00
9853cc137b
fixed double printing of first name if creature has no nickname
2012-03-20 11:01:33 +01:00
6c6438267b
add plugin vampcheck
2012-03-20 09:36:36 +01:00
bfb226b92e
Add a few comments.
2012-03-19 11:33:30 +04:00
14ae83ced5
Correctly handle military dwarves.
2012-03-18 16:54:47 -07:00
2bec9f6711
Merge https://github.com/warmist/dfhack
2012-03-18 20:51:13 +01:00
ff17e6c067
Neither of these plugins have anything at all in them, so don't bother building them
2012-03-18 14:44:10 -05:00
a40c386cef
Update bprobe to always display ID numbers (and put them in parentheses after the name)
2012-03-18 14:42:13 -05:00
fe211acb71
Small bug fixes
2012-03-18 16:23:31 +02:00
a8a540eeb8
Merge https://github.com/warmist/dfhack
2012-03-18 13:14:00 +01:00
19a317deeb
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-03-18 13:10:47 +01:00
a092ded82d
Track stonesense
2012-03-18 12:48:09 +01:00
3383aa7f6d
New pointer, setup pointer and df-array. ALso new tool, empregnate.
2012-03-18 12:24:28 +02:00
b9ecd03fe2
Make the server suspend the core around calls unless disabled.
...
I expect the majority of methods will have to suspend the core
first thing anyway, so this will reduce typing and bugs.
Also get rid of the "me->" ugliness by splitting threadFn.
2012-03-18 11:04:15 +04:00
293eb53677
Merge https://github.com/angavrilov/dfhack
2012-03-18 04:48:02 +01:00
5367d28110
few small bugs (embark caste selection) and moved runsaved to non-auto.
2012-03-18 03:02:16 +02:00
943c4abe76
updated readme.txt
2012-03-18 02:22:26 +02:00
e1279d79db
small debug un-optimatization removed
2012-03-18 02:16:53 +02:00
086ce16f0f
tools updated (not fully), added editor( edit everything in df)
2012-03-18 01:57:50 +02:00
77738085e2
embark and friendship working.
2012-03-18 00:50:47 +02:00
aa63493bb8
Add a ListSquads request.
2012-03-17 20:04:15 +04:00
16861781c2
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-17 15:09:05 +02:00
fd48c59aba
Started move to new system. Temp disabled non-working plugins.
2012-03-17 15:05:48 +02:00
58eb199036
Add many new template functions for enums & bitfields.
...
An incompatible change: ENUM_KEY_STR returns std::string now.
The old behavior is available via enum_item_key_str function.
2012-03-17 12:52:22 +04:00
14d6a62e1d
Move CoreService to a separate file.
2012-03-17 12:09:30 +04:00
89edfd4e15
Initial Autolabor code.
2012-03-16 21:45:52 -07:00
3168a2ef62
Add a tiletype function to get basic shapes from shapes. Track modules.
2012-03-16 20:41:07 +01:00
aa7f13266b
Fix dwarfexport to use enum macros
2012-03-15 20:43:27 -05:00
5464564ef6
Merge branch 'master' of git://github.com/angavrilov/dfhack
...
Conflicts:
library/xml
2012-03-15 20:12:01 -05:00
4d66218783
Update bprobe to print civzone subtypes
2012-03-15 20:09:56 -05:00
dea215d0b9
Alignment done (at least for now). Now there is a working access to df.
2012-03-16 02:08:55 +02:00
c72fb76316
MSVC fixage for the new socket API
2012-03-15 22:05:33 +01:00
f84b1539a8
Change to the traits representation of enum and bitfield properties.
2012-03-15 20:46:08 +04:00
1ac8025025
Merge https://github.com/angavrilov/dfhack
...
Conflicts:
plugins/workflow.cpp
2012-03-15 14:43:05 +01:00
605ee9669a
Plugin-exported functions now actually work.
2012-03-15 14:06:50 +04:00
87f925e72e
Add support for exporting functions from plugins, with example in rename.
...
TODO: test by actually calling them remotely.
2012-03-15 13:01:23 +04:00
e7851f5abd
Improve support for void RPC functions, dfhack-run, etc.
2012-03-15 11:07:43 +04:00
560e977f05
Implement trivial RPC interface for dfhack via TCP & protobufs.
...
Use it to make an executable capable of calling commands remotely.
2012-03-14 19:57:29 +04:00
03e648b3a1
Fix ordering for custom attribute names dwarfexport uses.
2012-03-14 12:57:53 +01:00
c42e2ff053
Support crafts and add a couple of options in workflow.
2012-03-14 12:09:02 +04:00
a05cbcc2de
Rename the world substruct with the save directory name.
2012-03-14 10:56:30 +04:00
d75908b95c
Merge https://github.com/ClaytonHughes/dfhack
...
Conflicts:
library/Core.cpp
plugins/workflow.cpp
Just had to fix a few minor things.
2012-03-14 01:52:58 +01:00
f092edaa99
alignment hell, and started to port all plugins to new structure based mode.
2012-03-13 23:08:46 +02:00
a4ce1fff13
Update MapCache to allow decoding tiles underneath ice and constructions, and allow revflood to take those into account
2012-03-13 15:40:38 -05:00
04a43501ac
Fixed loops in linked lists, split xml_types into windows (and in the future linux) versions. Works, but not tested. Also updated offset for migrants.
2012-03-13 21:40:25 +02:00
181f1c6ac6
Silence warning
2012-03-13 13:15:12 -05:00
eb4757043b
Move depends out of main library, make them (static) libraries.
2012-03-13 14:46:48 +01:00
d7f7437ca1
"clear all" wasn't working properly - I'm bad at counting.
2012-03-12 00:32:43 -07:00
708dc6c32d
Forgot usage message for "clear all"
2012-03-12 00:10:55 -07:00
7dff12ead7
Added "workflow clear all" command to remove all constraints.
2012-03-12 00:05:22 -07:00
68fbb535c9
Merge https://github.com/warmist/dfhack
2012-03-11 23:01:14 +01:00
b50d7ecdf3
Fix typo in features.cpp
2012-03-11 22:45:41 +01:00
27a7f97174
Merge branch 'master' of git://github.com/peterix/dfhack
...
Conflicts:
plugins/CMakeLists.txt
2012-03-11 15:32:16 -05:00
3b87f7bd3a
Add revforget command, lair plugin
...
revforget throws away data reveal keeps in order to be able to hide
the revealed parts of the map
lair allows marking the map as monster lair (or the opposite while
using the 'reset' option)
2012-03-11 22:25:30 +01:00
081aee1363
Fixes for DfHack::Process foolery.
2012-03-11 14:59:32 +02:00
237d7b433a
Updated to new dfhack standards.
2012-03-11 14:33:08 +02:00
792e48fb76
Merge branch 'master' of git://github.com/peterix/dfhack
...
Conflicts:
plugins/Dfusion/luafiles/xml_struct.lua
plugins/Dfusion/luafiles/xml_types.lua
2012-03-11 13:50:14 +02:00
35ca21426b
Df reading starting to work. Lots of testing required, some types don't have accessors yet, etc bugs
2012-03-11 13:42:59 +02:00
1124ab25fb
Add map feature manager - allows enabling/disabling magma workshops as well as halting subterranean plant growth outside the caverns
2012-03-10 13:40:55 -06:00
9d6a19b7d4
Track df2mc, stonesense
2012-03-10 18:48:52 +01:00
75113b715a
Misc fixes for warnings...
2012-03-10 16:03:11 +01:00
003a0f9eb8
Merge https://github.com/angavrilov/dfhack
2012-03-10 15:51:45 +01:00
50b7db982f
Fix zlib, protobuf.
...
Zlib is now found using CMake on linux and set to harcoded paths
on windows, yet uniform in use throughout the build system.
protobuf-lite now compiles under MSVC properly.
2012-03-10 15:31:46 +01:00
522dd1fd10
Update the devel plugins.
2012-03-10 17:25:00 +04:00
8cc82d5876
Make plugins accept explicit output stream references.
...
This is an incompatible change to the plugin ABI.
The Console is not thread-safe unless used indirectly
via color_ostream_proxy, so everything should use their
per-thread stream.
2012-03-10 15:55:42 +04:00
c260aca3f1
Merge https://github.com/angavrilov/dfhack
2012-03-10 02:15:34 +01:00
77349e9b80
Added age, currently enabled labors, and skill levels to dwarfexport XML
2012-03-10 02:10:53 +01:00
edf77cf270
Link protobuf to dfhack core as a shared library.
...
- Change protobuf libraries to build as DLLs.
- Move some stream features to the lite library.
- Install the lite library and use it from dfhack.
Note that:
- A couple of protobuf headers had to be tweaked.
- The lite library is used because the full one is
absolutely incompatible with reloading plugins.
- Shutting down protobuf also can't be allowed.
2012-03-09 19:46:21 +04:00
98a226ab63
Add a lair sub-command to tweak.
...
This allows setting the whole map as monster lair, effectively locking items in place so they don't scatter on abandon/reclaim.
2012-03-09 08:26:41 +01:00
dc0b2b8216
Track stonesense
2012-03-08 09:15:55 +01:00
9c7e341e5e
Track df2mc
2012-03-08 00:24:40 +01:00
3598282ed7
Update readme, track df2mc and structures
2012-03-07 23:40:22 +01:00
15a82cfbbf
Merge branch 'master' of github.com:peterix/dfhack
2012-03-07 21:40:09 +01:00
9b071097de
Fix advtools metal-detector
...
Trader items are now inside tables, and thus not in the block
item lists. Thus it is necessary to scan the global item vector
and look up blocks by coords.
2012-03-07 18:10:53 +04:00
7d2b6b4583
Lots of work done with xml parsing.
2012-03-07 19:41:43 +08:00
cbd254991f
Add a tweak for forcibly clearing the Missing status of units.
...
Mainly useful for fixing inexplicably missing ghosts.
2012-03-05 19:47:06 +04:00
a45fc82743
First pass at windowing, track df2mc, stonesense
2012-03-05 01:34:04 +01:00
69e1da184c
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-04 14:47:09 +02:00
e8788d8872
Lots of work done with xml parsing.
2012-03-04 14:45:15 +02:00
99abd4102d
Merge https://github.com/quietust/dfhack
2012-03-04 11:58:37 +01:00
1821dd6201
Merge https://github.com/warmist/dfhack
2012-03-04 11:57:44 +01:00
d33e9a9770
Sort layer materials in prospector by depth.
2012-03-03 23:18:12 +01:00
a0b671b289
sqrt() doesn't work on integers
2012-03-03 16:06:31 -06:00
e43a87b13b
Merge branch 'master' of git://github.com/peterix/dfhack
2012-03-03 14:13:51 -06:00
7fe8762852
Get rid of Simple namespace, Gui module is now a namespace.
2012-03-03 14:38:24 +01:00
5d4114f5b7
Add "bprobe" command, describes the buildings located under the cursor
2012-03-02 09:35:49 -06:00
3dd27c8d1d
Support items in bags, and tweak the output format in metal-detector.
2012-03-02 17:46:44 +04:00
da3ac54af7
Don't put clothing held in hands into the first 3 columns of list-equipped.
...
For some reason that stuff has INV_WEAPON and shows up in the
report, so since it does, put it in the weapon column.
2012-03-02 11:19:30 +04:00
ae655daf1a
Add an advtool for detecting metal stuff in shops.
...
Inspired by Q's advmode reveal. Obviously doesn't work in travel mode.
2012-03-02 11:10:34 +04:00
d014554679
Merge remote-tracking branch 'q-github/master'
2012-03-02 09:26:52 +04:00
5019af038b
Allow Reveal to be used in Adventurer mode
2012-03-01 22:52:40 -06:00
1c90019de4
More work with parsing xml (almost works)
2012-03-02 01:23:03 +02:00
df6bd59006
Fix advtools: player_id is an array index, not nemesis id.
...
In most worlds they happen to be the same, but not always.
2012-02-29 17:06:05 +04:00
26c15a1d51
Nuke wagons, move regrass to devel, bump to a dev version.
2012-02-28 23:33:02 +01:00
2c532b630a
Merge https://github.com/angavrilov/dfhack
2012-02-28 19:05:44 +01:00
a3108c668b
Actually fix cursor detection in follow this time.
2012-02-28 09:23:02 -08:00
bc02acb64f
Fix cursor detection for follow.
2012-02-28 09:16:33 -08:00
bc270c1813
Add advtools list-equipped to quickly check companion equipment.
...
Items are printed as a table, with columns for head,
body, legs, and weapons/ammo/misc.
2012-02-28 17:58:08 +04:00
f8721c88b5
dev version. update structures, stonesense
2012-02-27 20:10:31 +01:00
46a99084ee
Track stonesense
2012-02-26 18:35:20 +01:00
8afafd0430
Get rid of ntdll, update stonesense
2012-02-25 22:59:32 +01:00
30fe1f63ed
Track stonesense
2012-02-25 15:44:15 +01:00
ad7b9d42a1
Add a command for swapping body with another units in adventure mode.
...
Based on dfusion code, with lots of safety checks added. Supports two
swap modes: transient and permanent; the former does a minimal change
and is intended for managing companion inventory. The permanent one
performs all known actions necessary to turn it into the real adventurer.
Note: the transient mode is a hack and may cause the game to crash
if not reverted while within range of the real adventurer unit.
2012-02-25 17:08:05 +04:00
bca78088e2
Add "changevein" plugin, lets you change what mineral inclusions are made of
2012-02-24 14:07:04 -06:00
60b83b41ef
Merge https://github.com/warmist/dfhack
2012-02-23 08:56:40 +01:00
dfb0e41c87
Update stonesense
2012-02-23 07:47:53 +01:00
e2c677b020
Pattern reader to a tree
2012-02-23 01:32:38 +02:00
8d9fa86804
Added dfusion plugin name.
2012-02-23 00:41:27 +02:00
da57a66850
fixed build errors with offsetgroup
2012-02-23 00:21:50 +02:00
c26b1571a4
Merge https://github.com/quietust/dfhack
2012-02-22 22:58:20 +01:00
252176d064
Add abuse mode to mode plugin.
2012-02-22 22:46:12 +01:00
491c3aa0c9
Add "-a" option to getplants, selects every type of plant
2012-02-22 15:31:34 -06:00
e9b45a5b6d
Add "dumpmats" devel plugin
2012-02-22 14:00:37 -06:00
a779ac475d
Make follow work as a hotkey plugin.
2012-02-22 09:43:14 -08:00
4fe49d0028
Merge https://github.com/angavrilov/dfhack
2012-02-22 15:23:28 +01:00
8848f5a854
Merge branch 'vdig-fix' of https://github.com/plaes/dfhack
2012-02-22 15:23:06 +01:00
0807baf0c0
Merge https://github.com/mikestewart/dfhack
2012-02-22 15:22:19 +01:00
8ee27e182a
Hidden weather command raw value override
2012-02-22 15:21:29 +01:00
e88d5cb035
Fix rename squad: use entity data to skip squads from abandoned forts.
2012-02-22 17:44:36 +04:00
bc012ea7c7
vdig: Fix typo and update wiki link
2012-02-22 13:46:47 +02:00
baea253578
Merge remote-tracking branch 'upstream/master'
2012-02-21 23:31:53 -08:00
14b471a459
Add ability menu/area map width reading and writing to the Gui module, and use the new information in follow to properly center the screen regardless of menu configuration. Also general fixing and cleanup in follow.
2012-02-21 23:30:44 -08:00
34c9c2d663
Fix stonesense, MSVC fail
2012-02-21 18:30:31 +01:00
2cd2ee9b0c
New plugin interface
2012-02-21 18:19:17 +01:00
0b9e849096
Update submodules, sort 'ls' output.
2012-02-21 15:21:50 +01:00
f8d0b83b0a
Add new follow plugin that makes the DF window center on and follow a selected unit.
2012-02-21 00:44:10 -08:00
2524f81ae0
Fix tile materials in mapexport.
2012-02-20 19:32:58 -08:00
10a2f3ed1b
Merge https://github.com/mikestewart/dfhack
2012-02-20 17:55:16 +01:00
1ca500ff25
Update the assumed identity in rename unit.
2012-02-20 18:04:58 +04:00
80cedd2ff8
Fix header includes, update structures.
2012-02-20 11:42:40 +01:00
166213c150
Fix protobuf files to mirror changes to tiletype enums
2012-02-19 20:35:45 -08:00
a98f579828
Update stonesense
2012-02-19 20:33:19 +01:00
33f77c8837
Merge https://github.com/quietust/dfhack
2012-02-19 20:28:08 +01:00
27e3e0f2c2
Update submodules
2012-02-19 20:08:29 +01:00
e4a0b2aaf9
Fix reveal and tiletypes - RIVER and POOL are no longer tile shapes
2012-02-18 11:36:06 -06:00
7b20690db0
Merge branch 'master' of git://github.com/peterix/dfhack
2012-02-18 10:37:29 -06:00
1511a6b7ed
Use hexadecimal numbers in tilesieve
2012-02-18 15:07:55 +01:00
d908789dfa
Add useless dev plugin - set all "frozen liquid" tiles to be either Water or Magma
2012-02-17 16:20:17 -06:00
fa6ec63535
Add zoom to kittens, fix tilesieve.
2012-02-17 05:30:34 +01:00
28059a7f35
Tilesieve devel tool
2012-02-16 16:22:05 +01:00
1bf5080828
Fixage. Runs with 34.01
2012-02-15 21:35:44 +01:00
448e270421
Merge https://github.com/quietust/dfhack
...
Conflicts:
plugins/mapexport/mapexport.cpp
2012-02-14 09:59:33 +01:00
bdbfbf5988
Fix catsplosion.
2012-02-14 09:37:30 +01:00
091bf62aa8
DFhackCExport is only needed on the plugin_* functions
2012-02-13 22:54:08 -06:00
b152a40e83
Fix remaining issues
2012-02-13 19:56:55 -06:00
d15d38d536
Finish conversion, fix compile errors
2012-02-13 19:17:38 -06:00
d0a8c2edd8
Move TileTypes to XML, part 1 - a bunch of stuff is now broken
2012-02-13 16:56:33 -06:00
f600928ec1
Move catsplosion, tweak for build targets under MSVC.
2012-02-13 17:43:41 +01:00
9163dda076
Missing newline in mapexport help output.
2012-02-12 18:42:25 -08:00
1b3d517a61
Fixed material output -- material_type and material_index were being used backwards.
2012-02-12 18:39:43 -08:00
8f680dcf94
Make it build and run on linux (no stonesense, df2mc, dfusion)
2012-02-09 03:07:26 +01:00
8f1a2ebf7f
Added missing keybinding mention to 'ls', DFusion hotfix.
2012-02-06 04:47:13 +01:00
20b1d09fdc
Merge https://github.com/mikestewart/dfhack
2012-02-05 23:04:06 +01:00
cdb171e9b1
Fixed an issue with hidden plants.
2012-02-05 13:51:49 -08:00
6fe0867c46
Rename export to dwarfexport.
2012-02-05 20:41:12 +01:00
2b22b0b336
Make dwarf export optional. Update structures.
2012-02-05 20:16:00 +01:00
7d8a176e59
Merge branch 'export-plugin' of https://github.com/espenhw/dfhack
2012-02-05 20:05:19 +01:00
71b29b67cf
Merge https://github.com/mikestewart/dfhack
2012-02-05 19:50:15 +01:00
ec5f3cc4b3
Update fixpositions to match the new data definition naming.
2012-02-05 16:13:19 +04:00
6ac50fccbd
Fixed mapexport's plant saving.
2012-02-04 23:51:26 -08:00
e51e4f6bd2
More docs work.
2012-02-05 06:02:44 +01:00
ebeae664d7
Merge https://github.com/mikestewart/dfhack
2012-02-05 04:28:53 +01:00
b79c6880e2
Merge https://github.com/quietust/dfhack
2012-02-05 04:28:37 +01:00
8ddc2f87c9
Update docs.
2012-02-05 04:28:20 +01:00
e9118dceeb
Add fixpositions plugin - adds Elven Diplomats and Human Merchant Nobles to existing worlds
2012-02-04 20:45:45 -06:00
4c8717477c
Fix really stupid typo
2012-02-04 16:38:54 -06:00
b9020a70a9
Merge.
2012-02-04 13:08:08 -08:00
e5b2c78122
Added plant and material export to mapexport, and made constructions have the proper material.
2012-02-04 13:05:41 -08:00
5ad9274689
Update structures, stonesense.
2012-02-04 21:17:52 +01:00
cf3c5ff5d0
Merge https://github.com/angavrilov/dfhack
2012-02-04 20:54:41 +01:00
4b3a2bfe05
Merge.
2012-02-03 23:29:05 -08:00
24368df553
Update stonesense
2012-02-04 07:47:57 +01:00
6bf55978a4
Modify embark-time prospect using the randomized material hypothesis.
...
Assume that the game generates a fixed number of veins of each
type, but randomly chooses the material, using unk_38 as weight.
This seems to bring some numbers closer to the real counts.
2012-02-03 12:48:38 +04:00
d4163fcde3
Improve results of the embark-time prospector.
2012-02-03 11:43:13 +04:00
1e89b8d79b
Merge https://github.com/angavrilov/dfhack
2012-02-03 06:48:44 +01:00
81f434d5f7
Update stonesense, again.
2012-02-02 21:12:30 +01:00
878bc3d3a1
Implement pre-embark estimate in prospector.
...
Requires careful tuning of the vein density computation.
2012-02-02 22:14:49 +04:00
3770f141e0
Merge https://github.com/quietust/dfhack
2012-02-02 06:21:37 +01:00
lethosor
Japa
Lethosor
Eric Wald
Michael Casadevall
carbohydratesn
Ben Lubar
PeridexisErrant
Warmist
Japa
expwnent
sv-esk
James Gilles
Nikolay Amiantov
Quietust
DoctorVanGogh
Fukken-Saved
Adam Watkins
Ross Morgan-Linial
James Logsdon
Daniil Guzanov
scamtank
Chris Dombroski
Timothy Collett
Casey Link
expwnent
Patrick Dawson
Yoann Guillot
expwnent
Alexander "Ace" Olofsson
expwnent
Alexander Gavrilov
hobotron-df
Anuradha Dissanayake
Pierre-David Bélanger
expwnent
Tareq A Khandaker
Petr Mrázek
Robert Heinrich
Bjørnar Hansen
Kelly Martin
cherrydev
Anuradha Dissanayake
expwnent
rampaging-poet
Mathias Rav
Alexander Gavrilov
jj
Valentin Ochs
Donald Ruegsegger
Timothy Collett
Rinin
playfordh
Jared Adams
RossM
unknown
Clayton Hughes
Antalia
Mike Stewart
Priit Laes
Mike Stewart