Commit Graph

1565 Commits (c5aa80873754beb9586401d8617533edaea4baab)

Author SHA1 Message Date
Quietust e143c312bf Sync with df-structures changes 2012-05-31 19:13:11 -05:00
Quietust 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
jj 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
jj bcb698a5b4 ruby: have codegen compute struct offsets directly 2012-05-29 16:10:33 +02:00
Alexander Gavrilov e72bf1ac9a Sync to changes in df-structures. 2012-05-26 14:49:27 +04:00
Alexander Gavrilov 8644ea4dc0 Merge remote-tracking branch 'q-github/master' 2012-05-26 14:41:36 +04:00
Quietust 800cbca578 Some improvements to showmood - show relevant skill, cleanup messages 2012-05-25 21:31:47 -05:00
Timothy Collett 44c3afc306 Merge git://github.com/quietust/dfhack
Gotta get the changes that prevent DFHack from crashing.
2012-05-24 15:39:11 -04:00
Timothy Collett 24d221052b Initial changes to get dfhack building on the Mac 2012-05-24 11:31:20 -04:00
Quietust ae41ddc04a Don't crash if world is undefined 2012-05-23 13:43:41 -05:00
Quietust 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
Rinin 705b60ca27 Fixed BrewDrink products counting 2012-05-22 19:22:36 +04:00
Alexander Gavrilov 65349039f0 Fix workflow bug: properly deduce the output material of BrewDrink jobs. 2012-05-22 17:50:48 +04:00
Alexander Gavrilov 81022451c2 Support sorting items in stocks, and correct unit sorting in joblist. 2012-05-21 22:29:03 +04:00
Petr Mrázek 8ef1423ee7 Merge https://github.com/angavrilov/dfhack 2012-05-20 23:01:44 +02:00
Petr Mrázek 8ff4f1a78e Disable ruby plugin by default. 2012-05-20 22:58:02 +02:00
Alexander Gavrilov 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
Petr Mrázek 489f22e550 Merge branch 'ruby' of https://github.com/jjyg/dfhack 2012-05-20 17:37:13 +02:00
Petr Mrázek 3fa155e8e6 Merge https://github.com/angavrilov/dfhack 2012-05-20 17:33:09 +02:00
Alexander Gavrilov d28d240dbd Merge remote-tracking branch 'kmartin/master' 2012-05-20 11:03:41 +04:00
Petr Mrázek 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
Petr Mrázek b8ce3b45e1 Merge https://github.com/jaxad0127/dfhack 2012-05-19 18:37:02 +02:00
Petr Mrázek d0de575a2b Merge https://github.com/jjyg/dfhack 2012-05-19 18:27:57 +02:00
Alexander Gavrilov 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
jj b851ee2d22 Merge branch 'master' of git://github.com/peterix/dfhack 2012-05-19 12:53:23 +02:00
Petr Mrázek e2f39368b1 Sync submodules 2012-05-18 17:43:22 +02:00
Alexander Gavrilov 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
Kelly Martin 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
playfordh 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
harlanplayford 689cf3ee51 Added ForceEquip plugin to project
Signed-off-by: playfordh <harlanplayford@gmail.com>
2012-05-15 06:03:29 -04:00
Kelly Martin 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
Kelly Martin e078c75737 Track submodules 2012-05-14 13:44:03 -05:00
Kelly Martin 86dc2d9855 Merge remote-tracking branch 'angavrilov/master'
Conflicts:
	library/xml
