Alexander Gavrilov
174d9d0739
Tweak showmood, add a few validity checks, commit a dfhack.init example.
2012-01-24 15:36:30 +04:00
Quietust
6502f0f6ae
Print mood item flags if it's an unrecognized body part
2012-01-23 16:08:37 -06:00
Quietust
e3f875b9a5
Add "showmood" plugin, provides a detailed description of the currently
...
active mood (if any)
2012-01-23 16:03:29 -06:00
Espen Wiborg
8e2fef0c97
Merge branch 'master' into export-plugin
2012-01-23 10:43:24 +01:00
Espen Wiborg
0cf3ee3dc6
Merge branch 'master' of git://github.com/peterix/dfhack
2012-01-23 10:43:07 +01:00
Mike Stewart
5bf5908582
Made liquids not crash when a map isn't loaded.
2012-01-22 15:47:58 -08:00
Mike Stewart
031119ac73
Made mapexport build with latest Material changes.
2012-01-22 15:47:39 -08:00
Mike Stewart
0d79fd9b15
Merge remote-tracking branch 'quietust/master'
2012-01-22 15:31:34 -08:00
Quietust
2cc6bcf0e9
Use CoreSuspender and namespace df::enums
2012-01-21 18:31:15 -06:00
Quietust
ccf22bed10
Replace df_plant with df::plant - this leaves the Vegetation module a bit empty, but I'll leave it in case we decide to add something new there
2012-01-21 17:54:57 -06:00
Mike Stewart
debeebb7c4
Merge remote-tracking branch 'quietust/master'
2012-01-21 11:26:12 -08:00
Quietust
7b2835e2a9
Get rid of df_name
2012-01-21 13:12:40 -06:00
Quietust
8052305c2e
Cleanup the Units module
2012-01-21 13:03:39 -06:00
Quietust
118e5c6617
Major cleanup of Materials modul, precursor to eventually nuking it
2012-01-21 10:12:26 -06:00
Mike Stewart
df08914549
Better fix for building protobufs with C++0x turned on.
2012-01-20 16:21:50 -08:00
Mike Stewart
f02f4510dd
Added very basic export functionality to mapexport, taken almost directly from prospector. Only tile shapes are exported for now.
2012-01-20 14:51:51 -08:00
Mike Stewart
bf60f5975a
Cleaned up the protobuf and mapexport build scripts a lot, and added two more simple proto files to store map geometry information.
2012-01-20 11:21:29 -08:00
Mike Stewart
9b0b0d53f9
Merge remote-tracking branch 'quietust/master'
2012-01-20 09:47:32 -08:00
Mike Stewart
941c643b5c
Cleaned up the protobuf build a bit, and made git ignore files generated in doing so. Fixed building mapexport on Linux by forcing CMake to create a directory for protobuf output files.
2012-01-20 09:17:08 -08:00
Quietust
1b419313f4
Merge https://github.com/angavrilov/dfhack
2012-01-20 10:40:25 -06:00
Alexander Gavrilov
3a908eb64b
Support reporting the Z range of holes in the adamantine tubes.
2012-01-20 20:29:51 +04:00
Quietust
cbac8259ed
Fix unreveal
2012-01-20 10:13:34 -06:00
Alexander Gavrilov
cc510a2c4b
Replace DFCoord with df::coord and df::coord2d.
2012-01-20 14:28:00 +04:00
Mike Stewart
fb41e457c4
Added a plugin that starts up and shuts down protobufs. Will add actual map export functionality to it tomorrow.
2012-01-19 22:15:51 -08:00
Quietust
d35d070ff3
Only skip refilling tiles beneath non-featstone tiles if said tiles don't already have floors; also skip tiles filled with liquid
2012-01-19 22:41:59 -06:00
Quietust
7da633b6ef
Optimize reveal - instead of walking the entire map, just iterate across the list of blocks
2012-01-19 22:36:34 -06:00
Quietust
9dddb79165
Optimize tubefill, and also try to handle the floors above newly filled tiles (as well as tiles which were floors to begin with)
2012-01-19 22:34:06 -06:00
Quietust
3a11d0c86e
Switch deramp to using Maps::getBlockAbs()
2012-01-19 22:12:51 -06:00
Quietust
6a000811aa
Cleanowned doesn't touch the Maps module
2012-01-19 22:12:26 -06:00
Quietust
e7ecda1434
Kill the Maps module
2012-01-19 21:44:17 -06:00
Quietust
4bb724cd6c
Significant cleanup of Maps module - next step will be to kill it properly
2012-01-19 14:11:52 -06:00
Alexander Gavrilov
7db467a740
Update code to accomodate the new coord/coord2d/coord_path structs.
...
Also replicate the methods of DFCoord.
2012-01-19 14:30:22 +04:00
Alexander Gavrilov
d75292acc7
Merge remote-tracking branch 'q-github/master'
2012-01-19 12:07:00 +04:00
Quietust
35ad84c58a
angavrilov changed general_ref_type to be all uppercase
2012-01-18 08:26:08 -06:00
Alexander Gavrilov
1aec9649c5
Support including material value in the prospector output.
2012-01-17 20:04:54 +04:00
Alexander Gavrilov
43476b2ea7
Fix Z level computation in prospect, and add levels for flows & aquifer.
2012-01-17 20:04:49 +04:00
Quietust
fd653a0227
Kill the Items module
2012-01-16 22:12:58 -06:00
Quietust
e75291ee91
Unlink seedwatch plugin from Materials module
2012-01-16 21:29:09 -06:00
Quietust
9d8c67b710
Kill the Kitchen module (which was never really a proper module to begin with)
2012-01-16 21:22:42 -06:00
Quietust
64b55acf37
df_item -> df::item, t_itemflags -> df::item_flags
2012-01-16 20:16:16 -06:00
Alexander Gavrilov
89cb12add1
Merge remote-tracking branch 'q-github/master'
2012-01-16 19:55:47 +04:00
Alexander Gavrilov
4811d2945e
Count hospital supplies as busy, and detect soap-producing reactions.
2012-01-16 19:45:38 +04:00
Quietust
e84904f5c5
Typo - "desctruction" -> "destruction"
2012-01-15 15:01:40 -06:00
Quietust
0e0bca5dbb
Fix deadlock in autodump
2012-01-15 14:59:47 -06:00
Quietust
e82055986e
Only use #include <> for system libraries - for everything else, use ""
2012-01-15 14:54:14 -06:00
Quietust
f3cbf07a01
Use general_ref::getType() instead of strict_virtual_cast<>
2012-01-15 13:59:34 -06:00
Petr Mrázek
d972b07d57
Merge https://github.com/quietust/dfhack
...
Conflicts:
plugins/autodump.cpp
plugins/cleaners.cpp
2012-01-15 19:51:34 +01:00
Alexander Gavrilov
f0f354f3c7
Don't count stuff in flasks and backpacks as available in workflow.
2012-01-15 20:45:02 +04:00
Alexander Gavrilov
8158733745
Support changing the custom profession via rename.
...
Likewise, it works for any unit, including animals and enemies.
2012-01-15 15:57:33 +04:00
Alexander Gavrilov
bcb51d8ff7
Use the announcement API to report starting and stopping workflow jobs.
2012-01-15 15:39:20 +04:00
Alexander Gavrilov
54485d2551
Move plant material detection to guess_job_material in workflow.
...
So that the data will be available to shortJobDescription.
2012-01-15 12:58:36 +04:00
Alexander Gavrilov
8135420d87
Let job-material use any material in the build item selection mode.
2012-01-15 12:50:53 +04:00
Alexander Gavrilov
990a69ce9b
Add hotkey commands to destroy items under cursor, and a specific item.
2012-01-14 21:13:30 +04:00
Alexander Gavrilov
a31542862a
Add utility functions to retrieve the selected job/unit/item.
...
Units can be selected via 'u', 'j', 'v' and 'k'; full-screen
unit details view not supported.
Items can be selected via 't', 'k', 'v'->inventory.
Also, when viewing a container item full-screen, the selected
contained item or unit is returned; never the container itself.
The api is used in rename to allow setting nicknames for
arbitrary units, including animals and enemies.
2012-01-14 19:31:43 +04:00
Alexander Gavrilov
53e9a1659b
Add automatic drybucket and melting to workflow.
2012-01-12 20:07:53 +04:00
Quietust
59b66a2681
Fix output formatting
2012-01-11 11:04:20 -06:00
Quietust
18f2459b5d
Add missing newline to "clean" usage
2012-01-11 11:04:06 -06:00
Quietust
bb0959e470
Fix confusion between "cout" and "c->con"
2012-01-11 10:59:56 -06:00
Quietust
555183cb25
Remove unreferenced variables
2012-01-11 10:57:05 -06:00
Quietust
5173be649f
Silence warning
2012-01-11 10:49:42 -06:00
Quietust
a3d2cf3a85
Minor cleanup
2012-01-11 10:31:23 -06:00
Quietust
b0be2f55c6
Cleanup plugin 'flows'
2012-01-11 10:29:59 -06:00
Quietust
29b0c4273e
Cleanup fastdwarf plugin, no longer relies on modules
2012-01-11 10:17:25 -06:00
Alexander Gavrilov
9a86087db5
Add timeouts when a job is cancelled, and color the command output.
2012-01-11 20:04:04 +04:00
Quietust
9cc774fc9d
Update deramp plugin, no longer relies on modules
2012-01-11 09:53:48 -06:00
Quietust
524b53935d
block_index is declared correctly now
2012-01-11 09:53:28 -06:00
Quietust
1f8a005818
Update cleaners/drybuckets, Materials module now gone
2012-01-11 08:58:26 -06:00
Alexander Gavrilov
7f5aa4de62
Support the most important job types in workflow.
2012-01-10 17:23:37 +04:00
Petr Mrázek
571498ea21
Vermin tweaks.
2012-01-10 00:45:43 +01:00
Petr Mrázek
1652e99a0b
Merge https://github.com/angavrilov/dfhack
2012-01-09 20:43:55 +01:00
Petr Mrázek
263bed7d95
Merge https://github.com/angavrilov/dfhack
...
Conflicts:
library/xml
2012-01-09 20:43:31 +01:00
Alexander Gavrilov
c3d564dc7a
Count items matching constraints, and suspend/resume jobs based on it.
2012-01-09 21:25:55 +04:00
Alexander Gavrilov
ba338be350
Allow specifying constraints on item amounts, and match jobs to them.
2012-01-09 19:20:28 +04:00
Alexander Gavrilov
3e147fe902
Modify the workflow plugin to protect all repeat jobs when enabled.
2012-01-09 17:29:28 +04:00
Alexander Gavrilov
50386f66a3
Update structures and implement modifying the job_item item type.
2012-01-09 16:20:17 +04:00
Alexander Gavrilov
ea790f1346
Move a few functions into the core, and add some more.
2012-01-08 20:02:12 +04:00
Petr Mrázek
f31d7c792a
Merge https://github.com/warmist/dfhack
2012-01-08 16:21:23 +01:00
Petr Mrázek
175b3ed060
Fix getplants - duplicate variable.
2012-01-08 16:18:31 +01:00
Petr Mrázek
3a8bc4dbb5
Merge https://github.com/quietust/dfhack
2012-01-08 16:17:28 +01:00
Alexander Gavrilov
64a9a49ec0
Merge remote-tracking branch 'origin/master'
2012-01-08 16:19:58 +04:00
Petr Mrázek
8a46386502
Dissolve vermin module.
2012-01-08 06:59:52 +01:00
Quietust
fd2563d0d5
Cleanup "getplants" plugin, minimize reliance on modules
2012-01-07 23:31:23 -06:00
Quietust
c484d7ceae
Cleanup "fixwagons" plugin
2012-01-07 23:28:37 -06:00
Quietust
153efe9a69
Cleanup "drybuckets" plugin, minimize reliance on modules
2012-01-07 23:05:45 -06:00
Quietust
2ccb15524b
Cleanup "cleaners" plugin, minimize reliance on modules
2012-01-07 23:04:31 -06:00
Petr Mrázek
72016d9188
Buildings aren't a module anymore, fix probe segfaults.
2012-01-08 02:22:13 +01:00
Alexander Gavrilov
87009c0535
Add a plugin that protects specific repeat jobs from disappearing.
...
If they do disappear, they are re-added in a suspended state.
2012-01-07 21:47:23 +04:00
Alexander Gavrilov
f5e121a196
Move a bunch of stuff from the jobutils plugin into the core.
2012-01-07 19:21:07 +04:00
Espen Wiborg
6d79255131
Make gcc happy, too
2012-01-06 12:10:30 +01:00
Espen Wiborg
e068552c04
Make gcc happy, too
2012-01-06 12:10:11 +01:00
Warmist
571c249522
Fixed crash with dfusion migrants plugin.
2012-01-06 10:25:58 +02:00
Warmist
3115fb17c7
Merge branch 'master' of git://github.com/peterix/dfhack
2012-01-06 10:24:46 +02:00
Tim Walberg
890824dd38
Merge patch with new dig patterns for vdig plugin
...
Signed-off-by: Petr Mrázek <peterix@gmail.com>
2012-01-06 02:27:27 +01:00
Petr Mrázek
8312c39ab1
Merge https://github.com/quietust/dfhack
...
Conflicts:
plugins/CMakeLists.txt
2012-01-06 02:15:12 +01:00
Petr Mrázek
a2cad00dbb
Remove GetCustomWorkshopType, custom workshop types are now saner.
2012-01-06 01:08:30 +01:00
Espen Wiborg
8b7da08638
Add flood-fill brush to liquids (for wclean)
2012-01-06 00:35:38 +01:00
Espen Wiborg
06f1cffcbf
Add flood-fill brush to liquids (for wclean)
2012-01-06 00:35:05 +01:00
Petr Mrázek
756b8131c1
Small fix in Buildings, update stonesense.
2012-01-06 00:09:49 +01:00
Petr Mrázek
72a4698968
Merge https://github.com/angavrilov/dfhack
2012-01-05 23:54:33 +01:00
Petr Mrázek
78a98de37e
Fix MSVC builds, break buildings :D
2012-01-05 23:39:14 +01:00
Alexander Gavrilov
687245abd9
Allow setting job item materials.
2012-01-05 22:04:05 +04:00
Warmist
d612db0935
Added binding to suspend/resume (engine.suspend and engine.resume in lua)
2012-01-05 10:58:53 +02:00
Alexander Gavrilov
4a59690968
Don't print empty parentheses without any flags to fill them.
2012-01-04 20:22:56 +04:00
Alexander Gavrilov
284009e873
Add a hotkey command to duplicate jobs in workshops.
2012-01-04 19:39:38 +04:00
Alexander Gavrilov
99dda069de
Update data definitions.
2012-01-04 18:46:39 +04:00
Petr Mrázek
86464b99cc
Remove DfVector, break MSVC builds until further notice.
2012-01-04 01:45:11 +01:00
Alexander Gavrilov
1d1cd63800
Implement printing job details.
2012-01-03 22:56:05 +04:00
Alexander Gavrilov
f8814909a9
Move the MaterialInfo class to the main library.
2012-01-03 19:25:55 +04:00
Quietust
2af3b49e09
Add "regrass" plugin, regrows grass for pre-0.31.19 fortresses
2012-01-02 20:13:27 -06:00
Alexander Gavrilov
326c58f793
Add a plugin to tweak inorganic materials in jobs.
...
It also auto-seeks in the build item list if used in that context.
2012-01-02 18:46:24 +04:00
Espen Wiborg
e9c4d12d2a
Track upstream changes
2012-01-02 12:52:09 +01:00
Espen Wiborg
5918cb773d
Merge branch 'master' into export-plugin
2012-01-02 12:49:23 +01:00
Alexander Gavrilov
6476d61e59
Update structure definitions & add the fixwagons plugin from Q.
2012-01-01 23:05:45 +04:00
Petr Mrázek
f35cdb84cd
Merge https://github.com/angavrilov/dfhack
...
Conflicts:
library/Core.cpp
library/PluginManager.cpp
library/include/Core.h
library/include/PluginManager.h
library/modules/Gui.cpp
plugins/stockpiles.cpp
2011-12-31 13:09:12 +01:00
Petr Mrázek
9db20bd84d
Header changes/cleanup.
2011-12-31 12:48:42 +01:00
Alexander Gavrilov
b652ec4132
Implement context-sensitive keybinding support.
...
Allow defining commands with guard conditions, and binding
one or more commands to alphabetic and function keys. When
the relevant key is pressed, the first listed command with
successfully evaluated guard is chosen.
For consistency, the guard is also checked when the command
is invoked from the console; this requires suspending the
core inside PluginManager, before invoking plugin code.
2011-12-31 13:25:46 +04:00
Petr Mrázek
1284b30f79
Merge https://github.com/angavrilov/dfhack
2011-12-31 01:40:08 +01:00
Alexander Gavrilov
2222757e77
Implement context-sensitive keybinding support.
...
Allow defining commands with guard conditions, and binding
one or more commands to alphabetic and function keys. When
the relevant key is pressed, the first listed command with
successfully evaluated guard is chosen.
For consistency, the guard is also checked when the command
is invoked from the console; this requires suspending the
core inside PluginManager, before invoking plugin code.
2011-12-30 23:25:50 +04:00
Alexander Gavrilov
53346328e8
Notify plugins about game being loaded or unloaded.
...
As a test, make seadwatch deactivate on these events.
2011-12-30 18:12:15 +04:00
Petr Mrázek
e6ff6b04fc
Merge https://github.com/warmist/dfhack
2011-12-30 03:12:29 +01:00
Petr Mrázek
614605a2be
Fixed integer truncation in filltraffic.
2011-12-30 03:10:31 +01:00
Petr Mrázek
5c4ba8c1df
Merge https://github.com/rampaging-poet/dfhack
2011-12-30 03:08:20 +01:00
Petr Mrázek
9a48c98162
designed -> designated in tiletypes plugin
2011-12-30 03:05:53 +01:00
Petr Mrázek
a1e1d7cfce
Merge https://github.com/feng1st/dfhack
...
Conflicts:
plugins/tiletypes.cpp
2011-12-30 02:50:30 +01:00
Alexander Gavrilov
298e2fe92d
Add a plugin to rename squads and hotkeys (without the 9 char limit).
2011-12-29 17:37:07 +04:00
Alexander Gavrilov
d7faa6c471
Properly cleanup state when copystock in q during rect selection.
2011-12-29 16:46:08 +04:00
Espen Wiborg
21d81c8804
Make sure the encoding is right
2011-12-28 23:35:42 +01:00
Espen Wiborg
6c0d5d3cd2
Make sure the export plugin is built
2011-12-28 23:35:41 +01:00
Espen Wiborg
12446a62e2
Export exact trait value
2011-12-28 23:35:40 +01:00
Espen Wiborg
89e3361140
Plugin to export for dfcareers
2011-12-28 23:35:32 +01:00
Warmist
2643e0c5a7
Merge branch 'master' of git://github.com/peterix/dfhack
2011-12-28 22:49:31 +02:00
Warmist
5e34284e5d
Fix for give sentience.
2011-12-27 23:09:53 +02:00
Warmist
bc539672d5
Split some plugins to plugin/init pairs (for dfusion init mode)
2011-12-27 23:08:06 +02:00
Warmist
52a049cec3
Removed thready argument to dfusion, replaced with init (just sets stuff up, running everything in non interactive mode)
2011-12-27 23:07:23 +02:00
Warmist
71e2321fef
Added getKeys method to lua offsetgroup and a way to cast versioninfo to offsetgroup
2011-12-24 16:00:43 +02:00
Warmist
0bc41ccb10
Added header files to dfusion's project
2011-12-24 15:59:53 +02:00
Warmist
dc78e99f75
Added getKeys to OffsetGroup (for easy lua access to all things that memory.xml has)
2011-12-24 13:53:59 +02:00
Petr Mrázek
5bee16dbd8
Merge https://github.com/angavrilov/dfhack
2011-12-24 12:27:59 +01:00
Petr Mrázek
cfd2c95eab
Slight reformat in versionosd.
2011-12-24 12:27:34 +01:00
Alexander Gavrilov
79ac2a781a
Add infrastructure necessary to use the generated headers.
...
As a usage example, allow toggling water level display and idlers,
and implement a ui tweak for easily copying stockpiles.
Also disable df2mc by default - default options shouldn't
require anything not in the base package.
2011-12-24 14:51:58 +04:00
Warmist
2008ac5564
Added utils.lua with usefull lua utils.
2011-12-18 16:58:34 +02:00
Warmist
e84841e94f
Added autorunning initcustom.lua (for place to put private scripts) autorunning save files, and friendship_civ (still buggy)
2011-12-12 20:25:37 +02:00
Warmist
9b48d4946e
Added autorunning initcusom.lua if it exists (for custom scripts)
2011-12-11 02:28:15 +02:00
Warmist
a25c0b81de
Merge branch 'master' of git://github.com/peterix/dfhack
2011-12-07 23:15:11 +02:00
Petr Mrázek
b36e5ac248
Add missing files.
2011-12-07 20:50:37 +01:00
Petr Mrázek
647916e109
Graphic module
2011-12-07 20:37:09 +01:00
Warmist
e7a8c8c684
Lua function calling.
2011-12-04 18:45:34 +02:00
Petr Mrázek
f7d78539d3
Renaming Creatures to Units
2011-12-02 10:56:40 +01:00
Petr Mrázek
c0a6036cde
zeromq windows version
2011-11-25 23:21:31 +01:00
Petr Mrázek
780b659210
Zeromq hello world plugin.
2011-11-25 22:14:36 +01:00