Commit Graph

2199 Commits (04ceb64badf63f3c4a96edb3f3c64601d5021beb)

Author SHA1 Message Date
jj de8a76e37f rendermax: sunlight travels down stairs 2014-03-07 20:03:59 +02:00
Warmist 4d7a7425d0 Prelimenary work on advmode 2014-03-07 20:03:56 +02:00
Japa 4abff416d9 Some performance fixes and tweaks. Opaque blocks can now emit light. 2014-03-07 20:03:56 +02:00
jj 9a8ee755f8 rendermax: basic daylight 2014-03-07 20:03:52 +02:00
jj 2058a822a3 rendermax: make citizen glow 2014-03-07 20:03:17 +02:00
Japa 0a413e179e Made the low water check actually use floats. 2014-03-07 20:03:17 +02:00
Japa 31de296f31 Added some fast checking for obstacles around lights, resulting in a huge speedup outside. 2014-03-07 20:03:16 +02:00
Warmist f173810e2a Fixed skylight 2014-03-07 20:03:14 +02:00
Warmist 2195c4fe28 Small fixes 2014-03-07 20:03:12 +02:00
Warmist f745de3aff Added transparency to ice walls 2014-03-07 20:03:10 +02:00
Warmist 83265efaa8 fix for map_block lights, fix for gem window color, dimmed the plant lights. 2014-03-07 20:03:06 +02:00
Warmist ee7902c529 Fixed unload/disable crash. Added glowing plants. 2014-03-07 20:02:08 +02:00
Warmist 471eb9c02d Torches for statues, candles on the tables. 2014-03-07 20:01:19 +02:00
Warmist 1c4b5c2d38 Update water a bit. 2014-03-07 20:01:18 +02:00
Warmist b3ba3b9107 Fixed non-circular light. Do not show hidden tiles. 2014-03-07 20:01:10 +02:00
Warmist f92e4c91b8 Performance improvements, added flickering cursor light. 2014-03-07 20:00:39 +02:00
Japa 14c494dbfe Made sky light be more realistic, decreasing through water, and ignoring tile designations otherwise. 2014-03-07 19:58:32 +02:00
Japa 2fef60708d Added some more operators to the cell color class. 2014-03-07 19:58:32 +02:00
Japa 04f2d4ea58 Made windows transmit colored light. 2014-03-07 19:58:31 +02:00
Warmist a19200fbfe C++ version of light engine. 2014-03-07 19:58:30 +02:00
Warmist 446b4b9d50 New line algo for lights 2014-03-07 19:58:28 +02:00
Warmist eb999cd0ad Another file forgotten 2014-03-07 19:58:27 +02:00
Warmist 843237d1c9 Fixed bug. 2014-03-07 19:58:27 +02:00
Warmist 39da5babee Implemented lua interface. 2014-03-07 19:58:25 +02:00
Warmist 584640f12c Added help for truecolor light testing thing. Also added colors. 2014-03-07 19:58:24 +02:00
Warmist f68852b721 Forgot to add the plugin itself. Also some improvements 2014-03-07 19:58:24 +02:00
Warmist 55d845992c rendermax: removed all the opengl and sdl stuff. Now it work with magic alone. 2014-03-07 19:58:23 +02:00
Warmist dec0b202ee Added rendermax plugin- a bunch of rendering hax in one. Small fix to skeleton. 2014-03-07 19:58:22 +02:00
Warmist a52451a97a eventful: added support for custom workshops and a convenience function to interpose side panel generation 2014-03-07 19:41:50 +02:00
Warmist 834350012f building-hacks: added lua convenience function, made impassible tile fix optional. 2014-03-07 19:41:50 +02:00
Warmist b1e7356e63 Added animation and on update callback. 2014-03-07 19:41:49 +02:00
Warmist 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
Warmist 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
Alexander Gavrilov 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
Alexander Gavrilov 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
Alexander Gavrilov 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
Alexander Gavrilov 9827184ef7 Switch to the new random number generator class. 2014-03-07 17:34:21 +04:00
Alexander Gavrilov 983685de8d Squash uninitialized variable warnings. 2014-03-07 17:34:21 +04:00
Alexander Gavrilov 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
Warmist 9576c47e18 Cmake fix 2014-03-04 19:00:12 +02:00
Warmist 904808b168 Command prompt plugin with docs and readme patch. 2014-03-04 18:51:23 +02:00
Quietust dd268d43d9 Merge branch 'master' of https://github.com/jjyg/dfhack 2014-02-27 15:49:18 -06:00
Quietust 5a158b21cf Update plugins to match fixed field names in cage/civzone 2014-02-27 14:51:45 -06:00
jj 6d0e6cf7d5 remove old unused code from when dfhack was out of process 2014-02-26 12:44:10 +01:00
Quietust 5ced804312 Merge branch 'master' of https://github.com/angavrilov/dfhack 2014-02-20 12:42:57 -06:00
Quietust 73a112e06c Update tubefill to skip hollow tubes by default, and update docs 2014-02-14 11:06:33 -06:00
Quietust 67b7681ba6 Fix reaction errors, make quantities more consistent 2014-02-13 11:37:04 -06:00
jj 387cc983f9 Merge branch 'osx_shenanigans' of git://github.com/tareqak/dfhack 2014-02-02 23:50:21 +01:00
jj c0d3e9189d showmood: fix item count for real 2014-01-27 12:40:21 +01:00
jj 7f411e1cbf Merge branch 'plant' 2014-01-27 10:45:30 +01:00
Quietust 56f935aea6 Add bugfix for #6420 2014-01-26 18:55:52 -06:00
Quietust 5c28d7eaf6 Not enough mood tickets given out 2014-01-25 09:15:43 -06:00
Tareq A Khandaker f0eeba93ce DFHack compiles under OS X now. 2014-01-25 03:21:56 -05:00
Quietust 7f14e109fa Use DF-compatible RNG for better randomness 2014-01-19 20:31:15 -06:00
Quietust 89b3c7bb67 Change syntax for specifying mood type, also allow overriding mood skill 2014-01-19 20:21:41 -06:00
Quietust baf377afba Meant to move this, not copy it 2014-01-18 22:56:56 -06:00
Quietust 24fbf570e6 Add "strangemood" plugin, lets you trigger a strange mood 2014-01-18 22:45:42 -06:00
jj 04f88ef8fb showmood: fix count of gotten items 2014-01-05 02:29:01 +01:00
jj 7adb6b2ee9 ruby: codegen unit.caste_tg helper 2014-01-04 15:04:56 +01:00
Quietust 91a7280ac3 Need to include tool_uses.h 2014-01-03 16:42:24 -06:00
Quietust 69fc2bec6d A bit of cleanup 2013-12-27 13:01:34 -06:00
Quietust 540bcc1f46 Enhance createitem, can now place items into containers or buildings 2013-12-27 12:53:33 -06:00
Quietust 5c51f7dd2a Merge branch 'master' of git://github.com/angavrilov/dfhack 2013-11-10 14:04:48 -06:00
Alexander Gavrilov 7ce5831257 Get rid of the std exception. 2013-11-07 11:58:11 +04:00
Quietust 4d2e5b80bf Use df::allocate here for proper compatibility with 40d and earlier 2013-11-04 14:55:31 -06:00
jj 883d89bb68 plants: move all commands as "plant" subcommands, update NEWS/Readme 2013-11-02 18:54:29 +01:00
Quietust 463bb8d498 Update plugins to use CR_WRONG_USAGE where appropriate 2013-10-30 15:58:14 -05:00
Quietust ff939e36bb Missed parameter in plugin command init 2013-10-30 14:25:35 -05:00
Quietust 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
expwnent 8ccb04236f Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4 2013-10-25 11:47:03 -04:00
Alexander Gavrilov 54b45349c5 Improve pre-embark prospect using new knowledge about soil depth. 2013-10-25 14:37:37 +04:00
Alexander Gavrilov e4978a1da7 Relax 3dveins preconditions to account for soil quirks and volcanoes. 2013-10-25 12:51:06 +04:00
expwnent 329741f235 EventManager: added EQUIPMENT_CHANGE event and exposed it to lua. 2013-10-24 19:32:52 -04:00
expwnent 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
expwnent 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
expwnent e81c060627 Added EVENT_MAX just in case someone wants it. 2013-10-20 15:24:31 -04:00
expwnent d4542b32fa eventful: removed extra EventManager::unregisterAll. 2013-10-20 15:24:04 -04:00
expwnent 6ef360f4d6 Merge remote-tracking branch 'warmist/dev-EventManager-lua' into 0.34.11-r4 2013-10-20 14:52:40 -04:00
Warmist d179812c22 Small bug fix for autolabor crashing on script created creatures. 2013-10-20 21:50:22 +03:00
Warmist 0dff26aa23 Added lua interface (in eventful) for EventManager module. 2013-10-20 21:44:07 +03:00
expwnent 39553cfb6d EventManager: fixed a problem with constructionHandler. 2013-10-20 14:14:02 -04:00
expwnent ee056f4422 Merge remote-tracking branch 'angavrilov/master' into 0.34.11-r4
Conflicts:
	NEWS
