Commit Graph

719 Commits (e0a535897b2f198bd5897e9050378fc797891f77)

Author SHA1 Message Date
Quietust a0b671b289 sqrt() doesn't work on integers 2012-03-03 16:06:31 -06:00
Quietust e43a87b13b Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-03 14:13:51 -06:00
Petr Mrázek 7fe8762852 Get rid of Simple namespace, Gui module is now a namespace. 2012-03-03 14:38:24 +01:00
Quietust 5d4114f5b7 Add "bprobe" command, describes the buildings located under the cursor 2012-03-02 09:35:49 -06:00
Alexander Gavrilov 3dd27c8d1d Support items in bags, and tweak the output format in metal-detector. 2012-03-02 17:46:44 +04:00
Alexander Gavrilov 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
Alexander Gavrilov 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
Alexander Gavrilov d014554679 Merge remote-tracking branch 'q-github/master' 2012-03-02 09:26:52 +04:00
Quietust 5019af038b Allow Reveal to be used in Adventurer mode 2012-03-01 22:52:40 -06:00
Warmist 1c90019de4 More work with parsing xml (almost works) 2012-03-02 01:23:03 +02:00
Alexander Gavrilov 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
Petr Mrázek 26c15a1d51 Nuke wagons, move regrass to devel, bump to a dev version. 2012-02-28 23:33:02 +01:00
Petr Mrázek 2c532b630a Merge https://github.com/angavrilov/dfhack 2012-02-28 19:05:44 +01:00
Mike Stewart a3108c668b Actually fix cursor detection in follow this time. 2012-02-28 09:23:02 -08:00
Mike Stewart bc02acb64f Fix cursor detection for follow. 2012-02-28 09:16:33 -08:00
Alexander Gavrilov 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
Petr Mrázek f8721c88b5 dev version. update structures, stonesense 2012-02-27 20:10:31 +01:00
Petr Mrázek 46a99084ee Track stonesense 2012-02-26 18:35:20 +01:00
Petr Mrázek 8afafd0430 Get rid of ntdll, update stonesense 2012-02-25 22:59:32 +01:00
Petr Mrázek 30fe1f63ed Track stonesense 2012-02-25 15:44:15 +01:00
Alexander Gavrilov 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
Quietust bca78088e2 Add "changevein" plugin, lets you change what mineral inclusions are made of 2012-02-24 14:07:04 -06:00
Petr Mrázek 60b83b41ef Merge https://github.com/warmist/dfhack 2012-02-23 08:56:40 +01:00
Petr Mrázek dfb0e41c87 Update stonesense 2012-02-23 07:47:53 +01:00
Warmist e2c677b020 Pattern reader to a tree 2012-02-23 01:32:38 +02:00
Warmist 8d9fa86804 Added dfusion plugin name. 2012-02-23 00:41:27 +02:00
Warmist da57a66850 fixed build errors with offsetgroup 2012-02-23 00:21:50 +02:00
Petr Mrázek c26b1571a4 Merge https://github.com/quietust/dfhack 2012-02-22 22:58:20 +01:00
Petr Mrázek 252176d064 Add abuse mode to mode plugin. 2012-02-22 22:46:12 +01:00
Quietust 491c3aa0c9 Add "-a" option to getplants, selects every type of plant 2012-02-22 15:31:34 -06:00
Quietust e9b45a5b6d Add "dumpmats" devel plugin 2012-02-22 14:00:37 -06:00
Mike Stewart a779ac475d Make follow work as a hotkey plugin. 2012-02-22 09:43:14 -08:00
Petr Mrázek 4fe49d0028 Merge https://github.com/angavrilov/dfhack 2012-02-22 15:23:28 +01:00
Petr Mrázek 8848f5a854 Merge branch 'vdig-fix' of https://github.com/plaes/dfhack 2012-02-22 15:23:06 +01:00
Petr Mrázek 0807baf0c0 Merge https://github.com/mikestewart/dfhack 2012-02-22 15:22:19 +01:00
Petr Mrázek 8ee27e182a Hidden weather command raw value override 2012-02-22 15:21:29 +01:00
Alexander Gavrilov e88d5cb035 Fix rename squad: use entity data to skip squads from abandoned forts. 2012-02-22 17:44:36 +04:00
Priit Laes bc012ea7c7 vdig: Fix typo and update wiki link 2012-02-22 13:46:47 +02:00
Mike Stewart baea253578 Merge remote-tracking branch 'upstream/master' 2012-02-21 23:31:53 -08:00
Mike Stewart 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
Petr Mrázek 34c9c2d663 Fix stonesense, MSVC fail 2012-02-21 18:30:31 +01:00
Petr Mrázek 2cd2ee9b0c New plugin interface 2012-02-21 18:19:17 +01:00
Petr Mrázek 0b9e849096 Update submodules, sort 'ls' output. 2012-02-21 15:21:50 +01:00
Mike Stewart 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
Mike Stewart 2524f81ae0 Fix tile materials in mapexport. 2012-02-20 19:32:58 -08:00
Petr Mrázek 10a2f3ed1b Merge https://github.com/mikestewart/dfhack 2012-02-20 17:55:16 +01:00
Alexander Gavrilov 1ca500ff25 Update the assumed identity in rename unit. 2012-02-20 18:04:58 +04:00
Petr Mrázek 80cedd2ff8 Fix header includes, update structures. 2012-02-20 11:42:40 +01:00
Mike Stewart 166213c150 Fix protobuf files to mirror changes to tiletype enums 2012-02-19 20:35:45 -08:00
Petr Mrázek a98f579828 Update stonesense 2012-02-19 20:33:19 +01:00
Petr Mrázek 33f77c8837 Merge https://github.com/quietust/dfhack 2012-02-19 20:28:08 +01:00
Petr Mrázek 27e3e0f2c2 Update submodules 2012-02-19 20:08:29 +01:00
Quietust e4a0b2aaf9 Fix reveal and tiletypes - RIVER and POOL are no longer tile shapes 2012-02-18 11:36:06 -06:00
Quietust 7b20690db0 Merge branch 'master' of git://github.com/peterix/dfhack 2012-02-18 10:37:29 -06:00
Petr Mrázek 1511a6b7ed Use hexadecimal numbers in tilesieve 2012-02-18 15:07:55 +01:00
Quietust d908789dfa Add useless dev plugin - set all "frozen liquid" tiles to be either Water or Magma 2012-02-17 16:20:17 -06:00
Petr Mrázek fa6ec63535 Add zoom to kittens, fix tilesieve. 2012-02-17 05:30:34 +01:00
Petr Mrázek 28059a7f35 Tilesieve devel tool 2012-02-16 16:22:05 +01:00
Petr Mrázek 1bf5080828 Fixage. Runs with 34.01 2012-02-15 21:35:44 +01:00
Petr Mrázek 448e270421 Merge https://github.com/quietust/dfhack
Conflicts:
	plugins/mapexport/mapexport.cpp
