7fd7d3d48c
mousequery: several usability improvements.
...
mousequery: show live overlay (in menu area) of what's on the tile under the mouse cursor.
2014-05-04 21:55:58 +12:00
de9140336f
autotrade: adds "(Un)mark All" options to both panes of trade screen.
2014-05-03 22:56:34 +12:00
5e52bb60f0
Update uicommon.h with new common display functions
2014-05-03 21:19:46 +12:00
a14f31fbfe
Show box select dimensions in Automaterial
2014-05-03 11:44:35 +12:00
415cdad489
Make using new for allocating DF objects with vtables a compile-time error.
...
When done from plugins, it doesn't correctly initialize the vtable
because of some weird things MSVC does, so the only safe way is to
use df::allocate<df::foo>(). For consistency, it is also enforced
for code in the main library. It reveals the issue in the digging
invaders plugin, first found by warmist.
This change is linked to a modification in df-structures codegen.
2014-04-30 21:28:02 +04:00
b74d0da872
Merge branch 'develop' of https://github.com/DFHack/dfhack
...
Conflicts:
library/xml
2014-04-26 09:23:21 +05:30
e4641c506f
Replace a std::string method not implemented until C++11 with a C++0x-valid substitute
2014-04-21 09:34:42 +04:00
5fb87c2ea9
Now accepts the new enable/disable commands.
2014-04-18 21:58:45 -06:00
63d256c1e9
Adjust siege engine targeting weights.
...
Stop shooting at leaving caravan guards for one.
2014-04-17 22:10:43 +04:00
c27c38e4c0
Remove tired or hungry siege operators from duty when at peace.
...
The threshold is set at the level when they start to blink - normally
they would continue on with the job until they get a thirsty/hungry
thought, but immediately run off to eat if they lose the job (thus
refusing to load the engine after firing it). The code checks for
active sieges and whether there is a free replacement unit.
2014-04-15 21:52:39 +04:00
fc9826389b
Account for meandering movement when predicting unit path in siege engine.
...
The movement is random, but there is an average slowdown coefficient.
2014-04-15 19:50:23 +04:00
55cea36c76
Use the new API to produce combat reports for aimed siege engine attacks.
...
This requires exposing the actual operator unit to lua code.
2014-04-15 19:50:23 +04:00
0a99bb0cae
Now works when enabled is true by default.
2014-04-13 15:23:37 -06:00
b9ed7a5cc2
Stockflow plugin v1.0
2014-04-13 15:19:03 -06:00
7aecffe0cd
Update structures and fix broken things.
2014-04-04 22:34:39 +04:00
eac126c884
ruby: use placement-new instead of hack
2014-04-01 15:12:52 +02:00
837da8ae98
Fix siege-engine to compile on Windows - don't have C++11, and pow() is picky about arg types
2014-03-25 13:30:45 -05:00
36b069e981
Merge remote-tracking branch 'warmist/dev-cmdprompt' into develop
2014-03-24 20:10:58 +04:00
a01939fce6
Sync structures.
2014-03-24 19:45:27 +04:00
827dd121d8
Make createitem default to the controlled unit in adventure mode.
2014-03-24 19:35:34 +04:00
8963a49414
Forbid the items shot by siege engines if the forbid ammo order is set.
...
This only applies when targeting the engine, so you could still make
cheaty infinite ammo training units by using stock aiming mode.
2014-03-24 16:05:12 +04:00
4cbab2b014
Small fix that got lost in rebase
2014-03-07 20:28:07 +02:00
50963c73fa
rendermax: added adv mode lights also more proc-expensive diffuse mode.
2014-03-07 20:08:48 +02:00
b5b01ea02b
rendermax: mainly organizing
...
added comments, non-enabled code for adaptive eyes,
2014-03-07 20:08:11 +02:00
372f861010
rendermax: fixed crashes (hopefully for real this time)
2014-03-07 20:08:10 +02:00
72259c8eba
Added creature lights and item lights.
2014-03-07 20:08:08 +02:00
830d9900fb
Fixed a bug that enabled rendermax even when it was supposed to be off.
2014-03-07 20:08:08 +02:00
a3d3c34671
Bug fixes, perf improvement, don't load until there is a world. (breaks arena mode)
2014-03-07 20:08:07 +02:00
c2db761a1b
Rendermax: made it use unordered_map instead of map.
2014-03-07 20:07:21 +02:00
5ad3a7570f
Fixed a lot of disable lights bugs
2014-03-07 20:07:21 +02:00
f34a4ce34e
Renamed lightCell to rgbf
2014-03-07 20:07:20 +02:00
ee1bad84fc
Threading rewrite.
2014-03-07 20:07:20 +02:00
b248eb3e52
Fixed broken buildings, also added floodgate functionality.
...
Merge branch 'master' of git://github.com/JapaMala/dfhack
2014-03-07 20:07:19 +02:00
0cf5eedc2a
Fixed potential error with building getting transparent on un-powering.
2014-03-07 20:07:17 +02:00
48f855c499
Added occlusionON|occlusionOFF commands
2014-03-07 20:06:50 +02:00
360b5d2e18
Fix for gems not getting right color.
2014-03-07 20:06:50 +02:00
28985167c9
Fixed bug with buildings and added gems to material definition.
2014-03-07 20:06:49 +02:00
b12fd5a4c5
Changed sun calculation direction.
2014-03-07 20:06:46 +02:00
d8b0b82122
Added antialiased lights. They kind of suck. So I disabled them.
2014-03-07 20:06:46 +02:00
b4091b5056
Added day colors and day speed parameters.
2014-03-07 20:06:45 +02:00
70880897f6
Added sun time manipulation, updated helpstring.
2014-03-07 20:06:45 +02:00
7c0a734c97
Added building size. Removed material flags (on by default)
2014-03-07 20:06:18 +02:00
70e1320e6f
removed something I had for testing.
2014-03-07 20:06:18 +02:00
740e3ebc51
Implemented building support.
2014-03-07 20:06:16 +02:00
3433eb15fb
fixed (?) ice and made dragon blood glow a little.
2014-03-07 20:06:16 +02:00
5b0cb86278
Made the lighting engine multithreaded.
2014-03-07 20:06:15 +02:00
354ec37046
MAXIMUM SPEED UPDATE!!!!!
2014-03-07 20:06:12 +02:00
048395a2cd
Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels).
2014-03-07 20:06:12 +02:00
13228855eb
added square light volume, and automatic light radius.
2014-03-07 20:05:52 +02:00
b015149ac1
Added cmake info for the config lua.
2014-03-07 20:05:51 +02:00
0551661db2
Added more advanced sun light calculation
2014-03-07 20:05:51 +02:00
dceec6c6c7
Plantfix, viewport height fix, and fov viewport fix.
2014-03-07 20:05:47 +02:00
4ccc95bc97
Major rewrite of opacity calculation.
2014-03-07 20:05:47 +02:00
74bed5529b
Made light plugin read configuration file (rendermax.lua)
2014-03-07 20:04:02 +02:00
20d4707b00
rendermax: lights off when sleeping
2014-03-07 20:03:59 +02:00
de8a76e37f
rendermax: sunlight travels down stairs
2014-03-07 20:03:59 +02:00
4d7a7425d0
Prelimenary work on advmode
2014-03-07 20:03:56 +02:00
4abff416d9
Some performance fixes and tweaks. Opaque blocks can now emit light.
2014-03-07 20:03:56 +02:00
9a8ee755f8
rendermax: basic daylight
2014-03-07 20:03:52 +02:00
2058a822a3
rendermax: make citizen glow
2014-03-07 20:03:17 +02:00
0a413e179e
Made the low water check actually use floats.
2014-03-07 20:03:17 +02:00
31de296f31
Added some fast checking for obstacles around lights, resulting in a huge speedup outside.
2014-03-07 20:03:16 +02:00
f173810e2a
Fixed skylight
2014-03-07 20:03:14 +02:00
2195c4fe28
Small fixes
2014-03-07 20:03:12 +02:00
f745de3aff
Added transparency to ice walls
2014-03-07 20:03:10 +02:00
83265efaa8
fix for map_block lights, fix for gem window color, dimmed the plant lights.
2014-03-07 20:03:06 +02:00
ee7902c529
Fixed unload/disable crash. Added glowing plants.
2014-03-07 20:02:08 +02:00
471eb9c02d
Torches for statues, candles on the tables.
2014-03-07 20:01:19 +02:00
1c4b5c2d38
Update water a bit.
2014-03-07 20:01:18 +02:00
b3ba3b9107
Fixed non-circular light. Do not show hidden tiles.
2014-03-07 20:01:10 +02:00
f92e4c91b8
Performance improvements, added flickering cursor light.
2014-03-07 20:00:39 +02:00
14c494dbfe
Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise.
2014-03-07 19:58:32 +02:00
2fef60708d
Added some more operators to the cell color class.
2014-03-07 19:58:32 +02:00
04f2d4ea58
Made windows transmit colored light.
2014-03-07 19:58:31 +02:00
a19200fbfe
C++ version of light engine.
2014-03-07 19:58:30 +02:00
446b4b9d50
New line algo for lights
2014-03-07 19:58:28 +02:00
eb999cd0ad
Another file forgotten
2014-03-07 19:58:27 +02:00
843237d1c9
Fixed bug.
2014-03-07 19:58:27 +02:00
39da5babee
Implemented lua interface.
2014-03-07 19:58:25 +02:00
584640f12c
Added help for truecolor light testing thing. Also added colors.
2014-03-07 19:58:24 +02:00
f68852b721
Forgot to add the plugin itself. Also some improvements
2014-03-07 19:58:24 +02:00
55d845992c
rendermax: removed all the opengl and sdl stuff. Now it work with magic alone.
2014-03-07 19:58:23 +02:00
dec0b202ee
Added rendermax plugin- a bunch of rendering hax in one. Small fix to skeleton.
2014-03-07 19:58:22 +02:00
a52451a97a
eventful: added support for custom workshops and a convenience function to interpose side panel generation
2014-03-07 19:41:50 +02:00
834350012f
building-hacks: added lua convenience function, made impassible tile fix optional.
2014-03-07 19:41:50 +02:00
b1e7356e63
Added animation and on update callback.
2014-03-07 19:41:49 +02:00
94b5961372
New plugin: building-hacks. Allows workshops to block liquids and consume mechanical power, connect to machines.
2014-03-07 19:41:49 +02:00
cec4c8cd30
Added an output stream, now response is visible in same window. Also added a way to start prompt pre-filled.
...
It's nice to bind it to e.g. ctrl-shift-o "command-prompt :lua"
2014-03-07 18:52:06 +02:00
97ae857c38
Always shatter glass items within bins thrown by a catapult.
...
The glass materials have impact strength copied from compression
strength, so the items had 1/5 chance to survive without damage.
Since glass is infinite, it makes sense to make it single-use.
2014-03-07 17:42:49 +04:00
df22f25a69
Rewrite aiming error code to account for distance and engine quality.
...
Now the error is simulated by using an approximate normal distribution.
2014-03-07 17:35:04 +04:00
ef93f2ea4c
Compute quality of siege engines and use it to extend firing range.
...
Since parts aren't there until it is built, it requires checking that.
2014-03-07 17:34:21 +04:00
9827184ef7
Switch to the new random number generator class.
2014-03-07 17:34:21 +04:00
983685de8d
Squash uninitialized variable warnings.
2014-03-07 17:34:21 +04:00
41bcd52c36
Make siege engine debug markings toggleable via lua.
...
Also check that the tile actually exists to avoid crashes.
2014-03-07 17:34:04 +04:00
9576c47e18
Cmake fix
2014-03-04 19:00:12 +02:00
904808b168
Command prompt plugin with docs and readme patch.
2014-03-04 18:51:23 +02:00
dd268d43d9
Merge branch 'master' of https://github.com/jjyg/dfhack
2014-02-27 15:49:18 -06:00
5a158b21cf
Update plugins to match fixed field names in cage/civzone
2014-02-27 14:51:45 -06:00
6d0e6cf7d5
remove old unused code from when dfhack was out of process
2014-02-26 12:44:10 +01:00
5ced804312
Merge branch 'master' of https://github.com/angavrilov/dfhack
2014-02-20 12:42:57 -06:00
73a112e06c
Update tubefill to skip hollow tubes by default, and update docs
2014-02-14 11:06:33 -06:00
67b7681ba6
Fix reaction errors, make quantities more consistent
2014-02-13 11:37:04 -06:00
387cc983f9
Merge branch 'osx_shenanigans' of git://github.com/tareqak/dfhack
2014-02-02 23:50:21 +01:00
c0d3e9189d
showmood: fix item count for real
2014-01-27 12:40:21 +01:00
7f411e1cbf
Merge branch 'plant'
2014-01-27 10:45:30 +01:00
56f935aea6
Add bugfix for #6420
2014-01-26 18:55:52 -06:00
5c28d7eaf6
Not enough mood tickets given out
2014-01-25 09:15:43 -06:00
f0eeba93ce
DFHack compiles under OS X now.
2014-01-25 03:21:56 -05:00
7f14e109fa
Use DF-compatible RNG for better randomness
2014-01-19 20:31:15 -06:00
89b3c7bb67
Change syntax for specifying mood type, also allow overriding mood skill
2014-01-19 20:21:41 -06:00
baf377afba
Meant to move this, not copy it
2014-01-18 22:56:56 -06:00
24fbf570e6
Add "strangemood" plugin, lets you trigger a strange mood
2014-01-18 22:45:42 -06:00
04f88ef8fb
showmood: fix count of gotten items
2014-01-05 02:29:01 +01:00
7adb6b2ee9
ruby: codegen unit.caste_tg helper
2014-01-04 15:04:56 +01:00
91a7280ac3
Need to include tool_uses.h
2014-01-03 16:42:24 -06:00
69fc2bec6d
A bit of cleanup
2013-12-27 13:01:34 -06:00
540bcc1f46
Enhance createitem, can now place items into containers or buildings
2013-12-27 12:53:33 -06:00
8917892473
Merge branch 'master' of https://github.com/peterix/dfhack
...
Conflicts:
library/xml
plugins/CMakeLists.txt
2013-11-19 04:15:04 +05:30
5c51f7dd2a
Merge branch 'master' of git://github.com/angavrilov/dfhack
2013-11-10 14:04:48 -06:00
7ce5831257
Get rid of the std exception.
2013-11-07 11:58:11 +04:00
4d2e5b80bf
Use df::allocate here for proper compatibility with 40d and earlier
2013-11-04 14:55:31 -06:00
883d89bb68
plants: move all commands as "plant" subcommands, update NEWS/Readme
2013-11-02 18:54:29 +01:00
463bb8d498
Update plugins to use CR_WRONG_USAGE where appropriate
2013-10-30 15:58:14 -05:00
ff939e36bb
Missed parameter in plugin command init
2013-10-30 14:25:35 -05:00
b97a13fa63
Update "plants" plugin
...
* Add "createplant" command, creates a shrub or sapling at the cursor.
* Put help text in command definitions so CR_WRONG_USAGE works properly
2013-10-30 14:19:52 -05:00
8ccb04236f
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
2013-10-25 11:47:03 -04:00
54b45349c5
Improve pre-embark prospect using new knowledge about soil depth.
2013-10-25 14:37:37 +04:00
e4978a1da7
Relax 3dveins preconditions to account for soil quirks and volcanoes.
2013-10-25 12:51:06 +04:00
329741f235
EventManager: added EQUIPMENT_CHANGE event and exposed it to lua.
2013-10-24 19:32:52 -04:00
c409289ee4
EventManager: TICK events should unregister correctly when requested and after they fire, other tweaks.
...
- fixed unregister to allow unregistering individual TICK events
- make registerTick return the resulting freq you have to put back in to the handler in order for it to be unregisterable
- when TICK events fire, they now automatically remove themselves from handlers[TICK], as they should
- make sure manageTickEvent fires once per tick
2013-10-20 22:54:25 -04:00
a0ee74b3a5
eventful: no longer possible to disable an event type, event frequency is the minimum request frequency (most frequent), added array of event handler function pointers to simplify code
2013-10-20 19:56:48 -04:00
e81c060627
Added EVENT_MAX just in case someone wants it.
2013-10-20 15:24:31 -04:00
d4542b32fa
eventful: removed extra EventManager::unregisterAll.
2013-10-20 15:24:04 -04:00
6ef360f4d6
Merge remote-tracking branch 'warmist/dev-EventManager-lua' into 0.34.11-r4
2013-10-20 14:52:40 -04:00
d179812c22
Small bug fix for autolabor crashing on script created creatures.
2013-10-20 21:50:22 +03:00
0dff26aa23
Added lua interface (in eventful) for EventManager module.
2013-10-20 21:44:07 +03:00
39553cfb6d
EventManager: fixed a problem with constructionHandler.
2013-10-20 14:14:02 -04:00
ee056f4422
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
...
Conflicts:
NEWS
2013-10-20 11:09:40 -04:00
b2d2a074c8
Validate vein types in the scan phase and leave unexpected ones alone.
2013-10-20 12:33:17 +04:00
6805656dd0
Added enable/disable functionality to diggingInvaders.
2013-10-19 21:42:24 -04:00
9d3ee11349
Merge branch 'diggingInvaders' into 0.34.11-r4
...
Conflicts:
scripts/devel/invasion-now.lua
2013-10-19 21:26:50 -04:00
0bf427c689
Added enable/disable functionality to new plugins.
2013-10-19 21:19:39 -04:00
ef9d3b1521
Merge remote-tracking branch 'jjyg/master' into 0.34.11-r4
2013-10-19 20:28:30 -04:00
57fc0f3e89
Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
...
Conflicts:
NEWS
library/xml
plugins/CMakeLists.txt
plugins/autoSyndrome.cpp
2013-10-19 20:19:29 -04:00
1bd6d5f96d
ruby: add FEATURE/ice map tile materials
2013-10-14 01:58:55 +02:00
3d7661e7e9
ruby: fix map tile material reading
2013-10-14 00:01:26 +02:00
78de739d75
Update aquifers when generating 3D vein layout.
2013-10-11 19:23:32 +04:00
5bcae49249
Implement generation of 3D veins that match the existing mineral counts.
...
Vein distributions may need some improvement.
2013-10-10 12:50:52 +04:00
86d0022c58
Implement reading and writing the map for 3D veins plugin.
...
This should completely erase all veins from the map when run.
2013-10-10 12:15:50 +04:00
a273327c6a
Remove "using namespace std" from MiscUtils.h.
2013-10-10 12:15:50 +04:00
6852adbd91
Expose new MapCache features in probe and tiletypes.
2013-10-10 12:15:50 +04:00
4ba4f90147
ruby: add support for enable/disable plugin
2013-10-07 13:58:28 +02:00
a18347608a
ruby: vectors default to int32_t
2013-10-07 13:33:21 +02:00
32a6073dad
Remove lambdas from dwarfmonitor and resume.
2013-10-03 16:30:06 +04:00
f3be0ee187
Remove the use of lambdas in buildingplan.
2013-10-02 19:55:48 +04:00
599af0a4d9
Fix linux and windows build issues.
...
- Linux makefile overrides and removes the optimization flags.
- Old linux gcc doesn't understand lambdas.
- MSVC doesn't like extern and explicit instantiation in same file.
2013-09-30 22:51:29 +04:00
d7e35c2d23
Add built-in enable and disable commands.
2013-09-30 13:19:51 +04:00
a487ede2b9
autodump: typo in errmsg
2013-09-23 21:28:27 +02:00
b885123d4e
Fix a crash in beehive code if bees die with yet uncollected products.
...
http://www.bay12games.com/dwarves/mantisbt/view.php?id=6368
2013-08-26 16:55:30 +04:00
896cd11fe9
Track readable names of vmethod hooks for diagnostic messages.
...
Note that this changes the ABI of all plugins that use hooks.
2013-08-22 12:14:45 +04:00
70a2ab9141
Fix crash due to incorrect loop bounds in add-spatter.
...
This caused a buffer overrun bug if an ADD_SPATTER
reaction had any non-improvement outputs.
2013-08-22 11:22:18 +04:00
308e7b6820
fix renamed pregnancy_ptr/mystery to pregnancy_genes/caste
2013-08-10 01:57:11 +02:00
279c4a48dc
Started work on ramp generation, still needs work.
2013-07-22 19:05:09 +05:30
0bd627a6f6
Got basic mesh generation working for a unity Visualizer, as well as a block editor for the same.
2013-07-21 10:28:46 +05:30
297fa86c34
follow df-structures change to drawBuilding
2013-07-07 17:40:28 +02:00
34e5716cc0
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-28 23:52:51 +03:00
647b14b471
Fixed potential error with building getting transparent on un-powering.
2013-06-28 23:51:52 +03:00
269a2680c8
Added occlusionON|occlusionOFF commands
2013-06-28 23:34:47 +03:00
102b2ed450
Fixed broken buildings, also added floodgate functionality.
2013-06-28 23:47:54 +05:30
368a326b40
Fix for gems not getting right color.
2013-06-28 17:22:24 +03:00
26d557fc68
Fixed bug with buildings and added gems to material definition.
2013-06-27 18:11:50 +03:00
e2db468d3d
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-27 16:18:46 +03:00
7c190cd3f0
Added antialiased lights. They kind of suck. So I disabled them.
2013-06-27 16:11:29 +03:00
67859ada0a
Changed sun calculation direction.
2013-06-27 02:49:18 +05:30
7c9f0fd781
Added day colors and day speed parameters.
2013-06-27 00:14:03 +03:00
e1daa16d9e
Added sun time manipulation, updated helpstring.
2013-06-26 22:05:22 +03:00
b7f28877a2
Added building size. Removed material flags (on by default)
2013-06-26 20:19:30 +03:00
d90a7bfb88
removed something I had for testing.
2013-06-26 19:26:11 +05:30
dc42fa2fa3
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-26 19:14:55 +05:30
689caa5039
Made the lighting engine multithreaded.
2013-06-26 19:12:14 +05:30
c1fef35b52
Renamed digSmart to digFlood.
2013-06-25 19:57:17 -04:00
fbbae3e900
Implemented building support.
2013-06-26 01:18:26 +03:00
1d2accbe94
fixed (?) ice and made dragon blood glow a little.
2013-06-25 22:49:52 +03:00
539abff49a
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-25 23:23:52 +05:30
f4923d6974
added square light volume, and automatic light radius.
2013-06-25 23:13:55 +05:30
588ca8b8dd
MAXIMUM SPEED UPDATE!!!!!
2013-06-25 20:36:53 +03:00
3957fac531
Added citizen lights(only lights, no oclusion might change later). Added custom dim level (for darker nights and tunnels).
2013-06-25 19:34:38 +03:00
57e68aaee9
Added cmake info for the config lua.
2013-06-25 16:44:44 +05:30
5265f107b0
Added more advanced sun light calculation
2013-06-25 16:33:01 +05:30
ef7abaee14
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-25 01:25:56 +03:00
87f151f441
Plantfix, viewport height fix, and fov viewport fix.
2013-06-25 01:25:38 +03:00
4d9b7bd23d
Major rewrite of opacity calculation.
2013-06-25 00:59:32 +03:00
cb767531cf
Made light plugin read configuration file (rendermax.lua)
2013-06-24 18:18:57 +03:00
8271725320
Some performance fixes and tweaks. Opaque blocks can now emit light.
2013-06-24 14:20:22 +05:30
8dcff9bc5d
Merge branch 'rendermax' of git://github.com/jjyg/dfhack
2013-06-24 10:34:03 +03:00
5a82270aa6
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-24 10:19:10 +03:00
abc9dc300e
Prelimenary work on advmode
2013-06-24 03:47:42 +03:00
19952b9139
rendermax: lights off when sleeping
2013-06-24 02:27:43 +02:00
b95683adb2
rendermax: sunlight travels down stairs
2013-06-24 02:22:30 +02:00
ec913c2c5e
Merge branch 'rendermax' of https://github.com/jjyg/dfhack
2013-06-24 05:37:59 +05:30
b8d2ceb23b
Made the low water check actually use floats.
2013-06-24 05:35:16 +05:30
1a5169c70c
Merge branch 'master' of git://github.com/JapaMala/dfhack into rendermax
2013-06-24 01:56:32 +02:00
fb5d248720
rendermax: basic daylight
2013-06-24 01:54:09 +02:00
2da136116d
Added some fast checking for obstacles around lights, resulting in a huge speedup outside.
2013-06-24 05:10:01 +05:30
50073ae406
rendermax: make citizen glow
2013-06-24 00:45:45 +02:00
30697ee115
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-24 03:58:23 +05:30
a2cef2d86a
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-24 03:58:07 +05:30
736f9e85fc
Fixed skylight
2013-06-24 01:26:25 +03:00
8c9de79812
Small fixes
2013-06-24 00:53:39 +03:00
f5f1328678
Merge branch 'master' of git://github.com/JapaMala/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-24 00:53:03 +03:00
fe41504952
Merge branch 'master' of https://github.com/warmist/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
Still broken. Needs boundary checking.
2013-06-24 03:11:46 +05:30
3d6f4d3478
Added transparency to ice walls
2013-06-24 00:36:43 +03:00
6cd926b67e
fix for map_block lights, fix for gem window color, dimmed the plant lights.
2013-06-24 00:10:52 +03:00
c675ca467a
Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise.
2013-06-24 02:35:03 +05:30
06915aeded
Fixed unload/disable crash. Added glowing plants.
2013-06-23 23:56:01 +03:00
82deeafe89
Torches for statues, candles on the tables.
2013-06-23 22:28:26 +03:00
0473f89fa2
Update water a bit.
2013-06-23 21:49:17 +03:00
84ed3797d4
Merge branch 'master' of git://github.com/JapaMala/dfhack
2013-06-23 21:46:58 +03:00
fd0c053a80
Added some more operators to the cell color class.
2013-06-24 00:14:06 +05:30
1361b38f27
Merge branch 'master' of git://github.com/JapaMala/dfhack
...
Conflicts:
plugins/rendermax/renderer_light.cpp
2013-06-23 21:35:13 +03:00
4f7df238ea
Fixed non-circular light. Do not show hidden tiles.
2013-06-23 21:29:03 +03:00
f415ea2100
Made windows transmit colored light.
2013-06-23 23:51:25 +05:30
cb6130066d
Performance improvements, added flickering cursor light.
2013-06-23 20:45:05 +03:00
140371a0c7
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 22:05:02 +05:30
2c49c9e83c
C++ version of light engine.
2013-06-23 19:25:42 +03:00
25ab75137b
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 15:27:04 +05:30
e3ee876a11
New line algo for lights
2013-06-23 12:20:35 +03:00
be953ba4ab
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 12:07:14 +05:30
76f4c51a29
Another file forgotten
2013-06-23 09:36:04 +03:00
bea2cd74d6
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 11:50:09 +05:30
b35ea4d10c
Fixed bug.
2013-06-23 09:19:29 +03:00
77a301db27
Merge branch 'master' of https://github.com/warmist/dfhack
2013-06-23 02:45:14 +05:30
4cc14641ac
Implemented lua interface.
2013-06-22 17:40:52 +03:00
906864feaa
Added help for truecolor light testing thing. Also added colors.
2013-06-22 14:14:35 +03:00
c273377284
Forgot to add the plugin itself. Also some improvements
2013-06-22 13:29:58 +03:00
ea6a264fe2
rendermax: removed all the opengl and sdl stuff. Now it work with magic alone.
2013-06-22 03:45:42 +03:00
ebc51f1bd3
Added rendermax plugin- a bunch of rendering hax in one. Small fix to skeleton.
2013-06-21 22:47:23 +03:00
dc78f16e2b
Added a simple unity project that connects to DF and pulls a list of plugins.
2013-06-17 23:53:36 +05:30
f459bfc4f1
diggingInvaders: added per-creature dig times and differentiated between smooth and rough constructions.
2013-06-15 23:04:15 -04:00
8c6881beb6
Cleanup
2013-06-14 14:46:10 -05:00
4193d9b5b3
Add new plugin for cleaning up construction building materials
2013-06-14 14:40:02 -05:00
776d088eb9
diggingInvaders: tweaks.
2013-06-11 07:25:07 -04:00
f557376c3a
diggingInvaders: make invaders dig slowly, in a configurable way.
2013-06-11 05:14:56 -04:00
0378bbb896
diggingInvaders: proper user interface.
2013-06-10 01:58:27 -04:00
07a4839d8b
diggingInvaders: made it easy to flip between int64 and int32 for distance cost. It did not make a significant difference in performance when I timed it.
2013-06-09 23:26:07 -04:00
4e715ca44b
diggingInvaders: made it only do a little work each frame instead of all at once with the pathfinding.
2013-06-09 23:07:51 -04:00
c4533dcb0c
diggingInvaders: only path from one guy, and other minor tweaks.
2013-06-09 17:52:13 -04:00
d26b11eb40
diggingInvaders: cleaned up pick creation.
2013-06-09 17:20:23 -04:00
638affee06
diggingInvaders: tweaked pick creation. Don't recreate if they already have one.
2013-06-09 16:23:41 -04:00
08114cf574
diggingInvaders: more fixes. Still a few issues with ramps probably.
2013-05-31 20:39:43 -04:00
2b7dfca21e
diggingInvaders: cleanup, tweaks. Works for simple situations.
2013-05-31 19:27:22 -04:00
f8261348ff
Merge branch 'master' into diggingInvaders
...
Also make edgeCost.cpp compile because I stopped midsentence for some reason.
Conflicts:
library/modules/Maps.cpp
2013-05-31 16:28:05 -04:00
909d686ae4
digSmart: remove print statement.
2013-05-31 13:41:31 -04:00
b82b3f2283
digSmart: added user interface and documentation.
2013-05-31 13:32:56 -04:00
b945b36016
digSmart: framework in place for finding the bug. When a tile is actively being dug, the dig designation is cleared. If you designate the tile again for digging, multiple dwarves might try to dig it at the same time, leading to job cancellation spam when one finishes.
2013-05-31 12:23:28 -04:00
20fa38da7e
digSmart: still doesn't working, but learning more. Something weird happens with dig designations.
2013-05-31 00:49:35 -04:00
4ba73bc171
Merge branch 'master' into digSmart
2013-05-30 22:22:16 -04:00
8982abc163
treefarm: automatically chop trees and dig obsidian
2013-05-30 22:18:08 -04:00
594247b57e
skeletonShort: slightly easier to copy+paste it to start new plugins, but is more illegible to new DFHackers.
2013-05-30 19:07:22 -04:00
ee9bddf831
autoSyndrome comment tweaks
2013-05-25 20:23:59 -04:00
3403146461
Merge remote-tracking branch 'peterix/master'
...
Conflicts:
plugins/CMakeLists.txt
plugins/autoSyndrome.cpp
2013-05-25 20:08:56 -04:00
83a9e5c837
autoSyndrome: added reset policies, allowing modders to specify what to do if a unit already has the syndrome in question.
2013-05-25 14:26:42 -04:00
22f31ca3ad
workNow tweaks
2013-05-25 12:23:38 -04:00
5cca0b84a3
fastdwarf: made it work better when both fastdwarf and teledwarf are enabled.
2013-05-25 11:07:59 -04:00
141043363d
autoSyndrome: need to check JOB_COMPLETED very often to catch cancelled jobs properly.
2013-05-25 10:20:22 -04:00
b44cd86dc9
EventManager: completely overhauled JOB_COMPLETED event detection, and tweaked Job::cloneJobStruct.
2013-05-25 09:44:17 -04:00
01c311cf13
Weird compilation error.
2013-05-24 15:55:40 -04:00
170fe6a0ef
autoSyndrome/syndromeTrigger: made things off by default.
2013-05-24 15:55:19 -04:00
63e1f61f4f
autoSyndrome/syndromeTrigger: deal with overlap better for commands.
2013-05-12 12:43:45 -04:00
c127ad052e
autoSyndrome and syndromeTrigger documentation.
2013-05-11 19:20:02 -04:00
29b5e20575
autoSyndrome should now work with syndromeTrigger.
2013-05-11 16:46:37 -04:00
dd739313b1
ruby: tweak item_isfree
2013-04-30 18:38:52 +02:00
f3e357d161
Fix detection of GET_MATERIAL_FROM_REAGENT results in workflow.
...
Dereference pointer to strings. Also just return undefined
material instead of skipping the product if it still fails.
2013-04-30 19:42:51 +04:00
18a91ef221
Merge https://github.com/ab9rf/dfhack
...
Conflicts:
library/xml
plugins/stonesense
2013-04-24 18:00:40 +02:00
c39f4bc182
Fix build bug in automaterial.
2013-04-24 17:49:18 +02:00
222c61ab25
Merge branch 'IsoRemote' of https://github.com/JapaMala/dfhack
2013-04-24 17:36:22 +02:00
2e379c4d3f
Merge https://github.com/Falconne/dfhack
...
Conflicts:
plugins/CMakeLists.txt
plugins/stonesense
2013-04-24 17:24:03 +02:00
df6355a092
Merge https://github.com/jjyg/dfhack
2013-04-24 16:24:14 +02:00
0efbc74ac2
Merge https://github.com/quietust/dfhack
...
Conflicts:
NEWS
2013-04-24 16:21:59 +02:00
aad5296f91
Merge branch 'master' of https://github.com/rampaging-poet/dfhack
2013-04-24 16:14:30 +02:00
3e59794733
Merge branch 'master' of https://github.com/cherrydev/dfhack
...
Conflicts:
Readme.html
2013-04-24 16:13:27 +02:00
ce47033190
fix in zone UI filters: lower case 'f' conflicted as hotkey with toggling between pit and pond in the pit screen. So now the filter keys use upper case letters instead.
2013-04-24 23:37:05 +12:00
024a3d766b
Added some more commands to autobutcher UI script.
...
Changed autobutcher behavior a bit:
now protected units count towards the target quota,
units available for adoption are considered as protected.
Added filters for caged, male and female to assignement UI
for cages, pastures and pits.
2013-04-24 23:37:05 +12:00
fd265b37d6
Added lua GUI front-end for autobutcher.
2013-04-24 23:37:05 +12:00
80de3c05fa
Stocks plugin: Add keywords to search for flags.
2013-04-24 23:31:37 +12:00
eb8b2faf66
Stocks plugin: fix inventory check, add trade assignments, better hotkets.
2013-04-23 22:15:25 +12:00
c9776f481c
ruby: add construction/siegeengine bld subtypes in building_alloc
2013-04-21 22:29:51 +02:00
e70d7b404a
Don't exclude webs, check for items in inventory before discarding those without a valid position.
2013-04-20 12:09:07 +12:00
de5e713c51
ruby: add rb dfhack command shortcut
2013-04-16 21:54:03 +02:00
811bd191d5
Add wear filter
2013-04-15 20:43:13 +12:00
d99b930f58
Better Stocks - Quality & Wear filters
2013-04-14 16:39:21 +12:00
13451bd487
ruby: fix crash on Compound#_cpp_delete
2013-04-14 01:17:44 +02:00
17513283d4
Better Stocks screen - WIP
2013-04-14 00:45:06 +12:00
40f9f06360
dig: ignore tile shape if hidden
2013-04-12 15:23:16 +02:00
b2e22a2c42
ruby: add facility to queue dfhack commands
2013-04-12 15:23:13 +02:00
d0ba4f5881
Better Stocks screen - WIP
2013-04-11 20:52:46 +12:00
399fd107e4
Make createitem create shoes in pairs (as well as gloves)
2013-04-08 08:29:50 -05:00
658e64c1b2
Fix allegro, stonesense/deplibs is now hack/libs, sync isoworld and stonesense
2013-04-07 20:25:38 +02:00
fc6cb3ae42
Merge branches 'autoSyndrome', 'outsideOnly' and 'syndromeTrigger'
2013-04-07 14:00:24 -04:00
959321ec22
syndromeTrigger: logic tweak.
2013-04-07 13:56:12 -04:00
1c78f06a1c
syndromeTrigger: only complain once.
2013-04-07 13:22:38 -04:00
b057a0d82a
Merge branch 'once' into syndromeTrigger
2013-04-07 13:19:18 -04:00
ddc4cad73b
autoSyndrome: fixed a bug when a reaction didn't have a valid mat_index.
2013-04-07 13:17:00 -04:00
329538edfd
digsmart temp commit.
2013-04-07 13:08:32 -04:00
3b921feb61
Skip ice and brook floors.
2013-04-06 17:07:46 +05:30
efaa247d2a
Stocks start
2013-04-06 17:40:07 +13:00
660ce50542
Floors are loaded one level below solid blocks.
2013-04-06 02:42:51 +05:30
541e4f0947
Changed liquids to use an enum.
2013-04-04 14:28:43 +05:30
f1410c10c6
digcircle: fix bug #181 (help: radius -> diameter)
2013-04-03 22:16:36 +02:00
575b1c45fc
Sync isoworld, linux fixes
2013-04-03 01:10:06 +02:00
3580409cc1
Sync isoworld, some protobuf building changes
2013-04-02 22:37:41 +02:00
c361ba7bf4
Sync, fix isoworld in .gitmodules
2013-04-02 19:19:29 +02:00
5ff9947a06
Merge branch '0.34.11-r3-bugfixes'
2013-04-02 19:17:32 +02:00
fe922e3528
Merge branch 'IsoRemote' of https://github.com/JapaMala/dfhack
2013-04-02 19:01:46 +02:00
33f0f0d3f3
Isoworldremote plugin now gives material lists, and verifies weather a map block has anything in it.
2013-04-02 22:03:32 +05:30
9d6f202988
Fix the search plugin crashing the military screen.
...
The cause of the crash is that the right list is used for multiple
different things in different pages, so when cleaning up after a
page switch it is not acceptable to mess with it in any way. However
the search plugin changed its length, thus causing a crash if the
new contents were shorter than the original candidate list.
2013-04-02 22:42:55 +13:00
462a08a4ea
Fix the search plugin crashing the military screen.
...
The cause of the crash is that the right list is used for multiple
different things in different pages, so when cleaning up after a
page switch it is not acceptable to mess with it in any way. However
the search plugin changed its length, thus causing a crash if the
new contents were shorter than the original candidate list.
2013-04-02 12:03:37 +04:00
c0a4db32e9
Fixed the single tile reported coordinates.
2013-04-02 11:57:30 +05:30
b2f4029f42
Added in more sanity checks.
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-04-02 02:58:06 +05:30
29a2f36e4a
Fix small bug in the tweak plugin
2013-04-01 17:42:02 +02:00
b0ee4fe9d9
Update stonesense
2013-04-11 21:08:33 +02:00
d7c91975c0
Fix warnings
2013-04-01 20:02:39 +13:00
1070eec016
Make planned doors pet passable
2013-04-01 19:52:34 +13:00
1550df496f
Right align happiness monitor to avoid interference with announcements
2013-04-01 19:52:13 +13:00
c020c0271c
Respect export mandates
2013-04-01 19:21:10 +13:00
86a02952f8
Changed coords to embark tiles instead of blocks.
2013-04-01 04:39:30 +05:30
4bb80d9865
Added some sanity checks to isoworldremote.cpp
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-03-31 12:31:44 +05:30
39390e2749
Got a working connection with Isoworld.
2013-03-31 02:42:06 +05:30
135289e89a
ruby: add MapTile#burrow
2013-03-30 20:22:25 +01:00
0397912353
Merge branch 'master' into digSmart
...
Conflicts:
plugins/CMakeLists.txt
2013-03-30 12:46:10 -04:00
a3de35c32e
Added isoworld to the build list.
2013-03-30 15:27:37 +05:30
9981d21965
Merge branch 'IsoRemote' of github.com:JapaMala/dfhack into IsoRemote
...
Conflicts:
plugins/CMakeLists.txt
plugins/isoworldremote.cpp
2013-03-30 13:03:22 +05:30
14369d18dc
Initial work on the isoworldremote plugin, which sends sections of the map to isoworld.
...
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-03-30 12:38:42 +05:30
2027416997
Merge pull request #1 from zkf/overlay-position
...
Right-align happiness monitor overlay.
2013-03-29 20:59:54 -07:00
a5b9848271
Clean up
2013-03-30 16:38:21 +13:00
edc305db69
AutoTrade plugin: Automatically send items in marked stockpiles to trade depot, when trading is possible.
2013-03-30 16:38:03 +13:00
323c56a641
Right-align happiness monitor overlay.
...
The overlay was blocking game messages which are displayed on the left side.
2013-03-29 15:03:09 +01:00
6e9de245c2
Started work on isoworld remote
2013-03-27 01:24:13 +05:30
637daad83d
Outside only: new plugin. Buildings that start with OUTSIDE_ONLY get destroyed instantly before they can be created.
2013-03-24 00:15:20 -04:00
52480b155b
autoSyndrome: made it only print each error message at most once per DF run.
2013-03-23 22:46:43 -04:00
32e321c704
Merge branch 'once' into autoSyndrome
2013-03-23 22:39:57 -04:00
b4092f62e6
New module: Once. Intended to help prevent debug error message spam.
2013-03-23 22:38:33 -04:00
dc9a62fd1d
Fix crash when using right mouse button
2013-03-22 23:08:33 +13:00
cd00213e66
autoSyndrome: fixed a bug where it complains because can't find the worker because it didn't get a copy of the job quickly enough. It can still happen, it just doesn't complain anymore.
2013-03-17 11:02:31 -04:00
cf57fba58e
autoSyndrome: reorganize everything, make it make more sense.
2013-03-17 01:18:12 -04:00
83f7ad1700
syndromeTrigger: renamed from trueTransformation and generalized it to allow for triggering commands on any syndrome infection.
2013-03-17 00:23:08 -04:00
16b64b9fc3
workNow: added option to look for jobs every time a dwarf finishes or cancels a job.
2013-03-16 22:43:57 -04:00
4fe37b4bd5
ruby: fix DfFlagarray.inspect when no indexenum
2013-03-16 21:06:31 +01:00
49024809ce
Update NEWS, build DFusion by default
2013-03-16 18:37:16 +01:00
ffa9c50486
autoSyndrome: stop spam, and disable by default
2013-03-16 13:26:59 +01:00
59ec9bfc57
Update versions
2013-03-16 22:13:01 +13:00
a85d6bd2dd
Merge branch 'mousequery'
2013-03-16 20:40:20 +13:00
4bd5e3db77
Add mousequery to build
2013-03-16 20:35:53 +13:00
c16bd3d71a
Apply r3 name changes
2013-03-16 18:25:02 +13:00
cc5d354a59
Merge branch 'master' of github:jjyg/dfhack
2013-03-16 01:04:29 +01:00
b961cb6a09
Merge branch 'master' of https://github.com/peterix/dfhack
2013-03-16 12:51:31 +13:00
f69f245732
Allow planned constructions orthogonal to stairs
2013-03-16 12:26:37 +13:00
5a92eabb6b
Add all fortress dwarves to happiness monitor.
2013-03-16 10:29:17 +13:00
6a31abc60f
Another update to stonesense :-P
2013-03-15 14:30:21 -04:00
d87bfd7f26
Update to Stonesense
2013-03-15 14:28:46 -04:00
c93cb693c8
Merge branch 'master' of http://github.com/peterix/dfhack
2013-03-14 13:35:28 -04:00
9a58c5b7b3
Stonesense updates
2013-03-14 13:33:01 -04:00
2b675c80ce
Fix createitem to not leak memory
2013-03-14 12:00:16 -05:00
c5aa808737
Sync submodules
2013-03-14 05:07:30 +01:00
b5806f7278
Copy fixes from r3 to fix search issues in Nobles screen.
2013-03-13 22:21:30 +13:00
215a2e78af
Fix crash when persistent data refers to missing buildings. Can only happen if planned buildings are removed with the plugin removed, then the game is reloaded after the plugin is put back.
2013-03-13 21:44:33 +13:00
bc0c493b7c
Workaround for strange crash in accelerated mod
2013-03-12 21:18:29 +13:00
8e9fc235a9
Adding a debug mode to track down an elusive bug.
2013-03-10 16:14:00 +13:00
3ed5f06f49
Fix for eventful and a advfort not to show worn items.
2013-03-09 12:54:07 +02:00
63707471f4
WIP - More logical categories and variable windows
2013-03-07 22:27:06 +13:00
0b31fbafea
Remove the "assign random labors to random dwarfs" nonsense that I put in while drunk or something.
2013-03-02 23:05:09 -06:00
701b7b7d9b
Multiple data averaging windows and gcc fixes.
2013-03-02 15:14:56 +13:00
b07f2fc33f
Get entity from unit->civ_id instead of from ui (so it works in advmode), and only get site in fortress mode
2013-02-28 10:00:00 -06:00
9bd999ebc1
Update createitem to allow specifying quantity, also allow it to auto-detect whether it needs to create extra gloves and assign handedness
2013-02-28 09:23:48 -06:00
4afe74efa6
Add DwarfMonitor plugin to monitor activities and happiness levels in a fort.
2013-02-28 23:39:22 +13:00
f55030909f
Add createItem plugin, spawns an item at the selected unit's feet
2013-02-27 11:09:06 -06:00
03b91ca26c
Fix a problem in binpatch.lua and comment out debug messages in tweak.
2013-02-26 12:29:02 +04:00
2bbe6824fb
fix tweak/stable-cursor for low z-levels
2013-02-21 15:26:35 +01:00
6b70a89321
ruby: typo in autogen/int8_t
2013-02-17 02:05:01 +01:00
db98b06c6e
Added documentation of autolabor exemption from burrowed dwarves
2013-02-15 19:16:26 -08:00
b0528d283b
Merge branch 'master' of git://github.com/peterix/dfhack
2013-02-15 20:23:39 +02:00
ab6a993689
friendship.lua: removed debug printing
2013-02-15 20:21:33 +02:00
bb5d98e895
friendship fixes.
2013-02-15 20:19:55 +02:00
fe70df593b
Sync submodules
2013-02-14 18:36:21 -06:00
ac2e45c843
Compatibility with older GCC versions in the search plugin
2013-02-14 12:45:58 +01:00
8de172f1c8
Binsearch in units.active can't possibly work, ever.
2013-02-14 13:13:25 +04:00
a8f5e54e37
Sync submodules
2013-02-14 09:53:14 +01:00
e35a1c7720
Correct autolabor2 for changes in structures.
2013-02-13 16:00:09 -06:00
8d278a87db
Merge branch 'master' of https://github.com/angavrilov/dfhack.git
...
Conflicts:
plugins/devel/CMakeLists.txt
2013-02-13 13:52:02 -06:00
f9a3450aca
Reinstate old autolabor in its original place.
2013-02-13 13:34:39 -06:00
ff0012c91f
Move new autolabor to autolabor2 in devel.
2013-02-13 13:33:32 -06:00
27f5dc7631
Autolabor: add in the rest of the building construct and deconstruct labors. Also handle wood crafts at the craftdwarf's shop.
2013-02-13 13:07:54 -06:00
a17760af4f
Communicate the Plugin pointer to the plugin in a decent sort of way.
2013-02-13 14:45:24 +04:00
a5c21745eb
Enable all plan modes when entering quickfort mode
2013-02-09 16:49:36 +13:00
2f4979d3fa
Add Quickfort mode
2013-02-08 00:04:52 +13:00
1956f8b92d
Lock selection mode toggle
2013-02-07 22:57:07 +13:00
0e384ada75
Sync submodules
2013-02-05 05:34:34 +01:00
dff16c3c1d
Define nullptr for gcc < 4.6
2013-02-02 02:24:05 +13:00
ecf255243f
Plugin to easily find and resume suspended constructions
2013-02-02 02:24:05 +13:00
056bde451a
Remove some leftover code
2013-01-29 21:22:17 +13:00
ae8bb7c9f8
Fix for gcc errors.
2013-01-29 20:44:56 +13:00
58125a57a7
Merge remote-tracking branch 'remotes/github/buildingplan'
2013-01-27 23:42:28 +13:00
6546af94ee
Clear persistent data after item assigned. Fix some material selection screen functionality.
2013-01-24 20:16:18 +13:00
f036360688
Add filters for quality, material and decorations.
2013-01-23 23:25:38 +13:00
675e92f350
Autolabor: add build floor grate labor, add unbuild screwpump labor, protect pump operators, do not clear labors on already busy dwarfs
2013-01-22 16:34:51 -06:00
f5a0644b45
Fix bad refactor
2013-01-18 23:29:08 +13:00
192baa5638
Building plan plugin: place furniture before it's built. Initial checkin.
2013-01-18 23:28:45 +13:00
e1a2e6ece4
Block and grey out the trade screen actions when search is active.
...
After actually trying the search in game, it is obvious that
clearing search upon pressing the trade button is confusing,
because if you don't pay enough attention, it looks exactly
like as if the trade actually happened.
2013-01-16 20:42:41 +04:00
597074498f
Fix various issues with updated search.
...
- Priority conflict with tweak military-stable-assign.
- The noble screen misbehaves if only one list item is left.
- Noble screen search string not reset after Enter/Esc.
2013-01-16 20:30:11 +04:00
14d41b8eda
Update search to the newer structure definitions.
2013-01-16 18:55:05 +04:00
309f162566
Fix line endings again.
2013-01-16 18:54:35 +04:00
ed0baa3f69
Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin.
2013-01-16 18:48:59 +04:00
4257c9fe84
Ignore vermin in animals screen search
2013-01-16 18:48:55 +04:00
8741983aaa
Fix for gcc errors. It seems calls to base class members in a templated class must be fully template qualified.
2013-01-16 18:48:49 +04:00
655cd3602c
Merge remote-tracking branch 'falconne/search'
2013-01-16 18:30:29 +04:00
940d5fe891
Merge https://github.com/expwnent/dfhack
2013-01-15 23:49:10 +01:00
0073c1bec2
Track xml and stonesense
2013-01-15 23:16:15 +01:00
90a62a82f7
Autolabor: add screw pump build labor
2013-01-14 12:12:56 -06:00
c031a7e081
Merge branch 'infiniteSky'
2013-01-13 15:28:31 -05:00
44662de601
Infinite sky: bug with z level flags.
2013-01-13 15:28:17 -05:00
fdcb248ea0
Merge branch 'automaterial_box'
2013-01-12 23:39:50 +13:00
83ef94774b
A better format for toggle strings.
2013-01-12 23:32:30 +13:00
4c2dfdf772
Dig smart: dig out minerals as you discover them. Very rough draft.
2013-01-09 15:15:11 -05:00
3c6ddc2a8c
Merge branch 'master' of https://github.com/expwnent/dfhack
...
Conflicts:
NEWS
library/xml
2013-01-09 10:09:58 -06:00
476afafb3c
Merge branch 'autoSyndrome' into recent
2013-01-07 12:09:55 -05:00
6fd9ce339d
Autosyndrome: fixed the rules on when syndromes apply.
2013-01-07 12:09:39 -05:00
1990e2caf7
Small fix to adv site creation, now it's really centered around you
2013-01-07 02:01:59 +02:00
553a312266
Autolabor: add deconstruct bridge labor
2013-01-06 10:59:20 -06:00
6d6d55a937
Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin.
2013-01-06 18:32:49 +13:00
140f78c8a0
Ignore vermin in animals screen search
2013-01-06 18:14:25 +13:00
0fa27d6c34
Fix for gcc errors. It seems calls to base class members in a templated class must be fully template qualified.
2013-01-06 14:59:39 +13:00
3ffbef2396
Merge branch 'canStepBetween' into recent
2013-01-05 18:10:29 -05:00
f8abd5c595
StepBetween: renamed stuff back to the way it was. Thought I had already done that.
2013-01-05 18:09:50 -05:00
47b20ea301
Infinite sky: added glyphs and made it print status when no arguments given.
2013-01-05 17:32:23 -05:00
86c3c385bd
Autolabor: exclude hauling labors from clawback
2013-01-05 16:27:57 -06:00
4d57a053fc
Infinite sky: added helpful print statements.
2013-01-05 16:51:29 -05:00
151ff0f296
Infinite sky: rename from sky eternal.
2013-01-05 16:34:33 -05:00
4920293c2d
Infinite sky: get it to compile.
2013-01-05 16:30:48 -05:00
471e82a88a
Merge branch 'skyEternal' into infiniteSky
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 16:18:01 -05:00
9246ac9b05
Merge branch 'workNow' into recent
2013-01-05 13:36:24 -05:00
cf3ac48518
Merge in autoSyndrome, trueTransformation, ...
2013-01-05 13:35:49 -05:00
6622e9e06f
Merge branch 'canStepBetween' into recent
...
Conflicts:
library/modules/Maps.cpp
2013-01-05 13:32:29 -05:00
5fc466ef7e
Work now: also update dig on pause.
2013-01-05 12:50:44 -05:00
d2a2a63d01
Merge branch 'recent' into workNow
...
Conflicts:
plugins/CMakeLists.txt
2013-01-05 12:45:34 -05:00
874dfbdc4f
Merge branch 'eventManager' into autoSyndrome
2013-01-05 11:40:55 -05:00
bc5cdf8877
Auto syndrome: got rid of allow multiple syndromes option that didn't make any sense, and made sure that if allowing multiple targets it doesn't attach the syndrome to the worker twice.
2013-01-05 11:37:56 -05:00
3c7ca2ad71
Digging invaders: buildings can only be destroyed orthogonally, made path cost deal with hatches and raised bridges, but did NOT yet make job assignment deal with them.
2013-01-05 11:06:46 -05:00
4bef70ab6f
Merge branch 'search'
2013-01-06 02:27:57 +13:00
91ee8ac020
Refactor search to handle more types of screens cleanly.
...
Added search to screens:
* Animals
* Military positions assignment
* Announcements
* Room list
* Job list
* Burrow assignment
2013-01-06 00:26:16 +13:00
a7d6cf5157
Digging invaders: fixed a few problems involving digging and stairs, added a way to debug path cost, added a way to set the cost of each type of invasion job, made invaders only pathfind to one local instead of all of them.
2013-01-04 21:02:09 -05:00
fd05d30733
Digging invaders: improved edge cost evaluation.
2013-01-04 18:11:38 -05:00
9404267c1f
Autolabor: Tell DF to immediately process jobs after each run.
2013-01-04 13:14:20 -06:00
2ca943ae20
Digging invaders: comment out debug print statements.
2013-01-04 00:43:39 -05:00
038cc91fcd
Digging invaders: fixed a bug where it would reassign long-lasting jobs, making them take forever. Also added a check for the case that invaders cannot dig to any locals.
2013-01-04 00:35:47 -05:00
b6f0ae5b14
Digging invaders: keep track of who's working on the job, and check periodically to see if they quit.
2013-01-04 00:08:54 -05:00
47eca42f68
Digging invaders: made it possible to customize which races can dig.
2013-01-03 23:18:40 -05:00
0fecdfadb1
Digging Invaders: when assigning a job, get rid of old one. Handle loading and unloading. Optimizations for when invaders can already reach someone.
2013-01-03 22:46:17 -05:00
ed6dcf9589
DiggingInvaders: made invaders dig automatically, instead of on request.
2013-01-03 21:25:50 -05:00
f145f8d528
Merge branch 'eventManager' into diggingInvaders-unstable
2013-01-03 19:32:12 -05:00
715f191c26
EventManager: made the frequency part of EventHandler.
2013-01-03 19:31:29 -05:00
b82d6940b6
Digging invaders: started on making invaders keep digging until done.
2013-01-03 18:45:53 -05:00
1d6dec54c7
Digging Invaders: reorganized the files to make it easier to work with.
2013-01-03 18:14:16 -05:00
84b8fae326
Merge branch 'eventManager' into diggingInvaders-unstable
2013-01-03 15:53:06 -05:00
910e398a7b
EventManager: added invasion event.
2013-01-03 15:52:56 -05:00
34d9785ce5
Digging Invaders: minor changes.
2013-01-03 14:38:05 -05:00
b62e50f2e1
DiggingInvaders: get rid of the framework for assigning multiple dig/deconstruct/etc operations at the same time.
2013-01-03 14:16:10 -05:00
0b68e66dc9
DiggingInvaders: fixed a problem with deconstructing hatches.
2013-01-03 13:32:50 -05:00
c22c4d009c
Added convenience functions to eventful (see Lua API.rst)
2013-01-03 20:30:51 +02:00
796e387398
Add a guard against an invalid item pointer, and don't try to deduce construction labor for item_lost jobs
2013-01-03 12:24:32 -06:00
f60e44c395
DiggingInvaders: minor changes.
2013-01-03 13:11:11 -05:00
7b561f108b
Fix hotkey detection
2013-01-03 22:01:01 +13:00
7586e62374
Digging Invaders: fixed a problem with removing constructions.
2013-01-02 22:35:05 -05:00
5201870356
Digging Invaders: get rid of debug prints.
2013-01-02 22:13:23 -05:00
ae43865489
Digging Invaders: actually seems to basically work!
2013-01-02 22:11:05 -05:00
4e4e382b8f
EventManager: added syndrome event.
2013-01-02 18:30:15 -05:00
8b5e847dfa
New event for eventful. postWorkshopFillSidebarMenu for tweaking the sidebar menu on workshops.
2013-01-02 23:43:38 +02:00
38ef75418a
AutoSyndrome: added an option to delete boiling rocks as they are created (on by default).
2013-01-02 14:09:16 -05:00
5e2877be23
AutoSyndrome: added options for worker only (vs all in building), allow multiple targets, and allow multiple syndromes.
2013-01-02 13:47:59 -05:00
bf0f0e910b
Merge branch 'eventManager' into autoSyndrome
2013-01-02 12:40:20 -05:00
144e0b4dcb
Digging Invaders: merged eventManager and recent.
2013-01-02 11:26:30 -05:00
c3b2ae2137
EventManager: allowed plugins to specify how often they need events to be checked, in the event that monitoring is necessary.
2013-01-02 11:07:56 -05:00
581a8dd955
Prevent material selection cursor from going past its bounds
2013-01-02 22:27:26 +13:00
fa78d6ccfc
Merge branch 'recent' into eventManager-unstable
...
Conflicts:
library/modules/Job.cpp
2013-01-02 03:16:45 -05:00
b320fb25f3
AutoSyndrome: added smart arguments for location, worker id, and reaction id.
2013-01-02 00:07:23 -05:00
1fe3a0e343
Merge branch 'automaterial_box'
2013-01-02 14:01:11 +13:00
41615d0446
Autolabor: adjust idle clawback to deal with "pickup equipment" for miners.
2013-01-01 17:53:24 -06:00
d50aa24ebf
Autolabor: fix idle stepdown (seems to work much better), change some scoring weights, change autolabor list output to include busy and idle counters
2013-01-01 16:35:09 -06:00
3a24565728
Autolabor: add construction labor for hatch.
2013-01-01 15:12:45 -06:00
7df7b1758c
Merge branch 'automaterial' of https://github.com/Falconne/dfhack into automaterial_box
2013-01-01 19:51:29 +13:00
a1eadd0f08
Allocate sky blocks when needed.
...
Allow stairs to be designated on top of each other in open space.
2013-01-01 19:46:11 +13:00
0572e87d7b
SkyEternal: allocates new z-levels of sky as needed, or on request.
2012-12-31 13:57:59 -05:00
6ab8c8c30e
Autolabor: change fishery build labor to CLEAN_FISH to control random acts of fish extermination; add build labor for wells.
2012-12-28 07:58:29 -06:00
6d4c003748
Autolabor: fix dig-from-below bug regaring mining jobs, add overallocation detection and remediation, fix fishing and hunting
2012-12-27 02:52:54 -06:00
5d04148aad
Make gcc happy
2012-12-27 20:15:32 +13:00
1ed129e1a7
Allow placing constructions in unconnected open space, with sensible restrictions
2012-12-26 01:02:57 +13:00
40e25b6a1f
Better handling of open space construction placement
2012-12-25 18:08:41 +13:00
5e54c9919a
Improved check for figuring out what tiles can have constructions.
2012-12-24 00:59:12 +13:00
e4f4943b10
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-12-23 12:34:05 +02:00
2f48ed5d9a
Added restrictliquids and restrictice commands.
2012-12-23 01:09:21 -08:00
03aedf6895
Enabling designation like rectangular selection for constructions, with unlimited selection size and auto skipping of tiles that can't be built on.
2012-12-23 03:04:41 +13:00
a4dc79565a
AutoSyndrome: allowed for triggering DFHack commands from in game reactions.
2012-12-22 00:13:07 -05:00
786149a630
Added new event to eventful: onWorkshopFillSidebarMenu
2012-12-21 00:42:15 +02:00
46b9148277
Digging invaders: it still doesn't work, but now it's a lot simpler.
2012-12-20 00:35:45 -05:00
9cb3f19630
Digging invaders: Minor changes. Still unstable.
2012-12-19 20:44:22 -05:00
ee4f37ff72
Merge branch 'canWalkBetween' into diggingInvaders
2012-12-19 20:31:17 -05:00
7972902c81
stepBetween: named a few things better, and fixed a lot.
2012-12-19 20:30:37 -05:00
fcbc5d1cb0
Digging invaders. Temp commit. Unstable.
2012-12-19 18:46:46 -05:00
555c754636
EventManager: added construction and building events.
2012-12-18 18:34:38 -05:00
a9fec84c72
Autolabor: add paved roads.
2012-12-18 16:23:02 -06:00
a09764e77b
Digging Invaders: more optimizations.
2012-12-18 15:22:21 -05:00
110a9a5579
Digging Invaders: a bit faster.
2012-12-17 20:44:35 -05:00
937769874d
Digging Invaders: kind of works, but WAAAAAY too slow.
2012-12-17 20:12:11 -05:00
957a4da474
Minor changes.
2012-12-17 18:05:57 -05:00
ef80dbacde
More fiddling. Almost kind of works.
2012-12-17 17:36:35 -05:00
76fcf1c335
Digging invaders: multi-dimensional edge cost: always prefer walking over digging, no matter how far.
2012-12-17 14:22:45 -05:00
94673e447d
diggingInvaders: reimplemented path-based digging. Works kind of ok.
2012-12-17 13:37:02 -05:00
ed1766936b
diggingInvaders: sadly, it seems that minimum spanning tree is a terrible heuristic for vertex Steiner tree in this case.
2012-12-17 00:54:39 -05:00
bf25ea5129
diggingInvaders: fixed a major bug with edge sorting.
2012-12-17 00:17:07 -05:00
d79583a2c9
Merge branch 'canWalkBetween' into diggingInvaders
2012-12-16 23:39:36 -05:00
01e5e93825
Renamed Maps::canWalkBetween to Maps::canPathBetween and added Maps::canWalkBetween, which does what it says.
2012-12-16 23:26:50 -05:00
a61cbc661b
diggingInvaders: starting a rewrite. Unstable
2012-12-16 21:44:23 -05:00
9aa95ddca8
diggingInvaders: int -> int32_t
2012-12-16 17:06:46 -05:00
2760484c37
diggingInvaders: cleanup.
2012-12-16 16:53:02 -05:00
131d19e4cf
Merge branch 'eventManager' into diggingInvaders
2012-12-16 16:43:58 -05:00
8a242b3c0d
Merge branch 'master' into diggingInvaders
2012-12-16 16:34:45 -05:00
4ac6d9c0c3
Autolabor: add a number of destroy furniture labors (all "haul furniture")
2012-12-16 00:03:26 -06:00
8bf359ba02
Autolabor: add labor for ivory & horn crafts (yawn)
2012-12-15 21:18:06 -06:00
75db99a3c7
autoSyndrome: deleted an unused constant.
2012-12-15 18:52:05 -05:00
3e5537e321
autoSyndrome: made it use EventManager.
2012-12-15 18:47:51 -05:00
dae162a0b4
Merge branch 'eventManager' into autoSyndrome
2012-12-15 18:18:59 -05:00
935058f0a5
EventManager: moved files around, made eventExample not run by default, and got rid of the silly NONE event type.
2012-12-15 17:43:41 -05:00
86e002f3ff
EventManager: added item creation event.
2012-12-15 16:49:13 -05:00
b0314755e0
EventManager: added unit death event.
2012-12-15 14:40:11 -05:00
4af6b728b7
Small fix to gm-editor. Added proj_itemst and proj_unitst to eventful. Now you can make custom projectiles (e.g. rockets?)
2012-12-15 13:27:16 +02:00
155a4d044c
EventManager: fiddled with time events. Made it possible to register for time events before a world is loaded. Also added some files I forgot to add to the previous commit.
2012-12-14 23:29:28 -05:00
cf619a519e
EventManager: made event handlers unregister when plugins are unloaded. Also changed PluginManager so that plugins can call core.getPluginManager() during plugin_init.
2012-12-14 22:14:38 -05:00
747723187f
EventManager: first draft.
2012-12-14 21:05:38 -05:00
cd7c39f2db
Autolabor: add deconstruct labor for cages
2012-12-14 09:34:03 -06:00
08f454cc81
Removed old reactionhooks.lua
2012-12-14 16:41:59 +02:00
e46d434c25
Missing lua file for eventful.
2012-12-14 16:33:26 +02:00
af7f11fdfa
autoSyndrome: made the syndrome logic make more sense.
2012-12-13 11:30:37 -05:00
bba96494f3
ruby: add unit_hostiles to list hostiles units (duh)
2012-12-13 17:20:21 +01:00
a28fc65e6d
autoSyndrome now deals with creature_class.
2012-12-13 11:13:56 -05:00
2535b50bfc
Autolabor: add construct chain labor, add destruct trap labor, change overbroad test for military status (was catching uniformed reservists, who are eligible to do civilian labor)
2012-12-12 22:25:23 -06:00
3a541e26be
autoSyndrome: automatically detects boiling rock syndromes better, and checks if each syndrome is applicable to the unit that finished the job.
2012-12-12 23:01:05 -05:00
82031092a9
Autolabor: rework tool management to try to reduce tool litter
2012-12-12 14:28:11 -06:00
ddceabbfb7
Merge branch 'master' of git://github.com/jjyg/dfhack
2012-12-12 18:58:11 +02:00
3b9f21a1ea
Autolabor: do not count designations in hidden squares (since your dwarves can't reach them anyway). Also apply an assignment penalty for assigning a dwarf to a labor other than the one the dwarf is doing
2012-12-12 10:37:09 -06:00
0fc01c48e1
Autolabor: add construct labor for GearAssembly, AxleHorizonal, and AxleVertical (the last is a guess, but probably right)
2012-12-12 09:52:13 -06:00
b75c1da95e
Autolabor: add build waterwheel.
2012-12-12 08:46:52 -06:00
662d3101c7
ruby: fix onupdate tick limiting + advmode, add pageprotect, add :script_finished
2012-12-11 17:25:51 +01:00
bd1756e5d0
Autolabor: change the fallback labor (for dwarfs for which nothing seems appropriate) from NONE to CLEAN. Fiddle with weights in assignment algorithm.
2012-12-11 09:29:03 -06:00
3e8ba2dd06
Autolabor: fix bring-crutch labor
2012-12-11 09:19:38 -06:00
017b986987
Autolabor: fix wound cleaning labor.
2012-12-11 09:06:37 -06:00
966deb4647
Fix crash and confusing behavior in automaterial.
2012-12-11 22:05:00 +13:00
6bc791d985
follow df-structure rename unit.unknown8 + able_stand_*
2012-12-10 22:50:33 +01:00
a914f8e8e0
Autolabor: busy dwarfs may be reassigned now, but with a strong preference for their current job; armed dwarfs are given preference for outside jobs; include experience gained toward next level in preference weighting
2012-12-10 08:34:11 -06:00
e85f4eb880
First draft of autoSyndrome: a tool for replacing boiling rock syndromes with something more reliable. Uses non-df-recognized tags in material definition raws.
2012-12-09 21:19:40 -05:00
6c4f163a5e
Merge branch 'master' of https://github.com/angavrilov/dfhack
...
Conflicts:
NEWS
2012-12-09 14:25:31 +02:00
6d0e505fd2
Added onItemContaminate to eventful and readme/news for eventful
2012-12-09 14:15:39 +02:00
a0a566dbf2
Tidy up eventful.cpp
2012-12-09 13:00:49 +02:00
0ef4522f95
Merge branch 'master' into autolabor
2012-12-08 21:26:50 -06:00
468412b9fc
Autolabor: fix unitialized variable bug causing broker to be inappropriately excluded from work
2012-12-08 21:14:23 -06:00
72921fbfd5
Made workNow only check jobs when the game becomes paused instead of constantly when paused. Also made it enable/disable on command.
2012-12-08 12:50:33 -05:00
412a004751
Autolabor: identify labors that may involve going outside and apply an assignment penalty for such labors to dwarfs who have minor children (in order to keep the kids inside)
2012-12-08 10:55:44 -06:00
6ae82187d2
Autolabor: more tweaks to hauling labor decoding, fix heap corruption due to array underflow
2012-12-08 03:51:07 -06:00
e7d3fbe97b
Autolabor: track labors actually being used (to avoid "gone fishing" bug); fix several wrong labor map entries; add several special cases for hauling (still not all there yet); add debug warning if job deduction appears wrong; flail about mightily trying to resolve heap corruption on unload
2012-12-08 02:42:22 -06:00
7307f4e870
Fix crash and confusing behavior in automaterial.
2012-12-08 09:51:35 +04:00
42670f0233
Autolabor: only care about skills that are used for labors, when determining a dwarf's highest skill.
2012-12-07 15:41:39 -06:00
ebc2625d97
ditch the unused Vegetation module
2012-12-06 23:47:25 +01:00
fa9b71adc5
autolabor: add archery targets, improve JobLaborMapper's destructor
2012-12-06 09:39:14 -06:00
e1b70d171c
ruby: tweak is_citizen test
2012-12-06 12:48:16 +01:00
cd6eb9edd3
If training ammo is forbidden for all use, don't move it to combat chests.
2012-12-06 12:00:18 +04:00
0df60a0b4f
Autolabor: slabs, animal trainers
2012-12-06 01:38:43 -06:00
f8d6b83088
Add 'allow fishing' and 'allow hunting' config options. Protect against accidentially trying to set or unset the NONE labor or any other invalid labor value (which corrupts DF). Add traction benches. Change prioritization around quite a bit.
2012-12-04 20:23:19 -06:00
74ebe7d207
ruby: add df-static-flagarray
2012-12-04 17:55:29 +01:00
0b80dff09d
ruby: add d-float support
2012-12-04 17:18:09 +01:00
0f1aaa6ec4
Autolabor: Items marked for dump now generate haul refuse demand. Also corrected labor for dump item jobs.
2012-12-04 01:59:44 -06:00
745b347b5b
Fix const correctness
2012-12-04 10:30:49 +13:00
287ee2bc04
Autolabor: allow multiple simultaneous jobs at farms.
2012-12-03 14:20:57 -06:00
3953112eb9
dump Vegetation::t_plant, fix plant.is_burning
2012-12-03 19:03:07 +01:00
208b9915ea
Autolabor: splints and crutches are furniture (at least at a forge); remove test that excludes pet owners from being given jobs when they're idle; add test for hungry/thirsty dwarves to trigger a feed/water civilians requirement; add a vehicle hauling requirement based on the existence of hauling routes
2012-12-03 04:28:08 -06:00
9563dae5d7
Autolabor: add labors for construct bridge, construct nestbox, construct trap, deconstruct wagon; fix error in labor for deconstruct furnace/tradedepot/construction; actually update the "active dwarf" numbers displayed in "autolabor list"; increase assignment penalty for dwarfs using skills lower than their best skill; increase assignment bonus for continuing in the same labor and for having the right tool for the job.
2012-12-03 01:41:02 -06:00
44bb965c97
Autolabor: add more building labors
2012-12-02 18:41:20 -06:00
4cd217b782
to new assignment algorithm. Add priority boost for labors based on how long it's been since they were last used, to avoid labor starvation. Move persistent configuration to "autolabor/2.0" to avoid conflicting with older versions.
2012-12-02 14:27:13 -06:00
b743f4f42d
Autolabor: remove some debug spam, and fix an error in computing preference scoring
2012-12-02 09:47:15 -06:00
dc7f9f56cd
Implement a low stock level announcement as suggested by falconne.
2012-12-02 15:31:43 +04:00
799da41f70
Autolabor: Add debugging messages from the labor deduction module; add deduction rules for some building destroy jobs; automatically exclude handless dwarfs from labor poor; use DF's own hauling job counts to compute hauling demand (and arrange for the "hauling canary" so that this always works)
2012-12-02 02:02:16 -06:00
45564ca0cb
Autolabor: generating haulers based on unstockpiled items (less than ideal). Fix wrong build labor for Farmer's workshop. Add build labor function for constructions (also works for furnaces and trade depots). Add architect detection. Use a different mechanism for selecting dwarfs for labors.
2012-12-01 23:12:41 -06:00
15f7ffa0e2
autolabor: add ConstructBuilding (Farm); change priority calculation
2012-12-01 17:39:01 -06:00
bb2b97baa3
autolabor: exclude "item lost" jobs, exclude jobs that are not first-in-queue at workshop, improve debug messages
2012-12-01 16:09:52 -06:00
201430ed08
Autolabor: add health awareness, fix initialization crash, fix idle dwarf loop crash
2012-12-01 14:08:15 -06:00
df2e9f00e1
Document that search now works in the stockpile settings screen.
2012-12-01 17:21:06 +04:00
fd5b19fe8d
Merge remote-tracking branch 'falconne/search'
...
Conflicts:
plugins/search.cpp
2012-12-01 16:55:52 +04:00
afb6d8ef79
Autolabor: improve (hopefully) the functionality for mapping jobs to labors. Still some gaps to fill, but not many.
2012-12-01 02:26:06 -06:00
d2ec52fa0b
Merge branch 'master' into autolabor
2012-11-30 21:47:30 -06:00
05dce0d2f1
Fix inadvertently prematurely terminated block comment.
2012-11-30 21:24:18 -06:00
384a667e97
Assorted progress on new autolabor. Still lots of issues.
2012-11-30 20:22:58 -06:00
6bc6f3e555
Merge branch 'search'
2012-12-01 10:21:37 +13:00
5f3328dcb2
Merge branch 'master' into autolabor
...
Conflicts:
plugins/autolabor.cpp
2012-11-30 11:25:41 -06:00
eecb604800
Sync submodules
2012-11-30 11:23:58 -06:00
210c1650ec
Add stockpile screen searching capability
2012-12-01 01:01:04 +13:00
2cb594ba89
Tweak the workflow lua api: include history in output of listConstraints.
2012-11-30 14:48:05 +04:00
abe027c940
Copy changes from ag fork
2012-11-30 22:44:05 +13:00
13666ec6e6
Merge remote-tracking branch 'remotes/origin/automaterial'
2012-11-30 20:27:32 +13:00
d2a13ad2c7
Merge branch 'autopasture'
2012-11-30 19:53:14 +13:00
d59d1c652e
Fix gcc compile of search plugin
2012-11-30 19:50:42 +13:00
d7f7538d01
ruby: fix Pointer assignment
2012-11-29 17:11:29 +01:00
3095c43d26
Fix location of workshop ui, based on menu width
2012-11-29 23:15:24 +13:00
57b69da1f0
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-11-29 12:13:28 +02:00
2c9b560872
Made dfusion not stop df on input.
2012-11-28 22:13:28 +02:00
771a5ac50b
ruby: tweak flagarray#inspect
2012-11-28 20:08:34 +01:00
614225cc5f
follow rename itemst.flags.artifact1 -> artifact
2012-11-28 19:48:47 +01:00
bfc11cf946
Add persistent history of per-constraint item counts in workflow.
...
This will be needed for properly merging or integrating the status
screen by falconne. The history is maintained as a circular buffer
of up to 28 entries, and persists in save files.
2012-11-28 19:25:01 +04:00
593dc4f554
Fix handling of manipulator hotkey in unit search screen
2012-11-28 17:18:38 +04:00
8f0d552556
ruby: add DFHack::VERSION
2012-11-28 13:33:07 +01:00
7a2a746347
Add filtering to zone creature assignment menu. First steps towards adding autopasture functionality.
2012-11-29 00:31:39 +13:00
76bb5f0196
ruby: items in containers are free
2012-11-26 20:09:56 +01:00
2bbcfe912a
Site spawner added to adv_tools
2012-11-26 21:04:17 +02:00
f091284a75
ruby: avoid crash on ArgumentError in onupdate
2012-11-25 17:29:03 +01:00
3db5684ae7
Fix handling of manipulator hotkey in unit search screen
2012-11-25 19:01:58 +13:00
e9141f34f6
Adjust minimum widths so they actually work at 80x25 without glitching out
2012-11-24 11:13:54 -06:00
c58f30ba00
Use teal background instead of red for no-labor cells
2012-11-24 10:37:22 -06:00
cdc44b74f2
Fix possible crash when using shift+enter on cells that don't have labors
2012-11-24 10:36:32 -06:00
4dfe46e26f
manipulator: fix column width calculations for 80x25 window
2012-11-24 16:52:21 +01:00
e73274d281
ruby: add description field to onupdate_register
2012-11-24 16:10:55 +01:00
e750cbe5e9
MouseQuery Plugin
2012-11-25 04:02:49 +13:00
139fd07df3
missed a spot
2012-11-23 19:23:06 -06:00
e3eb325d36
Minimize references to gps->dimx/dimy
2012-11-23 19:18:56 -06:00
2a0d048040
Make tweak stable-cursor interact with the build menu properly.
2012-11-22 20:08:47 +04:00
e7905a5cff
Add docs for the automaterial plugin, and use the new Painter class.
2012-11-22 19:38:45 +04:00
2794143f77
Merge remote-tracking branch 'falconne/automaterial'
2012-11-22 18:27:31 +04:00
2a83d92290
Code cleanup
2012-11-21 23:45:26 +13:00
0d9efec062
Disable plugin in non construction menu
2012-11-21 20:17:36 +13:00
5b5c674f6e
ruby: update map_tile.mat_info for soil/stone special cases
2012-11-20 21:17:33 +01:00
9cb1a45855
Automaterial branch commit
2012-11-20 23:12:11 +13:00
5c18952caa
Select by item name
2012-11-20 22:52:44 +13:00
fe2257427f
workNow: plugin to make DF process jobs every time you pause.
2012-11-19 20:17:05 -05:00
f587d603e8
Allow the workflow goal gap in any range between 1..goal-1
2012-11-19 18:59:58 +04:00
0e2aa299b9
Auto material selection plugin - First push
2012-11-20 00:25:25 +13:00
902d2d5597
Try reducing the replace with sparring chance due to xp gain overkill.
...
Also add more debug spam to make behavior tracking easier.
2012-11-18 22:06:47 +04:00
ae7bf5aca6
Check unit inventory when replacing skill demo with sparring.
...
E.g. if they have no shields, they won't gain that skill when sparring.
2012-11-18 13:02:49 +04:00
ee15086963
Some preparations for new plugin.
2012-11-18 01:52:46 +02:00
2953e4c386
Implement a dialog to specify a workflow constraint with all features.
2012-11-17 20:32:39 +04:00
0b568942f4
Follow changes in the xml defs.
2012-11-17 16:43:29 +04:00
1ab48aa2de
Merge https://github.com/ab9rf/dfhack
2012-11-16 21:15:38 -06:00
e2b9b703a0
Get rid of tabs
2012-11-16 15:33:36 -06:00
fc1a1e1f0e
Merge remote-tracking branch 'jjyg/master'
...
Conflicts:
NEWS
2012-11-16 13:20:46 -06:00
2a0171a4ff
Merge remote-tracking branch 'angavrilov/master'
2012-11-16 13:15:55 -06:00
cbe3741751
Check all depots for trader requested, not just the last one.
2012-11-16 13:09:05 -06:00
d506dd7137
Add a tweak to speed up melee squad training.
2012-11-16 22:51:07 +04:00
423c122424
ruby: fix unit_find for advmode
2012-11-16 17:59:39 +01:00
bbe94c006f
Update for temperaturest
2012-11-12 11:54:21 -06:00
55fcb7e3ca
One more missed
2012-11-12 08:33:05 -06:00
766aca4911
Rename general_ref vectors for consistency
2012-11-12 08:27:58 -06:00
c32f85d637
Merge remote-tracking branch 'warmist/master'
...
Conflicts:
plugins/Dfusion/include/OutFile.h
2012-11-12 10:50:48 +04:00
ce8ada4419
More bug fixing
2012-11-11 22:14:00 +02:00
3eb852a43b
Added cheat commands to companion-order, (including rumrushers)
2012-11-11 21:18:59 +02:00
df3b791665
Fixed error in dfusion and added some readme.
2012-11-11 17:19:37 +02:00
683da39636
Fix dfusion build on linux.
2012-11-11 17:24:25 +04:00
d5c31942b5
Add a way to only count locally-made items in workflow.
2012-11-11 15:56:31 +04:00
0e4df55364
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-11-11 12:46:55 +02:00
33f674eee2
Removed dfusion lua files. Updated plugins.
2012-11-11 12:33:54 +02:00
f1d4eac700
Pre-class remove
2012-11-11 11:58:43 +02:00
7ee817b324
Add gcc compile fixes
2012-11-11 19:42:30 +13:00
6803a83e07
Refresh constraints on map reload
2012-11-11 18:18:54 +13:00
f86371cfc3
Try blocking any use of stockpiles for squad stuff in fix-armory.
2012-11-10 18:06:41 +04:00
b16bbdd6df
Generate correct constraint string for persistence
2012-11-11 03:00:55 +13:00
56ef33ea0e
Support building steam engines on top of brooks without any down stairs.
2012-11-10 17:33:05 +04:00
eb936c4ce0
Support milking and shearing in workflow.
2012-11-10 17:06:54 +04:00
0222b93bb0
Fix bug with non-repeating jobs getting protected
2012-11-10 03:47:15 +13:00
69bb6a5b3b
Finished dashboard, colour coding, trend calculation and charts, material selection screen, mouse support
2012-11-09 20:05:16 +13:00
a7bf526f41
Make workflow consider squad-assigned items busy.
2012-11-08 21:27:56 +04:00
0c70a448d0
Update submodules
2012-11-07 23:06:02 +01:00
f6b6d730a0
Fix fix-armory constantly trying to store ammo already stored in chest.
2012-11-07 22:49:40 +04:00
b089221400
Inventory Monitor - first checkin
2012-11-06 06:59:51 +13:00
edf80ff748
Show the sex of the unit in the bottom line of Dwarf Manipulator.
2012-11-04 18:03:02 +04:00
9bf24bde10
More various updates for search.
...
- Keep the search state as long as the screen is alive.
- Properly forget saved state when clearing search.
- Fix the start column in render for stocks screen.
- Allow search by profession in all Units pages.
- Dismiss search when trying to trade.
2012-11-03 15:34:04 +04:00
8bccfb1e9a
Fix gcc compiler errors and warnings in search, reindent plugin_init, etc.
2012-11-03 14:31:07 +04:00
43ab172652
Merge remote-tracking branch 'falconne/master'
...
Conflicts:
plugins/zone.cpp
2012-11-03 14:07:42 +04:00
71c1ba84e3
Merge remote-tracking branch 'q-github/master'
2012-11-03 14:05:15 +04:00
3257eb80a1
Add checks to avoid crashing if we encounter a soulless unit
2012-11-02 16:28:48 -05:00
e887c60e93
Removed unused buffers.
2012-11-02 21:00:35 +02:00
86e4a42bdd
Small fix due to vmethod change
2012-11-02 20:59:05 +02:00
6be65690f7
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-11-02 20:29:27 +02:00
5295be5fdb
More work done. Only bin-plugs left (and docs)
2012-11-02 20:28:08 +02:00
296d1cf090
More scripts for dfusion. Only fixes left, and updating bin-plugins (friendship and migrants(??))
2012-11-02 00:50:20 +02:00
ba071468dc
New way of doing things!
...
Now using a class for menus, also no (non script) way to use bin-plugins.
2012-11-02 00:28:16 +02:00
209d593f21
Another day, another commit.
2012-11-01 16:00:00 +02:00
0a78064467
ruby: raise on invalid enum symbols
2012-10-31 16:11:06 +01:00
69bdb0f8b8
Update fix-armory documentation and comments.
2012-10-31 11:31:31 +04:00
05b73af9bb
Extend fix-armory with support for storing ammo in barracks.
2012-10-30 23:20:34 +04:00
c4f544d796
Fix stupid MSVC
2012-10-30 13:50:14 -05:00
b46885bb3c
Fix compile
2012-10-30 11:48:28 -05:00
4fa826d2b9
Block instant creation of store in stockpile jobs when removing uniforms.
2012-10-30 13:11:57 +04:00
3ff5d38a5c
Add a few utility functions to the main library.
2012-10-30 12:40:26 +04:00
dc2805b1f3
Link the renderer vtable from libgraphics on linux.
2012-10-30 10:38:32 +04:00
cd14bdfd43
Disable dfstream by default
2012-10-29 22:29:07 -05:00
3a6b0357a2
Fix compilation on Windows, incorporate latest df-structures data
2012-10-29 16:56:22 -05:00
c69ae2fc4a
Merge https://github.com/Mortal/dfhack
2012-10-29 16:34:26 -05:00
7646fa6aa3
Add dfstream plugin. Broadcasts the Dwarf Fortress display on TCP port 8008. For use with https://github.com/Mortal/dfstream
2012-10-29 22:18:50 +01:00
7219200d17
Split the armory tweak into a separate plugin - it is too big now.
2012-10-28 22:05:00 +04:00
ed4904fb66
Add a tweak that makes dwarves haul equipment from stockpiles to the armory.
2012-10-28 21:13:28 +04:00
fa88ee5f17
Update the armory tweak to protect other potential squad equipment.
...
Specifically clothing in cabinets and flasks/backpacks/quivers in boxes.
2012-10-28 15:37:16 +04:00
4c2c6a1911
Fix handling of Collect Webs jobs in workflow.
2012-10-26 23:53:18 +04:00
c5d8bd9db6
Add a tweak to stop stockpiling items on weapon racks and armor stands.
2012-10-26 23:30:44 +04:00
b976e01b8c
Follow the change in the base-type of job_skill.
2012-10-26 20:29:21 +04:00
1b9d11090f
ruby: ANY_FREE/IN_PLAY
2012-10-25 13:44:01 +02:00
1f994295b8
Consider assigned vehicles in use, and tweak text color rendering.
2012-10-25 13:20:41 +04:00
79d2cb1a5c
Remove the C++ version of the job output deduction code and switch to lua.
2012-10-25 12:44:23 +04:00
8eebfa007c
Tweak the workflow gui script to make the UI operate smoother.
2012-10-25 12:15:18 +04:00
a7f1ceb75d
Link lua to workflow.
2012-10-24 23:01:31 +04:00
59ec9b304e
Implement adding workflow constraints from gui/workflow.
2012-10-24 21:49:30 +04:00
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
cd852e2240
Fix one more place that was using ANY_FREE.
2012-10-24 17:51:47 +04:00
7b67df4b4e
Merge remote-tracking branch 'q-github/master'
2012-10-24 16:49:12 +04:00
09f8e8e419
Start working on gui for workflow.
2012-10-23 21:42:03 +04:00
27c7dfde4f
ANY_FREE -> IN_PLAY, to match terminology used in DF's error messages
2012-10-23 12:14:21 -05:00
94898a73fb
Add Search plugin comments
2012-10-23 21:20:51 +13:00
cfbdf47f6e
follow rename Carried->Hauled in df-structures unit inventory mode
2012-10-22 19:37:12 +02:00
2fcceaa65e
Set priority over manipulator plugin
...
Include animal type is search
2012-10-22 21:44:02 +13:00
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
59ece3d4f1
Merge branch 'master' into autolabor
2012-10-21 17:25:14 -05:00
f501ae0748
Bug fix on unit sort
2012-10-22 01:09:10 +13:00
bf01ecd206
Added Trade screen
2012-10-22 00:48:27 +13:00
a3f6e9e305
Small error fix
2012-10-21 13:46:12 +03:00
86ec66c0fb
More work on dfusion. Embark anywhere script separated.
2012-10-21 13:42:55 +03:00
c5b38a24eb
Refactoring to use templates
2012-10-21 20:57:03 +13:00
67674a7676
Merge remote-tracking branch 'jjyg/master'
2012-10-21 11:12:32 +04:00
1f7a01d685
follow rename unit.military.squad_index to squad_id in df-structures
2012-10-20 22:35:39 +02:00
fd60db44ab
Search plugin, early work. Unit and stocks screen.
2012-10-21 00:49:46 +13:00
687dc7105f
Merge remote-tracking branch 'kmartin/master'
2012-10-20 15:39:20 +04:00
6a54878a6b
Fix autobutcher resume
2012-10-20 01:38:08 +13:00
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
5f4f540bfa
Fix "fastdwarf" command to print syntax where appropriate, silence warning
2012-10-17 07:57:14 -05:00
ffe70e9ee7
ruby: unregister onupdate callback on exception
2012-10-17 14:40:28 +02:00
0003fe0b2a
Merge remote-tracking branch 'jjyg/master'
2012-10-12 20:33:07 -05:00
c089534f73
ruby: fix assigning value to pointer to number
2012-10-12 13:33:58 +02:00
1f88c0eeed
ruby: codegen: avoid bad vector_reftg accessor
2012-10-12 11:42:42 +02:00
0547ee7f83
ruby: add magic "nolock " prefix to run ruby without Suspending main df
2012-10-12 11:12:31 +02:00
12eeb9e5c0
Correct wrong variable use in start_autonestbox.
2012-10-12 00:38:45 -05:00
424c37c0ea
ruby: fix codegen to handle composite vtables
2012-10-11 17:51:49 +02:00
9148079745
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-10-10 19:47:01 +02:00
46a24a83fb
ruby: fix item_find(:selected) in item details screen
2012-10-10 18:01:57 +02:00
41de37a5c1
Add a special workshop for add spatter reactions into example raws.
2012-10-10 18:29:59 +04:00
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
5cf42fd6f8
ruby: add Matinfo#===
2012-10-10 14:57:45 +02:00
ab90e3eefe
Manipulator - take false identities into account
2012-10-07 17:35:41 -05:00
49476818c4
Dfusion rebuild start (lua script side plugins)
2012-10-07 20:45:14 +03:00
923ea3f4b0
Reactionhooks more usefull and gm-editor minor tweaks (e.g. search in containers)
2012-10-07 20:44:18 +03:00
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
696cc4a911
Stop autobutcher and autonestbox crashing if started without world.
2012-10-06 13:07:11 +04:00
6fefd09072
Fix re-enabling autobutcher after being disabled.
2012-10-06 12:51:34 +04:00
5396a67465
Some tweaking and edited NEWS.
2012-10-06 12:40:46 +04:00
cbbb164dad
ruby: add MapTile distance_to and spiral_search
2012-10-05 20:44:29 +02:00
ddcc2ee90d
Should use "break" in this construct, not "continue"
2012-10-04 20:20:35 -05:00
6b3d85eb0f
Don't make teledwarf skip everything after it if there's a problem
2012-10-04 20:17:33 -05:00
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
9f687f64a4
Fix build.
2012-10-03 12:58:05 +04:00
7962f24cce
Display actual key bindings for Manipulator
2012-10-02 10:20:54 -05:00
43532e4871
Progress commit of a rewrite of autolabor to draw from the jobs list and other world information. A lot still to do on this.
...
DO NOT MERGE INTO THE MAIN BRANCH. This code is incomplete and only vaguely tested.
2012-10-01 17:48:47 -05:00
150704f1af
ruby: raise when using unknown symbols in viewscreen.feed
2012-10-01 16:05:07 +02:00
fbc2d85609
ruby: rename building_isitemfree to item_isfree, add trader flag check
2012-10-01 11:14:00 +02:00
4de245d691
ruby: install generated autogen after copying *.rb
2012-09-30 17:08:03 +02:00
6fd002382f
ruby: fix cmake dependency on codegen.out.xml
2012-09-29 12:13:04 +02:00
7a74088287
Make backspace seek to top left corner in manipulator.
2012-09-29 13:01:11 +04:00
1bac22884e
xMerge https://github.com/jjyg/dfhack
2012-09-29 01:58:29 +02:00
12f5e6028c
manipulator: avoid NULL deref with unassigned job in unit list
2012-09-29 01:38:32 +02:00
4258d1eb83
Merge branch 'experimental' of https://github.com/expwnent/dfhack
2012-09-29 01:31:12 +02:00
0e124bf62b
Merge branch 'teledwarf' into experimental
2012-09-28 19:17:56 -04:00
d41c4849f9
Fixed unit_grounded in teleporting dwarf tile.
2012-09-28 19:17:12 -04:00
4b99d096da
Merge branch 'teledwarf' into experimental
2012-09-28 19:07:29 -04:00
1bde32fa5b
Fixed a tile occupancy problem with teleporting dwarves.
2012-09-28 19:06:22 -04:00
44a74ddc38
ruby: remove unused var
2012-09-28 22:58:26 +02:00
ce7e21f869
Merge branches 'digAll', 'misery' and 'teledwarf' into experimental
2012-09-28 16:44:08 -04:00
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
53c6ee4673
Track structures and stonesense
2012-09-28 21:57:12 +02:00
687657f2da
manipulator: show full group when navigating labor groups
2012-09-28 19:48:28 +02:00
4a495c2c7f
manipulator: make cursor_down_z go to beginning of next group
2012-09-28 19:20:10 +02:00
ca0097b910
manipulator: better screen width usage
2012-09-28 19:20:10 +02:00
c4f26d0aa8
manipulator: make up/down keys wrap around
2012-09-28 19:20:04 +02:00
783b218eec
Try a different color scheme when highlighting squad members in tweak.
2012-09-28 18:50:01 +04:00
ba763b773d
New tweaks for the military assign to position screen.
2012-09-28 18:01:17 +04:00
bd7cd690aa
Implement the common suggestion of Shift-Enter in trade screens.
2012-09-28 13:32:41 +04:00
164c61b638
Forbid stuff from bins in siege-engine, if forbid ammo standing order set.
2012-09-27 10:43:42 +04:00
7cc29250f8
fix for updated viewlist_petst
2012-09-26 18:22:07 +02:00
d975ce5135
ruby: add onstatechange_register_once
2012-09-26 15:08:54 +02:00
ddc83a0a72
Another dfusion nuking (not much left :) )
2012-09-25 11:30:38 +03:00
0bee8c360e
Reaction hooks experimentation.
2012-09-25 10:25:47 +03:00
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
f628c3732a
ruby: avoid smoothing grass/trees
2012-09-24 19:19:34 +02:00
a622ee52e9
ruby: fix building_alloc Trap, and init Floodgates as closed
2012-09-24 19:11:42 +02:00
a2bb322344
ruby: item_find now works in z/stocks
2012-09-24 15:40:35 +02:00
962a057ffa
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-23 23:31:05 +02:00
aefedb9887
ruby: MapTile#offset, tweak #dig to check for existing jobs
2012-09-23 23:26:57 +02:00
6385128c28
Sort by units.active (arrival), and seek to top/bottom in manipulator.
2012-09-23 16:41:14 +04:00
f2199c2951
ruby: fix activity zone_num
2012-09-23 11:44:27 +02:00
f7272e4a8f
ruby: use cursor as default map_tile_at arg
2012-09-23 10:58:31 +02:00
ebd4b94c2d
ruby: add onupdate_register_once
2012-09-22 11:57:33 +02:00
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
b115edcf68
ruby: return selected zone in building_find
2012-09-20 19:57:43 +02:00
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
1f7c10252e
Support renaming activity zones.
...
This one required hooking the dwarfmode render method.
2012-09-20 11:48:53 +04:00
462bedb757
Fix the rename plugin and script to use the new getSelectedBuilding API.
2012-09-20 11:11:59 +04:00
c39a337223
Add unit/item/job/building getter hook vmethods to dfhack_viewscreen.
2012-09-20 11:11:20 +04:00
1fd0654d63
Restore stonesense to the proper revision
2012-09-19 22:55:38 -05:00
e154d5447b
ruby: fix building linking more
2012-09-20 01:33:10 +02:00
2d5942d5d7
ruby: fix building linking
2012-09-20 00:33:22 +02:00
bef9e9af7c
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-09-19 20:24:38 +03:00
b6d9863172
ruby: allow Civzone constants in building_alloc
2012-09-19 19:19:58 +02:00
a80f574be8
Only initialize siege engine in dwarf mode.
2012-09-19 19:52:57 +04:00
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
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
27fd3f5fc7
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-19 15:05:42 +02:00
45c057b3d2
ruby: handle ptr-strings in df-structures
2012-09-19 14:25:14 +02:00
65a382a2d7
Document some of the new stuff in the readme.
2012-09-19 15:55:08 +04:00
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
69e8fcce91
Add mouse input to Manipulator, along with column labels
2012-09-18 13:57:06 -05:00
b470abed90
ruby: misc tweaks
2012-09-18 18:13:22 +02:00
a7998f71a2
Add a tweak workaround for the issue with container reactions in advmode.
2012-09-18 17:39:37 +04:00
f2e7ee4756
Tweak the add spatter plugin.
2012-09-18 13:15:25 +04:00
d70a79deb9
Follow changes in XML defs.
2012-09-18 13:11:11 +04:00
57d01f0008
ruby: use ui.follow_item/unit in unit_find, show non-english names by default
2012-09-18 10:17:33 +02:00
72141a3c9b
ruby: use implicit init-value -1 for ref-target/refers-to in codegen
2012-09-18 10:17:32 +02:00
eacca723e0
ruby: fix building subtype/customtype init value
2012-09-18 10:17:32 +02:00
36e44c682c
Add a plugin implementing 'add spatter to item' reactions.
2012-09-17 21:15:51 +04:00
613063cef4
Add a tweak to fix subtractDimension of small amounts.
2012-09-17 17:19:24 +04:00
82e870c8dd
Move siege engine out of devel.
2012-09-17 14:59:59 +04:00
f2fde21b10
Implement a slightly more sensible aiming AI in siege engine.
2012-09-17 14:45:22 +04:00
c1e20c6f05
Follow changes to structures.
2012-09-17 12:47:18 +04:00
58fda716e6
Explicit cast is required for MSVC.
2012-09-16 17:06:31 -05:00
847dadd3f5
Merge remote-tracking branch 'angavrilov/master'
2012-09-16 16:37:08 -05:00
38f920dd65
Merge remote-tracking branch 'q/master'
2012-09-16 16:36:51 -05:00
b6d9a3c3ad
More useless stuff removed
2012-09-16 13:20:55 +03:00
2f131178d8
Removed unused triggers folder
2012-09-15 18:05:53 +03:00
4f9732bfda
Useless files removed, small bugfix
2012-09-15 15:44:15 +03:00
000e3baf27
Implement skill-based miss probability in siege engine.
2012-09-14 20:57:03 +04:00
811c096c0e
Vaporize liquids from barrels, and destroy bin contents in siege engine.
2012-09-14 20:22:49 +04:00
5474ccacb6
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-14 14:30:25 +02:00
b05905a0ba
ruby: basic stl::set<uint32> support, add Viewscreen.feed_keys
2012-09-14 13:55:22 +02:00
d22591e240
Fix a file descriptor leak and a crash in linux getMemRanges.
2012-09-14 12:35:55 +04:00
aaf5d181bd
Add yet one more performance-oriented tweak for temperature updates.
2012-09-14 12:14:36 +04:00
c927623050
Rework handling of column positions, and insert a new "Happiness" column
2012-09-13 15:42:51 -05:00
1325b70e41
Cleanup autolabor+cleanowned, fix depends/clsocket
2012-09-13 14:42:17 -05:00
1d8c9a6a5f
Merge https://github.com/danaris/dfhack
2012-09-13 14:30:44 -05:00
cae01250ff
Merge branch 'master' of https://github.com/angavrilov/dfhack
2012-09-13 14:08:26 -05:00
a9ce19b826
ruby: add raw_rtti_classname to read real classname from RTTI info
2012-09-13 19:07:37 +02:00
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
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
ae6e0f617d
Make it clear that this is from DFHack, and properly name it Dwarf Manipulator
2012-09-13 08:27:28 -05:00
19a150fb38
ruby: fix dig smooth overdigging
2012-09-12 20:59:37 +02:00
c9d73cb6fb
Fix crash bug when using manipulator in Arena mode
2012-09-12 13:42:16 -05:00
f06f9af6b8
Throw items from bins around in siege engine, like minecarts do.
2012-09-12 20:57:25 +04:00
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
cda17954c8
ruby: add MapTile.dig(:Smooth)
2012-09-12 01:07:19 +02:00
b0938d7e0d
Allow specifying arbitrary items to use in catapults.
2012-09-11 22:46:17 +04:00
3a075f4bc7
Trivial siege engine aiming at units, with logic in lua.
2012-09-11 19:17:24 +04:00
ccefd02ee3
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-09-10 11:56:23 -04:00
96abc903ab
Merge branch 'master' of http://github.com/peterix/dfhack
2012-09-10 11:54:56 -04:00
274d6038ad
Merge further changes (???)
2012-09-10 09:19:21 -04:00
270351f510
Merge branch 'master' of https://github.com/danaris/dfhack
2012-09-10 09:18:24 -04:00
8ab615f6d0
Implement unit path prediction in siege engine.
2012-09-09 20:54:12 +04:00
9679b7729c
Clean up the movement speed calculation function and move into the core.
2012-09-09 17:04:58 +04:00
ec3d489bda
Move curse-affected attribute value getters to the core.
2012-09-09 12:51:08 +04:00
a36fe25e72
Finish the effective skill computation function, and move to core.
2012-09-09 12:27:40 +04:00
fb88aad51d
Reverse-engineer unit speed computation from DF code.
2012-09-08 21:07:18 +04:00
003c3391d1
Implement aiming projectiles at random points in the designated area.
2012-09-08 15:49:46 +04:00
bfa6ed3e08
Support setting the target area for the siege engine.
2012-09-08 13:46:02 +04:00
325e294af2
Start the siege engine plugin with code to highlight obstacles on screen.
2012-09-07 19:54:32 +04:00
85fc3384dd
Little cleanup and update to gm-editor
2012-09-07 17:25:39 +03:00
0db873493a
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
...
Conflicts:
dfhack.init-example
2012-09-07 17:24:38 +03:00
d0e630d4c3
Move steam engine out of devel, since it should be fully functional.
2012-09-06 17:10:58 +04:00
d5ea05ebb8
Implement a pressure plate sensitive to machine power.
...
When built next to a gearbox, it will monitor its powered state.
2012-09-06 12:37:29 +04:00
3dcaee7cb9
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-09-05 21:55:17 +03:00
6fc10fc268
Fixed embark anywhere to use more sane code segment search
2012-09-05 21:52:54 +03:00
e09b98216f
ruby: fix vector[length+50] = 0 segfault
2012-09-05 20:39:13 +02:00
8d876cc7d9
Support renaming some buildings, and arbitrary units, via gui script.
2012-09-05 21:27:42 +04:00
afbace8af6
ruby: alloc_building(:Furnace, :Smelter)
2012-09-05 19:18:21 +02:00
9c6fcee9a9
Add steam engine documentation, and use barrel quality in efficiency calc.
2012-09-05 11:23:00 +04:00
96fec768c7
Merge remote-tracking branch 'angavrilov/master'
2012-09-04 12:05:05 -05:00
aa449a2180
Add a tweak to work around the endless temperature update bug.
...
This obsoletes fix/stable-temp.lua, which only fixes items once.
2012-09-03 21:11:35 +04:00
1618ccf5bb
Fix steam-engine build on msvc, and add a script for listing mem ranges.
2012-09-03 10:28:17 +04:00
2249cb14fa
Require level 3 both for water & magma, and indicate level 5 by brightness.
2012-09-02 18:57:10 +04:00
3b08ee44d1
Vary the internal power consumption of the engine depending on quality.
2012-09-02 17:32:44 +04:00
67630776ee
Tweak steam engine raws.
2012-09-02 17:17:18 +04:00
9c3843c1d4
Use new API in steam engine; always explode if destroyed with steam inside.
2012-09-02 14:59:13 +04:00
3713c5ea9e
Add some APIs required by steam engine to the core.
2012-09-02 14:10:58 +04:00
a4c028b3b7
ruby: buildings tweaks
2012-09-02 01:38:58 +02:00
2574bb1e3d
embark anywhere upgrade.
2012-09-01 21:58:01 +03:00
8536785d1d
Boilers made out of unsuitable materials should explode!
2012-09-01 20:46:34 +04:00
bae85ac77d
Make the steam engine consume liquids from Z level below.
2012-09-01 17:52:51 +04:00
74501d3197
Try preventing "boiling water" from freezing, and dump steam on destroy.
2012-09-01 14:42:19 +04:00
532839a4d5
Embark anywhere ported
2012-09-01 10:54:45 +03:00
f158e1894d
Further work on steam engine.
...
- Display water inside as 'boiling' by hooking item_liquid_miscst.
- Store current power in flags to avoid mess if items disappear etc.
- Suspend/unsuspend stoke jobs depending on steam level.
- Implement intelligent steam use rate and boiler capacity cap.
- Modify appearance of special tiles to display status.
2012-09-01 11:29:05 +04:00
acdf0ffb42
ruby: fix create building map occupancy
2012-09-01 03:35:47 +02:00
c68afdaad2
Display command key helper for Manipulator on Unit List, various tweaks
2012-08-31 20:35:35 -05:00
dcc9498dbc
ruby: tweak apis
2012-09-01 03:22:48 +02:00
262233aa33
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-08-31 23:53:31 +03:00
ece0833c93
Prototype steam engine workshop :)
...
Very broken and incomplete still.
2012-09-01 00:22:55 +04:00
ce608e4f6a
ruby: yield announcements for further customization
2012-08-31 19:16:13 +02:00
54780cac3f
ruby: allow vmethod call with 6 args, use direct fptr
2012-08-31 15:51:22 +02:00
90021b4e5e
simple_embark/plugin.lua sanitized
2012-08-30 20:41:10 +03:00
e6b2cb73af
Add a tweak for pressure plate creature weight limit rendering.
...
Print them as readable "???K", instead of the normal truncated numbers.
2012-08-30 20:48:06 +04:00
6b7594dbd7
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-08-30 18:52:48 +03:00
c414aafc59
Add "Toggle Group" key
2012-08-30 10:03:12 -05:00
1dee51abb0
Use generic DOCTOR tile for wound dresser labor.
2012-08-30 19:01:43 +04:00
7676f07b06
Display creature graphics tiles beneath the column headers
2012-08-30 09:46:09 -05:00
a8158cb19a
Merge remote-tracking branch 'q/master'
2012-08-30 09:25:26 -05:00
604cf80832
Repurpose the nestboxes plugin as a watcher that automatically forbids fertile eggs.
2012-08-30 09:23:11 -05:00
4e169558f5
Tweak column labels a bit
2012-08-28 15:52:26 -05:00
b2587c1e6d
Fix skill sort
2012-08-28 15:33:22 -05:00
fee3cfda96
Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
2012-08-28 20:18:12 +03:00
834d7fa1fa
Tweak prospector: try using the biome elevation for soil depth.
...
Until a better idea presents itself (or maybe it is the right way).
Soil depth computation affects which soil layers are reported, and
Z level alignment of the layer stack.
2012-08-28 11:52:54 +04:00
d69a7c63e3
Tabs to spaces.
2012-08-27 16:05:23 -04:00
1a5f05768f
Made it not run every tick.
2012-08-27 15:06:41 -04:00
c587ea2c74
Add new tweak command to make Train orders no longer count as patrol duty
2012-08-27 14:06:10 -05:00
f73cebff68
Account for caves and magma sea in pre-embark prospector.
2012-08-27 23:03:17 +04:00
f1915915b4
Follow change in xml again.
2012-08-27 23:03:02 +04:00
e12e7ddd40
Fixed some memory leaks.
2012-08-27 14:42:00 -04:00
5ad9b82ace
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-08-27 09:17:27 -05:00
faf3bdf2b7
Adjust grid display - labors without skills use different tiles, and skills without labors have a red background
2012-08-27 09:04:32 -05:00
5fed060d7d
Follow field rename in xml.
2012-08-27 16:01:11 +04:00
f562871867
Add ViewCre and Zoom-Cre to Manipulator (by forwarding them to Unitlist)
2012-08-26 13:58:37 -05:00
84f6663a07
Add a tweak to save the cursor position of dwarfmode between menus.
2012-08-26 21:19:56 +04:00
8171652323
Support permaflow in liquids, including the gui.
2012-08-26 20:08:28 +04:00
bee33fd486
Add a performance test for location caching in general refs.
2012-08-26 14:43:14 +04:00
f6e4969e19
Key names are bright green, not dark green
2012-08-25 11:07:42 -05:00
da6567e374
Merge branch 'master' of git://github.com/angavrilov/dfhack
2012-08-25 11:02:28 -05:00
bd9800055d
Link to the lua library in the liquids plugin.
2012-08-25 20:01:03 +04:00
dcdff40c85
Add sorting, command help; replace filtering with just using the current page of the UnitList viewscreen (and don't close it)
2012-08-25 10:57:50 -05:00
41ad42d0fd
Expose the liquids plugin engine to lua, and make a wrapper gui script.
2012-08-25 10:37:03 +04:00
21904fd607
Merge https://github.com/jjyg/dfhack
2012-08-24 22:30:39 +02:00
9154564e71
Sync up submodules
2012-08-24 21:56:16 +02:00
45efcfc763
Warning: does not work. Temp commit!
2012-08-24 11:40:51 -04:00
cb24f1e53a
Converted tabs to spaces.
2012-08-23 22:25:25 -04:00
15adb17559
Converted tabs to spaces.
2012-08-23 22:21:09 -04:00
76cd941084
Added teledwarf: teleports dwarves to their destination instantly.
2012-08-23 22:17:28 -04:00
6de9049dcc
Very rough draft. Invaders tend to overdestroy buildings. They also overdig. Also they only do it on user request. Also it happens instantly. Also they can't dig through constructions. Also I have tabs in the indentation.
2012-08-23 22:12:07 -04:00
eac2f3f5d1
Added misery plugin: multiply effects of negative thoughts.
2012-08-23 22:05:35 -04:00
27bdc9f2df
Start gutting dfusion.
2012-08-23 21:38:38 +03:00
c339c7085a
ruby: add memory_check / memory_patch native methods
2012-08-23 18:44:03 +02:00
5b0f37276f
Merge branch 'master' of git://github.com/quietust/dfhack
2012-08-23 17:19:15 +02:00
7046a6abbc
Manipulator - store unit 'summary' objects so names/professions can be cached (for faster sorting), and properly display skill level when it's exactly at the level threshold
2012-08-22 20:52:19 -05:00
132491e868
Use Units module to get unit colors, fix initial scroll position
2012-08-22 16:54:34 -05:00
92c0b555dc
Use Units module to get profession strings
2012-08-22 11:15:05 -05:00
83214ccb72
Fix bugs in window resizing, cleanup some other stuff
2012-08-22 10:43:26 -05:00
7987ea9a98
Put some compatibility features into the base dfhack viewscreen.
2012-08-22 18:18:19 +04:00
8969fc9435
manipulator: Inherit from dfhack_viewscreen, and don't use itoa.
2012-08-22 12:23:56 +04:00
b6e5786b4f
Manipulator - display summary of selected unit + skill/labor
2012-08-21 16:41:20 -05:00
2c0a42296c
New plugin: Dwarf Manipulator - enter the [u]nits list and press [l]abors to get a DwarfTherapist-style labor editor
2012-08-21 15:43:32 -05:00
Anuradha Dissanayake
Alexander Gavrilov
Japa
Timothy Collett
Eric Wald
jj
Quietust
Warmist
Japa
Tareq A Khandaker
expwnent
Petr Mrázek
Robert Heinrich
Bjørnar Hansen
Kelly Martin
cherrydev
Anuradha Dissanayake
expwnent
expwnent
rampaging-poet
Mathias Rav
Alexander Gavrilov
jj