Commit Graph

695 Commits (de160de0e8fe721e5ec8353cef07ad01935d5a16)

Author SHA1 Message Date
Warmist a1e0a30335 Advfort bug fixes and quickmode addition. 2015-09-14 18:55:13 +03:00
lethosor a852ca10d7 Merge remote-tracking branches 'warmist/luasocket' and 'warmist/advfort' into develop 2015-09-12 19:59:53 -04:00
lethosor 9123f3cd3e gm-editor: Select enum items from a list by default
SEC_SELECT can be used for the old (numerical editing) behavior
2015-09-12 19:55:38 -04:00
warmist 5a39a1d86d Make forbidding jobs in sites optional
Activated with "-s" or "--safe" mode.
2015-09-10 14:38:44 +03:00
Warmist a80f14de36 MOAR whitespace reductionisms included. 2015-09-09 22:33:46 +03:00
Warmist 96e6582417 Mostly whitespace changes. 2015-09-09 22:30:00 +03:00
Warmist 72b7a19425 Advfort improvements
* forbid doing anything in non-sites unless you are (-c)heating
* a bit more documentation and tidying
* add a deadlock fix
2015-09-09 22:19:19 +03:00
Warmist 6643b43d2b A bit more info what is new. 2015-09-09 22:19:18 +03:00
Warmist b52beb5aa4 Add autofill. 2015-09-09 22:19:17 +03:00
Warmist 510fdd529c Axle fix, lever linking, clutter display. 2015-09-09 22:19:16 +03:00
Warmist cd027afe90 Add known bugs to advfort.lua 2015-09-09 22:18:36 +03:00
Warmist f3811c4772 advfort: siege weapon and trap fixes 2015-09-09 22:18:35 +03:00
PeridexisErrant f242872963 Documentation for Vjek's scripts 2015-09-04 17:13:21 +10:00
PeridexisErrant 0a63afa977 Import Vjek's script collection from the wiki
http://dwarffortresswiki.org/index.php/User:Vjek
2015-09-04 16:51:28 +10:00
lethosor f1391b63e2 dfstatus: Allow sections and metal bars to be customized 2015-09-03 15:02:08 -04:00
warmist 5e38689a62 Whitespace removal
oh why oh why, my editor does not do this automagically? We are after all in year 2015...
2015-08-23 15:03:15 +03:00
warmist a7e1b15db5 Add civilization chooser
Adds a civilization chooser, also there is race choice dialog and civ choice dialog (with race filtering).
2015-08-23 14:33:14 +03:00
PeridexisErrant d5513eac1b Tweak readme based on feedback 2015-08-16 13:15:11 +10:00
PeridexisErrant f8f7194f82 Make exportlegends compatible with open-legends 2015-08-15 16:44:12 +10:00
PeridexisErrant 84a1edc3b8 Add initial comments to some scripts 2015-08-15 16:43:50 +10:00
lethosor 8c93177f1d No need to document documentation updates 2015-08-14 16:33:34 -04:00
Zac-HD 776af19045 Add and document points.lua
A trivial script to choose the number of points available at embark.
2015-08-14 11:54:38 +10:00
lethosor 9a58332aed Update lethosor/dfhack-scripts submodule (whitespace) 2015-08-06 21:59:33 -04:00
lethosor 418d2831ef Add a framework for including 3rd-party script repos
Repos need to include a CMakeLists.txt file with calls to the
DFHACK_SCRIPTS macro, which functions similarly to DFHACK_PLUGIN.

