Commit Graph

779 Commits (0867f3d311260d3a1f8cd0bea1c2949355649f76)

Author SHA1 Message Date
Kelly Martin 5d8adbc779 Merge branch 'master' of https://github.com/jjyg/dfhack.git 2012-11-30 11:15:15 -06:00
Kelly Martin 57233cb350 Merge branch 'master' of https://github.com/angavrilov/dfhack.git
Conflicts:
	scripts/autofarm.rb (resolved with added bug correction)
2012-11-30 11:09:03 -06:00
Kelly Martin 9e30bf0dff Autofarm: use player's actual seed stocks as basis for plantable seeds, instead of player entity's hypothetically plantable seeds. Avoids designating a plot for planting with seeds the player doesn't have. 2012-11-30 11:05:37 -06:00
Alexander Gavrilov 0bfe006016 Try to reimplement the inventory monitor by falconne in lua.
For no other reason than to provide a complete example of lua
interface for a native plugin :)

TODO: paint the graph in the right pane.
2012-11-30 19:10:17 +04:00
jj 9ed7a56202 deathcause: handle non-dead units 2012-11-30 15:50:35 +01:00
Kelly Martin f8dea0e9f9 Autofarm: only try to plant things that have seeds. 2012-11-29 18:19:53 -06:00
Warmist 0fb5ad7729 Some readme and bugfixes 2012-11-30 01:17:01 +02:00
Warmist c31b320722 Building now respects required items. 2012-11-30 00:02:03 +02:00
Warmist 49de3fe237 Removed spam yet again... 2012-11-29 20:50:02 +02:00
Warmist 471d15ba4c New building selection dialog. 2012-11-29 20:49:16 +02:00
Warmist 346b402a0f Allow look up/down, unsuspend job if pressing wait with job. 2012-11-29 18:49:36 +02:00
Warmist f617d2844b Fixed look exit and allow skip messages 2012-11-29 18:33:04 +02:00
jj 184082b379 scripts/lever: fix for links to cage/support 2012-11-29 17:11:29 +01:00
Warmist 3858fb320d in Advfort- splint removeconstruction into building/construction removal. 2012-11-29 17:50:22 +02:00
Warmist 5b53f07905 Real construction removal added. 2012-11-29 17:24:45 +02:00
Warmist 2d4fc739ed Removed console spam 2012-11-29 17:16:58 +02:00
Warmist 7f23c1f55f Added ability to look in advfort, moved to tiletypes and fixed most of predicates 2012-11-29 17:16:32 +02:00
Alexander Gavrilov 5ea26d9cae Only show the advanced new constraint dialog on Shift-Enter.
Upon reflection it is a bit too scary to be always shown.
2012-11-29 16:27:51 +04:00
Warmist 364dd01142 Allowed moving up/down in advfort, now correctly checks for main weapon. 2012-11-29 12:41:27 +02:00
Warmist 57b69da1f0 Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-11-29 12:13:28 +02:00
Warmist f4d048526a Moved advfort to gui subfolder 2012-11-29 12:10:25 +02:00
Warmist 1226f5c990 Increased speed of adv-fort a lot, now filters keypresses to be more intuitive. 2012-11-29 11:56:05 +02:00
Warmist 028b535598 removed used minw for labels 2012-11-29 11:13:26 +02:00
Warmist fe2fbe347c Added advfort script, now you can have adventurer forts!!!!! 2012-11-29 02:26:10 +02:00
Warmist 01966167f6 gm-editor updated to use widgets. 2012-11-28 21:13:42 +02:00
jj 614225cc5f follow rename itemst.flags.artifact1 -> artifact 2012-11-28 19:48:47 +01:00
Warmist 3964c8a581 gm-editor, set field to lua return value. 2012-11-28 17:40:37 +02:00
jj e73274d281 ruby: add description field to onupdate_register 2012-11-24 16:10:55 +01:00
jj cb06c89698 stripcaged: dont list empty cages individually 2012-11-24 16:10:55 +01:00
jj b577bcde1a scripts/lever: show pending jobs 2012-11-24 16:10:55 +01:00
jj 8429f65176 add scripts/stripcaged.rb and documentation 2012-11-24 16:10:55 +01:00
jj fd9a4ffafa script/lever: synchronize linked buildings as the game does 2012-11-22 03:17:41 +01:00
jj 5f92561cd9 add scripts/lever, add binary patches section in NEWS file 2012-11-22 02:57:55 +01:00
Kelly Martin 364030f06b Add unsuspend and autounsuspend scripts. The latter is especially useful when trying to build near aquifers. :) 2012-11-20 08:41:35 -06:00
Kelly Martin 79b6a8f9f9 Add autofarm script. 2012-11-20 08:40:42 -06:00
Kelly Martin 5ac8d3be82 Added option to region-pops script to additively augment populations. 2012-11-20 08:28:06 -06:00
Alexander Gavrilov f587d603e8 Allow the workflow goal gap in any range between 1..goal-1 2012-11-19 18:59:58 +04:00
Warmist 66257cf24d gm-editor now features alt+o to show field offset 2012-11-18 01:48:02 +02:00
Alexander Gavrilov 2953e4c386 Implement a dialog to specify a workflow constraint with all features. 2012-11-17 20:32:39 +04:00
jj 342badac98 scripts/superdwarf: advmode support 2012-11-16 17:59:42 +01:00
Quietust bbe94c006f Update for temperaturest 2012-11-12 11:54:21 -06:00
Quietust 7a3de785ec Missed a few spots 2012-11-12 08:29:44 -06:00
Alexander Gavrilov bd75cad508 Support ! and ~ prefixes in the lua script, and edit readme. 2012-11-12 12:48:17 +04:00
Alexander Gavrilov 6cf85b4318 Abstract the back-end from the binpatch script, and use in gui/assign-rack. 2012-11-12 12:26:31 +04:00
Alexander Gavrilov c32f85d637 Merge remote-tracking branch 'warmist/master'
Conflicts:
	plugins/Dfusion/include/OutFile.h