2012-05-12 19:49:27 -05:00
Kelly Martin bd2b55c490 Merge remote-tracking branch 'upstream/master' 2012-05-12 19:43:02 -05:00
jj 2629db5ed1 ruby: add building creation code 2012-05-13 01:40:44 +02:00
jj ea6e207290 Merge upstream 2012-05-12 23:52:13 +02:00
jj 3da787c5c9 Merge upstream 2012-05-12 23:51:49 +02:00
Alexander Gavrilov 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
Kelly Martin 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
Alexander Gavrilov 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
Alexander Gavrilov af3e389093 Update submodules. 2012-05-12 18:50:22 +04:00
Petr Mrázek 92f069e209 Brush output lists numbers, update xml. 2012-05-11 07:00:18 +02:00
Jared Adams f3ca3addbf Merge remote-tracking branch 'upstream/master' 2012-05-10 22:06:43 -06:00
jj dfe86f9bd7 ruby: interpret types in vmethod signatures 2012-05-11 01:34:03 +02:00
jj 607cd9c8f2 ruby: tweak enums 2012-05-10 23:41:50 +02:00
jj d30573a0e0 probe: fix gcc warning 2012-05-10 22:57:11 +02:00
jj 987cf697db Merge upstream 2012-05-09 15:44:32 +02:00
Jared Adams dce7f17fe7 Merge remote-tracking branch 'upstream/master' 2012-05-08 07:32:35 -06:00
Jared Adams 5bd90e28b8 Add a missing return in tiletypes 2012-05-07 19:30:33 -06:00
Jared Adams 833bf518d9 Fix some issues 2012-05-07 18:31:28 -06:00
jj 7ee4c584b9 ruby: tweak enums, pointerary 2012-05-06 22:42:06 +02:00
jj bfb26f1c1f ruby: deconstructbld 2012-05-06 01:02:21 +02:00
jj 96a62a8865 ruby: fix buildbed sample 2012-05-06 00:13:53 +02:00
jj f18aa9d947 ruby: add link_job 2012-05-05 23:56:26 +02:00
jj e2a978a4fa ruby: avoid infinite recursion in inspect 2012-05-05 22:43:12 +02:00
Alexander Gavrilov e3440126a3 Fix missing switch case warnings. 2012-05-05 19:36:22 +04:00
Alexander Gavrilov 4e084d0df7 Merge remote-tracking branch 'rh73/master' 2012-05-05 19:28:19 +04:00
Alexander Gavrilov 1b5ce7b717 Merge remote-tracking branch 'ab9rf/master' 2012-05-05 19:26:56 +04:00
Alexander Gavrilov 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
jj 138461634e ruby: fix vtable for linux destructor 2012-05-03 19:19:58 +02:00
jj ba1e3c4b23 ruby: vmethod call 2012-05-03 18:49:12 +02:00
Alexander Gavrilov 5afe2ca002 Update dfhack for specific_ref. 2012-05-03 11:47:04 +04:00
jj 8952eabd62 ruby: typo 2012-05-03 03:33:50 +02:00
jj 5fdeac9913 ruby: fix StaticArray#inspect with indexenum, allow df.cursor = [x, y, z] 2012-05-03 02:52:53 +02:00
Kelly Martin 6903f3877f Devel plugin nestboxes scans all nestboxes for unhatchable eggs and optionally dumps them. 2012-05-01 10:58:12 -05:00
Alexander Gavrilov 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
Kelly Martin e7c55ab6e1 Also exclude trader from hauling when requested at depot. 2012-04-30 09:01:48 -05:00
Alexander Gavrilov 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
Warmist a56f1549a9 Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-04-28 22:21:57 +03:00
Warmist 519ea08e8f Typo fix 2012-04-28 22:21:35 +03:00
Warmist 3d277823eb Misc stuff needed for unreleased unfunctional stuff 2012-04-28 22:20:49 +03:00
jj ec8b090abe ruby: add plugins/buildbed.rb (segfaults) 2012-04-27 18:50:27 +02:00
jj a7afe04f3b ruby: name nested compounds, to allow cpp_new etc 2012-04-27 17:59:54 +02:00
jj bc218db596 ruby: more minor tweaks 2012-04-27 17:46:51 +02:00
jj 3446fd024e ruby: tweak inspect 2012-04-27 17:38:31 +02:00
jj 9bceb7a443 ruby: typo in enumerable 2012-04-27 17:31:39 +02:00
jj 6800f459f5 ruby: fix bitfield looking for enum value 2012-04-27 17:24:15 +02:00
jj fcfd7062eb ruby: tweak inspect, autodereference pointers 2012-04-27 17:11:01 +02:00
jj 22628fe9bb codegen: all class-type have a vtable 2012-04-27 14:13:44 +02:00
jj 551df9bb73 ruby: use binsearch in find_unit/find_item 2012-04-27 03:07:03 +02:00
jj 2cc5333157 ruby: cleanup codegen enum 2012-04-27 03:02:37 +02:00
jj 51ecd15fa8 ruby: use symbols for enums everywhere 2012-04-26 20:55:52 +02:00
Kelly Martin 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
jj ba7d4f8edd ruby: extract additional info for enums 2012-04-26 20:03:56 +02:00
Kelly Martin 53e0ba8b8d Actually write the noble penalty to the dwarf_info structure.... 2012-04-26 12:54:10 -05:00
jj 2ee1887870 ruby: add plugins/unit exemple 2012-04-26 19:38:15 +02:00
jj 461c7e20cd ruby: add vector#binsearch 2012-04-26 19:37:58 +02:00
Alexander Gavrilov 02e43428ee Sync to changes in the data structure definitions. 2012-04-26 12:36:29 -05:00
Alexander Gavrilov b4a8bcd8d0 Refactor MapCache: make it parse everything that is known re tiles & mats.
Conflicts:

	library/xml