2013-10-20 11:09:40 -04:00
Alexander Gavrilov b2d2a074c8 Validate vein types in the scan phase and leave unexpected ones alone. 2013-10-20 12:33:17 +04:00
expwnent 6805656dd0 Added enable/disable functionality to diggingInvaders. 2013-10-19 21:42:24 -04:00
expwnent 9d3ee11349 Merge branch 'diggingInvaders' into 0.34.11-r4
Conflicts:
	scripts/devel/invasion-now.lua
2013-10-19 21:26:50 -04:00
expwnent 0bf427c689 Added enable/disable functionality to new plugins. 2013-10-19 21:19:39 -04:00
expwnent ef9d3b1521 Merge remote-tracking branch 'jjyg/master' into 0.34.11-r4 2013-10-19 20:28:30 -04:00
expwnent 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
jj 1bd6d5f96d ruby: add FEATURE/ice map tile materials 2013-10-14 01:58:55 +02:00
jj 3d7661e7e9 ruby: fix map tile material reading 2013-10-14 00:01:26 +02:00
Alexander Gavrilov 78de739d75 Update aquifers when generating 3D vein layout. 2013-10-11 19:23:32 +04:00
Alexander Gavrilov 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
Alexander Gavrilov 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
Alexander Gavrilov a273327c6a Remove "using namespace std" from MiscUtils.h. 2013-10-10 12:15:50 +04:00
Alexander Gavrilov 6852adbd91 Expose new MapCache features in probe and tiletypes. 2013-10-10 12:15:50 +04:00
jj 4ba4f90147 ruby: add support for enable/disable plugin 2013-10-07 13:58:28 +02:00
jj a18347608a ruby: vectors default to int32_t 2013-10-07 13:33:21 +02:00
Alexander Gavrilov 32a6073dad Remove lambdas from dwarfmonitor and resume. 2013-10-03 16:30:06 +04:00
Alexander Gavrilov f3be0ee187 Remove the use of lambdas in buildingplan. 2013-10-02 19:55:48 +04:00
Alexander Gavrilov 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
Alexander Gavrilov d7e35c2d23 Add built-in enable and disable commands. 2013-09-30 13:19:51 +04:00
jj a487ede2b9 autodump: typo in errmsg 2013-09-23 21:28:27 +02:00
Alexander Gavrilov 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
Alexander Gavrilov 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
Alexander Gavrilov 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
jj 308e7b6820 fix renamed pregnancy_ptr/mystery to pregnancy_genes/caste 2013-08-10 01:57:11 +02:00
jj 297fa86c34 follow df-structures change to drawBuilding 2013-07-07 17:40:28 +02:00
expwnent c1fef35b52 Renamed digSmart to digFlood. 2013-06-25 19:57:17 -04:00
expwnent f459bfc4f1 diggingInvaders: added per-creature dig times and differentiated between smooth and rough constructions. 2013-06-15 23:04:15 -04:00
Quietust 8c6881beb6 Cleanup 2013-06-14 14:46:10 -05:00
Quietust 4193d9b5b3 Add new plugin for cleaning up construction building materials 2013-06-14 14:40:02 -05:00
expwnent 776d088eb9 diggingInvaders: tweaks. 2013-06-11 07:25:07 -04:00
expwnent f557376c3a diggingInvaders: make invaders dig slowly, in a configurable way. 2013-06-11 05:14:56 -04:00
expwnent 0378bbb896 diggingInvaders: proper user interface. 2013-06-10 01:58:27 -04:00
expwnent 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
expwnent 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
expwnent c4533dcb0c diggingInvaders: only path from one guy, and other minor tweaks. 2013-06-09 17:52:13 -04:00
expwnent d26b11eb40 diggingInvaders: cleaned up pick creation. 2013-06-09 17:20:23 -04:00
expwnent 638affee06 diggingInvaders: tweaked pick creation. Don't recreate if they already have one. 2013-06-09 16:23:41 -04:00
expwnent 08114cf574 diggingInvaders: more fixes. Still a few issues with ramps probably. 2013-05-31 20:39:43 -04:00
expwnent 2b7dfca21e diggingInvaders: cleanup, tweaks. Works for simple situations. 2013-05-31 19:27:22 -04:00
expwnent 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
expwnent 909d686ae4 digSmart: remove print statement. 2013-05-31 13:41:31 -04:00
expwnent b82b3f2283 digSmart: added user interface and documentation. 2013-05-31 13:32:56 -04:00
expwnent 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
expwnent 20fa38da7e digSmart: still doesn't working, but learning more. Something weird happens with dig designations. 2013-05-31 00:49:35 -04:00
expwnent 4ba73bc171 Merge branch 'master' into digSmart 2013-05-30 22:22:16 -04:00
expwnent 8982abc163 treefarm: automatically chop trees and dig obsidian 2013-05-30 22:18:08 -04:00
expwnent 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
expwnent ee9bddf831 autoSyndrome comment tweaks 2013-05-25 20:23:59 -04:00
expwnent 3403146461 Merge remote-tracking branch 'peterix/master'
Conflicts:
	plugins/CMakeLists.txt
	plugins/autoSyndrome.cpp