2012-02-14 09:59:33 +01:00
Petr Mrázek bdbfbf5988 Fix catsplosion. 2012-02-14 09:37:30 +01:00
Quietust 091bf62aa8 DFhackCExport is only needed on the plugin_* functions 2012-02-13 22:54:08 -06:00
Quietust b152a40e83 Fix remaining issues 2012-02-13 19:56:55 -06:00
Quietust d15d38d536 Finish conversion, fix compile errors 2012-02-13 19:17:38 -06:00
Quietust d0a8c2edd8 Move TileTypes to XML, part 1 - a bunch of stuff is now broken 2012-02-13 16:56:33 -06:00
Petr Mrázek f600928ec1 Move catsplosion, tweak for build targets under MSVC. 2012-02-13 17:43:41 +01:00
Mike Stewart 9163dda076 Missing newline in mapexport help output. 2012-02-12 18:42:25 -08:00
Mike Stewart 1b3d517a61 Fixed material output -- material_type and material_index were being used backwards. 2012-02-12 18:39:43 -08:00
Petr Mrázek 8f680dcf94 Make it build and run on linux (no stonesense, df2mc, dfusion) 2012-02-09 03:07:26 +01:00
Petr Mrázek 8f1a2ebf7f Added missing keybinding mention to 'ls', DFusion hotfix. 2012-02-06 04:47:13 +01:00
Petr Mrázek 20b1d09fdc Merge https://github.com/mikestewart/dfhack 2012-02-05 23:04:06 +01:00
Mike Stewart cdb171e9b1 Fixed an issue with hidden plants. 2012-02-05 13:51:49 -08:00
Petr Mrázek 6fe0867c46 Rename export to dwarfexport. 2012-02-05 20:41:12 +01:00
Petr Mrázek 2b22b0b336 Make dwarf export optional. Update structures. 2012-02-05 20:16:00 +01:00
Petr Mrázek 7d8a176e59 Merge branch 'export-plugin' of https://github.com/espenhw/dfhack 2012-02-05 20:05:19 +01:00
Petr Mrázek 71b29b67cf Merge https://github.com/mikestewart/dfhack 2012-02-05 19:50:15 +01:00
Alexander Gavrilov ec5f3cc4b3 Update fixpositions to match the new data definition naming. 2012-02-05 16:13:19 +04:00
Mike Stewart 6ac50fccbd Fixed mapexport's plant saving. 2012-02-04 23:51:26 -08:00
Petr Mrázek e51e4f6bd2 More docs work. 2012-02-05 06:02:44 +01:00
Petr Mrázek ebeae664d7 Merge https://github.com/mikestewart/dfhack 2012-02-05 04:28:53 +01:00
Petr Mrázek b79c6880e2 Merge https://github.com/quietust/dfhack 2012-02-05 04:28:37 +01:00
Petr Mrázek 8ddc2f87c9 Update docs. 2012-02-05 04:28:20 +01:00
Quietust e9118dceeb Add fixpositions plugin - adds Elven Diplomats and Human Merchant Nobles to existing worlds 2012-02-04 20:45:45 -06:00
Quietust 4c8717477c Fix really stupid typo 2012-02-04 16:38:54 -06:00
Mike Stewart b9020a70a9 Merge. 2012-02-04 13:08:08 -08:00
Mike Stewart e5b2c78122 Added plant and material export to mapexport, and made constructions have the proper material. 2012-02-04 13:05:41 -08:00
Petr Mrázek 5ad9274689 Update structures, stonesense. 2012-02-04 21:17:52 +01:00
Petr Mrázek cf3c5ff5d0 Merge https://github.com/angavrilov/dfhack 2012-02-04 20:54:41 +01:00
Mike Stewart 4b3a2bfe05 Merge. 2012-02-03 23:29:05 -08:00
Petr Mrázek 24368df553 Update stonesense 2012-02-04 07:47:57 +01:00
Alexander Gavrilov 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
Alexander Gavrilov d4163fcde3 Improve results of the embark-time prospector. 2012-02-03 11:43:13 +04:00
Petr Mrázek 1e89b8d79b Merge https://github.com/angavrilov/dfhack 2012-02-03 06:48:44 +01:00
Petr Mrázek 81f434d5f7 Update stonesense, again. 2012-02-02 21:12:30 +01:00
Alexander Gavrilov 878bc3d3a1 Implement pre-embark estimate in prospector.
Requires careful tuning of the vein density computation.
2012-02-02 22:14:49 +04:00
Petr Mrázek 3770f141e0 Merge https://github.com/quietust/dfhack 2012-02-02 06:21:37 +01:00
Petr Mrázek e751f9a3eb Update stonesense, safe-ish CXXFLAGS for linux. 2012-02-02 05:43:43 +01:00
Quietust fc3644bf4a Optimize seedwatch to only look in the SEEDS-specific item vector (just like 'Plant Seeds' jobs do) 2012-02-01 08:09:11 -06:00
Quietust 425b293cd5 Merge https://github.com/peterix/dfhack 2012-02-01 07:57:31 -06:00
Petr Mrázek 22aeb6e2ac Added linkage to libdl, fix for mode. 2012-02-01 04:12:15 +01:00
Quietust cad31c505e Some fixes for fixveins
* Ignore map feature tiles if the map feature does not specify a material
* Ignore mineral tiles if a map feature material is also present
2012-01-31 20:10:21 -06:00
Mike Stewart 7d55b84545 Merge remote-tracking branch 'upstream/master' 2012-01-31 11:45:20 -08:00
Quietust 9afcea3deb In all loops that iterate across a vector, use a size_t as the index 2012-01-31 10:55:38 -06:00
Mike Stewart 3816bd7789 Merge remote-tracking branch 'origin/master' 2012-01-31 08:42:41 -08:00
Mike Stewart 09f197fa6d Fixed mapexport build on Linux. 2012-01-31 08:42:25 -08:00
Quietust a82f4c9138 Cleanup code to get rid of MSVC warning C4482 2012-01-31 10:17:27 -06:00
Mike Stewart 5c550b9e2f Made mapexport put out some (but certainly not all) tile materials. 2012-01-30 21:12:35 -08:00
Mike Stewart 3dece3395d Merge remote-tracking branch 'upstream/master' 2012-01-29 12:04:33 -08:00
Alexander Gavrilov 04b505cde4 Actually scan through all parameters in autodump. 2012-01-29 18:17:06 +04:00
Mike Stewart 05c37af4c9 Mapexport now puts stuff out to a binary file compressed with zlib. Added liquid type and flow size to output as well. 2012-01-28 23:55:42 -08:00
Mike Stewart bd26c54259 Merge remote-tracking branch 'quietust/master' 2012-01-28 13:33:26 -08:00
Mike Stewart b07d3b25b5 Merge upstream/master 2012-01-28 13:32:48 -08:00
Alexander Gavrilov 683c989d0f Add options to autodump that filter on the forbidden and hidden flags.
This allows processing only a specific subset of items by first
setting an unlikely combination of flags, like dump+hide+forbid.
2012-01-28 17:40:09 +04:00
Alexander Gavrilov fa4fb4b407 Modify a number of commands to use CR_WRONG_USAGE for displaying help. 2012-01-28 16:03:56 +04:00
Alexander Gavrilov c59f5c1642 Allow using the job command with jobs highlighted in the unitjobs screen. 2012-01-28 15:00:24 +04:00
Alexander Gavrilov f6b19045dd Merge remote-tracking branch 'q-github/master' 2012-01-28 12:14:30 +04:00
Quietust 7949aab199 Make sure showmood has access to Translation 2012-01-27 22:02:43 -06:00
Quietust a36e7f4298 Cleanowned doesn't need Materials, but it does need Translation in order to print names 2012-01-27 22:02:25 -06:00
Quietust 116e5d60be Update Translation::TranslateName to include the first name, plus have it follow the init setting for nickname display (in Dwarf mode) 2012-01-27 21:36:01 -06:00
Mike Stewart b89cd43b85 More work on getting the map exporter up to speed. 2012-01-27 17:32:52 -08:00
Quietust 331be2c821 Update fixveins to also handle feature stones (e.g. adamantine vein floors) 2012-01-27 11:33:51 -06:00
Alexander Gavrilov ef256e1453 Detect incomplete thread and cloth items in workflow. 2012-01-27 21:17:50 +04:00
Espen Wiborg 5072c6e1f4 Update the export plugin for new API 2012-01-27 14:46:42 +01:00
Espen Wiborg cfb975a522 Track upstream changes 2012-01-27 12:06:57 +01:00
Espen Wiborg 26880d9108 Merge branch 'master' into export-plugin 2012-01-27 11:00:34 +01:00
Espen Wiborg 018f4083a3 Merge git://github.com/peterix/dfhack 2012-01-27 10:59:57 +01:00
Petr Mrázek 1d7ed14442 Merge https://github.com/quietust/dfhack
Re-add some get* forms of module calls.