2012-04-26 12:21:59 -05:00
Alexander Gavrilov 82a0e52a3e Add api to check the walkable cache, and update flow_forbid in liquids. 2012-04-26 18:51:39 +04:00
Kelly Martin 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
jj 9b7fbcc477 ruby: fix warning in codegen with initvalue 2012-04-26 15:37:10 +02:00
jj 03925c923a ruby: fix new c++ obj initialization, use xml init-value 2012-04-26 14:16:47 +02:00
Alexander Gavrilov 16ee049664 Split off the burrows api from Maps and Units. 2012-04-26 12:56:28 +04:00
Alexander Gavrilov 6ab270d129 Retrieve unit noble position info, and use it in getProfessionName. 2012-04-26 12:03:56 +04:00
jj 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
jj bd2e6e74de ruby: add manual c++ object allocator 2012-04-25 19:22:04 +02:00
jj b0acad6d59 ruby: use index-enum xml attr, fix bitfield[i] = 0 2012-04-25 17:18:24 +02:00
Alexander Gavrilov 23a0b17ff3 Make liquids and tiletypes force rebuild of pathfinding data. 2012-04-25 18:38:43 +04:00
Alexander Gavrilov 1cd802d426 Implement unit sorting for the pen zone assignment interface. 2012-04-25 18:28:00 +04:00
jj d1ea97c272 ruby: README 2012-04-25 01:20:35 +02:00
jj bf64c3e23c ruby/plugin: tweak plants, add growcrops 2012-04-24 19:08:14 +02:00
jj 7a71204b82 ruby: guard against undefined globals, fix inspect for inherited classes 2012-04-24 19:07:54 +02:00
jj eca17fff53 ruby: add sample plugin (cuttrees, growtrees) 2012-04-24 00:57:07 +02:00
jj c1baebd083 ruby: rename find_map_block to map_block_at, add other helper methods 2012-04-24 00:47:10 +02:00
jj 8a05db7a1b ruby: add map block iterators, fix FlagArray.length 2012-04-23 21:12:24 +02:00
Alexander Gavrilov 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
Kelly Martin 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
Kelly Martin e06c80f690 Fix minor ostream munging glitch in rprobe. 2012-04-22 23:36:13 -05:00
Robert Heinrich 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
Robert Heinrich 045b7b6a20 Merge branch 'master' of git://github.com/ab9rf/dfhack 2012-04-22 20:26:12 +02:00
Robert Heinrich 760bc8b09f regrass: ignore furrowed tiles (dirt roads) 2012-04-22 20:25:10 +02:00
Alexander Gavrilov 125cd6622a Support sorting units in many more ui contexts. 2012-04-22 19:22:00 +04:00
Kelly Martin 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
Robert Heinrich af12e83ac4 Merge branch 'master' of git://github.com/ab9rf/dfhack 2012-04-22 15:25:22 +02:00
Kelly Martin 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
jj 6fc17b3e1f ruby: clean helper with offsetof 2012-04-21 21:20:51 +02:00
Kelly Martin c104f822a4 Move stripcaged to master branch, works fine. 2012-04-21 12:53:46 -05:00
Jared Adams 567b3e2a52 Fix range on tiletypes and make it saner for both plugins. 2012-04-21 11:26:40 -06:00
jj 9317143909 ruby: officially dont support stl::deque, add class sizeof 2012-04-21 15:04:52 +02:00
Alexander Gavrilov 4af051bab3 Add a few more unit orderings, and a way to reverse direction. 2012-04-21 16:53:17 +04:00
Alexander Gavrilov 3282ac3db2 Add a hotkey command that sorts units in lists using lua comparators. 2012-04-21 15:43:52 +04:00
Robert Heinrich 709536c6c3 Merge branch 'master' of git://github.com/ab9rf/dfhack 2012-04-21 11:53:19 +02:00
Robert Heinrich a282c9dede Merge branch 'master' of git://github.com/peterix/dfhack 2012-04-21 11:52:25 +02:00
Robert Heinrich 2d19514fbc probe: minor change 2012-04-21 11:52:03 +02:00
Alexander Gavrilov adbd351462 Rename units.other[0] to units.active. 2012-04-21 12:46:55 +04:00
Kelly Martin ad73b8c737 Add "tamable" for animals that can be tamed (PET or PET_EXOTIC in raws) 2012-04-20 14:38:50 -05:00
Kelly Martin e0bb5bf53b Add "naked" (has no inventory) predicate to zone (useful for mass pitting) 2012-04-20 14:22:20 -05:00
jj 826e0b7dcf ruby: iterate in LinkedList 2012-04-20 20:43:18 +02:00
jj 417356c3cb ruby: add df-linked-list support (also, xml could be simplified) 2012-04-20 18:20:24 +02:00
jj f57d63ed95 ruby: df_flagarray support 2012-04-20 17:57:41 +02:00
jj 66891fd23c ruby: tweak onupdate, fix some inspects, add inverse ENUM 2012-04-20 17:33:48 +02:00
jj fb2dcf55ca ruby: fix DfArray, add #inspect, fix ruby.rb 2012-04-20 15:30:15 +02:00
Alexander Gavrilov 0a6982f404 Enable warnings correctly on linux and fix a lot of them. 2012-04-20 13:30:37 +04:00
Jared Adams 52138d8998 Improve the range function of tiletypes a bit and add the functionality to liquids. 2012-04-19 21:13:07 -06:00
Jared Adams 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
jj 0952b76173 ruby: add df_array, pointer_ary, move generated classes in DFHack 2012-04-20 01:29:52 +02:00
Alexander Gavrilov 0b32d374db Implement SOIL/STONE substitution logic, and add compat in mapexport. 2012-04-19 23:02:30 +04:00
jj a450e9ddeb ruby: fix vectors, add bitvector 2012-04-19 19:35:55 +02:00
Alexander Gavrilov 4b87f1bcac Refactor MapCache: make it parse everything that is known re tiles & mats. 2012-04-19 19:17:07 +04:00
Alexander Gavrilov f655a0986d Sync to changes in the data structure definitions. 2012-04-19 11:03:29 +04:00
jj 0e10a8edff Merge branch 'master' of git://github.com/peterix/dfhack 2012-04-18 18:50:48 +02:00
jj 3ad3d1af46 ruby: use rtti info to cast Item/etc subclasses 2012-04-18 18:46:33 +02:00
Kelly Martin b7b27ebb9e Merge remote-tracking branch 'upstream/master' 2012-04-18 11:35:32 -05:00
Kelly Martin 2dc3aa1b89 danger of rotting) 2012-04-18 11:33:17 -05:00
Kelly Martin 9e1e34f69b Created new stockcheck plugin 2012-04-18 00:16:44 -05:00
Petr Mrázek c17529a794 Track stonesense 2012-04-18 05:09:22 +02:00
Petr Mrázek 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
jj 3b54cf4657 Merge branch 'master' of git://github.com/peterix/dfhack 2012-04-17 22:42:29 +02:00
jj 3339fdfea8 ruby: fix anon unions, add some find_* helpers in ruby.rb 2012-04-17 22:42:23 +02:00
Petr Mrázek d0e9ab49e7 Merge https://github.com/jaxad0127/dfhack 2012-04-17 21:46:57 +02:00
Petr Mrázek bdd697f1a0 Merge https://github.com/rh73/dfhack 2012-04-17 21:46:40 +02:00
Robert Heinrich 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
Robert Heinrich 40f36c1912 minor stuff, use building->is_room instead of building->isRoom() which returns unexpected values 2012-04-17 16:57:41 +02:00
jj d901dd28cf ruby: merge upstream 2012-04-17 14:40:59 +02:00
Jared Adams ebd21e9249 Fix some issues with last commit 2012-04-16 20:48:08 -06:00
Petr Mrázek 7946cafc86 Merge https://github.com/jaxad0127/dfhack 2012-04-16 22:37:07 +02:00
Petr Mrázek d2dde361ad Merge https://github.com/rh73/dfhack 2012-04-16 22:35:46 +02:00
Petr Mrázek ccf10a1428 Merge https://github.com/warmist/dfhack 2012-04-16 22:30:55 +02:00
Robert Heinrich 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
Petr Mrázek 45f9f756f0 Merge https://github.com/rh73/dfhack
Conflicts:
	plugins/stonesense
