jj
1b9d11090f
ruby: ANY_FREE/IN_PLAY
2012-10-25 13:44:01 +02:00
Alexander Gavrilov
1f994295b8
Consider assigned vehicles in use, and tweak text color rendering.
2012-10-25 13:20:41 +04:00
Alexander Gavrilov
79d2cb1a5c
Remove the C++ version of the job output deduction code and switch to lua.
2012-10-25 12:44:23 +04:00
Alexander Gavrilov
8eebfa007c
Tweak the workflow gui script to make the UI operate smoother.
2012-10-25 12:15:18 +04:00
Alexander Gavrilov
a7f1ceb75d
Link lua to workflow.
2012-10-24 23:01:31 +04:00
Alexander Gavrilov
59ec9b304e
Implement adding workflow constraints from gui/workflow.
2012-10-24 21:49:30 +04:00
Alexander Gavrilov
616c57257d
Support changing the constraint ranges from the workflow gui script.
...
TODO: implement creating completely new constraints.
2012-10-24 19:25:06 +04:00
Alexander Gavrilov
cd852e2240
Fix one more place that was using ANY_FREE.
2012-10-24 17:51:47 +04:00
Alexander Gavrilov
7b67df4b4e
Merge remote-tracking branch 'q-github/master'
2012-10-24 16:49:12 +04:00
Alexander Gavrilov
09f8e8e419
Start working on gui for workflow.
2012-10-23 21:42:03 +04:00
Quietust
27c7dfde4f
ANY_FREE -> IN_PLAY, to match terminology used in DF's error messages
2012-10-23 12:14:21 -05:00
Anuradha Dissanayake
94898a73fb
Add Search plugin comments
2012-10-23 21:20:51 +13:00
jj
cfbdf47f6e
follow rename Carried->Hauled in df-structures unit inventory mode
2012-10-22 19:37:12 +02:00
Anuradha Dissanayake
2fcceaa65e
Set priority over manipulator plugin
...
Include animal type is search
2012-10-22 21:44:02 +13:00
Anuradha Dissanayake
c433a8eeff
Better handling of Trade screen. Tracks marked items and handles re-orders is sort plugin is used to sort filtered list.
2012-10-22 19:54:36 +13:00
Anuradha Dissanayake
f501ae0748
Bug fix on unit sort
2012-10-22 01:09:10 +13:00
Anuradha Dissanayake
bf01ecd206
Added Trade screen
2012-10-22 00:48:27 +13:00
Warmist
a3f6e9e305
Small error fix
2012-10-21 13:46:12 +03:00
Warmist
86ec66c0fb
More work on dfusion. Embark anywhere script separated.
2012-10-21 13:42:55 +03:00
Anuradha Dissanayake
c5b38a24eb
Refactoring to use templates
2012-10-21 20:57:03 +13:00
Alexander Gavrilov
67674a7676
Merge remote-tracking branch 'jjyg/master'
2012-10-21 11:12:32 +04:00
jj
1f7a01d685
follow rename unit.military.squad_index to squad_id in df-structures
2012-10-20 22:35:39 +02:00
Anuradha Dissanayake
fd60db44ab
Search plugin, early work. Unit and stocks screen.
2012-10-21 00:49:46 +13:00
Alexander Gavrilov
687dc7105f
Merge remote-tracking branch 'kmartin/master'
2012-10-20 15:39:20 +04:00
Anuradha Dissanayake
6a54878a6b
Fix autobutcher resume
2012-10-20 01:38:08 +13:00
Warmist
da92fb9a1c
Start of dfusion module. Fixed small error in memscan.lua and start of custom embark command.
2012-10-17 21:43:44 +03:00
Quietust
5f4f540bfa
Fix "fastdwarf" command to print syntax where appropriate, silence warning
2012-10-17 07:57:14 -05:00
jj
ffe70e9ee7
ruby: unregister onupdate callback on exception
2012-10-17 14:40:28 +02:00
Kelly Martin
0003fe0b2a
Merge remote-tracking branch 'jjyg/master'
2012-10-12 20:33:07 -05:00
jj
c089534f73
ruby: fix assigning value to pointer to number
2012-10-12 13:33:58 +02:00
jj
1f88c0eeed
ruby: codegen: avoid bad vector_reftg accessor
2012-10-12 11:42:42 +02:00
jj
0547ee7f83
ruby: add magic "nolock " prefix to run ruby without Suspending main df
2012-10-12 11:12:31 +02:00
ab9rf
12eeb9e5c0
Correct wrong variable use in start_autonestbox.
2012-10-12 00:38:45 -05:00
jj
424c37c0ea
ruby: fix codegen to handle composite vtables
2012-10-11 17:51:49 +02:00
jj
9148079745
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-10-10 19:47:01 +02:00
jj
46a24a83fb
ruby: fix item_find(:selected) in item details screen
2012-10-10 18:01:57 +02:00
Alexander Gavrilov
41de37a5c1
Add a special workshop for add spatter reactions into example raws.
2012-10-10 18:29:59 +04:00
Alexander Gavrilov
7c969f774f
Split the liquipowder fix-dimensions hook into separate liquid and powder.
...
The item_liquipowder vtable is completely optimized out by MSVC.
2012-10-10 18:22:01 +04:00
jj
5cf42fd6f8
ruby: add Matinfo#===
2012-10-10 14:57:45 +02:00
Quietust
ab90e3eefe
Manipulator - take false identities into account
2012-10-07 17:35:41 -05:00
Warmist
49476818c4
Dfusion rebuild start (lua script side plugins)
2012-10-07 20:45:14 +03:00
Warmist
923ea3f4b0
Reactionhooks more usefull and gm-editor minor tweaks (e.g. search in containers)
2012-10-07 20:44:18 +03:00
Alexander Gavrilov
459c69046b
Dissolve the World module class into a namespace.
...
It made accessing persistent data way too cumbersome.
2012-10-06 13:46:20 +04:00
Alexander Gavrilov
696cc4a911
Stop autobutcher and autonestbox crashing if started without world.
2012-10-06 13:07:11 +04:00
Alexander Gavrilov
6fefd09072
Fix re-enabling autobutcher after being disabled.
2012-10-06 12:51:34 +04:00
Alexander Gavrilov
5396a67465
Some tweaking and edited NEWS.
2012-10-06 12:40:46 +04:00
jj
cbbb164dad
ruby: add MapTile distance_to and spiral_search
2012-10-05 20:44:29 +02:00
Quietust
ddcc2ee90d
Should use "break" in this construct, not "continue"
2012-10-04 20:20:35 -05:00
Quietust
6b3d85eb0f
Don't make teledwarf skip everything after it if there's a problem
2012-10-04 20:17:33 -05:00
Quietust
faa131942c
Partial rewrite of 'fastdwarf' plugin:
...
* add "fastdwarf 2" to use DF builtin "turbo speed" debug setting
* use Units::isCitizen() instead of race/civ check
* only scan active units, not all of them
* do both fastdwarf and teledwarf in the same loop
* teledwarf: don't use MapCache - it's faster to do it directly
* teledwarf: don't clear both occupancy flags - check unit 'prone' flag
* teledwarf: set proper unit occupancy flag at destination tile
* teledwarf: if destination tile has standing unit, make dwarf lie down
* cleanup 'fastdwarf' command
* improve help text
2012-10-04 20:14:50 -05:00
Alexander Gavrilov
9f687f64a4
Fix build.
2012-10-03 12:58:05 +04:00
Quietust
7962f24cce
Display actual key bindings for Manipulator
2012-10-02 10:20:54 -05:00
jj
150704f1af
ruby: raise when using unknown symbols in viewscreen.feed
2012-10-01 16:05:07 +02:00
jj
fbc2d85609
ruby: rename building_isitemfree to item_isfree, add trader flag check
2012-10-01 11:14:00 +02:00
jj
4de245d691
ruby: install generated autogen after copying *.rb
2012-09-30 17:08:03 +02:00
jj
6fd002382f
ruby: fix cmake dependency on codegen.out.xml
2012-09-29 12:13:04 +02:00
Alexander Gavrilov
7a74088287
Make backspace seek to top left corner in manipulator.
2012-09-29 13:01:11 +04:00
Petr Mrázek
1bac22884e
xMerge https://github.com/jjyg/dfhack
2012-09-29 01:58:29 +02:00
jj
12f5e6028c
manipulator: avoid NULL deref with unassigned job in unit list
2012-09-29 01:38:32 +02:00
Petr Mrázek
4258d1eb83
Merge branch 'experimental' of https://github.com/expwnent/dfhack
2012-09-29 01:31:12 +02:00
expwnent
0e124bf62b
Merge branch 'teledwarf' into experimental
2012-09-28 19:17:56 -04:00
expwnent
d41c4849f9
Fixed unit_grounded in teleporting dwarf tile.
2012-09-28 19:17:12 -04:00
expwnent
4b99d096da
Merge branch 'teledwarf' into experimental
2012-09-28 19:07:29 -04:00
expwnent
1bde32fa5b
Fixed a tile occupancy problem with teleporting dwarves.
2012-09-28 19:06:22 -04:00
jj
44a74ddc38
ruby: remove unused var
2012-09-28 22:58:26 +02:00
expwnent
ce7e21f869
Merge branches 'digAll', 'misery' and 'teledwarf' into experimental
2012-09-28 16:44:08 -04:00
expwnent
79ac1a81b9
It was backwards when calling fastdwarf with just one argument. Also made it print the current status of fastdwarf when no arguments are given.
2012-09-28 16:36:37 -04:00
Petr Mrázek
53c6ee4673
Track structures and stonesense
2012-09-28 21:57:12 +02:00
jj
687657f2da
manipulator: show full group when navigating labor groups
2012-09-28 19:48:28 +02:00
jj
4a495c2c7f
manipulator: make cursor_down_z go to beginning of next group
2012-09-28 19:20:10 +02:00
jj
ca0097b910
manipulator: better screen width usage
2012-09-28 19:20:10 +02:00
jj
c4f26d0aa8
manipulator: make up/down keys wrap around
2012-09-28 19:20:04 +02:00
Alexander Gavrilov
783b218eec
Try a different color scheme when highlighting squad members in tweak.
2012-09-28 18:50:01 +04:00
Alexander Gavrilov
ba763b773d
New tweaks for the military assign to position screen.
2012-09-28 18:01:17 +04:00
Alexander Gavrilov
bd7cd690aa
Implement the common suggestion of Shift-Enter in trade screens.
2012-09-28 13:32:41 +04:00
Alexander Gavrilov
164c61b638
Forbid stuff from bins in siege-engine, if forbid ammo standing order set.
2012-09-27 10:43:42 +04:00
jj
7cc29250f8
fix for updated viewlist_petst
2012-09-26 18:22:07 +02:00
jj
d975ce5135
ruby: add onstatechange_register_once
2012-09-26 15:08:54 +02:00
Warmist
ddc83a0a72
Another dfusion nuking (not much left :) )
2012-09-25 11:30:38 +03:00
Warmist
0bee8c360e
Reaction hooks experimentation.
2012-09-25 10:25:47 +03:00
Warmist
bd2f3a9998
Moved lua out of dfusion.
...
Now lua is a script. supports --file (or -f) flag, usage: lua <command> or lua --file <filename> or just "lua" for interactive interpreter.
2012-09-25 00:24:37 +03:00
jj
f628c3732a
ruby: avoid smoothing grass/trees
2012-09-24 19:19:34 +02:00
jj
a622ee52e9
ruby: fix building_alloc Trap, and init Floodgates as closed
2012-09-24 19:11:42 +02:00
jj
a2bb322344
ruby: item_find now works in z/stocks
2012-09-24 15:40:35 +02:00
jj
962a057ffa
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-23 23:31:05 +02:00
jj
aefedb9887
ruby: MapTile#offset, tweak #dig to check for existing jobs
2012-09-23 23:26:57 +02:00
Alexander Gavrilov
6385128c28
Sort by units.active (arrival), and seek to top/bottom in manipulator.
2012-09-23 16:41:14 +04:00
jj
f2199c2951
ruby: fix activity zone_num
2012-09-23 11:44:27 +02:00
jj
f7272e4a8f
ruby: use cursor as default map_tile_at arg
2012-09-23 10:58:31 +02:00
jj
ebd4b94c2d
ruby: add onupdate_register_once
2012-09-22 11:57:33 +02:00
Alexander Gavrilov
038d62367e
Implement explicit hook priority in vmethod interpose.
...
This resolves a getName order conflict between power-meter and rename.
2012-09-22 13:14:06 +04:00
jj
b115edcf68
ruby: return selected zone in building_find
2012-09-20 19:57:43 +02:00
Alexander Gavrilov
e2d6a14720
Make manipulator re-read names and professions if change is suspected.
...
Namely, if it either invoked View Unit itself, or was queried
(possibly by the rename plugin) via getSelectedUnit.
2012-09-20 12:27:03 +04:00
Alexander Gavrilov
1f7c10252e
Support renaming activity zones.
...
This one required hooking the dwarfmode render method.
2012-09-20 11:48:53 +04:00
Alexander Gavrilov
462bedb757
Fix the rename plugin and script to use the new getSelectedBuilding API.
2012-09-20 11:11:59 +04:00
Alexander Gavrilov
c39a337223
Add unit/item/job/building getter hook vmethods to dfhack_viewscreen.
2012-09-20 11:11:20 +04:00
Quietust
1fd0654d63
Restore stonesense to the proper revision
2012-09-19 22:55:38 -05:00
jj
e154d5447b
ruby: fix building linking more
2012-09-20 01:33:10 +02:00
jj
2d5942d5d7
ruby: fix building linking
2012-09-20 00:33:22 +02:00
Warmist
bef9e9af7c
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-09-19 20:24:38 +03:00
jj
b6d9863172
ruby: allow Civzone constants in building_alloc
2012-09-19 19:19:58 +02:00
Alexander Gavrilov
a80f574be8
Only initialize siege engine in dwarf mode.
2012-09-19 19:52:57 +04:00
Alexander Gavrilov
b5ede66224
Switch some plugins to using world load/unload instead of map.
...
Otherwise they apply and remove hooks every time fast travel is used.
2012-09-19 19:46:54 +04:00
Quietust
19e1711a2f
Several Manipulator updates
...
* Add documentation to README, cleanup some docs for other plugins
* Preserve existing unit list order and cursor/scroll position
* Adjust mouse input handling, don't move cursor on left-click
2012-09-19 10:20:18 -05:00
jj
27fd3f5fc7
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-19 15:05:42 +02:00
jj
45c057b3d2
ruby: handle ptr-strings in df-structures
2012-09-19 14:25:14 +02:00
Alexander Gavrilov
65a382a2d7
Document some of the new stuff in the readme.
2012-09-19 15:55:08 +04:00
Warmist
a02a120e2d
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
...
Conflicts:
dfhack.init-example
library/xml
plugins/CMakeLists.txt
2012-09-18 23:46:16 +03:00
Quietust
69e8fcce91
Add mouse input to Manipulator, along with column labels
2012-09-18 13:57:06 -05:00
jj
b470abed90
ruby: misc tweaks
2012-09-18 18:13:22 +02:00
Alexander Gavrilov
a7998f71a2
Add a tweak workaround for the issue with container reactions in advmode.
2012-09-18 17:39:37 +04:00
Alexander Gavrilov
f2e7ee4756
Tweak the add spatter plugin.
2012-09-18 13:15:25 +04:00
Alexander Gavrilov
d70a79deb9
Follow changes in XML defs.
2012-09-18 13:11:11 +04:00
jj
57d01f0008
ruby: use ui.follow_item/unit in unit_find, show non-english names by default
2012-09-18 10:17:33 +02:00
jj
72141a3c9b
ruby: use implicit init-value -1 for ref-target/refers-to in codegen
2012-09-18 10:17:32 +02:00
jj
eacca723e0
ruby: fix building subtype/customtype init value
2012-09-18 10:17:32 +02:00
Alexander Gavrilov
36e44c682c
Add a plugin implementing 'add spatter to item' reactions.
2012-09-17 21:15:51 +04:00
Alexander Gavrilov
613063cef4
Add a tweak to fix subtractDimension of small amounts.
2012-09-17 17:19:24 +04:00
Alexander Gavrilov
82e870c8dd
Move siege engine out of devel.
2012-09-17 14:59:59 +04:00
Alexander Gavrilov
f2fde21b10
Implement a slightly more sensible aiming AI in siege engine.
2012-09-17 14:45:22 +04:00
Alexander Gavrilov
c1e20c6f05
Follow changes to structures.
2012-09-17 12:47:18 +04:00
Kelly Martin
58fda716e6
Explicit cast is required for MSVC.
2012-09-16 17:06:31 -05:00
Kelly Martin
847dadd3f5
Merge remote-tracking branch 'angavrilov/master'
2012-09-16 16:37:08 -05:00
Kelly Martin
38f920dd65
Merge remote-tracking branch 'q/master'
2012-09-16 16:36:51 -05:00
Warmist
b6d9a3c3ad
More useless stuff removed
2012-09-16 13:20:55 +03:00
Warmist
2f131178d8
Removed unused triggers folder
2012-09-15 18:05:53 +03:00
Warmist
4f9732bfda
Useless files removed, small bugfix
2012-09-15 15:44:15 +03:00
Alexander Gavrilov
000e3baf27
Implement skill-based miss probability in siege engine.
2012-09-14 20:57:03 +04:00
Alexander Gavrilov
811c096c0e
Vaporize liquids from barrels, and destroy bin contents in siege engine.
2012-09-14 20:22:49 +04:00
jj
5474ccacb6
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-14 14:30:25 +02:00
jj
b05905a0ba
ruby: basic stl::set<uint32> support, add Viewscreen.feed_keys
2012-09-14 13:55:22 +02:00
Alexander Gavrilov
d22591e240
Fix a file descriptor leak and a crash in linux getMemRanges.
2012-09-14 12:35:55 +04:00
Alexander Gavrilov
aaf5d181bd
Add yet one more performance-oriented tweak for temperature updates.
2012-09-14 12:14:36 +04:00
Quietust
c927623050
Rework handling of column positions, and insert a new "Happiness" column
2012-09-13 15:42:51 -05:00
Quietust
1325b70e41
Cleanup autolabor+cleanowned, fix depends/clsocket
2012-09-13 14:42:17 -05:00
Quietust
1d8c9a6a5f
Merge https://github.com/danaris/dfhack
2012-09-13 14:30:44 -05:00
Quietust
cae01250ff
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-09-13 14:08:26 -05:00
jj
a9ce19b826
ruby: add raw_rtti_classname to read real classname from RTTI info
2012-09-13 19:07:37 +02:00
Alexander Gavrilov
881fed41de
Support setting workshop profile for siege engines.
...
Since can't use built-in viewscreen, UI limited to skills only.
2012-09-13 20:20:56 +04:00
Alexander Gavrilov
5690a26439
On second thought, remove stockpile->engine links; keep only reverse.
...
Bi-directional links involve the risk of crashes if the plugin
is unloaded, and the engine subsequently deconstructed.
2012-09-13 17:49:41 +04:00
Quietust
ae6e0f617d
Make it clear that this is from DFHack, and properly name it Dwarf Manipulator
2012-09-13 08:27:28 -05:00
jj
19a150fb38
ruby: fix dig smooth overdigging
2012-09-12 20:59:37 +02:00
Quietust
c9d73cb6fb
Fix crash bug when using manipulator in Arena mode
2012-09-12 13:42:16 -05:00
Alexander Gavrilov
f06f9af6b8
Throw items from bins around in siege engine, like minecarts do.
2012-09-12 20:57:25 +04:00
Alexander Gavrilov
448d7e3633
Support linking siege engines to stockpiles.
...
Since they can't do that natively, the links object has to
be maintained in dfhack memory, and with dfhack persistence.
2012-09-12 12:15:12 +04:00
jj
cda17954c8
ruby: add MapTile.dig(:Smooth)
2012-09-12 01:07:19 +02:00
Alexander Gavrilov
b0938d7e0d
Allow specifying arbitrary items to use in catapults.
2012-09-11 22:46:17 +04:00
Alexander Gavrilov
3a075f4bc7
Trivial siege engine aiming at units, with logic in lua.
2012-09-11 19:17:24 +04:00
Timothy Collett
ccefd02ee3
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-10 11:56:23 -04:00
Timothy Collett
96abc903ab
Merge branch 'master' of http://github.com/peterix/dfhack
2012-09-10 11:54:56 -04:00