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
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