2012-04-16 20:33:30 +02:00
Petr Mrázek 862fa9d675 Track stonesense 2012-04-16 20:19:45 +02:00
Robert Heinrich 70ebd26e6c Merge branch 'master' of git://github.com/ab9rf/dfhack 2012-04-16 17:37:09 +02:00
Kelly Martin 43e4814147 Mod workflow to properly handle custom reactions that produce CRAFTS 2012-04-16 10:34:12 -05:00
Robert Heinrich 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
Robert Heinrich 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
Robert Heinrich 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
Robert Heinrich 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
Robert Heinrich 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
Robert Heinrich 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
Alexander Gavrilov 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
Robert Heinrich 6197c4e739 zone: added keyword 'not' which negates the filter followed by it (e.g. 'not grazer') 2012-04-15 19:49:50 +02:00
Robert Heinrich 8bbd43f2c9 zone: added filters to search for creatures who can be trained for war/hunting 2012-04-15 17:40:39 +02:00
Alexander Gavrilov 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
Jared Adams 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
Robert Heinrich be580592ce Merge branch 'master' of git://github.com/ab9rf/dfhack 2012-04-15 16:07:43 +02:00
Kelly Martin 005658a9cd Add noegglayer zone filter 2012-04-15 09:04:19 -05:00
Robert Heinrich cf0d45be78 merged stuff from peterix 2012-04-15 12:32:25 +02:00
Petr Mrázek c69af6ab9e Fix missing lua linkage in burrows plugin. 2012-04-15 01:58:02 +02:00
Petr Mrázek fa063e2936 Track structures, fix trivial problem in zone plugin 2012-04-15 00:35:59 +02:00
Petr Mrázek 45ca8c6ac1 Merge https://github.com/angavrilov/dfhack 2012-04-15 00:13:39 +02:00
Petr Mrázek c52eb517b0 Merge https://github.com/rh73/dfhack 2012-04-15 00:12:38 +02:00
Petr Mrázek fa6ecacda9 Merge https://github.com/warmist/dfhack 2012-04-15 00:12:06 +02:00
Robert Heinrich 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
Alexander Gavrilov 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
Petr Mrázek bbf28eb33d Disable df2minecraft again. 2012-04-14 14:15:46 +02:00
Robert Heinrich 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
Warmist a2a47c5d63 Fix to init (no need to add " around). Added experimental (crashy as hell) tools.project 2012-04-14 13:30:48 +03:00
Alexander Gavrilov 7a34a89f53 Add burrow subcommands to modify burrow unit and tile sets. 2012-04-14 14:12:59 +04:00
Alexander Gavrilov 2f54a48e63 Add a plugin that makes selected burrows auto-grow on digging. 2012-04-13 21:41:42 +04:00
jj 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
jj bf4bd1f034 ruby: fix vectors of pointers, fix global enum fields 2012-04-13 17:19:53 +02:00
jj 3044da5887 ruby: add global-objects, add bitfield._whole, make StlVector enumerable 2012-04-13 16:17:56 +02:00
Robert Heinrich 09608467c1 tweak fixmigrant: updated help text 2012-04-12 22:44:53 +02:00
jj f503bf36f4 ruby: set everything up 2012-04-12 19:12:46 +02:00
Alexander Gavrilov 2d8611a480 Add core api for moving items between ground and containers. 2012-04-12 18:37:27 +04:00
Robert Heinrich 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
Robert Heinrich 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
Petr Mrázek d874c3b538 Track stonesense 2012-04-11 21:33:45 +02:00
Robert Heinrich 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
Robert Heinrich 09aad951a6 Merge branch 'master' of git://github.com/angavrilov/dfhack 2012-04-11 18:23:01 +02:00
Robert Heinrich 2cf078419b cprobe: list items worn by unit and checks if they are owned or not 2012-04-11 18:22:39 +02:00
Alexander Gavrilov 5d5502ae34 Update the item owner modification api and export it to lua. 2012-04-11 20:10:31 +04:00
Robert Heinrich e8e8f29328 regrass: fix 2012-04-11 17:01:20 +02:00
Robert Heinrich 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
Alexander Gavrilov c7b922250b More maps api refactoring and renaming.
getBlockAbs is a very confusing name; getTileBlock is better.
2012-04-11 12:01:27 +04:00
Alexander Gavrilov 59ddbfacb7 Implement item occupancy tracking in MapCache. 2012-04-10 20:19:41 +04:00
Alexander Gavrilov b15d2da819 Get rid of some obsolete api functions, and restructure MapCache. 2012-04-10 18:21:19 +04:00
Robert Heinrich 7d0cfb7e80 Merge branch 'master' of git://github.com/angavrilov/dfhack 2012-04-10 10:18:38 +02:00
Alexander Gavrilov 93c795cfc3 Job module api tweaks: add a namespace to match others and some funcs. 2012-04-10 11:43:36 +04:00
Robert Heinrich 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
Robert Heinrich b2d976b06b zone tool: added new filter 'nograzer' 2012-04-10 04:10:07 +02:00
Robert Heinrich 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
Robert Heinrich 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
Robert Heinrich 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
Robert Heinrich afba284283 autobutcher: added a forgotten ';' 2012-04-09 15:35:25 +02:00
Robert Heinrich b6adfaaf0a Merge branch 'master' of git://github.com/peterix/dfhack 2012-04-09 15:09:39 +02:00
Robert Heinrich 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
Petr Mrázek e5213d77f6 Merge https://github.com/angavrilov/dfhack 2012-04-09 00:55:31 +02:00
Robert Heinrich 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
Kelly Martin 53118bc986 Merge remote-tracking branch 'rossm/master' 2012-04-08 01:45:16 -05:00
Kelly Martin ad657c68a3 Leave merchant stuff alone, even if they're certainly dwarfs. 2012-04-08 01:07:29 -05:00
Kelly Martin de960e65f5 Stealing animals from traders is bad. 2012-04-07 23:25:40 -05:00
Kelly Martin 2e6ee0ac84 Don't assign dead animals to pastures. 2012-04-07 20:36:29 -05:00
Kelly Martin dac84080c0 Exclude grazing units from autonestbox to avoid starving da poor boids 2012-04-07 20:26:56 -05:00
Kelly Martin c89416a3f8 Merge remote-tracking branch 'rh73/master' 2012-04-07 12:23:31 -05:00
Kelly Martin f931060dd9 Exclude worn items from counts for workflow 2012-04-07 12:11:53 -05:00
Alexander Gavrilov 45ae2ed67f Pull a few utility functions into the core and publish to lua. 2012-04-07 19:08:30 +04:00
Robert Heinrich 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
Robert Heinrich e3fb922f53 fixed handling of units in cages who have an invalid map pos. 2012-04-07 06:47:32 +02:00
Robert Heinrich c5fc8aab9f autobutcher: now accepts list of races in one command 2012-04-07 05:05:42 +02:00
Robert Heinrich e8ccbb4b2c Merge branch 'master' of git://github.com/peterix/dfhack 2012-04-07 02:49:39 +02:00
Robert Heinrich 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
jj ac0d878b69 ruby: include memstruct in autogen 2012-04-06 19:59:11 +02:00
jj 52007e0d4f ruby: patron for memory primitives 2012-04-06 19:30:58 +02:00
RossM 284ada9432 Better config persistence. 2012-04-05 20:34:06 -07:00
jj fb1b424cbf fix various crash with gcc autogen.cpp. all seems well 2012-04-05 22:15:43 +02:00
jj 689cc50409 multistage autogen en route 2012-04-05 22:15:43 +02:00
jj 3f39e285d0 codegen: gen cpp helper 2012-04-05 22:15:43 +02:00
jj 872eebe7ef rbcodegen: hop 2012-04-05 22:15:43 +02:00
jj 780d7a8b18 codegen ++ 2012-04-05 22:15:43 +02:00
jj ca528fff35 rb codegen: generate ruby 2012-04-05 22:15:43 +02:00
jj 57f2e189ee ruby: rm silly debug statement 2012-04-05 22:15:43 +02:00
jj f46e1ee518 ruby: link libruby, fix stuff, it works 2012-04-05 22:15:43 +02:00
jj b2846492f4 ruby: compiles 2012-04-05 22:15:43 +02:00
Robert Heinrich 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
RossM df98d67ad7 Merge branch 'master' of git://github.com/peterix/dfhack 2012-04-05 10:00:56 -07:00
Petr Mrázek 109edc5e77 Track stonesense 2012-04-05 16:15:41 +02:00
Alexander Gavrilov 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
Robert Heinrich 511fceff0a Merge branch 'master' of git://github.com/peterix/dfhack 2012-04-05 11:41:01 +02:00
Robert Heinrich 33ceee8310 zone tool: some cleanup, added 'slaughter' command 2012-04-05 11:40:27 +02:00
RossM b1c41c2c9f Merge branch 'master' of git://github.com/peterix/dfhack 2012-04-04 23:33:49 -07:00
RossM 564150bb19 Persist autolabor config in the savefile. 2012-04-04 23:33:26 -07:00
Petr Mrázek 330118ee27 Fix zone tool 2012-04-05 03:00:10 +02:00
Petr Mrázek b8ccb0424d Merge https://github.com/rh73/dfhack 2012-04-05 02:55:42 +02:00
Petr Mrázek 659dca0640 Merge https://github.com/RossM/dfhack 2012-04-05 02:47:19 +02:00
Warmist aaffdd56d8 Fixes to all of the new stuff. 2012-04-04 19:06:56 +03:00
Robert Heinrich 796bc18fb0 zone plugin: fixed bug when parsing options 2012-04-04 16:48:22 +02:00
Robert Heinrich 5ce0e7dbf2 zone tool: added lots of filters, added mass-assigning of nestboxes 2012-04-04 14:58:53 +02:00
RossM a76de8b777 Fix detection of military dwarves. Add overview comments explaining why
autolabor works how it does.
2012-04-03 23:26:15 -07:00
Warmist 9707939f2c whoops, now it actually swaps souls :) 2012-04-04 02:13:48 +03:00
Warmist 179c6e4025 Revived adv_tools, with new reincarnate command. 2012-04-04 02:06:35 +03:00
Warmist 6a6ca516c3 Stupid bug with nemesis... 2012-04-04 00:18:40 +03:00
Warmist 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
Warmist 6d4ef1fd38 Started rework lua files to be more hotkey friendly and adv/fort mode independant. 2012-04-03 23:16:29 +03:00
Warmist 3a0bd73315 Fix for getSelectedCreature in adv mode. 2012-04-03 21:47:54 +03:00
Warmist 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
RossM 285afa2594 Autolabor tweaks. 2012-04-03 00:12:13 -07:00
RossM 288acf4b79 Tweak autolabor. 2012-04-02 23:40:56 -07:00
RossM 3bd499ff93 Limit number of dwarves assigned when idle dwarves are available. 2012-04-02 22:47:26 -07:00
RossM 18a0c80d5d Merge branch 'master' of git://github.com/peterix/dfhack 2012-04-02 22:31:00 -07:00
RossM 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
RossM 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
Robert Heinrich 707aee82bd Merge branch 'master' of git://github.com/peterix/dfhack 2012-04-02 20:33:29 +02:00
Robert Heinrich 9cc2040a6b minor fix in zone tool: ignore dead units 2012-04-02 16:58:12 +02:00
Robert Heinrich 772c6b1cbb Added plugin 'zone'. Helps with assigning units to pens/pastures and pits. 2012-04-02 16:07:23 +02:00
Alexander Gavrilov a9a6fbd8b5 Lua tweaks: a couple of functions, dfusion tweak, backtrace metadata. 2012-04-01 12:50:56 +04:00
Alexander Gavrilov 73cf822a13 Merge remote-tracking branch 'warmist/master' 2012-04-01 11:43:09 +04:00
Petr Mrázek 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
Petr Mrázek 7ff728b6fc Track world and map changes separately for plugin_onstatechange 2012-04-01 02:56:54 +02:00
Petr Mrázek 4bac6edd79 Merge https://github.com/rh73/dfhack 2012-04-01 00:29:00 +02:00
Alexander Gavrilov 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
Robert Heinrich 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
Alexander Gavrilov 0f41608ed4 Pull console output support and REPL out of dfusion into core lib. 2012-03-31 15:40:54 +04:00
Warmist 5a90e71c87 Fixes for lua5.2 2012-03-31 12:12:16 +03:00
Alexander Gavrilov 9384f0c842 Update lua to 5.2 and fix obvious breakage due to obsolete api. 2012-03-31 12:11:43 +04:00
Alexander Gavrilov 10b610669f Give some sensible looking names to the arrays in pregnancy_ptr. 2012-03-31 10:31:45 +04:00
Quietust 8665d1b195 Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-30 19:41:00 -05:00
Petr Mrázek f8d96d1d26 Merge https://github.com/warmist/dfhack 2012-03-31 01:32:16 +02:00
Petr Mrázek 387d0fd062 Track stonesense 2012-03-31 00:34:09 +02:00
Warmist 95947a8635 Reworked to use start_dwarf_count offset from version info 2012-03-31 01:27:26 +03:00
Warmist c0cd5b9212 New offset for embark/simple-embark (starting dwarfs) 2012-03-31 00:54:37 +03:00
Quietust 0f3ae4499f New devel plugin - list counters for selected creature 2012-03-30 16:39:19 -05:00
Petr Mrázek a4c41bf64c Merge https://github.com/rh73/dfhack 2012-03-30 23:34:51 +02:00
Quietust 4d5aade389 Update changeitem, allow attempting to change item subtype 2012-03-30 16:34:07 -05:00
Petr Mrázek 1da914fb87 Fix init.lua 2012-03-30 21:59:35 +02:00
Petr Mrázek 5d8415c8d9 Merge https://github.com/warmist/dfhack
Conflicts:
	plugins/Dfusion/luafiles/init.lua
