Alexander Gavrilov
|
1b5ce7b717
|
Merge remote-tracking branch 'ab9rf/master'
|
2012-05-05 19:26:56 +04: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
|
ad73b8c737
|
Add "tamable" for animals that can be tamed (PET or PET_EXOTIC in raws)
|
2012-04-20 14:38:50 -05:00 |
|
Kelly Martin
|
e0bb5bf53b
|
Add "naked" (has no inventory) predicate to zone (useful for mass pitting)
|
2012-04-20 14:22:20 -05: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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Kelly Martin
|
005658a9cd
|
Add noegglayer zone filter
|
2012-04-15 09:04:19 -05:00 |
Petr Mrázek
|
fa063e2936
|
Track structures, fix trivial problem in zone plugin
|
2012-04-15 00:35:59 +02:00 |
|
Robert Heinrich
|
9f95e67c75
|
tweak makeown: converts MERCHANT to TRADER (otherwise you can't assign jobs to kidnapped merchants.
zone: fixed a bug which could lead to units being assigned to more than one cage and/or accidentally marked for slaughter
|
2012-04-14 19:06:03 +02:00 |
|
Robert Heinrich
|
2100a95ad5
|
zone: fixed major derp (assign commands would accidentally free caged creatures). tweak: added cheat to kidnap caravan escorts (works fine even for other races, does NOT work for traders because they can't be assigned any labors for whatever reason)
|
2012-04-14 13:36:22 +02:00 |
|
Robert Heinrich
|
ae7ce9e5d7
|
zone: fixed assigning to pit/pond. regrass: look for grass events in the map block, increase amount of grass at map position instead of simply changing the tile type
|
2012-04-11 14:08:47 +02:00 |
|
Robert Heinrich
|
f8123c3b40
|
zone: can now assign to and from built cages. autobutcher: fixed initializing when getting SC_MAP_LOADED event while a map is currently running
|
2012-04-10 09:15:38 +02:00 |
|
Robert Heinrich
|
b2d976b06b
|
zone tool: added new filter 'nograzer'
|
2012-04-10 04:10:07 +02:00 |
|
Robert Heinrich
|
674337e3ae
|
added tweak clear-resident which fixes bugged migrants and makes them proper members of the fortress. added tweak clear-merchant which assimilates merchants who linger at the map edge into the fortress. updated readme.rst
|
2012-04-10 00:22:38 +02:00 |
|
Robert Heinrich
|
37f3056fdd
|
autobutcher: fixed behaviour of keywords 'all' and 'new'. (didn't work properly with watch, unwatch and forget)
|
2012-04-09 18:36:01 +02:00 |
|
Robert Heinrich
|
8ae774fbd5
|
fixed wrong description of the behaviour for using keyword 'all' in autobutcher (affects all races on the watchlist, not all races in your fort)
|
2012-04-09 16:02:03 +02:00 |
|
Robert Heinrich
|
afba284283
|
autobutcher: added a forgotten ';'
|
2012-04-09 15:35:25 +02:00 |
|
Robert Heinrich
|
a9ff1d0423
|
autonestbox and autobutcher store settings in the savegame. added command list_export to autobutcher which prints the current settings and watchlist in a batch file format (to allow importing settings to other savegames). updated readme.rst
|
2012-04-09 15:03:26 +02:00 |
|
Robert Heinrich
|
f609aa0db7
|
zone: can now search for merchants (to allow pitting them). autobutcher: ignore merchant animals, ignore war/hunting creatures, fixed autowatch, stop spamming the console if there is nothing to report. updated readme.rst
|
2012-04-08 12:51:03 +02:00 |
|
Kelly Martin
|
ad657c68a3
|
Leave merchant stuff alone, even if they're certainly dwarfs.
|
2012-04-08 01:07:29 -05:00 |
|
Kelly Martin
|
de960e65f5
|
Stealing animals from traders is bad.
|
2012-04-07 23:25:40 -05:00 |
|
Kelly Martin
|
2e6ee0ac84
|
Don't assign dead animals to pastures.
|
2012-04-07 20:36:29 -05:00 |
|
Kelly Martin
|
dac84080c0
|
Exclude grazing units from autonestbox to avoid starving da poor boids
|
2012-04-07 20:26:56 -05:00 |
|
Robert Heinrich
|
55e059c40f
|
autobutcher: added keywords 'all' and 'new' for handling the whole watchlist. added option 'autowatch' which will put all new tame animal races onto the watchlist using the current default settings
|
2012-04-07 11:15:49 +02:00 |
|
Robert Heinrich
|
e3fb922f53
|
fixed handling of units in cages who have an invalid map pos.
|
2012-04-07 06:47:32 +02:00 |
|
Robert Heinrich
|
c5fc8aab9f
|
autobutcher: now accepts list of races in one command
|
2012-04-07 05:05:42 +02:00 |
|
Robert Heinrich
|
eff5189acb
|
added autobutcher: watch lifestock, mark excess animals for slaughter. Not quite done yet (doesn't save config etc) but already works fine.
|
2012-04-07 02:31:10 +02:00 |
|
Robert Heinrich
|
577e333ac9
|
some cleanup in zone tool, added slaughter option, autonestbox is now an own command which can be set to run every X ticks
|
2012-04-05 20:32:44 +02:00 |
|
Robert Heinrich
|
511fceff0a
|
Merge branch 'master' of git://github.com/peterix/dfhack
|
2012-04-05 11:41:01 +02:00 |
|
Robert Heinrich
|
33ceee8310
|
zone tool: some cleanup, added 'slaughter' command
|
2012-04-05 11:40:27 +02:00 |
|
Petr Mrázek
|
330118ee27
|
Fix zone tool
|
2012-04-05 03:00:10 +02:00 |
|
Robert Heinrich
|
796bc18fb0
|
zone plugin: fixed bug when parsing options
|
2012-04-04 16:48:22 +02:00 |
|
Robert Heinrich
|
5ce0e7dbf2
|
zone tool: added lots of filters, added mass-assigning of nestboxes
|
2012-04-04 14:58:53 +02:00 |
|
Robert Heinrich
|
9cc2040a6b
|
minor fix in zone tool: ignore dead units
|
2012-04-02 16:58:12 +02:00 |
|
Robert Heinrich
|
772c6b1cbb
|
Added plugin 'zone'. Helps with assigning units to pens/pastures and pits.
|
2012-04-02 16:07:23 +02:00 |