2013-05-25 20:08:56 -04:00
expwnent 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
expwnent 22f31ca3ad workNow tweaks 2013-05-25 12:23:38 -04:00
expwnent 5cca0b84a3 fastdwarf: made it work better when both fastdwarf and teledwarf are enabled. 2013-05-25 11:07:59 -04:00
expwnent 141043363d autoSyndrome: need to check JOB_COMPLETED very often to catch cancelled jobs properly. 2013-05-25 10:20:22 -04:00
expwnent b44cd86dc9 EventManager: completely overhauled JOB_COMPLETED event detection, and tweaked Job::cloneJobStruct. 2013-05-25 09:44:17 -04:00
expwnent 01c311cf13 Weird compilation error. 2013-05-24 15:55:40 -04:00
expwnent 170fe6a0ef autoSyndrome/syndromeTrigger: made things off by default. 2013-05-24 15:55:19 -04:00
expwnent 63e1f61f4f autoSyndrome/syndromeTrigger: deal with overlap better for commands. 2013-05-12 12:43:45 -04:00
expwnent c127ad052e autoSyndrome and syndromeTrigger documentation. 2013-05-11 19:20:02 -04:00
expwnent 29b5e20575 autoSyndrome should now work with syndromeTrigger. 2013-05-11 16:46:37 -04:00
jj dd739313b1 ruby: tweak item_isfree 2013-04-30 18:38:52 +02:00
Alexander Gavrilov 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
Petr Mrázek 18a91ef221 Merge https://github.com/ab9rf/dfhack
Conflicts:
	library/xml
	plugins/stonesense