2012-03-30 20:32:57 +02:00
Petr Mrázek 61fe605676 Merge https://github.com/RossM/dfhack 2012-03-30 20:30:28 +02:00
RossM 590ea629f3 Don't try to give labors to merchant guards or dead dwarves. 2012-03-30 10:01:33 -07:00
Alexander Gavrilov 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
Alexander Gavrilov 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
Alexander Gavrilov 81bc73f435 Follow a typo fix in flag name. 2012-03-30 10:44:52 +04:00
Quietust 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
Warmist 531704da8c print (after dfuse/dfusion) no longer needs tostring 2012-03-29 22:08:45 +03:00
Warmist 7d47208c65 Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-29 21:33:41 +03:00
Petr Mrázek 0c2c94fa92 Remove random bad asserts 2012-03-29 20:18:14 +02:00
Petr Mrázek 69b1bbe59e Turn sorting lambdas into functors in autolabor. 2012-03-29 20:00:26 +02:00
Petr Mrázek 5f53388890 Track stonesense 2012-03-29 19:03:51 +02:00
Petr Mrázek 541e0ca205 Merge https://github.com/rh73/dfhack
Conflicts:
	plugins/changelayer.cpp
2012-03-29 18:42:45 +02:00
Petr Mrázek 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
Robert Heinrich 2446fb7abf Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-29 18:27:40 +02:00
Robert Heinrich a4995d7681 minor: return CR_WRONG_USAGE if user forgot to specify material and/or quality 2012-03-29 18:26:10 +02:00
Warmist ce69cdb5df New way of doing assignments used in tools/empregnate. 2012-03-29 18:39:11 +03:00
Robert Heinrich 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
Robert Heinrich e249ef1377 minor fix (forgot a line break in helpstring) 2012-03-29 17:14:41 +02:00
Robert Heinrich 4525bee58f Merge branch 'master' of git://github.com/ab9rf/dfhack
Conflicts:
	library/xml