2012-11-12 10:50:48 +04:00
Warmist ce8ada4419 More bug fixing 2012-11-11 22:14:00 +02:00
Warmist 3eb852a43b Added cheat commands to companion-order, (including rumrushers) 2012-11-11 21:18:59 +02:00
Alexander Gavrilov 012d22fa4f Add a script for manipulating binary patches at runtime, and some patches. 2012-11-11 17:24:13 +04:00
Alexander Gavrilov d5c31942b5 Add a way to only count locally-made items in workflow. 2012-11-11 15:56:31 +04:00
Warmist 0e4df55364 Merge branch 'master' of https://github.com/angavrilov/dfhack 2012-11-11 12:46:55 +02:00
Warmist 856c9ebd4b Added save specific scripts to lua interpreter script, also better error reporting. 2012-11-11 12:39:49 +02:00
Alexander Gavrilov eb936c4ce0 Support milking and shearing in workflow. 2012-11-10 17:06:54 +04:00
Alexander Gavrilov 20e98d4926 Add a script for viewing and poking at local populations. 2012-11-04 20:51:13 +04:00
Warmist 6be65690f7 Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge 2012-11-02 20:29:27 +02:00
Warmist 296d1cf090 More scripts for dfusion. Only fixes left, and updating bin-plugins (friendship and migrants(??)) 2012-11-02 00:50:20 +02:00
Warmist 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
Warmist 209d593f21 Another day, another commit. 2012-11-01 16:00:00 +02:00
Alexander Gavrilov e353f5f03e Add a script to complement the weapon rack binary patch. 2012-10-27 20:16:27 +04:00
Alexander Gavrilov e23052a570 Fix an error in gui/workflow when enabling, and tweak color. 2012-10-26 11:52:41 +04:00
Alexander Gavrilov 8eebfa007c Tweak the workflow gui script to make the UI operate smoother. 2012-10-25 12:15:18 +04:00
Alexander Gavrilov 59ec9b304e Implement adding workflow constraints from gui/workflow. 2012-10-24 21:49:30 +04:00
Alexander Gavrilov 616c57257d Support changing the constraint ranges from the workflow gui script.
TODO: implement creating completely new constraints.
2012-10-24 19:25:06 +04:00
Alexander Gavrilov 09f8e8e419 Start working on gui for workflow. 2012-10-23 21:42:03 +04:00
Alexander Gavrilov 46938625fd Pass the hotkey keys to dwarfmode from overlays, and fix gui/workshop-job. 2012-10-21 21:45:51 +04:00
Warmist 86ec66c0fb More work on dfusion. Embark anywhere script separated. 2012-10-21 13:42:55 +03:00
Alexander Gavrilov 67674a7676 Merge remote-tracking branch 'jjyg/master' 2012-10-21 11:12:32 +04:00
jj 1f7a01d685 follow rename unit.military.squad_index to squad_id in df-structures 2012-10-20 22:35:39 +02:00
Alexander Gavrilov dee0c97584 Add a gui script for viewing and changing job_item properties. 2012-10-20 21:57:36 +04:00
Warmist 1b5a6616e2 Just companion orders tool 2012-10-17 19:33:20 +03:00
Alexander Gavrilov 2d4935bc17 Add lua API functions for verifying item and material vs job_item flags. 2012-10-17 19:16:18 +04:00
Alexander Gavrilov abfe2754fb Start implementing common widgets for lua screens. 2012-10-15 20:03:18 +04:00
Alexander Gavrilov 33bd8103de Extract an abstract View superclass from Screen to handle widget trees. 2012-10-15 15:30:00 +04:00
Alexander Gavrilov adfb307942 Merge remote-tracking branch 'kmartin/master' 2012-10-12 16:02:42 +04:00
Alexander Gavrilov 5f9489a843 Start making a script for viewing and changing minecart Guide paths. 2012-10-11 19:32:41 +04:00
jj 9148079745 Merge branch 'master' of git://github.com/angavrilov/dfhack 2012-10-10 19:47:01 +02:00
jj b5f5d1f85b removebadthoughts: add --dry-run option 2012-10-10 19:45:16 +02:00
jj b3b93f818d slayrace: show number of creatures per race 2012-10-10 19:25:30 +02:00
jj e3e01107b9 fix deathcause for new df-structures 2012-10-10 18:56:23 +02:00
Warmist 923ea3f4b0 Reactionhooks more usefull and gm-editor minor tweaks (e.g. search in containers) 2012-10-07 20:44:18 +03:00
Alexander Gavrilov 3a522768a2 Implement feed-based finders for the remaining applicable globals. 2012-10-03 19:07:04 +04:00
Alexander Gavrilov 33aead34b4 Implement a more automated search mode based on keys for some globals. 2012-10-02 19:53:16 +04:00
Alexander Gavrilov 9d5adf1b2f Update the lua screens to use the new key display string API function. 2012-10-02 15:25:59 +04:00
Alexander Gavrilov 62cde96724 Add a script to reclassify 'individual choice' weapons based on unit skill. 2012-09-29 17:21:49 +04:00
Warmist cc5df57e53 Little error fixed in lua script 2012-09-25 10:24:45 +03:00
Warmist bd2f3a9998 Moved lua out of dfusion.
Now lua is a script. supports --file (or -f) flag, usage: lua <command> or lua --file <filename> or just "lua" for interactive interpreter.
2012-09-25 00:24:37 +03:00
Alexander Gavrilov 821271383e Add one more bad thought from siren for civilians.
Originally a Tax Collector thought, but the message sounds appropriate.
2012-09-24 20:01:53 +04:00
Warmist 28354715ff Editor with dialog mode (no without switching from/to console to edit anything!) 2012-09-23 23:45:19 +03:00
Warmist 39df1e0ece Removed unused stuff from editor 2012-09-23 23:23:12 +03:00
Warmist 77a4058145 gm-editor fixes and improvements 2012-09-23 23:22:14 +03:00
Kelly Martin b0bec4c4d4 Merge remote-tracking branch 'angavrilov/master' 2012-09-22 13:07:00 -05:00
Alexander Gavrilov 825d21c91a Add a script to wake up units and stop breaks & parties. 2012-09-22 21:00:13 +04:00
Alexander Gavrilov 6f67a71e00 Search for cur_season and cur_season_tick in devel/find-offsets. 2012-09-22 14:52:08 +04:00
Alexander Gavrilov f7e414e397 Add a devel script to inject raw definitions into an existing world. 2012-09-21 19:00:18 +04:00
jj b3ae67cc8b add scripts/deathcause 2012-09-21 15:47:46 +02:00
Alexander Gavrilov 462bedb757 Fix the rename plugin and script to use the new getSelectedBuilding API. 2012-09-20 11:11:59 +04:00
jj 27fd3f5fc7 Merge branch 'master' of git://github.com/angavrilov/dfhack 2012-09-19 15:05:42 +02:00
Warmist a02a120e2d Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge
Conflicts:
	dfhack.init-example
	library/xml
	plugins/CMakeLists.txt