2013-04-24 18:00:40 +02:00
Petr Mrázek c39f4bc182 Fix build bug in automaterial. 2013-04-24 17:49:18 +02:00
Petr Mrázek 222c61ab25 Merge branch 'IsoRemote' of https://github.com/JapaMala/dfhack 2013-04-24 17:36:22 +02:00
Petr Mrázek 2e379c4d3f Merge https://github.com/Falconne/dfhack
Conflicts:
	plugins/CMakeLists.txt
	plugins/stonesense
2013-04-24 17:24:03 +02:00
Petr Mrázek df6355a092 Merge https://github.com/jjyg/dfhack 2013-04-24 16:24:14 +02:00
Petr Mrázek 0efbc74ac2 Merge https://github.com/quietust/dfhack
Conflicts:
	NEWS
2013-04-24 16:21:59 +02:00
Petr Mrázek aad5296f91 Merge branch 'master' of https://github.com/rampaging-poet/dfhack 2013-04-24 16:14:30 +02:00
Petr Mrázek 3e59794733 Merge branch 'master' of https://github.com/cherrydev/dfhack
Conflicts:
	Readme.html
2013-04-24 16:13:27 +02:00
Robert Heinrich 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
Robert Heinrich 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
Robert Heinrich fd265b37d6 Added lua GUI front-end for autobutcher. 2013-04-24 23:37:05 +12:00
Anuradha Dissanayake 80de3c05fa Stocks plugin: Add keywords to search for flags. 2013-04-24 23:31:37 +12:00
Anuradha Dissanayake eb8b2faf66 Stocks plugin: fix inventory check, add trade assignments, better hotkets. 2013-04-23 22:15:25 +12:00
jj c9776f481c ruby: add construction/siegeengine bld subtypes in building_alloc 2013-04-21 22:29:51 +02:00
Anuradha Dissanayake 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
jj de5e713c51 ruby: add rb dfhack command shortcut 2013-04-16 21:54:03 +02:00
Anuradha Dissanayake 811bd191d5 Add wear filter 2013-04-15 20:43:13 +12:00
falconne d99b930f58 Better Stocks - Quality & Wear filters 2013-04-14 16:39:21 +12:00
jj 13451bd487 ruby: fix crash on Compound#_cpp_delete 2013-04-14 01:17:44 +02:00
falconne 17513283d4 Better Stocks screen - WIP 2013-04-14 00:45:06 +12:00
jj 40f9f06360 dig: ignore tile shape if hidden 2013-04-12 15:23:16 +02:00
jj b2e22a2c42 ruby: add facility to queue dfhack commands 2013-04-12 15:23:13 +02:00
Anuradha Dissanayake d0ba4f5881 Better Stocks screen - WIP 2013-04-11 20:52:46 +12:00
Quietust 399fd107e4 Make createitem create shoes in pairs (as well as gloves) 2013-04-08 08:29:50 -05:00
Petr Mrázek 658e64c1b2 Fix allegro, stonesense/deplibs is now hack/libs, sync isoworld and stonesense 2013-04-07 20:25:38 +02:00
expwnent fc6cb3ae42 Merge branches 'autoSyndrome', 'outsideOnly' and 'syndromeTrigger' 2013-04-07 14:00:24 -04:00
expwnent 959321ec22 syndromeTrigger: logic tweak. 2013-04-07 13:56:12 -04:00
expwnent 1c78f06a1c syndromeTrigger: only complain once. 2013-04-07 13:22:38 -04:00
expwnent b057a0d82a Merge branch 'once' into syndromeTrigger 2013-04-07 13:19:18 -04:00
expwnent ddc4cad73b autoSyndrome: fixed a bug when a reaction didn't have a valid mat_index. 2013-04-07 13:17:00 -04:00
expwnent 329538edfd digsmart temp commit. 2013-04-07 13:08:32 -04:00
Japa 3b921feb61 Skip ice and brook floors. 2013-04-06 17:07:46 +05:30
Anuradha Dissanayake efaa247d2a Stocks start 2013-04-06 17:40:07 +13:00
Japa 660ce50542 Floors are loaded one level below solid blocks. 2013-04-06 02:42:51 +05:30
Japa 541e4f0947 Changed liquids to use an enum. 2013-04-04 14:28:43 +05:30
jj f1410c10c6 digcircle: fix bug #181 (help: radius -> diameter) 2013-04-03 22:16:36 +02:00
Petr Mrázek 575b1c45fc Sync isoworld, linux fixes 2013-04-03 01:10:06 +02:00
Petr Mrázek 3580409cc1 Sync isoworld, some protobuf building changes 2013-04-02 22:37:41 +02:00
Petr Mrázek c361ba7bf4 Sync, fix isoworld in .gitmodules 2013-04-02 19:19:29 +02:00
Petr Mrázek 5ff9947a06 Merge branch '0.34.11-r3-bugfixes' 2013-04-02 19:17:32 +02:00
Petr Mrázek fe922e3528 Merge branch 'IsoRemote' of https://github.com/JapaMala/dfhack 2013-04-02 19:01:46 +02:00
Japa 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
Alexander Gavrilov 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
Alexander Gavrilov 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
Japa c0a4db32e9 Fixed the single tile reported coordinates. 2013-04-02 11:57:30 +05:30
Japa b2f4029f42 Added in more sanity checks.
Signed-off-by: Japa <japa.mala.illo@gmail.com>
2013-04-02 02:58:06 +05:30
Petr Mrázek 29a2f36e4a Fix small bug in the tweak plugin 2013-04-01 17:42:02 +02:00
Petr Mrázek b0ee4fe9d9 Update stonesense 2013-04-11 21:08:33 +02:00
Anuradha Dissanayake d7c91975c0 Fix warnings 2013-04-01 20:02:39 +13:00
Anuradha Dissanayake 1070eec016 Make planned doors pet passable 2013-04-01 19:52:34 +13:00
Anuradha Dissanayake 1550df496f Right align happiness monitor to avoid interference with announcements 2013-04-01 19:52:13 +13:00
Anuradha Dissanayake c020c0271c Respect export mandates 2013-04-01 19:21:10 +13:00
Japa 86a02952f8 Changed coords to embark tiles instead of blocks. 2013-04-01 04:39:30 +05:30
Japa 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
Japa 39390e2749 Got a working connection with Isoworld. 2013-03-31 02:42:06 +05:30
jj 135289e89a ruby: add MapTile#burrow 2013-03-30 20:22:25 +01:00
expwnent 0397912353 Merge branch 'master' into digSmart
Conflicts:
	plugins/CMakeLists.txt