2012-03-29 16:10:31 +02:00
Robert Heinrich 9b75373403 Merge branch 'master' of git://github.com/peterix/dfhack
Conflicts:
	library/xml
2012-03-29 16:03:12 +02:00
Robert Heinrich 88c914142b added plugin changeitem (change material type and base quality) 2012-03-29 15:33:54 +02:00
Kelly Martin 453141920f Merge remote-tracking branch 'upstream/master' 2012-03-28 23:22:28 -05:00
Kelly Martin fea34bfdde autolabor: set reequip flag when appropriate. also tweaked scoring to reduce job clumping. 2012-03-28 21:57:08 -05:00
Petr Mrázek 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
Kelly Martin 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
Robert Heinrich cebdbff46d minor updates in readme.rst; moved changelayer plugin to main plugin folder 2012-03-28 17:00:33 +08:00
unknown 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
Warmist 13d7beda4b Dfusion crash fix 2012-03-28 16:58:52 +08:00
Petr Mrázek d2d16271f0 Track stonesense 2012-03-27 01:30:46 +02:00
Warmist 3761426ef5 Extern "C" mess fixed, bitlib mess fixed, bitlib added to autoload. 2012-03-26 18:48:24 +03:00
Warmist 18c94f8000 Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-26 18:14:14 +03:00
Warmist 61f0bc66af small changes to tools(lua) 2012-03-26 18:12:32 +03:00
Petr Mrázek b4d458b47f Track stonesense 2012-03-26 16:16:19 +02:00
Robert Heinrich 517fc310bf documented changelayer plugin 2012-03-26 12:27:32 +02:00
Robert Heinrich af344e57bd Merge remote-tracking branch 'upstream/master' 2012-03-26 04:17:06 +02:00
Robert Heinrich e63ba6f87d added changelayer plugin 2012-03-26 04:15:42 +02:00
Petr Mrázek 1a19e17695 Track structures, stonesense 2012-03-26 03:39:14 +02:00
Petr Mrázek 85c3fbedcc Merge https://github.com/warmist/dfhack 2012-03-26 03:38:16 +02:00
Robert Heinrich 96064da6ba remove cursedump, use api instead 2012-03-25 12:11:00 +02:00
Robert Heinrich b790909950 Merge remote-tracking branch 'upstream/master' 2012-03-25 11:57:13 +02:00
Warmist 63634de8d5 Fixed empregnate, and some other tools... 2012-03-25 11:48:53 +03:00
Petr Mrázek def7e51564 Merge https://github.com/warmist/dfhack 2012-03-25 03:27:26 +02:00
Warmist e36ed9ac07 Fixed more plugins (embark/friendship/simple_embark) 2012-03-25 01:31:58 +02:00
Petr Mrázek ee66731d63 Remove Qt and server plugins. 2012-03-25 00:28:29 +01:00
Warmist b8210a4cc7 Commented non working parts... Not very much left... 2012-03-25 01:16:41 +02:00
Warmist b56917f91b Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-03-24 16:49:17 +02:00
Warmist 99da37ae46 Moving to new LuaWrapper. 2012-03-24 14:47:51 +02:00
Petr Mrázek 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
Petr Mrázek 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
Robert Heinrich 106aedbaa5 Merge remote-tracking branch 'upstream/master' 2012-03-24 12:02:50 +01:00
Robert Heinrich 9c38b1e6b5 minor: changed comment 2012-03-24 12:02:41 +01:00
Petr Mrázek 7fe5fc9a90 autolabor fixage 2012-03-24 01:33:29 +01:00
Petr Mrázek e90da2bff1 Move autolabor to main plugin folder 2012-03-24 01:29:09 +01:00
Petr Mrázek 13cf648634 Merge https://github.com/RossM/dfhack 2012-03-24 01:26:36 +01:00
Petr Mrázek addb5c87aa liquids vs liquidsgo: FIGHT!
liquidsgo WINS, renamed to liquids to not confuse users.
2012-03-24 00:13:16 +01:00
Petr Mrázek 078caf363f Move merged plugins into main plugin folder. 2012-03-23 23:49:28 +01:00
Petr Mrázek 2f76a52959 Merge https://github.com/rh73/dfhack 2012-03-23 23:06:48 +01:00
Petr Mrázek 90de6a1b62 Track submodules 2012-03-23 22:59:40 +01:00
Warmist e10b1a50a3 Onfunction start 2012-03-23 11:07:54 +02:00
Warmist 61eef26c92 Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-03-23 11:06:44 +02:00
Warmist f25d15ce9c Stupid mistake fixed 2012-03-22 23:27:25 +02:00
Warmist 8f72a642b2 Fixed getxyz(), getCreatureAtPos() (also returns nil/creature) and empregnate to work with look/talk 2012-03-22 21:47:33 +02:00
Robert Heinrich aa807343cc vampcheck is now generic cursecheck, added tweak clear-ghostly 2012-03-22 16:30:15 +01:00
RossM c48c7cf874 Make logic closer to C# version. Address code comments from peterix. 2012-03-22 00:33:18 -07:00
Robert Heinrich cf029e0a2e fixed memory leak in liquids.cpp 2012-03-21 13:57:55 +01:00
Robert Heinrich 38686765a6 added plugin liquidsgo (like liquids but can run from hotkey) 2012-03-21 12:40:07 +01:00
Robert Heinrich 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
Robert Heinrich c9701b536a minor indentation fix 2012-03-20 11:41:17 +01:00
Robert Heinrich 9853cc137b fixed double printing of first name if creature has no nickname 2012-03-20 11:01:33 +01:00
Robert Heinrich 6c6438267b add plugin vampcheck 2012-03-20 09:36:36 +01:00
Alexander Gavrilov bfb226b92e Add a few comments. 2012-03-19 11:33:30 +04:00
RossM 14ae83ced5 Correctly handle military dwarves. 2012-03-18 16:54:47 -07:00
Petr Mrázek 2bec9f6711 Merge https://github.com/warmist/dfhack 2012-03-18 20:51:13 +01:00
Quietust 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
Quietust a40c386cef Update bprobe to always display ID numbers (and put them in parentheses after the name) 2012-03-18 14:42:13 -05:00
Warmist fe211acb71 Small bug fixes 2012-03-18 16:23:31 +02:00
Petr Mrázek a8a540eeb8 Merge https://github.com/warmist/dfhack 2012-03-18 13:14:00 +01:00
Petr Mrázek 19a317deeb Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-03-18 13:10:47 +01:00
Petr Mrázek a092ded82d Track stonesense 2012-03-18 12:48:09 +01:00
Warmist 3383aa7f6d New pointer, setup pointer and df-array. ALso new tool, empregnate. 2012-03-18 12:24:28 +02:00
Alexander Gavrilov 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
Petr Mrázek 293eb53677 Merge https://github.com/angavrilov/dfhack 2012-03-18 04:48:02 +01:00
Warmist 5367d28110 few small bugs (embark caste selection) and moved runsaved to non-auto. 2012-03-18 03:02:16 +02:00
Warmist 943c4abe76 updated readme.txt 2012-03-18 02:22:26 +02:00
Warmist e1279d79db small debug un-optimatization removed 2012-03-18 02:16:53 +02:00
Warmist 086ce16f0f tools updated (not fully), added editor( edit everything in df) 2012-03-18 01:57:50 +02:00
Warmist 77738085e2 embark and friendship working. 2012-03-18 00:50:47 +02:00
Alexander Gavrilov aa63493bb8 Add a ListSquads request. 2012-03-17 20:04:15 +04:00
Warmist 16861781c2 Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-17 15:09:05 +02:00
Warmist fd48c59aba Started move to new system. Temp disabled non-working plugins. 2012-03-17 15:05:48 +02:00
Alexander Gavrilov 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
Alexander Gavrilov 14d6a62e1d Move CoreService to a separate file. 2012-03-17 12:09:30 +04:00
unknown 89edfd4e15 Initial Autolabor code. 2012-03-16 21:45:52 -07:00
Petr Mrázek 3168a2ef62 Add a tiletype function to get basic shapes from shapes. Track modules. 2012-03-16 20:41:07 +01:00
Quietust aa7f13266b Fix dwarfexport to use enum macros 2012-03-15 20:43:27 -05:00
Quietust 5464564ef6 Merge branch 'master' of git://github.com/angavrilov/dfhack
Conflicts:
	library/xml