Conflicts:
	plugins/mapexport/mapexport.cpp
2012-01-27 06:27:57 +01:00
Petr Mrázek d5d4875532 Make things work properly. 2012-01-27 05:54:26 +01:00
Quietust be51221939 Add plugin "fixveins", restores mineral floors that were erased by placing/removing constructions 2012-01-26 10:06:03 -06:00
Quietust 40b82d4e6c Fix compilation of mapexport - was trying to load the old Vegetation module (even though it didn't actually use it) 2012-01-26 09:58:24 -06:00
Espen Wiborg b6ef14bafa Merge branch 'master' into export-plugin 2012-01-26 13:57:01 +01:00
Espen Wiborg b48c110438 Merge git://github.com/peterix/dfhack 2012-01-26 13:56:45 +01:00
Petr Mrázek 0375be549c Merge https://github.com/mikestewart/dfhack 2012-01-26 05:37:50 +01:00
Quietust fbadb3ee33 Removed unused var 2012-01-24 16:13:55 -06:00
Mike Stewart e68cdee95b Merge remote-tracking branch 'quietust/master' 2012-01-24 12:27:38 -08:00
Quietust 8861e93848 Kill the Vegetation module, replacing it with the same 3 simple methods used in Engravings 2012-01-24 12:02:12 -06:00
Quietust cc7c7795a1 Kill the Units module, and add another pair of methods to the Items module to simplify some things 2012-01-24 11:32:34 -06:00
Quietust 466bf89578 Goodbye, Translation module 2012-01-24 10:54:12 -06:00
Quietust 06547c8948 Update showmood to recognize corpses (fell mood) and remains (macabre mood) 2012-01-24 10:03:28 -06:00
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