2013-03-30 12:46:10 -04:00
Japa a3de35c32e Added isoworld to the build list. 2013-03-30 15:27:37 +05:30
Japa 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
Japa 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
Anuradha Dissanayake 2027416997 Merge pull request #1 from zkf/overlay-position
Right-align happiness monitor overlay.
2013-03-29 20:59:54 -07:00
Anuradha Dissanayake a5b9848271 Clean up 2013-03-30 16:38:21 +13:00
Anuradha Dissanayake edc305db69 AutoTrade plugin: Automatically send items in marked stockpiles to trade depot, when trading is possible. 2013-03-30 16:38:03 +13:00
Bjørnar Hansen 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
Japa 6e9de245c2 Started work on isoworld remote 2013-03-27 01:24:13 +05:30
expwnent 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
expwnent 52480b155b autoSyndrome: made it only print each error message at most once per DF run. 2013-03-23 22:46:43 -04:00
expwnent 32e321c704 Merge branch 'once' into autoSyndrome 2013-03-23 22:39:57 -04:00
expwnent b4092f62e6 New module: Once. Intended to help prevent debug error message spam. 2013-03-23 22:38:33 -04:00
Anuradha Dissanayake dc9a62fd1d Fix crash when using right mouse button 2013-03-22 23:08:33 +13:00
expwnent 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
expwnent cf57fba58e autoSyndrome: reorganize everything, make it make more sense. 2013-03-17 01:18:12 -04:00
expwnent 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
expwnent 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
jj 4fe37b4bd5 ruby: fix DfFlagarray.inspect when no indexenum 2013-03-16 21:06:31 +01:00
Petr Mrázek 49024809ce Update NEWS, build DFusion by default 2013-03-16 18:37:16 +01:00
jj ffa9c50486 autoSyndrome: stop spam, and disable by default 2013-03-16 13:26:59 +01:00
Anuradha Dissanayake 59ec9bfc57 Update versions 2013-03-16 22:13:01 +13:00
Anuradha Dissanayake a85d6bd2dd Merge branch 'mousequery' 2013-03-16 20:40:20 +13:00
Anuradha Dissanayake 4bd5e3db77 Add mousequery to build 2013-03-16 20:35:53 +13:00
Anuradha Dissanayake c16bd3d71a Apply r3 name changes 2013-03-16 18:25:02 +13:00
jj cc5d354a59 Merge branch 'master' of github:jjyg/dfhack 2013-03-16 01:04:29 +01:00
Anuradha Dissanayake b961cb6a09 Merge branch 'master' of https://github.com/peterix/dfhack 2013-03-16 12:51:31 +13:00
Anuradha Dissanayake f69f245732 Allow planned constructions orthogonal to stairs 2013-03-16 12:26:37 +13:00
Anuradha Dissanayake 5a92eabb6b Add all fortress dwarves to happiness monitor. 2013-03-16 10:29:17 +13:00
Timothy Collett 6a31abc60f Another update to stonesense :-P 2013-03-15 14:30:21 -04:00
Timothy Collett d87bfd7f26 Update to Stonesense 2013-03-15 14:28:46 -04:00
Timothy Collett c93cb693c8 Merge branch 'master' of http://github.com/peterix/dfhack 2013-03-14 13:35:28 -04:00
Timothy Collett 9a58c5b7b3 Stonesense updates 2013-03-14 13:33:01 -04:00
Quietust 2b675c80ce Fix createitem to not leak memory 2013-03-14 12:00:16 -05:00
Petr Mrázek c5aa808737 Sync submodules 2013-03-14 05:07:30 +01:00
Anuradha Dissanayake b5806f7278 Copy fixes from r3 to fix search issues in Nobles screen. 2013-03-13 22:21:30 +13:00
Anuradha Dissanayake 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
falconne bc0c493b7c Workaround for strange crash in accelerated mod 2013-03-12 21:18:29 +13:00
falconne 8e9fc235a9 Adding a debug mode to track down an elusive bug. 2013-03-10 16:14:00 +13:00
Warmist 3ed5f06f49 Fix for eventful and a advfort not to show worn items. 2013-03-09 12:54:07 +02:00
Anuradha Dissanayake 63707471f4 WIP - More logical categories and variable windows 2013-03-07 22:27:06 +13:00
Kelly Martin 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
Anuradha Dissanayake 701b7b7d9b Multiple data averaging windows and gcc fixes. 2013-03-02 15:14:56 +13:00
Quietust 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
Quietust 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
Anuradha Dissanayake 4afe74efa6 Add DwarfMonitor plugin to monitor activities and happiness levels in a fort. 2013-02-28 23:39:22 +13:00
Quietust f55030909f Add createItem plugin, spawns an item at the selected unit's feet 2013-02-27 11:09:06 -06:00
Alexander Gavrilov 03b91ca26c Fix a problem in binpatch.lua and comment out debug messages in tweak. 2013-02-26 12:29:02 +04:00
jj 2bbe6824fb fix tweak/stable-cursor for low z-levels 2013-02-21 15:26:35 +01:00
jj 6b70a89321 ruby: typo in autogen/int8_t 2013-02-17 02:05:01 +01:00
cherrydev db98b06c6e Added documentation of autolabor exemption from burrowed dwarves 2013-02-15 19:16:26 -08:00
Warmist b0528d283b Merge branch 'master' of git://github.com/peterix/dfhack 2013-02-15 20:23:39 +02:00
Warmist ab6a993689 friendship.lua: removed debug printing 2013-02-15 20:21:33 +02:00
Warmist bb5d98e895 friendship fixes. 2013-02-15 20:19:55 +02:00
Kelly Martin fe70df593b Sync submodules 2013-02-14 18:36:21 -06:00
Petr Mrázek ac2e45c843 Compatibility with older GCC versions in the search plugin 2013-02-14 12:45:58 +01:00
Alexander Gavrilov 8de172f1c8 Binsearch in units.active can't possibly work, ever. 2013-02-14 13:13:25 +04:00
Petr Mrázek a8f5e54e37 Sync submodules 2013-02-14 09:53:14 +01:00
Kelly Martin e35a1c7720 Correct autolabor2 for changes in structures. 2013-02-13 16:00:09 -06:00
Kelly Martin 8d278a87db Merge branch 'master' of https://github.com/angavrilov/dfhack.git
Conflicts:
	plugins/devel/CMakeLists.txt