2012-03-15 20:12:01 -05:00
Quietust 4d66218783 Update bprobe to print civzone subtypes 2012-03-15 20:09:56 -05:00
Warmist dea215d0b9 Alignment done (at least for now). Now there is a working access to df. 2012-03-16 02:08:55 +02:00
Petr Mrázek c72fb76316 MSVC fixage for the new socket API 2012-03-15 22:05:33 +01:00
Alexander Gavrilov f84b1539a8 Change to the traits representation of enum and bitfield properties. 2012-03-15 20:46:08 +04:00
Petr Mrázek 1ac8025025 Merge https://github.com/angavrilov/dfhack
Conflicts:
	plugins/workflow.cpp
2012-03-15 14:43:05 +01:00
Alexander Gavrilov 605ee9669a Plugin-exported functions now actually work. 2012-03-15 14:06:50 +04:00
Alexander Gavrilov 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
Alexander Gavrilov e7851f5abd Improve support for void RPC functions, dfhack-run, etc. 2012-03-15 11:07:43 +04:00
Alexander Gavrilov 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
Petr Mrázek 03e648b3a1 Fix ordering for custom attribute names dwarfexport uses. 2012-03-14 12:57:53 +01:00
Alexander Gavrilov c42e2ff053 Support crafts and add a couple of options in workflow. 2012-03-14 12:09:02 +04:00
Alexander Gavrilov a05cbcc2de Rename the world substruct with the save directory name. 2012-03-14 10:56:30 +04:00
Petr Mrázek 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
Warmist f092edaa99 alignment hell, and started to port all plugins to new structure based mode. 2012-03-13 23:08:46 +02:00
Quietust 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
Warmist 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
Quietust 181f1c6ac6 Silence warning 2012-03-13 13:15:12 -05:00
Petr Mrázek eb4757043b Move depends out of main library, make them (static) libraries. 2012-03-13 14:46:48 +01:00
Clayton Hughes d7f7437ca1 "clear all" wasn't working properly - I'm bad at counting. 2012-03-12 00:32:43 -07:00
Clayton Hughes 708dc6c32d Forgot usage message for "clear all" 2012-03-12 00:10:55 -07:00
Clayton Hughes 7dff12ead7 Added "workflow clear all" command to remove all constraints. 2012-03-12 00:05:22 -07:00
Petr Mrázek 68fbb535c9 Merge https://github.com/warmist/dfhack 2012-03-11 23:01:14 +01:00
Petr Mrázek b50d7ecdf3 Fix typo in features.cpp 2012-03-11 22:45:41 +01:00
Quietust 27a7f97174 Merge branch 'master' of git://github.com/peterix/dfhack
Conflicts:
	plugins/CMakeLists.txt
