lethosor
8145a04944
dwarfmonitor: Add mouse cursor widget
...
Suggested by @ragundo
2015-06-15 13:42:29 -04:00
lethosor
7581bda7d5
Update dwarfmonitor documentation and NEWS
2015-06-13 21:50:15 -04:00
lethosor
93c9a41a3a
Reimplement dwarfmonitor widgets in Lua (and improve customizability)
...
Widget positions and a few other options (e.g. date formats) can be
specified in dfhack-config/dwarfmonitor.json on a per-instance basis.
Related changes:
* Fixed an issue loading JSON files from Lua
* JSON files in dfhack-config (only dwarfmonitor.json currently) are
no longer copied into the DF directory when building DFHack. This
keeps developers' personal settings intact, but will require
copying over changes made to DFHack's copies manually.
* Fixed incorrect config path in dwarfmonitor help
2015-06-13 21:15:43 -04:00
Fukken-Saved
9a262ad013
Travis compliance
2015-06-13 14:19:14 -04:00
Fukken-Saved
d4c7cd2a4e
Update autohauler.cpp
2015-06-13 14:08:42 -04:00
lethosor
2d121caabc
Allow searching noble suggestions in liaison meetings
...
Closes #622
2015-06-11 21:37:58 -04:00
Lethosor
09db800f3d
Change tabs to spaces
2015-06-11 12:50:00 -04:00
Japa
eef9f49ae8
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-06-11 21:51:03 +05:30
Japa
cf13b677b6
Added all main tile flags to the list of sent stuff.
2015-06-11 21:49:42 +05:30
lethosor
84b0b48028
dwarfmonitor: Allow weather indicator to be configured separately
2015-06-10 23:09:01 -04:00
lethosor
eabcee38e5
dwarfmonitor: Get rid of "Clear" weather indicator
2015-06-10 23:05:33 -04:00
Adam Watkins
772ad0372d
Improved issue with workflow job being resumed but never being worked
...
Fixes #487
* This doesn't fix existing stuck jobs, in order to fix, remove repeat, cancel, add, repeat
* Most workshops worked great after this, however, I noticed my bone bolts and wood bolts still got stuck, not sure if it is the same issue
* The unk_v4020_1 field was not being reset to -1 when resuming the job.
* Updated to be reset only when the job is being resumed
** Setting it to -1 without checking sets this field on all workflow jobs, which causes a crash
* Made other calls to suspend call set_resumed rather than setting the suspend field
This is the behavior I saw for the unk_v4020_1 field:
Suspended jobs: -1
Jobs not in the top of the list but not suspended: -1
Jobs at the top of the list to work next, not suspended: A positive integer (priority of job?)
2015-05-22 22:26:58 -04:00
lethosor
0f1adeb3e7
Update stonesense
2015-05-17 12:47:43 -04:00
lethosor
84b2f814e8
Disable some plugin output on startup
...
* tweak: Log tweak changes to stderr.log instead of the console
* stockflow: Use "enable stockflow" instead of "stockflow enable"
in dfhack.init-example
2015-05-16 18:23:02 -04:00
lethosor
a577248a38
Make memview output more readable
2015-05-09 19:41:13 -04:00
lethosor
6eb929b306
Move JSON files out of hack/ folder
2015-05-09 16:04:15 -04:00
lethosor
a8f5e683f7
Merge remote-tracking branches 'RossM/autolabor-changes', 'RossM/workflow-changes' and 'lethosor/plugin-exports' into develop
2015-05-09 09:39:55 -04:00
lethosor
d0ba6d7019
Fix tweak fps-min
2015-05-08 17:35:46 -04:00
lethosor
9c404a535d
Make search plugin intercept MOVIES and HELP keys
2015-05-08 16:27:52 -04:00
Ross Morgan-Linial
3001053cef
Change tabs to spaces.
2015-05-07 21:51:03 -07:00
Ross Morgan-Linial
7aac9a8fb8
Improve workflow handling of plant reactions
...
Makes workflow understand "seeds of any plant", "thread of any plant",
"drink of any plant", "powder of any plant", and "liquid of any plant"
when counting items.
Changes workflow's handling of the built-in plant reactions to
understand that they always produce plant products, and that they also
produce seeds.
This means that you can set a target for, for example, "powder of any
plant", and workflow will use a milling job to produce that.
2015-05-07 20:49:29 -07:00
Ross Morgan-Linial
3da939bb02
Change tabs to spaces.
2015-05-07 20:41:11 -07:00
Ross Morgan-Linial
684ff433d4
Autolabor changes
...
Try harder to concentrate skill on certain dwarves, at the expense of
potentially allowing more idle dwarves.
Attempt to keep dwarves with tools from running off and doing other
things while holding on the tool so much.
Add comments explaining the two modes autolabor uses depending on number
of idle dwarves.
2015-05-07 20:37:01 -07:00
Ross Morgan-Linial
82202efb26
Don't reset disabled labors
...
Autolabor was disabling all labors on dwarves selected for trading or
diplomacy, even if those labors were not supposed to be managed by
autolabor. This is wrong.
2015-05-07 20:36:51 -07:00
lethosor
a1fd1d9219
Document dwarfmonitor and allow date format to be modified
2015-04-19 12:38:37 -04:00
lethosor
6187ac3054
Only initialize steam-engine when a fortress mode map is loaded
...
world->raws.buildings.workshops is not always cleared on world load
(notably in the arena), so it can contain invalid pointers from
previous games.
Fixes #444
2015-04-02 17:17:29 -04:00
lethosor
786581689f
Move get_dfhack_version() to a separate namespace and add a few other version-related functions
2015-04-02 16:37:58 -04:00
lethosor
9b6d8d2799
Allow dev plugins to be skipped on startup
2015-04-01 17:50:22 -04:00
lethosor
82d72007fc
Move zoom-related commands to a separate dev plugin
2015-04-01 17:24:52 -04:00
lethosor
7913517b2c
Add "nyan stop" command
2015-04-01 17:02:33 -04:00
expwnent
6779849bc6
This requires a return value in Windows, and really should have one anyway.
2015-03-29 14:21:59 -04:00
Lethosor
88c3a629d5
Fix vshook
2015-03-26 19:27:22 -04:00
James Logsdon
f8d8baef39
Remove explicit tokens and use ENUM_KEY_STR for profession templates
2015-03-25 15:04:52 -04:00
Ben Lubar
d182b6c1c3
only create the stocksettings directory when it is requested
2015-03-24 17:46:49 -05:00
lethosor
a5b2b92b30
Merge remote-tracking branch 'eswald/stockflow' into develop
2015-03-24 16:05:48 -04:00
lethosor
ff38a60d56
Merge remote-tracking branch 'lethosor/ui-tweaks' into develop
2015-03-24 15:53:36 -04:00
expwnent
4fac0aff0d
Fix compile: missing include in plugins/manipulator.cpp.
2015-03-24 12:25:50 -04:00
Eric Wald
4f963233f4
Enticing the bookkeeper to work more often
2015-03-20 19:23:04 -06:00
James Logsdon
caed509d0b
Simply maniuplator professions by adding the text token to the SkillColumn entries
2015-03-19 03:30:03 -04:00
Eric Wald
23707db1d3
Fixed ballistic arrow head orders
2015-03-15 16:38:59 -06:00
Eric Wald
6bfaa8d35d
Better way to handle obsolete job types.
2015-03-15 16:37:35 -06:00
Eric Wald
81c2a6e79f
Refactoring a table insert into reaction_entry.
2015-03-15 16:02:29 -06:00
Eric Wald
11d65b4f2d
Always clear reactions when loading.
...
This removes a minor potential for memory leaks.
2015-03-15 15:43:46 -06:00
Eric Wald
d18bd3e2a5
Preventing a stockflow error message in Arena mode
2015-03-15 14:08:47 -06:00
Lethosor
3639920a50
Merge pull request #575 from lethosor/game-type
...
Add gametype checks to World module
2015-03-13 22:25:37 -04:00
Lethosor
48b7c51027
Merge pull request #574 from melkor217/master
...
Negative autolabor pool size uses most unskilled dwarves.
2015-03-10 19:58:18 -04:00
lethosor
0c5b5c691a
Use gametype checks in plugins
2015-03-09 20:17:18 -04:00
lethosor
c2eba99cb9
Create professions folder if necessary
2015-03-05 16:57:58 -05:00
lethosor
efa9224eef
Merge remote-tracking branch 'lethosor/manipulator-expansion' into develop
2015-03-05 16:55:30 -05:00
lethosor
6f276ac419
Shorten option width to stay within 80 columns
2015-03-05 16:48:11 -05:00
Daniil Guzanov
4c06e022a6
Negative autolabor pool size uses most unskilled dwarves.
2015-03-06 00:47:18 +03:00
lethosor
be2349d67d
Revert "Expose manipulator columns to Lua"
...
This reverts commit 1d8b2d8cea
.
2015-03-05 16:32:57 -05:00
lethosor
8459959124
Add fps-min to dfhack.init-example and plugin help
2015-03-05 16:29:36 -05:00
lethosor
83cb7b48f9
Add "fps-min" tweak and allow onupdate-based tweaks
2015-03-04 19:03:39 -05:00
lethosor
abc60f53ad
Add `tweak shift-8-scroll`; misc. tweak plugin changes
...
* Avoid dumping complete usage information for unrecognized tweaks
* Alphabetize tweaks in Readme.rst
2015-03-04 18:32:10 -05:00
Lethosor
499ac05ad3
Merge pull request #569 from Fukken-Saved/master
...
Small update (autohauler)
2015-03-04 15:08:52 -05:00
Fukken-Saved
7a26e633e9
Update autohauler.cpp
2015-03-04 07:06:24 -05:00
Fukken-Saved
36cee730f1
Update autohauler.cpp
2015-03-04 06:59:29 -05:00
lethosor
0b912f54be
Fix field name in lua/stockflow.lua
...
From DFHack/df-structures#39
2015-03-01 17:32:25 -05:00
Lethosor
6bfbb93377
Merge pull request #557 from jlogsdon/manipulator-job-view
...
Add current job as a view mode in manipulator
2015-03-01 17:14:29 -05:00
James Logsdon
1ebb1f1d11
Add current job as a view mode in manipulator
2015-02-28 17:09:58 -05:00
lethosor
87867b96b9
Add autohauler to plugins/CMakeLists.txt
2015-02-27 23:18:26 -05:00
lethosor
fdfebf4d4e
Merge remote-tracking branch 'Fukken-Saved/master' (autohauler) into develop
2015-02-27 23:15:49 -05:00
lethosor
cdf211d437
Merge remote-tracking branch 'PeridexisErrant/autobutcher-export' into develop
2015-02-27 23:13:06 -05:00
lethosor
64123d8fea
Merge remote-tracking branch 'warmist/dev_building_hacks' into develop
2015-02-27 23:09:56 -05:00
Fukken-Saved
ac5909ad2a
Update autohauler.cpp
...
Some small text changes
2015-02-25 07:47:15 -05:00
Fukken-Saved
a228977976
Update autohauler.cpp
...
Final whitespace fixes?
2015-02-25 07:26:54 -05:00
Fukken-Saved
53c88bab56
Update autohauler.cpp
2015-02-25 07:22:25 -05:00
Fukken-Saved
68d088eeb5
Revert "Add autohauler plugin to cmakelist"
...
This reverts commit a13c9b0310
.
2015-02-25 07:13:29 -05:00
Fukken-Saved
6e0c7d6a4e
Revert "whoops"
...
This reverts commit 5f498b1b78
.
2015-02-25 07:13:09 -05:00
James Logsdon
2549f116a0
Custom Profession Templates in manipulator!
2015-02-24 15:51:24 -05:00
James Logsdon
c2c8ae6a44
Add current job as a view mode in manipulator
2015-02-24 15:51:24 -05:00
lethosor
1d8b2d8cea
Expose manipulator columns to Lua
2015-02-24 15:50:27 -05:00
lethosor
70824ade14
Allow shift to extend selection
2015-02-24 15:50:27 -05:00
lethosor
e2d7a7395e
Add several additional format options
...
Also set do_refresh_names and call calcIDs() when needed
2015-02-24 15:50:27 -05:00
lethosor
c36daa4d7d
Fix a few minor StringFormatter issues
...
* Recognize the end of a format specifier properly
* Make '$' actually work
2015-02-24 15:50:27 -05:00
lethosor
5a92080cc1
Add various ID formatting options, allow editing a single dwarf
2015-02-24 15:50:27 -05:00
lethosor
b5797daa8a
Allow custom nicknames/profession names to use format specifiers
...
Also prevent selecting/applying operations to uneditable units
2015-02-24 15:50:27 -05:00
lethosor
21e96ba369
Implement batch operation callbacks and a basic string formatter
2015-02-24 15:50:26 -05:00
lethosor
dd17f90dcd
Add a flag to allow mouse clicks to select ListColumn items
2015-02-24 15:50:26 -05:00
lethosor
9d600f00a0
Add batch operations menu
2015-02-24 15:50:26 -05:00
lethosor
990ab9c76b
Typecast nullptr in ListColumn::getFirstSelectedElem()
2015-02-24 15:50:26 -05:00
lethosor
481e5cc19e
Implement dwarf selection
2015-02-24 15:50:25 -05:00
Warmist
17fda7ffa0
Fixed whitespace.
2015-02-24 20:28:49 +02:00
Warmist
e9ab892369
Building hacks changes.
...
Fixed buildings not consuming correct value of power. Added way to ignore unpowered state. Added setPower/getPower to change how much power building uses on the fly.
2015-02-24 15:37:38 +02:00
lethosor
cebfa603e0
Update isoworld, stonesense
2015-02-22 16:51:37 -05:00
Fukken-Saved
5f498b1b78
whoops
2015-02-22 14:45:15 -05:00
Fukken-Saved
a13c9b0310
Add autohauler plugin to cmakelist
2015-02-22 14:43:08 -05:00
Fukken-Saved
250bc0a58d
Autohauler - An alternative to Autolabor
2015-02-22 14:41:45 -05:00
lethosor
100fce0419
Update submodules
2015-02-21 23:06:15 -05:00
lethosor
6a64525284
Include a ruby library for OS X
...
See #560
2015-02-21 21:53:08 -05:00
lethosor
d7897caec7
Display a more user-friendly error message when the ruby library is not available
2015-02-21 21:50:25 -05:00
lethosor
0f77a1a578
Move DFHack version to a separate (static) library
...
This allows the DFHack version to be changed without recompiling
everything
2015-02-19 12:08:23 -05:00
lethosor
c80fbbc397
Remove AS prefixes from add-spatter.cpp
...
The actual cause of this crash was fixed in #558
See #205
2015-02-19 12:05:32 -05:00
lethosor
2921879be8
Improve error detection and only list creatures when necessary
2015-02-17 14:33:58 -05:00
lethosor
645c2a7f86
Make catsplosion work on any specified creature(s)
...
Also add a "list" option
2015-02-17 14:16:50 -05:00
lethosor
3750b8c589
Add "DFHack" indicator to trackstop menus
2015-02-17 14:13:53 -05:00
lethosor
661eacf223
Always show trackstop menus when visible
2015-02-17 14:13:37 -05:00
Japa
f2461254d4
Merge branch 'develop' of https://github.com/DFHack/dfhack into develop
2015-02-17 22:52:39 +05:30
Japa
8423710c2f
Made remotefortressreader.cpp return a specified number of map blocks, spiraling out from the center.
2015-02-17 22:51:33 +05:30
PeridexisErrant
bc505952a3
Change autobutcher export format a little
2015-02-17 14:15:33 +11:00
lethosor
b7f15ef2d6
Update xml, stonesense for 0.40 ui_advmode_menu changes
...
Closes #552
2015-02-16 19:10:15 -05:00
lethosor
9ef25f33a9
Update submodules (whitespace changes)
2015-02-14 23:28:16 -05:00
lethosor
10cfef0553
Fix whitespace issues
2015-02-14 22:53:06 -05:00
lethosor
3f9d3dc110
Use unix line endings in isoworldremote.proto
2015-02-13 15:14:31 -05:00
Japa
5dab36948a
Merge branch 'master' of https://github.com/JapaMala/dfhack into develop
2015-02-13 19:55:00 +05:30
Japa
6e7b543414
Added liquids
2015-02-13 18:38:02 +05:30
lethosor
8e8f88f3db
initflags: Remove debug output
2015-02-09 22:01:12 -05:00
Lethosor
f287a99a37
Merge pull request #542 from scamtank/fix-armory
...
fix-armory: Substitute removed jobtypes with working ones
2015-02-09 11:07:51 -05:00
scamtank
9c4dbea392
Re-enabled fix-armory plugin
2015-02-09 00:22:19 +02:00
scamtank
35d357776c
Substitute removed jobtypes with working ones
...
Replaced StoreItemInChest with StoreItemInHospital and StoreItemInCabinet with StoreOwnedItem. Seem to work on the basic level with waterskins and uniform cloaks.
2015-02-08 23:41:22 +02:00
lethosor
43d6a7b5d4
tradereq-pet-gender: Fix MSVC build error
2015-02-08 09:33:37 -05:00
lethosor
50770f8cdd
Clean up whitespace in zone.cpp
2015-02-06 19:13:34 -05:00
lethosor
00072dae1d
Fix crash in zone plugin from scrolling when assigning an owner to a cage
...
Fixes #534
2015-02-06 19:12:10 -05:00
Lethosor
67bf26dbbe
Merge pull request #525 from lethosor/tweak-tradereq-pet-gender
...
New tweak to display pet genders on trade request screen
2015-02-03 08:25:12 -05:00
expwnent
69dfec88cb
Merge remote-tracking branch 'dfhack/develop' into develop
2015-02-03 01:12:34 -05:00
lethosor
5a93de3f31
New tweak (tradereq-pet-gender): Displays pet genders on trade agreement screen
...
Closes #515
2015-02-02 10:04:31 -05:00
expwnent
e5e0d93ef1
Added modtools/reaction-product-trigger.
2015-02-02 02:39:05 -05:00
lethosor
e34178e367
Fix add-spatter crash
...
Hopefully fixes #205
2015-02-01 21:31:05 -05:00
expwnent
5b3e5b533e
Make zone compile on Windows.
2015-01-31 21:04:12 -05:00
expwnent
e9b4fc513a
Merge remote-tracking branch 'cdombroski/zone-plugin-cleanup' into temp
...
Conflicts:
NEWS
plugins/zone.cpp
2015-01-31 21:01:41 -05:00
expwnent
1d8fd55a4a
Merge remote-tracking branch 'cdombroski/dfhack-484' into develop
...
Conflicts:
NEWS
2015-01-31 20:22:17 -05:00
expwnent
6b2e7cfe3e
Merge pull request #511 from lethosor/stocksettings-create-dir
...
Create `stocksettings` directory on startup
2015-01-31 20:17:22 -05:00
expwnent
ab01e7d102
Eventful no longer requires LUA_HOOK to do reaction events.
2015-01-31 20:10:06 -05:00
Chris Dombroski
f608235b1e
Fix some Lua things
2015-01-29 19:56:50 -05:00
Chris Dombroski
f2eec3198c
Rename findPenPitAtCoord
2015-01-29 15:02:54 -05:00
Chris Dombroski
48b6cf1beb
Export functions to Buildings.h
2015-01-29 13:57:50 -05:00
Chris Dombroski
4199728ba6
Cleanup building methods before extracting to Buildings.h
2015-01-29 13:57:50 -05:00
Chris Dombroski
c179f5b913
Extract some stuff from zone.cpp to plugins/Units.{h,cpp}
2015-01-28 21:28:32 -05:00
Chris Dombroski
789cc01e93
Remove gcc warnings
2015-01-28 21:28:32 -05:00
Chris Dombroski
10ec5f1330
Use auto to reduce vector iteration redundancy
2015-01-28 21:17:37 -05:00
Chris Dombroski
5f9fe871b3
Add isGelded() to the priority butcher checks
...
Fixes #484
2015-01-28 21:17:37 -05:00
Chris Dombroski
26ad797c43
isGelded function
2015-01-28 21:17:37 -05:00
Lethosor
58f896d569
Create `stocksettings` directory on startup
2015-01-26 16:28:57 -05:00
Japa
ae2e4f99eb
Merge branch 'develop' of https://github.com/DFHack/dfhack
2015-01-19 20:02:19 +05:30
Japa
8efac385cc
changed tile direction to a string, rather than a hard to understand int.
2015-01-19 19:58:09 +05:30
expwnent
53a8032f8a
Fix compile of blueprint plugin on Linux.
2015-01-16 03:27:14 -05:00
expwnent
06c4755168
Merge branch 'blueprint' of https://github.com/cdombroski/dfhack into temp
...
Conflicts:
NEWS
Readme.html
2015-01-15 22:45:57 -05:00
Chris Dombroski
da2224b0ba
Changed how parameters are parsed.
2015-01-14 14:58:15 -05:00
Chris Dombroski
106612f386
Use alternate qf syntax for output.
2015-01-14 14:08:54 -05:00
Chris Dombroski
d0273b8eff
Now puts room designations in the query blueprint
2015-01-13 16:15:54 -05:00
Chris Dombroski
f315ee43a4
Added stockpiles
2015-01-13 14:28:28 -05:00
Chris Dombroski
3489c2f39a
Buildings complete
2015-01-13 09:40:24 -05:00
Japa
3e91d34ab3
remotefortressreader.cpp only sends map changes now.
2015-01-11 16:16:53 +05:30
Chris Dombroski
ea313b6bf5
plugins/blueprint.cpp: Buildings hopefully
2015-01-09 16:00:47 -05:00
lethosor
aa332e18e2
Remove stray whitespace
2015-01-08 16:59:37 -05:00
lethosor
859fdd60d6
annoucnement -> announcement
2015-01-08 16:59:25 -05:00
Chris Dombroski
b627240943
Dig mode complete
2015-01-08 12:17:18 -05:00
Chris Dombroski
819327348b
Blueprint plugin basic structure
...
It should be able to load and make empty blueprint files.
2015-01-08 08:28:54 -05:00
lethosor
c39cf1fb49
Add room assignment search
2015-01-05 21:09:30 -05:00