2013-02-13 13:52:02 -06:00
Kelly Martin f9a3450aca Reinstate old autolabor in its original place. 2013-02-13 13:34:39 -06:00
Kelly Martin ff0012c91f Move new autolabor to autolabor2 in devel. 2013-02-13 13:33:32 -06:00
Kelly Martin 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
Alexander Gavrilov a17760af4f Communicate the Plugin pointer to the plugin in a decent sort of way. 2013-02-13 14:45:24 +04:00
Anuradha Dissanayake a5c21745eb Enable all plan modes when entering quickfort mode 2013-02-09 16:49:36 +13:00
Anuradha Dissanayake 2f4979d3fa Add Quickfort mode 2013-02-08 00:04:52 +13:00
Anuradha Dissanayake 1956f8b92d Lock selection mode toggle 2013-02-07 22:57:07 +13:00
Petr Mrázek 0e384ada75 Sync submodules 2013-02-05 05:34:34 +01:00
Anuradha Dissanayake dff16c3c1d Define nullptr for gcc < 4.6 2013-02-02 02:24:05 +13:00
Anuradha Dissanayake ecf255243f Plugin to easily find and resume suspended constructions 2013-02-02 02:24:05 +13:00
Anuradha Dissanayake 056bde451a Remove some leftover code 2013-01-29 21:22:17 +13:00
Anuradha Dissanayake ae8bb7c9f8 Fix for gcc errors. 2013-01-29 20:44:56 +13:00
falconne 58125a57a7 Merge remote-tracking branch 'remotes/github/buildingplan' 2013-01-27 23:42:28 +13:00
Anuradha Dissanayake 6546af94ee Clear persistent data after item assigned. Fix some material selection screen functionality. 2013-01-24 20:16:18 +13:00
Anuradha Dissanayake f036360688 Add filters for quality, material and decorations. 2013-01-23 23:25:38 +13:00
Kelly Martin 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
Anuradha Dissanayake f5a0644b45 Fix bad refactor 2013-01-18 23:29:08 +13:00
Anuradha Dissanayake 192baa5638 Building plan plugin: place furniture before it's built. Initial checkin. 2013-01-18 23:28:45 +13:00
Alexander Gavrilov 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
Alexander Gavrilov 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
Alexander Gavrilov 14d41b8eda Update search to the newer structure definitions. 2013-01-16 18:55:05 +04:00
Alexander Gavrilov 309f162566 Fix line endings again. 2013-01-16 18:54:35 +04:00
Anuradha Dissanayake ed0baa3f69 Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin. 2013-01-16 18:48:59 +04:00
Anuradha Dissanayake 4257c9fe84 Ignore vermin in animals screen search 2013-01-16 18:48:55 +04:00
Anuradha Dissanayake 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
Alexander Gavrilov 655cd3602c Merge remote-tracking branch 'falconne/search' 2013-01-16 18:30:29 +04:00
Petr Mrázek 940d5fe891 Merge https://github.com/expwnent/dfhack 2013-01-15 23:49:10 +01:00
Petr Mrázek 0073c1bec2 Track xml and stonesense 2013-01-15 23:16:15 +01:00
Kelly Martin 90a62a82f7 Autolabor: add screw pump build labor 2013-01-14 12:12:56 -06:00
expwnent c031a7e081 Merge branch 'infiniteSky' 2013-01-13 15:28:31 -05:00
expwnent 44662de601 Infinite sky: bug with z level flags. 2013-01-13 15:28:17 -05:00
Anuradha Dissanayake fdcb248ea0 Merge branch 'automaterial_box' 2013-01-12 23:39:50 +13:00
Anuradha Dissanayake 83ef94774b A better format for toggle strings. 2013-01-12 23:32:30 +13:00
expwnent 4c2dfdf772 Dig smart: dig out minerals as you discover them. Very rough draft. 2013-01-09 15:15:11 -05:00
Quietust 3c6ddc2a8c Merge branch 'master' of https://github.com/expwnent/dfhack
Conflicts:
	NEWS
	library/xml