The `open-legends` script from lethosor/dfhack-scripts is included
as an example.
2015-08-06 21:50:01 -04:00
lethosor d7b1714a6c gui/create-item: Improve quality assignment and make "Esc" work 2015-08-02 10:07:57 -04:00
expwnent 7b91730352 Initial commit for modtools/create-unit.lua. 2015-07-27 08:46:01 -04:00
warmist d9da55f6bd Update gm-unit.lua
tabs to spaces.
2015-07-26 12:54:23 +03:00
warmist 0e939531ab Update gm-unit.lua
Add counter editor.
2015-07-26 12:53:48 +03:00
warmist b6f48e088a Create gm-unit.lua
A gui util to (eventually) user friendly edit any unit.
2015-07-25 15:16:30 +03:00
lethosor 726ffd6417 gm-editor: Define some aliases for useful variables 2015-07-24 13:59:19 -04:00
lethosor 4a6bde35ab Only display names of levers with names 2015-07-15 16:19:58 -04:00
Michon van Dooren 237ce2c539 Extended lever.rb a bit
Added names to the lever list, and `lever pull` without any arguments now pulls the lever under the cursor.
2015-07-15 16:02:23 -04:00
lethosor 01c4d4540b Add a gui/hack-wish alias for gui/create-item 2015-06-23 11:27:43 -04:00
lethosor 66525ee92d fix-ster.lua: Improve style and fix handling of units with no souls
* Remove unnecessary "return" statements
* Use s:foo() instead of string.foo(s)
* Allow use as a module

