Petr Mrázek
b1c5621123
Bump release to r2
2012-04-17 23:24:43 +02:00
Petr Mrázek
d825356878
Fix windows console bug
...
Line input cursor was going crazy when input reached right side of the screen
2012-04-17 23:23:45 +02:00
Petr Mrázek
c031349a62
Track structures
2012-04-17 21:48:18 +02:00
Petr Mrázek
e530707985
Merge https://github.com/angavrilov/dfhack
2012-04-17 21:48:04 +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
Alexander Gavrilov
378a1fb914
Support the '#' string as index for wrapper vector insert at end.
2012-04-17 12:15:45 +04:00
Alexander Gavrilov
3beb2ebf25
Export the onStateChange event to core lua context & add some docs.
2012-04-17 11:45:09 +04: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
Warmist
17d5b2de04
Multiline interpreter.
...
To test try writing for k,v in pairs(table) do <enter> print(k) <enter> end
Also prompt could be changed (couldn't think of anything better).
2012-04-16 18:46:20 +03: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
3b68faa1be
updated readme.rst
2012-04-16 17:14:02 +02:00
Warmist
cd51ddc272
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-04-16 17:42:49 +03:00
Alexander Gavrilov
ee7100216e
Fix lua interpreter bug: the C call counter is already unwound by yield.
...
Decrementing it causes underflow and subsequent spurious stack overflow.
2012-04-16 18:32:12 +04: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
Alexander Gavrilov
1e64a6a2f6
Make dfhack.lineedit automatically interact with RunCoreQueryLoop.
...
It still falls back to the original waiting mode if yield fails.
2012-04-16 18:05:42 +04:00
Alexander Gavrilov
9c25351281
Add a template to make using lua_pcallk a bit more convenient.
2012-04-16 18:01:21 +04:00
Alexander Gavrilov
3e4863bc80
Integrate coroutines with table-based error handling.
...
Properly attach stack traces to errors passing the resume boundary.
Replaces coroutine.resume and coroutine.wrap with appropriately
modified versions, and adds a Lua::SafeResume function for C++.
2012-04-16 14:45:04 +04: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
Alexander Gavrilov
48e4717dd2
Try working around some msvc problems.
2012-04-16 10:59:55 +04: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
6287ee59d8
updated readme.rst
2012-04-16 00:52:25 +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
Warmist
ea4c1e4928
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-04-15 20:56:49 +03: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
Warmist
35981e8146
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-04-15 18:17:00 +03:00
Warmist
92bc28bb81
Autobuild script update... Edit if you want different zip names.
2012-04-15 18:16:45 +03: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
98df7d99d4
fixed library/xml pointing to wrong commit (I hope)
2012-04-15 15:26:08 +02:00
Robert Heinrich
401461ed49
Merge branch 'master' of git://github.com/peterix/dfhack
...
Conflicts:
library/DataDefs.cpp
2012-04-15 12:36:47 +02:00
Robert Heinrich
cf0d45be78
merged stuff from peterix
2012-04-15 12:32:25 +02:00
Alexander Gavrilov
cb27a1d839
Fix typo in the 1MB constant.
2012-04-15 11:31:05 +04:00
Kelly Martin
e9542fb239
Merge remote-tracking branch 'upstream/master'
2012-04-14 20:38:16 -05:00
Petr Mrázek
c69af6ab9e
Fix missing lua linkage in burrows plugin.
2012-04-15 01:58:02 +02:00