2013-01-09 10:09:58 -06:00
expwnent 476afafb3c Merge branch 'autoSyndrome' into recent 2013-01-07 12:09:55 -05:00
expwnent 6fd9ce339d Autosyndrome: fixed the rules on when syndromes apply. 2013-01-07 12:09:39 -05:00
Warmist 1990e2caf7 Small fix to adv site creation, now it's really centered around you 2013-01-07 02:01:59 +02:00
Kelly Martin 553a312266 Autolabor: add deconstruct bridge labor 2013-01-06 10:59:20 -06:00
Anuradha Dissanayake 6d6d55a937 Restore accidentally removed priority of unit screen search hook's input check over manipulator plugin. 2013-01-06 18:32:49 +13:00
Anuradha Dissanayake 140f78c8a0 Ignore vermin in animals screen search 2013-01-06 18:14:25 +13:00
Anuradha Dissanayake 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
expwnent 3ffbef2396 Merge branch 'canStepBetween' into recent 2013-01-05 18:10:29 -05:00
expwnent f8abd5c595 StepBetween: renamed stuff back to the way it was. Thought I had already done that. 2013-01-05 18:09:50 -05:00
expwnent 47b20ea301 Infinite sky: added glyphs and made it print status when no arguments given. 2013-01-05 17:32:23 -05:00
Kelly Martin 86c3c385bd Autolabor: exclude hauling labors from clawback 2013-01-05 16:27:57 -06:00
expwnent 4d57a053fc Infinite sky: added helpful print statements. 2013-01-05 16:51:29 -05:00
expwnent 151ff0f296 Infinite sky: rename from sky eternal. 2013-01-05 16:34:33 -05:00
expwnent 4920293c2d Infinite sky: get it to compile. 2013-01-05 16:30:48 -05:00
expwnent 471e82a88a Merge branch 'skyEternal' into infiniteSky
Conflicts:
	plugins/CMakeLists.txt