Fixes #645
2015-06-22 23:39:43 -04:00
Putnam3145 4d20552ef8 Rename gui/hack-wish to gui/create-item
After an [extensive, in-depth discussion about the merits of the name](https://github.com/DFHack/dfhack/issues/634), I decided that "hack-wish" was a dumb name and figure changing it will make everything easier for everyone forever.
2015-06-13 02:41:51 -07:00
Lethosor 67203e1ddd Merge pull request #635 from warmist/patch-2
gui/gm-editor changes
2015-06-12 20:55:20 -04:00
warmist 00251386f5 fix spelling mistake 2015-06-13 00:02:12 +03:00
warmist a8a3153de6 gui/gm-editor changes
Add label to show that you can actually (s)earch through lists. Add "]" to displace references (e.g. map blocks and stuff) - will crash stuff you don't know what you are doing.
2015-06-12 23:55:55 +03:00
scamtank 64c92802c2 String.find(k) into k:find
Looks neater already.
2015-06-12 03:22:05 +03:00
scamtank 01a3ed627f Just delete the thing
If there's need for the DRINK_MAT thing again, it's no big deal to write it back.
2015-06-12 00:53:49 +03:00
scamtank d049f79d08 Make second function do what the first won't
Dummy out the DRINK_MAT lookup in the first one to stop the overlap, make the second one look up all the stuff that the first one expects to find with material reaction product tokens.
2015-06-12 00:10:50 +03:00
Lethosor 20bd56e7f4 Merge pull request #627 from scamtank/scam-viewiteminfo
Fixed elasticity descriptions
2015-06-05 16:04:43 -04:00
scamtank 8336e831d2 Fixed elasticity descriptions
Previous order of comparisons would describe any amount of strain at yield below 50000 as "elastic". Flip the order of checks and it works as intended. Seems like a simple mistake, I don't think this'll break anything else.
2015-06-05 19:59:28 +03:00
scamtank 01ee8b97b2 Add format guide to item-descriptions.lua
Including a short list of the screen's limitations would be a good idea, I think.
2015-06-05 18:24:02 +03:00
Peridexis Errant 942f451358 Finish item descriptions, test, document 2015-05-30 17:11:00 -04:00
Peridexis Errant b86214e0e1 Final item descriptions 2015-05-30 17:10:59 -04:00
Peridexis Errant 9dcc49aec5 Descriptions - nine weapons and tools to go 2015-05-30 17:10:59 -04:00
Peridexis Errant 0b0fd18c31 Yet more descriptions - 30 to go 2015-05-30 17:10:59 -04:00
Peridexis Errant e58ab09d86 More descriptions
Just 40 items to go - all subtypes of shield, weapon, tool, helm, or
gloves!
2015-05-30 17:10:59 -04:00
Peridexis Errant 5d4bccb800 List wesQ3 as contributor 2015-05-30 17:10:58 -04:00
Wes Malone 07ed843737 Describe wood, table, quern, millstone 2015-05-30 17:10:55 -04:00
Peridexis Errant bec0150669 Many more descriptions - 54 to go! 2015-05-27 09:31:04 +10:00
Peridexis Errant de2724062d Several more descriptions 2015-05-26 23:55:18 +10:00
Peridexis Errant e929760f6b Described jewelery 2015-05-26 21:09:59 +10:00
Peridexis Errant 711a817e88 Added some more descriptions
Thanks to /u/Puffin4Tom and /u/KroyMortlach
2015-05-26 20:58:16 +10:00
Peridexis Errant 3bd258816f Merge branch 'develop' of https://github.com/DFHack/dfhack into describe-items 2015-05-26 17:28:29 +10:00
Peridexis Errant 1ad5fda6b4 Finish item-descriptions.lua templating 2015-05-26 17:27:58 +10:00
lethosor 957b894a80 warn-starving improvements
* Display all problems with all units
* Display units' professions if applicable
* Log warnings to the console
* Allow use as a module
* Add an argument to (re-)display all problematic units

See #614
2015-05-24 13:05:46 -04:00
lethosor de984b1a60 Merge remote-tracking branch 'PeridexisErrant/warn-starving' into develop 2015-05-24 12:35:10 -04:00
lethosor 7baf581b93 Make gui/gm-editor work with lua tables 2015-05-24 11:43:05 -04:00
Putnam3145 73527cc6eb Made teleport work with cursor and handle errors. 2015-05-19 13:18:40 -07:00
PeridexisErrant 7c3c92dd54 Remove surplus end 2015-05-13 23:04:32 +10:00
PeridexisErrant 2569abcdec Fix variables na and announcement -> msg 2015-05-13 22:58:34 +10:00
Peridexis Errant 3583004c6d Add warn-starving.lua
With minor changes; it doesn't repeat here.
Closes issue #596.
2015-05-13 14:49:10 +10:00
lethosor 6447695d1f Merge remote-tracking branch 'PeridexisErrant/add-scripts' into develop 2015-05-09 09:36:51 -04:00
Peridexis Errant d7717a92ab Add burial.lua by Putnam
It's useful, and why not?
2015-05-09 17:29:03 +10:00
Peridexis Errant 939cab4451 Add fix-ster by Tacomagic
Allow setting fertility or sterility of units or whole species.
2015-05-09 16:35:19 +10:00
lethosor 9ce0616325 Allow scripts that recognize "moduleMode" to be used as modules 2015-05-08 18:03:19 -04:00
lethosor 4e5326e25d Only allow quicksave to be used in fortress mode 2015-05-06 18:47:40 -04:00
Lethosor c095371814 Merge pull request #606 from Putnam3145/patch-16
Make full-heal -r optionally remove corpse.
2015-04-29 17:37:22 -04:00
Lethosor 06a2e430dc Merge pull request #608 from Putnam3145/patch-17
Made "could not find syndrome" error work.
2015-04-29 17:37:06 -04:00
Putnam3145 aeeb2cfd6e Made "could not find syndrome" error work.
Before, it was trying to look at the syndrome ID it didn't actually find.
2015-04-29 14:19:24 -07:00
Putnam3145 f6b9d19762 Make full-heal -r optionally remove corpse. 2015-04-24 18:59:09 -07:00
Putnam3145 d4c2ec9365 Made hack-wish assign quality properly.
Also added a few return values and localized most functions so that it can be better used with dfhack.script_environment.
2015-04-23 18:11:13 -07:00
lethosor 3eb814ce51 Clean up gui/dfstatus.lua 2015-04-18 19:19:43 -04:00
lethosor e3b7d61bc1 Fix a few view-item-info issues
* Make descriptions work
* Allow the script to be enabled/disabled
* Avoid appending an empty line to script output and add a DFHack
  label
2015-04-18 18:57:21 -04:00
lethosor 1a23ce136a Merge remote-tracking branch 'PeridexisErrant/item-info' into develop 2015-04-18 17:56:32 -04:00
lethosor fab7887f20 Make lint.py work under Python 3 and fix a few UTF-8 errors 2015-04-06 11:25:30 -04:00
Peridexis Errant 2bd5b7e349 Describe blocks, fix trailing whitespace 2015-04-06 16:03:14 +10:00
PeridexisErrant ad09bc98d1 Add script, content, and documentation
See readme diff for more information.  A follow-up pull will eventually
come to complete the description coverage.
2015-04-01 10:23:09 +11:00
Ben Lubar e657a05ca1 ban-cooking script
ban-cooking booze  - bans cooking of drinks
ban-cooking honey  - bans cooking of honey bee honey
ban-cooking tallow - bans cooking of tallow
ban-cooking oil    - bans cooking of oil
ban-cooking seeds  - bans cooking of plants that have seeds (tree seeds
don't count)
2015-03-28 13:09:35 -05:00
scamtank 9a661e1481 Extend fix/blood-del to include tears and sweat
This version of blood-del.lua will catch the new bodily emissions too, mostly from gremlins or gnomes.
2015-03-22 14:24:51 +02:00
lethosor 83e175f52b Fix syntax error in devel/light.lua 2015-02-23 18:57:50 -05:00
Lethosor e9cc242322 Merge pull request #555 from lethosor/travis
Add .travis.yml and fix whitespace issues
2015-02-16 17:05:29 -05:00
Lethosor d14a8b4308 Convert TranslateName output to UTF-8 2015-02-16 13:55:19 -05:00
lethosor 10cfef0553 Fix whitespace issues 2015-02-14 22:53:06 -05:00
lethosor 57bdf731f0 Merge branch 'export-more-legends' into develop 2015-02-12 19:01:05 -05:00
lethosor c39d3165eb Use consistent indentation 2015-02-12 19:00:41 -05:00
PeridexisErrant 62bec962f8 Standard function definition syntax 2015-02-13 10:08:44 +11:00
Peridexis Errant 74476bcd95 fix whitespace
PSA:  do not assume that it's the same as last time you checked.
2015-02-12 16:14:25 +11:00
lethosor 3411704140 Merge remote-tracking branch 'Putnam3145/patch-12' into develop
Conflicts:
	NEWS
2015-02-11 23:18:54 -05:00
Putnam3145 38fbf67262 Make skill-change actually work with level
It was trying to set the level to the string "Proficient" instead of 5, same for every other skill level. There was no workaround, especially since it expected numbers for the value.
2015-02-11 16:08:23 -08:00
PeridexisErrant f67370b817 exportlegends - more data in legends_plus.xml
Originally written by Mason11987, adapted and included with permission.
2015-02-12 09:39:56 +11:00
Ben Lubar ea74e1252a fix attribute-changing syndromes in show-unit-syndromes 2015-02-08 13:55:39 -06:00
lethosor 7823a14a8f Merge remote-tracking branch 'Putnam3145/patch-10' into develop
Conflicts:
	NEWS
2015-02-06 17:08:00 -05:00
Lethosor 8bc9bcfcb1 Merge pull request #533 from Putnam3145/patch-11
Added subthought properly to add-thought.
2015-02-06 16:58:40 -05:00
Putnam3145 ac318aaee8 Added subthought properly to add-thought.
Not used much, but still very much a problem that it wasn't there.
2015-02-06 13:52:56 -08:00
Putnam3145 674b9dd5a9 Made hack-wish stack properly. 2015-02-05 00:25:05 -08:00
Lethosor bcfff161e7 Rename ShowUnitSyndromes.rb to show-unit-syndromes.rb 2015-02-03 21:25:43 -05:00
Ben Lubar 02a14c6b57 fix ShowUnitSyndromes 2015-02-03 20:05:33 -06:00
Lethosor 7aa82fdbdb Merge pull request #527 from warmist/gm-editor
Add search bar to gui/gm-editor
2015-02-03 12:29:01 -05:00
Warmist ab14eae76c LEAVESCREEN now exits out of search too. 2015-02-03 19:17:33 +02:00
expwnent def4fca175 Tweak anonymous-script. 2015-02-02 05:21:13 -05:00
expwnent 0fa316f6eb Tweak reaction-product-trigger. 2015-02-02 05:20:59 -05:00
expwnent e5e0d93ef1 Added modtools/reaction-product-trigger. 2015-02-02 02:39:05 -05:00
Warmist c56d928dae Update search bar after browsing. 2015-02-01 20:07:28 +02:00
Warmist 570381f059 Added search. Access with "s". 2015-02-01 19:58:49 +02:00
expwnent bf5e491647 Allow Lua scripts to be used as modules. 2015-01-31 22:43:54 -05:00
expwnent b685aa2729 Merge remote-tracking branch 'peridexis/fix_hfs-pit' into develop
Conflicts:
	NEWS
2015-01-31 20:19:42 -05:00
Peridexis Errant fa4a781763 Fix hfs-pit feature search
Via notfood, here:
http://www.bay12forums.com/smf/index.php?topic=139553.msg5984896#msg5984896
2015-01-28 09:33:26 +11:00
Putnam3145 0cb70fdb86 Updated add-thought for proper stress change.
Apparently, just adding the thought doesn't cut it.

Also added thought strength to the whole thing.
2015-01-26 19:11:53 -08:00
warmist 686647af0e fix skill-change so it would use insert_sorted
This is needed because the skills vector is actually sorted. Adding skill with id<last one would mess things up very badly.
2015-01-18 19:53:08 +02:00
expwnent a962865b7f Merge remote-tracking branch 'dfhack/develop' into develop 2015-01-15 22:54:42 -05:00
expwnent a78d4cc5f0 Merge pull request #488 from warmist/advfort
Update advfort.lua
2015-01-15 22:49:17 -05:00
warmist f510cd7c11 Update advfort.lua
Fix bug with building jobs
2015-01-13 10:30:53 +02:00
Peridexis Errant 9f0558b547 Allow for other hotkeys keybinds
Using this method is more compact and more flexible.  Also tabs to
spaces...
2015-01-08 13:10:11 +11:00
Peridexis Errant b030bb08fe Finish and document hotkey-notes
All working correctly - thus ends the long story of the needs_porting
folder.
2015-01-08 11:11:09 +11:00
Peridexis Errant 5b54909886 Move hotkey-notes to scripts, delete needs_porting!
The notes script is unfinished, but that's the last thing to do - since
everything else is obsolete, ported, or the subject of a github issue to
make a replacement.
2015-01-06 22:48:24 +11:00
lethosor f451cfb3a5 Merge remote-tracking branches 'cdombroski/autobutcher' and 'cdombroski/siren.lua'
Also update NEWS
2015-01-05 16:59:08 -05:00
lethosor 06029c92c2 Merge remote-tracking branches 'lethosor/export-dt-ini-0.40.21' and 'lethosor/patch-9' 2015-01-05 16:40:44 -05:00
lethosor 7da9ab8f80 Merge remote-tracking branch 'lethosor/0.40.22-plugins'
Also update NEWS
2015-01-05 16:37:34 -05:00
lethosor 3bc17dafab Merge remote-tracking branch 'PeridexisErrant/digfort-checks'
Conflicts:
	NEWS
2015-01-05 16:32:14 -05:00
lethosor 8f60e0eb01 Merge remote-tracking branches 'lethosor/remove-embark' and 'lethosor/revert-401-dfhack-log'
Also update NEWS
2015-01-05 16:31:03 -05:00
lethosor ad6b19f1b2 Merge remote-tracking branch 'PeridexisErrant/needs_porting-cleanup'
Conflicts:
	NEWS
2015-01-05 16:21:24 -05:00
lethosor f0e7d2b895 Merge remote-tracking branches 'warmist/advfort', 'Putnam3145/patch-8', 'AndreasPK/master' and 'PeridexisErrant/fix-exportlegends' 2015-01-05 16:19:52 -05:00
Chris Dombroski 294fe0b30c Update siren.lua for emotions
Runs now without exception/error and adds emotions correctly. Seems to work as intended.
2015-01-05 08:33:10 -05:00
PeridexisErrant b4f224fb3f minor console output tweaks
Also remove unused sample file from code, change handling of offset.
2015-01-02 22:01:48 +11:00
Lethosor 5a404333ca Update devel/export-dt-ini for 0.40.21+
https://github.com/splintermind/Dwarf-Therapist/commit/356ae80
2014-12-26 12:39:05 -05:00
PeridexisErrant d95c0878e1 fix -info option
to export info instead of detailed maps (oops!)
2014-12-24 22:10:04 +11:00
PeridexisErrant e71408b40b replace hellhole.cpp with hfs-pit.lua
A port/update.  May not have great argument handling, and there's a few
magic numbers, but it's a huge improvement over a non-compiling plugin.
2014-12-24 18:24:52 +11:00
lethosor ee958c0f8f Update some plugins/scripts for 0.40.22
* autolabor, manipulator: Add BUILD_CONSTRUCTION and BUILD_ROAD labors
* mousequery: Support "toggle engravings" sidebar mode
* devel/export-dt-ini.lua: Add body_part_flags

Conflicts:
	plugins/mousequery.cpp
2014-12-21 16:49:33 -05:00
Peridexis Errant 93def956f5 finish position.lua
It would be great to report the name of the Age, and the position of the
fort within the world, but aside from those it's finished.
2014-12-21 21:03:44 +11:00
Lethosor 695f04a51d Delete embark.lua
This has been replaced by embark-tools, and there have been reports of this not working in 0.40.xx (http://www.bay12forums.com/smf/index.php?topic=139553.msg5885446#msg5885446)
2014-12-17 21:26:01 -05:00
PeridexisErrant dba7d1bd5d Add file checks to digfort
Checking file type and existence before we start avoids a few issues,
and prevents (highly) misleading feedback of "done" regardless of action
taken.  Closes #453
2014-12-18 09:50:00 +11:00
Warmist 651a8ab497 fixed crashing bug. 2014-12-17 23:05:48 +02:00
PeridexisErrant f3826abc0c cleaning up in needs_porting
Removed obsolete plugins.  Started hotkeys port.  Mostly-finished
position port.  Corrected dwarfmonitor date display.  Documented
putontable.lua in readme.
2014-12-15 23:11:23 +11:00
PeridexisErrant b93eac1c7a Fix "exportlegends maps"
Correct list index error which skipped export of detailed map.  Allow
region-maps-only export to start from detailed maps viewscreen.  More
informative error message.  Closes #445.,
2014-12-15 10:22:05 +11:00
Warmist e22c3b099b New and improved. Fixed bugs, now work gets done automatically. 2014-12-12 10:32:22 +02:00
AndreasPK 88354c7183 Fixed error with passing nil to unit.find 2014-12-12 02:47:59 +01:00
Warmist 550cddc604 Gui for item selection in advfort 2014-12-10 00:09:28 +02:00
Warmist f47565465e more fixes, improvements 2014-12-08 22:19:22 +02:00
Putnam3145 17772954cc Made restrictive mat filter work properly
Yeah, not sure what the heck I was doing there before.
2014-12-07 21:04:39 -08:00
Warmist f84a5dbce1 Fixed a bug where it does not find building ref. 2014-12-08 00:55:46 +02:00
Warmist 05887ffdb8 Fixed advfort somewhat: now it teleports items so you can build/craft stuff. 2014-12-07 22:21:19 +02:00
Warmist c1da5e2741 Removed (for now) all the cruft involving item selection gui. Added unit_action for adventurer to perform work. 2014-12-07 22:21:18 +02:00
Casey Link 52f4cb3fc1 stockpiles: load prompt uses typing + filtering 2014-12-05 14:49:40 +01:00
Casey Link 332566f6a1 stockpiles: disable gui/script when plugin is disabled 2014-12-05 13:27:58 +01:00
Casey Link 1f1780cae9 stockpiles: fix usage help 2014-12-05 12:35:24 +01:00
Casey Link b6118d272c stockpiles: integrate gui plugin into dfhack.init-example 2014-12-05 12:35:24 +01:00
expwnent 19e977528c Merge branch 'autolabor-artisans' of https://github.com/pkdawson/dfhack into develop
Conflicts:
	NEWS
2014-12-04 23:49:13 -05:00