2012-09-18 23:46:16 +03:00
Alexander Gavrilov 57b72831ca Overhaul the concept of lua 'class' initialization yet again. 2012-09-18 20:30:25 +04:00
jj 2032f8e407 scripts/drainaquifer 2012-09-18 10:17:32 +02:00
jj 711a9bd9b2 add scripts/superdwarf 2012-09-18 10:17:32 +02:00
Alexander Gavrilov 82e870c8dd Move siege engine out of devel. 2012-09-17 14:59:59 +04:00
jj 5474ccacb6 Merge branch 'master' of git://github.com/angavrilov/dfhack 2012-09-14 14:30:25 +02:00
Alexander Gavrilov aaf5d181bd Add yet one more performance-oriented tweak for temperature updates. 2012-09-14 12:14:36 +04:00
Alexander Gavrilov 881fed41de Support setting workshop profile for siege engines.
Since can't use built-in viewscreen, UI limited to skills only.
2012-09-13 20:20:56 +04:00
Alexander Gavrilov 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
Alexander Gavrilov b0938d7e0d Allow specifying arbitrary items to use in catapults. 2012-09-11 22:46:17 +04:00
Alexander Gavrilov 3a075f4bc7 Trivial siege engine aiming at units, with logic in lua. 2012-09-11 19:17:24 +04:00
Alexander Gavrilov bfa6ed3e08 Support setting the target area for the siege engine. 2012-09-08 13:46:02 +04:00
jj 7b86f203c3 add script/digfort.rb 2012-09-07 22:47:44 +02:00
Alexander Gavrilov 325e294af2 Start the siege engine plugin with code to highlight obstacles on screen. 2012-09-07 19:54:32 +04:00
Warmist 85fc3384dd Little cleanup and update to gm-editor 2012-09-07 17:25:39 +03:00
Warmist 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
Alexander Gavrilov c971a819de Experimental creation of map blocks in gui/liquids script. 2012-09-06 22:45:19 +04:00
Alexander Gavrilov 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
Warmist 3dcaee7cb9 Merge branch 'master' of https://github.com/angavrilov/dfhack into experimental-dontmerge 2012-09-05 21:55:17 +03:00
Alexander Gavrilov 8d876cc7d9 Support renaming some buildings, and arbitrary units, via gui script. 2012-09-05 21:27:42 +04:00
Alexander Gavrilov 1618ccf5bb Fix steam-engine build on msvc, and add a script for listing mem ranges. 2012-09-03 10:28:17 +04:00
warmist febfc9aa5b Fixed bug with gui/mechanism
Fixes script not allowing to ran on e.g. levers (focus string: dwarfmode/QueryBuilding/Some/Lever/Empty )
2012-09-01 23:33:49 +03:00
Warmist 5b60dc296a Renamed editor and added example keybinding 2012-09-01 21:53:52 +03:00
Warmist c9c587af9a small fix for boolean values 2012-09-01 01:27:01 +03:00
Warmist af155db3be Added whole bunch of editable things (units, jobs, flows) 2012-09-01 01:22:51 +03:00
Warmist f8744e2ec2 Experimental stuff editor (can and will crash DF ) 2012-08-31 23:46:33 +03:00
Alexander Gavrilov cb125f3d89 Add a script to fix population cap problems. 2012-08-29 19:20:38 +04:00
Alexander Gavrilov 8171652323 Support permaflow in liquids, including the gui. 2012-08-26 20:08:28 +04:00
Alexander Gavrilov 41ad42d0fd Expose the liquids plugin engine to lua, and make a wrapper gui script. 2012-08-25 10:37:03 +04:00
Alexander Gavrilov 8359e80b23 Expose a few API functions to lua, and implement a room browser overlay. 2012-08-24 18:26:18 +04:00
Alexander Gavrilov d52c54cc76 Pull some minor stuff from mechanisms into main libs. 2012-08-24 13:49:22 +04:00
Alexander Gavrilov 296f82b02f Try using the Objective-C 'alloc + init' idiom for lua screen objects. 2012-08-24 13:28:34 +04:00
Alexander Gavrilov e825dc5ddb Tweak the API for current viewscreen, and dispatch show/dismiss from C++. 2012-08-24 13:20:08 +04:00
Alexander Gavrilov cf4b8a0196 Improve viewport manipulation utilities and support scroll in mechanisms.
I.e. allow the user to scroll around with cursor keys,
provided that keeps the cursor still visible.
2012-08-22 22:29:01 +04:00
Alexander Gavrilov 6e8b68fb29 Add yet one more frame style. 2012-08-22 13:06:06 +04:00
Alexander Gavrilov 44e3e318d0 Add a key handler to refresh the mechanism screen without exiting it. 2012-08-21 20:34:15 +04:00
Alexander Gavrilov 15235cc938 More work on utilities for making lua viewscreens. 2012-08-21 19:40:37 +04:00
Alexander Gavrilov 451e965936 Add a Painter class for lua viewscreens, and extract other utilities.
Painter clips to an arbitrary rectangle window, and
tracks current cursor and color state.
2012-08-21 11:35:39 +04:00
Alexander Gavrilov be7bce1541 Immediately step once when showing the mechanism list. 2012-08-20 23:59:54 +04:00
Alexander Gavrilov 601a3a7927 Add a script that implements a linked mechanism browser. 2012-08-20 23:04:01 +04:00
Alexander Gavrilov cacb082416 Add a stupid example of a lua-controlled viewscreen. 2012-08-19 17:53:25 +04:00
jj eb52410565 fix/loyaltycascade: reset enemy_status_cache.next_slot too 2012-08-12 00:46:03 +02:00
jj 030bd8ab57 fix/loyaltycascade: clear the enemy status cache, dont require a save/reload anymore 2012-08-12 00:24:34 +02:00
jj 85f1a6fa6a add fix/loyaltycascade script 2012-08-11 22:25:40 +02:00
jj cb04a082fd move script/fixstuckdoors to script/fix/stuckdoors 2012-08-11 21:41:47 +02:00
jj 64a8443b5a slayrace: add single-creature targetting, add magma column mode 2012-08-03 17:00:06 +02:00
jj c1bcd270e9 ruby: add spawn_water/spawn_magma methods to MapTile 2012-08-03 17:00:02 +02:00
Kelly Martin ab4c4b63c0 Merge remote-tracking branch 'jjyg/master' 2012-07-16 20:52:15 -05:00
jj 9c0bc3144a magmasource: add documentation 2012-07-12 14:50:59 +02:00
jj c823f12737 add scripts/magmasource to generate an infinite magma source 2012-07-12 14:35:49 +02:00
Petr Mrázek a4194cc5b9 Even more derp. 2012-07-12 11:54:03 +02:00
Petr Mrázek 1c9194d1c4 While installing scripts, do not copy ~ files. 2012-07-12 02:24:32 +02:00
Petr Mrázek eae94693f7 Eliminate magic numbers from the fixnaked script. 2012-07-12 02:17:01 +02:00
Petr Mrázek 8f8f25384c Merge pull request #167 from amezick/master
Removing Bad Thoughts from Dwarves
2012-07-08 19:22:20 -07:00
jj c20951c30b Merge branch 'master' of git://github.com/angavrilov/dfhack 2012-07-06 20:37:14 +02:00
jj 1d6160de02 added fixstuckdoors.rb script 2012-07-03 18:01:56 +02:00
Alexander Gavrilov 07dc20055a Tweak documentation for utils.make_sort_order and devel/prepare-save 2012-06-30 16:25:41 +04:00
jj b421c08d31 growcrops: allow any unambiguous substring among existing seed types 2012-06-29 14:09:11 +02:00
jj 7971925f7a slayrace: ignore caged units 2012-06-29 13:23:44 +02:00
jj a72a59b2f9 add scripts/removebadthoughts 2012-06-29 11:38:58 +02:00
jj 412e8608d8 ruby: add method for basic xml ref-target support, tweak scripts/slayrace 2012-06-25 19:05:50 +02:00
jj 17d06b969b ruby: move all ruby invocations inside a CoreSuspend lock, remove ruby suspend method 2012-06-25 17:06:37 +02:00
jj d1762e3cb8 ruby: add growcrops script, add doc for methods in README 2012-06-24 21:44:40 +02:00
jj 552da8417e ruby: handle .rb files in df/hack/scripts/ 2012-06-24 20:24:46 +02:00
Alexander Gavrilov 65e82f7c12 Support controllable error presentation verbosity in lua code.
Use qerror to squash stack traces and location prefix.
2012-06-22 16:36:50 +04:00
Alexander Gavrilov f207714d42 Add finders for enabler, gps and init. 2012-06-21 21:08:36 +04:00
Angus Mezick a17a4a2ce2 Script to remove certain bad thoughts 2012-06-20 14:45:09 -04:00
Alexander Gavrilov ed4acbdedb Add a searcher for current_weather, using a prepared save. 2012-06-20 10:12:26 +04:00
Alexander Gavrilov f989ef213e Add 5 more finders to the script; these use relative location heuristics. 2012-06-19 22:43:31 +04:00
Alexander Gavrilov bd5b675fa5 Add ui_menu_width finder, tweak instructions, and add a case for win exe. 2012-06-18 21:11:54 +04:00
Alexander Gavrilov a6bfc67038 Find a tweak to make two search recipes work, and add two more. 2012-06-17 21:40:08 +04:00
Alexander Gavrilov dc6cb61979 Add more offset finders to the script. 2012-06-17 18:44:59 +04:00
Alexander Gavrilov 67536da2fe Add an interactive script finding a limited subset of linux offsets. 2012-06-16 19:51:15 +04:00
Petr Mrázek a5c9bf53c5 Merge https://github.com/warmist/dfhack 2012-06-14 00:01:09 +02:00
Alexander Gavrilov 6ca5a03008 Add 3 more lua scripts. 2012-06-13 10:54:28 +04:00
Alexander Gavrilov d35d8d3431 Add the script to fix lagging fat dwarves. 2012-06-05 14:06:29 +04:00
warmist 2ab4e32a53 Edited use_mode in moveToBuilding. It looks like df uses either 0 or 2 and 2 is structural. 2012-05-24 14:03:05 +03:00
Warmist 2beaed4fd8 Added moveToBuilding to api docs and made a script using it (puts item on table) 2012-05-18 18:46:08 +03:00
Alexander Gavrilov 8185eec95c Add two more development related lua scripts. 2012-05-16 17:46:44 +04:00
Alexander Gavrilov 642a625586 Support custom buildings in dfhack.buildings.getFiltersByType.
Also document it and constructBuilding in Lua API docs.
2012-05-13 18:39:00 +04:00
Alexander Gavrilov 191071beb6 Add more lua scripts. 2012-05-08 12:55:06 +04:00
Alexander Gavrilov 7e01b004e9 Implement timeouts in the core lua context, and quicksave script. 2012-05-04 20:59:06 +04:00
Alexander Gavrilov d4d6349f48 Expose builtin commands to dfhack-run, and add lua script support.
Move builtin command implementation to Core methods, and fall
back to hack/scripts/*.lua for otherwise unrecognized commands.
2012-05-04 19:47:18 +04:00