2012-03-11 15:32:16 -05:00
Petr Mrázek 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
Warmist 081aee1363 Fixes for DfHack::Process foolery. 2012-03-11 14:59:32 +02:00
Warmist 237d7b433a Updated to new dfhack standards. 2012-03-11 14:33:08 +02:00
Warmist 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
Warmist 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
Quietust 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
Petr Mrázek 9d6a19b7d4 Track df2mc, stonesense 2012-03-10 18:48:52 +01:00
Petr Mrázek 75113b715a Misc fixes for warnings... 2012-03-10 16:03:11 +01:00
Petr Mrázek 003a0f9eb8 Merge https://github.com/angavrilov/dfhack 2012-03-10 15:51:45 +01:00
Petr Mrázek 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
Alexander Gavrilov 522dd1fd10 Update the devel plugins. 2012-03-10 17:25:00 +04:00
Alexander Gavrilov 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
Petr Mrázek c260aca3f1 Merge https://github.com/angavrilov/dfhack 2012-03-10 02:15:34 +01:00
Antalia 77349e9b80 Added age, currently enabled labors, and skill levels to dwarfexport XML 2012-03-10 02:10:53 +01:00
Alexander Gavrilov 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
Petr Mrázek 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
Petr Mrázek dc0b2b8216 Track stonesense 2012-03-08 09:15:55 +01:00
Petr Mrázek 9c7e341e5e Track df2mc 2012-03-08 00:24:40 +01:00
Petr Mrázek 3598282ed7 Update readme, track df2mc and structures 2012-03-07 23:40:22 +01:00
Petr Mrázek 15a82cfbbf Merge branch 'master' of github.com:peterix/dfhack 2012-03-07 21:40:09 +01:00
Alexander Gavrilov 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
Warmist 7d2b6b4583 Lots of work done with xml parsing. 2012-03-07 19:41:43 +08:00
Alexander Gavrilov 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
Petr Mrázek a45fc82743 First pass at windowing, track df2mc, stonesense 2012-03-05 01:34:04 +01:00
Warmist 69e1da184c Merge branch 'master' of git://github.com/peterix/dfhack 2012-03-04 14:47:09 +02:00
Warmist e8788d8872 Lots of work done with xml parsing. 2012-03-04 14:45:15 +02:00
Petr Mrázek 99abd4102d Merge https://github.com/quietust/dfhack 2012-03-04 11:58:37 +01:00
Petr Mrázek 1821dd6201 Merge https://github.com/warmist/dfhack 2012-03-04 11:57:44 +01:00
Petr Mrázek d33e9a9770 Sort layer materials in prospector by depth. 2012-03-03 23:18:12 +01:00
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