95606ee3dc
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-06-11 16:00:00 +02:00
c0e7295f22
ruby: fix cmake to rebuild ruby-autogen.rb only when necessary
2012-06-10 23:42:58 +02:00
7ee8d79014
ruby: download libruby with cmake
2012-06-10 02:06:22 +02:00
bc734619b4
ruby: use ruby1.9.1 on linux
2012-06-10 01:45:30 +02:00
2aace670ea
ruby: dlopen libruby -- currently segfaults with rb1.9 ...
2012-06-02 23:44:52 +02:00
e143c312bf
Sync with df-structures changes
2012-05-31 19:13:11 -05:00
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
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
bcb698a5b4
ruby: have codegen compute struct offsets directly
2012-05-29 16:10:33 +02:00
e72bf1ac9a
Sync to changes in df-structures.
2012-05-26 14:49:27 +04:00
8644ea4dc0
Merge remote-tracking branch 'q-github/master'
2012-05-26 14:41:36 +04:00
800cbca578
Some improvements to showmood - show relevant skill, cleanup messages
2012-05-25 21:31:47 -05:00
44c3afc306
Merge git://github.com/quietust/dfhack
...
Gotta get the changes that prevent DFHack from crashing.
2012-05-24 15:39:11 -04:00
24d221052b
Initial changes to get dfhack building on the Mac
2012-05-24 11:31:20 -04:00
ae41ddc04a
Don't crash if world is undefined
2012-05-23 13:43:41 -05:00
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
705b60ca27
Fixed BrewDrink products counting
2012-05-22 19:22:36 +04:00
65349039f0
Fix workflow bug: properly deduce the output material of BrewDrink jobs.
2012-05-22 17:50:48 +04:00
81022451c2
Support sorting items in stocks, and correct unit sorting in joblist.
2012-05-21 22:29:03 +04:00
8ef1423ee7
Merge https://github.com/angavrilov/dfhack
2012-05-20 23:01:44 +02:00
8ff4f1a78e
Disable ruby plugin by default.
2012-05-20 22:58:02 +02:00
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
489f22e550
Merge branch 'ruby' of https://github.com/jjyg/dfhack
2012-05-20 17:37:13 +02:00
3fa155e8e6
Merge https://github.com/angavrilov/dfhack
2012-05-20 17:33:09 +02:00
d28d240dbd
Merge remote-tracking branch 'kmartin/master'
2012-05-20 11:03:41 +04:00
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
b8ce3b45e1
Merge https://github.com/jaxad0127/dfhack
2012-05-19 18:37:02 +02:00
d0de575a2b
Merge https://github.com/jjyg/dfhack
2012-05-19 18:27:57 +02:00
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
b851ee2d22
Merge branch 'master' of git://github.com/peterix/dfhack
2012-05-19 12:53:23 +02:00
e2f39368b1
Sync submodules
2012-05-18 17:43:22 +02:00
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
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
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
689cf3ee51
Added ForceEquip plugin to project
...
Signed-off-by: playfordh <harlanplayford@gmail.com>
2012-05-15 06:03:29 -04:00
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
e078c75737
Track submodules
2012-05-14 13:44:03 -05:00
86dc2d9855
Merge remote-tracking branch 'angavrilov/master'
...
Conflicts:
library/xml
2012-05-12 19:49:27 -05:00
bd2b55c490
Merge remote-tracking branch 'upstream/master'
2012-05-12 19:43:02 -05:00
2629db5ed1
ruby: add building creation code
2012-05-13 01:40:44 +02:00
ea6e207290
Merge upstream
2012-05-12 23:52:13 +02:00
3da787c5c9
Merge upstream
2012-05-12 23:51:49 +02:00
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
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
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
af3e389093
Update submodules.
2012-05-12 18:50:22 +04:00
92f069e209
Brush output lists numbers, update xml.
2012-05-11 07:00:18 +02:00
f3ca3addbf
Merge remote-tracking branch 'upstream/master'
2012-05-10 22:06:43 -06:00
dfe86f9bd7
ruby: interpret types in vmethod signatures
2012-05-11 01:34:03 +02:00
607cd9c8f2
ruby: tweak enums
2012-05-10 23:41:50 +02:00
d30573a0e0
probe: fix gcc warning
2012-05-10 22:57:11 +02:00
987cf697db
Merge upstream
2012-05-09 15:44:32 +02:00
dce7f17fe7
Merge remote-tracking branch 'upstream/master'
2012-05-08 07:32:35 -06:00
5bd90e28b8
Add a missing return in tiletypes
2012-05-07 19:30:33 -06:00
833bf518d9
Fix some issues
2012-05-07 18:31:28 -06:00
7ee4c584b9
ruby: tweak enums, pointerary
2012-05-06 22:42:06 +02:00
bfb26f1c1f
ruby: deconstructbld
2012-05-06 01:02:21 +02:00
96a62a8865
ruby: fix buildbed sample
2012-05-06 00:13:53 +02:00
f18aa9d947
ruby: add link_job
2012-05-05 23:56:26 +02:00
e2a978a4fa
ruby: avoid infinite recursion in inspect
2012-05-05 22:43:12 +02:00
e3440126a3
Fix missing switch case warnings.
2012-05-05 19:36:22 +04:00
4e084d0df7
Merge remote-tracking branch 'rh73/master'
2012-05-05 19:28:19 +04:00
1b5ce7b717
Merge remote-tracking branch 'ab9rf/master'
2012-05-05 19:26:56 +04:00
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
138461634e
ruby: fix vtable for linux destructor
2012-05-03 19:19:58 +02:00
ba1e3c4b23
ruby: vmethod call
2012-05-03 18:49:12 +02:00
5afe2ca002
Update dfhack for specific_ref.
2012-05-03 11:47:04 +04:00
8952eabd62
ruby: typo
2012-05-03 03:33:50 +02:00
5fdeac9913
ruby: fix StaticArray#inspect with indexenum, allow df.cursor = [x, y, z]
2012-05-03 02:52:53 +02:00
6903f3877f
Devel plugin nestboxes scans all nestboxes for unhatchable eggs and optionally dumps them.
2012-05-01 10:58:12 -05:00
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
e7c55ab6e1
Also exclude trader from hauling when requested at depot.
2012-04-30 09:01:48 -05:00
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
a56f1549a9
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-04-28 22:21:57 +03:00
519ea08e8f
Typo fix
2012-04-28 22:21:35 +03:00
3d277823eb
Misc stuff needed for unreleased unfunctional stuff
2012-04-28 22:20:49 +03:00
ec8b090abe
ruby: add plugins/buildbed.rb (segfaults)
2012-04-27 18:50:27 +02:00
a7afe04f3b
ruby: name nested compounds, to allow cpp_new etc
2012-04-27 17:59:54 +02:00
bc218db596
ruby: more minor tweaks
2012-04-27 17:46:51 +02:00
3446fd024e
ruby: tweak inspect
2012-04-27 17:38:31 +02:00
9bceb7a443
ruby: typo in enumerable
2012-04-27 17:31:39 +02:00
6800f459f5
ruby: fix bitfield looking for enum value
2012-04-27 17:24:15 +02:00
fcfd7062eb
ruby: tweak inspect, autodereference pointers
2012-04-27 17:11:01 +02:00
22628fe9bb
codegen: all class-type have a vtable
2012-04-27 14:13:44 +02:00
551df9bb73
ruby: use binsearch in find_unit/find_item
2012-04-27 03:07:03 +02:00
2cc5333157
ruby: cleanup codegen enum
2012-04-27 03:02:37 +02:00
51ecd15fa8
ruby: use symbols for enums everywhere
2012-04-26 20:55:52 +02:00
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
ba7d4f8edd
ruby: extract additional info for enums
2012-04-26 20:03:56 +02:00
53e0ba8b8d
Actually write the noble penalty to the dwarf_info structure....
2012-04-26 12:54:10 -05:00
2ee1887870
ruby: add plugins/unit exemple
2012-04-26 19:38:15 +02:00
461c7e20cd
ruby: add vector#binsearch
2012-04-26 19:37:58 +02:00
02e43428ee
Sync to changes in the data structure definitions.
2012-04-26 12:36:29 -05:00
b4a8bcd8d0
Refactor MapCache: make it parse everything that is known re tiles & mats.
...
Conflicts:
library/xml
2012-04-26 12:21:59 -05:00
82a0e52a3e
Add api to check the walkable cache, and update flow_forbid in liquids.
2012-04-26 18:51:39 +04:00
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
9b7fbcc477
ruby: fix warning in codegen with initvalue
2012-04-26 15:37:10 +02:00
03925c923a
ruby: fix new c++ obj initialization, use xml init-value
2012-04-26 14:16:47 +02:00
16ee049664
Split off the burrows api from Maps and Units.
2012-04-26 12:56:28 +04:00
6ab270d129
Retrieve unit noble position info, and use it in getProfessionName.
2012-04-26 12:03:56 +04:00
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
bd2e6e74de
ruby: add manual c++ object allocator
2012-04-25 19:22:04 +02:00
b0acad6d59
ruby: use index-enum xml attr, fix bitfield[i] = 0
2012-04-25 17:18:24 +02:00
23a0b17ff3
Make liquids and tiletypes force rebuild of pathfinding data.
2012-04-25 18:38:43 +04:00
1cd802d426
Implement unit sorting for the pen zone assignment interface.
2012-04-25 18:28:00 +04:00
d1ea97c272
ruby: README
2012-04-25 01:20:35 +02:00
bf64c3e23c
ruby/plugin: tweak plants, add growcrops
2012-04-24 19:08:14 +02:00
7a71204b82
ruby: guard against undefined globals, fix inspect for inherited classes
2012-04-24 19:07:54 +02:00
eca17fff53
ruby: add sample plugin (cuttrees, growtrees)
2012-04-24 00:57:07 +02:00
c1baebd083
ruby: rename find_map_block to map_block_at, add other helper methods
2012-04-24 00:47:10 +02:00
8a05db7a1b
ruby: add map block iterators, fix FlagArray.length
2012-04-23 21:12:24 +02:00
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
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
e06c80f690
Fix minor ostream munging glitch in rprobe.
2012-04-22 23:36:13 -05:00
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
045b7b6a20
Merge branch 'master' of git://github.com/ab9rf/dfhack
2012-04-22 20:26:12 +02:00
760bc8b09f
regrass: ignore furrowed tiles (dirt roads)
2012-04-22 20:25:10 +02:00
125cd6622a
Support sorting units in many more ui contexts.
2012-04-22 19:22:00 +04:00
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
af12e83ac4
Merge branch 'master' of git://github.com/ab9rf/dfhack
2012-04-22 15:25:22 +02:00
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
6fc17b3e1f
ruby: clean helper with offsetof
2012-04-21 21:20:51 +02:00
c104f822a4
Move stripcaged to master branch, works fine.
2012-04-21 12:53:46 -05:00
567b3e2a52
Fix range on tiletypes and make it saner for both plugins.
2012-04-21 11:26:40 -06:00
9317143909
ruby: officially dont support stl::deque, add class sizeof
2012-04-21 15:04:52 +02:00
4af051bab3
Add a few more unit orderings, and a way to reverse direction.
2012-04-21 16:53:17 +04:00
3282ac3db2
Add a hotkey command that sorts units in lists using lua comparators.
2012-04-21 15:43:52 +04:00
709536c6c3
Merge branch 'master' of git://github.com/ab9rf/dfhack
2012-04-21 11:53:19 +02:00
a282c9dede
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-21 11:52:25 +02:00
2d19514fbc
probe: minor change
2012-04-21 11:52:03 +02:00
adbd351462
Rename units.other[0] to units.active.
2012-04-21 12:46:55 +04:00
ad73b8c737
Add "tamable" for animals that can be tamed (PET or PET_EXOTIC in raws)
2012-04-20 14:38:50 -05:00
e0bb5bf53b
Add "naked" (has no inventory) predicate to zone (useful for mass pitting)
2012-04-20 14:22:20 -05:00
826e0b7dcf
ruby: iterate in LinkedList
2012-04-20 20:43:18 +02:00
417356c3cb
ruby: add df-linked-list support (also, xml could be simplified)
2012-04-20 18:20:24 +02:00
f57d63ed95
ruby: df_flagarray support
2012-04-20 17:57:41 +02:00
66891fd23c
ruby: tweak onupdate, fix some inspects, add inverse ENUM
2012-04-20 17:33:48 +02:00
fb2dcf55ca
ruby: fix DfArray, add #inspect, fix ruby.rb
2012-04-20 15:30:15 +02:00
0a6982f404
Enable warnings correctly on linux and fix a lot of them.
2012-04-20 13:30:37 +04:00
52138d8998
Improve the range function of tiletypes a bit and add the functionality to liquids.
2012-04-19 21:13:07 -06:00
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
0952b76173
ruby: add df_array, pointer_ary, move generated classes in DFHack
2012-04-20 01:29:52 +02:00
0b32d374db
Implement SOIL/STONE substitution logic, and add compat in mapexport.
2012-04-19 23:02:30 +04:00
a450e9ddeb
ruby: fix vectors, add bitvector
2012-04-19 19:35:55 +02:00
4b87f1bcac
Refactor MapCache: make it parse everything that is known re tiles & mats.
2012-04-19 19:17:07 +04:00
f655a0986d
Sync to changes in the data structure definitions.
2012-04-19 11:03:29 +04:00
0e10a8edff
Merge branch 'master' of git://github.com/peterix/dfhack
2012-04-18 18:50:48 +02:00
3ad3d1af46
ruby: use rtti info to cast Item/etc subclasses
2012-04-18 18:46:33 +02:00
b7b27ebb9e
Merge remote-tracking branch 'upstream/master'
2012-04-18 11:35:32 -05:00
2dc3aa1b89
danger of rotting)
2012-04-18 11:33:17 -05:00
jj
Quietust
Alexander Gavrilov
Timothy Collett
Rinin
Petr Mrázek
Kelly Martin
playfordh
Jared Adams
Warmist
Robert Heinrich