2013-01-05 16:18:01 -05:00
expwnent 9246ac9b05 Merge branch 'workNow' into recent 2013-01-05 13:36:24 -05:00
expwnent cf3ac48518 Merge in autoSyndrome, trueTransformation, ... 2013-01-05 13:35:49 -05:00
expwnent 6622e9e06f Merge branch 'canStepBetween' into recent
Conflicts:
	library/modules/Maps.cpp
2013-01-05 13:32:29 -05:00
expwnent 5fc466ef7e Work now: also update dig on pause. 2013-01-05 12:50:44 -05:00
expwnent d2a2a63d01 Merge branch 'recent' into workNow
Conflicts:
	plugins/CMakeLists.txt
2013-01-05 12:45:34 -05:00
expwnent 874dfbdc4f Merge branch 'eventManager' into autoSyndrome 2013-01-05 11:40:55 -05:00
expwnent 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
expwnent 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
Anuradha Dissanayake 4bef70ab6f Merge branch 'search' 2013-01-06 02:27:57 +13:00
Anuradha Dissanayake 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
expwnent 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
expwnent fd05d30733 Digging invaders: improved edge cost evaluation. 2013-01-04 18:11:38 -05:00
Kelly Martin 9404267c1f Autolabor: Tell DF to immediately process jobs after each run. 2013-01-04 13:14:20 -06:00
expwnent 2ca943ae20 Digging invaders: comment out debug print statements. 2013-01-04 00:43:39 -05:00
expwnent 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
expwnent 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
expwnent 47eca42f68 Digging invaders: made it possible to customize which races can dig. 2013-01-03 23:18:40 -05:00
expwnent 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
expwnent ed6dcf9589 DiggingInvaders: made invaders dig automatically, instead of on request. 2013-01-03 21:25:50 -05:00
expwnent f145f8d528 Merge branch 'eventManager' into diggingInvaders-unstable 2013-01-03 19:32:12 -05:00
expwnent 715f191c26 EventManager: made the frequency part of EventHandler. 2013-01-03 19:31:29 -05:00
expwnent b82d6940b6 Digging invaders: started on making invaders keep digging until done. 2013-01-03 18:45:53 -05:00
expwnent 1d6dec54c7 Digging Invaders: reorganized the files to make it easier to work with. 2013-01-03 18:14:16 -05:00
expwnent 84b8fae326 Merge branch 'eventManager' into diggingInvaders-unstable 2013-01-03 15:53:06 -05:00
expwnent 910e398a7b EventManager: added invasion event. 2013-01-03 15:52:56 -05:00
expwnent 34d9785ce5 Digging Invaders: minor changes. 2013-01-03 14:38:05 -05:00
expwnent 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
expwnent 0b68e66dc9 DiggingInvaders: fixed a problem with deconstructing hatches. 2013-01-03 13:32:50 -05:00
Warmist c22c4d009c Added convenience functions to eventful (see Lua API.rst) 2013-01-03 20:30:51 +02:00
Kelly Martin 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
expwnent f60e44c395 DiggingInvaders: minor changes. 2013-01-03 13:11:11 -05:00
Anuradha Dissanayake 7b561f108b Fix hotkey detection 2013-01-03 22:01:01 +13:00
expwnent 7586e62374 Digging Invaders: fixed a problem with removing constructions. 2013-01-02 22:35:05 -05:00
expwnent 5201870356 Digging Invaders: get rid of debug prints. 2013-01-02 22:13:23 -05:00
expwnent ae43865489 Digging Invaders: actually seems to basically work! 2013-01-02 22:11:05 -05:00
expwnent 4e4e382b8f EventManager: added syndrome event. 2013-01-02 18:30:15 -05:00
Warmist 8b5e847dfa New event for eventful. postWorkshopFillSidebarMenu for tweaking the sidebar menu on workshops. 2013-01-02 23:43:38 +02:00
expwnent 38ef75418a AutoSyndrome: added an option to delete boiling rocks as they are created (on by default). 2013-01-02 14:09:16 -05:00
expwnent 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
expwnent bf0f0e910b Merge branch 'eventManager' into autoSyndrome 2013-01-02 12:40:20 -05:00
expwnent 144e0b4dcb Digging Invaders: merged eventManager and recent. 2013-01-02 11:26:30 -05:00