Commit Graph

1113 Commits (6b7594dbd7abf93f2ecd25aea428a844abe587ed)

Author SHA1 Message Date
jj f80ca239d0 ruby: allow coords arguments to *_find, add building_find 2012-07-04 18:34:41 +02:00
jj 7c4f60df1d ruby: extend item_find to work on constructed coffers 2012-07-04 17:48:44 +02:00
jj 15cfc1d00b ruby: handle constructed beds in item_find in LookAround mode 2012-07-04 17:24:46 +02:00
jj edf0a9cb3d ruby: add decode_mat method for mat_type/mat_index 2012-07-04 17:24:03 +02:00
jj cb17bde8f4 ruby: refix codegen for refers-to without key-field, add translate_name 2012-07-04 15:18:36 +02:00
jj 877b879e57 ruby: item_find handle v/i unit inventory 2012-07-03 23:57:15 +02:00
jj 2e42e31754 ruby: add curview, fix item_find/unit_find wrt gview mode, fix refers-to to use binsearch 2012-07-03 19:51:52 +02:00
jj 501fd43dda ruby: fix handling of <pointer to unknown data struct> 2012-07-03 18:40:10 +02:00
jj a7a25b80a0 ruby: use the color_ostream argument from dfhack to output to dfhack-run 2012-07-03 16:13:15 +02:00
jj 0bdff401ca ruby: fix codegen align int64_t on windows 2012-07-03 15:24:35 +02:00
jj b9425474a1 ruby: fix codegen for darwin 2012-07-02 21:57:53 +02:00
Timothy Collett c24333515b Merge branch 'master' of https://github.com/jjyg/dfhack
Conflicts:
	library/Core.cpp

Starting to merge in Ruby stuffs
2012-07-02 11:07:30 -04:00
Timothy Collett 421e5fd82c Swap order of includes to work around silly compiler/assembler bug on OS X 2012-07-02 11:02:48 -04:00
jj 554683929f ruby: allow explicit target-os override in codegen 2012-07-01 14:20:55 +02:00
Alexander Gavrilov bd5aea994b Merge remote-tracking branch 'q-github/master' 2012-06-30 15:51:49 +04:00
jj 31a5495031 ruby: osx support (maybe) 2012-06-29 17:51:26 +02:00
jj 592c0a41ac ruby: remove useless raise in unit_find 2012-06-29 11:29:36 +02:00
jj 56ff129ee0 ruby: fix enum + base-type 2012-06-29 11:25:41 +02:00
Quietust f0d4d799d8 Don't index world_data->region_map beyond its bounds 2012-06-27 16:38:39 -05:00
jj 24aa3827c1 ruby: generate accessors for refers-to and vector of ref-target 2012-06-27 14:52:34 +02:00
Warmist 85f9d35f6f Temporary fix for memory accessor. 2012-06-25 22:26:08 +03:00
Warmist 4e4e375122 Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-06-25 22:23:37 +03:00
Warmist 1c013486d5 Removed non-working onfunction. 2012-06-25 22:22:20 +03:00
jj c2c29af959 ruby: fix deadlock on df exit due to BEGIN_UNLOAD + Core.Suspend() 2012-06-25 19:16:35 +02:00
jj 412e8608d8 ruby: add method for basic xml ref-target support, tweak scripts/slayrace 2012-06-25 19:05:50 +02:00
jj 17d06b969b ruby: move all ruby invocations inside a CoreSuspend lock, remove ruby suspend method 2012-06-25 17:06:37 +02:00
jj 8fb139a2f4 ruby: document mutex use, load ruby-autogen in the background 2012-06-25 01:45:50 +02:00
jj d1762e3cb8 ruby: add growcrops script, add doc for methods in README 2012-06-24 21:44:40 +02:00
jj 552da8417e ruby: handle .rb files in df/hack/scripts/ 2012-06-24 20:24:46 +02:00
jj 3f4d2e4792 ruby: split ruby.rb in modules 2012-06-24 17:30:26 +02:00
jj 4c2d4d4b86 ruby: clean stuff up, install ruby modules in df/hack/ruby/ 2012-06-24 16:09:31 +02:00
jj ad1ba9bf6b ruby: try msvc workaround for __thiscall 2012-06-24 02:59:56 +02:00
Quietust 1327b4954a Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-06-18 10:04:45 -05:00
Alexander Gavrilov db91850464 Sync to the change in gamemode/gametype globals. 2012-06-16 14:42:56 +04:00
jj 0bdae68294 ruby: fix codegen enum base-types 2012-06-15 21:02:04 +02:00
Warmist 93662034fe Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-06-15 13:08:46 +03:00
jj cfdf941c52 ruby: fix windows build warnings/load ruby.rb 2012-06-14 22:35:59 +02:00
jj 6bd67cc055 ruby: try to fix msvc build (use fastcall for thiscall fptr) 2012-06-14 14:25:16 +02:00
Petr Mrázek 2781723f7b Linux build works again. 2012-06-14 02:25:15 +02:00
Petr Mrázek 5f33ebde41 Merge https://github.com/Rinin/dfhack 2012-06-14 00:01:38 +02:00
Petr Mrázek 52f9fe4a6a Merge https://github.com/danaris/dfhack
Conflicts:
	depends/clsocket
2012-06-14 00:00:36 +02:00
jj 0285448367 ruby: fix download url, cmake doesnt handle HTTP 301 2012-06-13 00:20:52 +02:00
jj 3c1cb24d9f ruby: download lib from github as tgz, switch to ruby18, simply log to stderr.log if cannot load libruby 2012-06-12 18:51:33 +02:00
jj 95606ee3dc Merge branch 'master' of git://github.com/angavrilov/dfhack 2012-06-11 16:00:00 +02:00
jj c0e7295f22 ruby: fix cmake to rebuild ruby-autogen.rb only when necessary 2012-06-10 23:42:58 +02:00
jj 7ee8d79014 ruby: download libruby with cmake 2012-06-10 02:06:22 +02:00
jj bc734619b4 ruby: use ruby1.9.1 on linux 2012-06-10 01:45:30 +02:00
jj 2aace670ea ruby: dlopen libruby -- currently segfaults with rb1.9 ... 2012-06-02 23:44:52 +02:00
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