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
20bd56e7f4
Merge pull request #627 from scamtank/scam-viewiteminfo
...
Fixed elasticity descriptions
2015-06-05 16:04:43 -04:00
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
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
942f451358
Finish item descriptions, test, document
2015-05-30 17:11:00 -04:00
b86214e0e1
Final item descriptions
2015-05-30 17:10:59 -04:00
9dcc49aec5
Descriptions - nine weapons and tools to go
2015-05-30 17:10:59 -04:00
0b0fd18c31
Yet more descriptions - 30 to go
2015-05-30 17:10:59 -04:00
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
5d4bccb800
List wesQ3 as contributor
2015-05-30 17:10:58 -04:00
07ed843737
Describe wood, table, quern, millstone
2015-05-30 17:10:55 -04:00
bec0150669
Many more descriptions - 54 to go!
2015-05-27 09:31:04 +10:00
de2724062d
Several more descriptions
2015-05-26 23:55:18 +10:00
e929760f6b
Described jewelery
2015-05-26 21:09:59 +10:00
711a817e88
Added some more descriptions
...
Thanks to /u/Puffin4Tom and /u/KroyMortlach
2015-05-26 20:58:16 +10:00
3bd258816f
Merge branch 'develop' of https://github.com/DFHack/dfhack into describe-items
2015-05-26 17:28:29 +10:00
1ad5fda6b4
Finish item-descriptions.lua templating
2015-05-26 17:27:58 +10:00
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
de984b1a60
Merge remote-tracking branch 'PeridexisErrant/warn-starving' into develop
2015-05-24 12:35:10 -04:00
7baf581b93
Make gui/gm-editor work with lua tables
2015-05-24 11:43:05 -04:00
73527cc6eb
Made teleport work with cursor and handle errors.
2015-05-19 13:18:40 -07:00
7c3c92dd54
Remove surplus end
2015-05-13 23:04:32 +10:00
2569abcdec
Fix variables na and announcement -> msg
2015-05-13 22:58:34 +10:00
3583004c6d
Add warn-starving.lua
...
With minor changes; it doesn't repeat here.
Closes issue #596 .
2015-05-13 14:49:10 +10:00
6447695d1f
Merge remote-tracking branch 'PeridexisErrant/add-scripts' into develop
2015-05-09 09:36:51 -04:00
d7717a92ab
Add burial.lua by Putnam
...
It's useful, and why not?
2015-05-09 17:29:03 +10:00
939cab4451
Add fix-ster by Tacomagic
...
Allow setting fertility or sterility of units or whole species.
2015-05-09 16:35:19 +10:00
9ce0616325
Allow scripts that recognize "moduleMode" to be used as modules
2015-05-08 18:03:19 -04:00
4e5326e25d
Only allow quicksave to be used in fortress mode
2015-05-06 18:47:40 -04:00
c095371814
Merge pull request #606 from Putnam3145/patch-16
...
Make full-heal -r optionally remove corpse.
2015-04-29 17:37:22 -04:00
06a2e430dc
Merge pull request #608 from Putnam3145/patch-17
...
Made "could not find syndrome" error work.
2015-04-29 17:37:06 -04:00
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
f6b9d19762
Make full-heal -r optionally remove corpse.
2015-04-24 18:59:09 -07:00
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
3eb814ce51
Clean up gui/dfstatus.lua
2015-04-18 19:19:43 -04:00
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
1a23ce136a
Merge remote-tracking branch 'PeridexisErrant/item-info' into develop
2015-04-18 17:56:32 -04:00
fab7887f20
Make lint.py work under Python 3 and fix a few UTF-8 errors
2015-04-06 11:25:30 -04:00
2bd5b7e349
Describe blocks, fix trailing whitespace
2015-04-06 16:03:14 +10:00
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
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
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
83e175f52b
Fix syntax error in devel/light.lua
2015-02-23 18:57:50 -05:00
e9cc242322
Merge pull request #555 from lethosor/travis
...
Add .travis.yml and fix whitespace issues
2015-02-16 17:05:29 -05:00
d14a8b4308
Convert TranslateName output to UTF-8
2015-02-16 13:55:19 -05:00
10cfef0553
Fix whitespace issues
2015-02-14 22:53:06 -05:00
57bdf731f0
Merge branch 'export-more-legends' into develop
2015-02-12 19:01:05 -05:00
c39d3165eb
Use consistent indentation
2015-02-12 19:00:41 -05:00
62bec962f8
Standard function definition syntax
2015-02-13 10:08:44 +11:00
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
3411704140
Merge remote-tracking branch 'Putnam3145/patch-12' into develop
...
Conflicts:
NEWS
2015-02-11 23:18:54 -05:00
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
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
ea74e1252a
fix attribute-changing syndromes in show-unit-syndromes
2015-02-08 13:55:39 -06:00
7823a14a8f
Merge remote-tracking branch 'Putnam3145/patch-10' into develop
...
Conflicts:
NEWS
2015-02-06 17:08:00 -05:00
8bc9bcfcb1
Merge pull request #533 from Putnam3145/patch-11
...
Added subthought properly to add-thought.
2015-02-06 16:58:40 -05:00
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
674b9dd5a9
Made hack-wish stack properly.
2015-02-05 00:25:05 -08:00
bcfff161e7
Rename ShowUnitSyndromes.rb to show-unit-syndromes.rb
2015-02-03 21:25:43 -05:00
02a14c6b57
fix ShowUnitSyndromes
2015-02-03 20:05:33 -06:00
7aa82fdbdb
Merge pull request #527 from warmist/gm-editor
...
Add search bar to gui/gm-editor
2015-02-03 12:29:01 -05:00
ab14eae76c
LEAVESCREEN now exits out of search too.
2015-02-03 19:17:33 +02:00
def4fca175
Tweak anonymous-script.
2015-02-02 05:21:13 -05:00
0fa316f6eb
Tweak reaction-product-trigger.
2015-02-02 05:20:59 -05:00
e5e0d93ef1
Added modtools/reaction-product-trigger.
2015-02-02 02:39:05 -05:00
c56d928dae
Update search bar after browsing.
2015-02-01 20:07:28 +02:00
570381f059
Added search. Access with "s".
2015-02-01 19:58:49 +02:00
bf5e491647
Allow Lua scripts to be used as modules.
2015-01-31 22:43:54 -05:00
b685aa2729
Merge remote-tracking branch 'peridexis/fix_hfs-pit' into develop
...
Conflicts:
NEWS
2015-01-31 20:19:42 -05:00
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
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
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
a962865b7f
Merge remote-tracking branch 'dfhack/develop' into develop
2015-01-15 22:54:42 -05:00
a78d4cc5f0
Merge pull request #488 from warmist/advfort
...
Update advfort.lua
2015-01-15 22:49:17 -05:00
f510cd7c11
Update advfort.lua
...
Fix bug with building jobs
2015-01-13 10:30:53 +02:00
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
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
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
f451cfb3a5
Merge remote-tracking branches 'cdombroski/autobutcher' and 'cdombroski/siren.lua'
...
Also update NEWS
2015-01-05 16:59:08 -05:00
06029c92c2
Merge remote-tracking branches 'lethosor/export-dt-ini-0.40.21' and 'lethosor/patch-9'
2015-01-05 16:40:44 -05:00
7da9ab8f80
Merge remote-tracking branch 'lethosor/0.40.22-plugins'
...
Also update NEWS
2015-01-05 16:37:34 -05:00
3bc17dafab
Merge remote-tracking branch 'PeridexisErrant/digfort-checks'
...
Conflicts:
NEWS
2015-01-05 16:32:14 -05:00
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
ad6b19f1b2
Merge remote-tracking branch 'PeridexisErrant/needs_porting-cleanup'
...
Conflicts:
NEWS
2015-01-05 16:21:24 -05:00
f0e7d2b895
Merge remote-tracking branches 'warmist/advfort', 'Putnam3145/patch-8', 'AndreasPK/master' and 'PeridexisErrant/fix-exportlegends'
2015-01-05 16:19:52 -05:00
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
b4f224fb3f
minor console output tweaks
...
Also remove unused sample file from code, change handling of offset.
2015-01-02 22:01:48 +11:00
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
d95c0878e1
fix -info option
...
to export info instead of detailed maps (oops!)
2014-12-24 22:10:04 +11:00
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
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
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
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
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
651a8ab497
fixed crashing bug.
2014-12-17 23:05:48 +02:00
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
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
e22c3b099b
New and improved. Fixed bugs, now work gets done automatically.
2014-12-12 10:32:22 +02:00
88354c7183
Fixed error with passing nil to unit.find
2014-12-12 02:47:59 +01:00
550cddc604
Gui for item selection in advfort
2014-12-10 00:09:28 +02:00
f47565465e
more fixes, improvements
2014-12-08 22:19:22 +02:00
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
f84a5dbce1
Fixed a bug where it does not find building ref.
2014-12-08 00:55:46 +02:00
05887ffdb8
Fixed advfort somewhat: now it teleports items so you can build/craft stuff.
2014-12-07 22:21:19 +02:00
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
52f4cb3fc1
stockpiles: load prompt uses typing + filtering
2014-12-05 14:49:40 +01:00
332566f6a1
stockpiles: disable gui/script when plugin is disabled
2014-12-05 13:27:58 +01:00
1f1780cae9
stockpiles: fix usage help
2014-12-05 12:35:24 +01:00
b6118d272c
stockpiles: integrate gui plugin into dfhack.init-example
2014-12-05 12:35:24 +01:00
19e977528c
Merge branch 'autolabor-artisans' of https://github.com/pkdawson/dfhack into develop
...
Conflicts:
NEWS
2014-12-04 23:49:13 -05:00
6e86336b8f
Merge pull request #427 from Ramblurr/fix-teleport
...
teleport: fix unused code causing crash
2014-12-04 23:39:13 -05:00
a107e41bda
Merge pull request #430 from splintermind/master
...
update DT scripts for versions 29.0.0+
2014-12-04 23:38:34 -05:00
5d1efa82f1
update DT scripts
2014-12-03 23:34:22 +01:00
c1d36be6e8
teleport: fix unused code causing crash
...
The `teleportSettings` variable was never used and the line referenced
the non-existing function `getArgsTogether`
2014-12-03 11:33:05 +01:00
d9ae3cc612
Removed removebadthoughts and updated Readme.rst and NEWS.
2014-11-30 09:26:04 -05:00
81b75161d6
Updated remove-stress to the new argument system.
2014-11-30 09:23:35 -05:00
5dcec6f683
Add Putnam's remove-stress script
2014-11-30 22:30:13 +11:00
16fcdc3035
modtools/item-trigger should now work with items
2014-11-28 23:03:27 -05:00
762f5231e2
reaction-trigger typo.
2014-11-28 23:01:44 -05:00
8b1b32a499
autolabor: Add a talent pool parameter.
2014-11-27 15:56:14 +01:00
42dd60a24c
Add autolabor-artisans.lua
2014-11-24 02:32:22 +01:00
ae6675a188
Update add-thought.lua
2014-11-17 22:47:33 -08:00
c43685ae76
superdwarf: remove ruby global function
2014-11-16 13:06:14 +01:00
723d6af9f8
Merge https://github.com/Mchl/dfhack into develop. Manually remove trailing whitespace, update NEWS.
...
Conflicts:
scripts/forum-dwarves.lua
2014-11-15 15:33:48 -05:00
15194613f5
Manually add hobotron's superdwarf fix.
2014-11-15 15:23:00 -05:00
a04ea52e19
Added Putnam's gaydar script.
2014-11-15 00:22:58 -05:00
ba8b964f8d
reaction-trigger-transition.lua should work now.
2014-11-15 00:06:10 -05:00
59ef4e0cc2
It is now possible to remove syndromes by SYN_CLASS.
2014-11-14 23:33:49 -05:00
c7e0a13505
Merge branch 'adaptation-4015' of https://github.com/hobotron-df/dfhack into develop
...
Conflicts:
NEWS
2014-11-14 19:06:04 -05:00
a474bc4dea
Merge remote-tracking branch 'dfhack/develop' into develop
...
Conflicts:
NEWS
2014-11-14 18:58:21 -05:00
c40c4460ba
Merge remote-tracking branch 'putnam/fullhealfix' into develop
...
Conflicts:
NEWS
2014-11-14 18:56:21 -05:00
428fe6a400
interaction-trigger tweaks
2014-11-14 18:50:19 -05:00
38c4edf858
Merge pull request #388 from Putnam3145/add-thought
...
Add "add-thought" script to main repo
2014-11-14 16:05:38 -05:00
0642333f97
Merge pull request #343 from PeridexisErrant/exportlegends-sites
...
exportlegends can do site maps, IDd field
2014-11-14 16:05:06 -05:00
a6b7d6beeb
New script for viewing or setting cavern adapation of citizens.
2014-11-13 12:13:23 -06:00
9f6a04db7f
Switched subthought and severity in function arg
2014-11-12 13:55:38 -08:00
4ccd4a96be
Updated add-thought to allow subthoughts.
...
Only works in non-gui mode for now, since there's no easy way to tell people what subthought is which with the GUI.
2014-11-12 13:54:44 -08:00
f980ecf38d
Added add-thought to scripts.
...
I figure that it's useful enough and good enough by this point to be
included.
2014-11-10 01:44:30 -08:00
3a403d8ec6
Updated full-heal to properly use args system.
...
Also updated NEWS.
2014-11-10 01:09:15 -08:00
6220a21de6
More straggling documentation errors in modtools.
2014-11-09 18:39:23 -05:00
55348e9c80
Correct reaction-trigger documentation.
2014-11-09 18:37:39 -05:00
838bbd97f6
New devel scripts for testing interaction-trigger.
2014-11-09 18:37:11 -05:00
779ac3fd50
Updated interaction-trigger to work better.
2014-11-09 18:36:21 -05:00
7549169cd2
Merge remote-tracking branch 'dfhack/develop' into develop
2014-11-09 00:39:40 -05:00
f6a281ebc7
Merge pull request #379 from Putnam3145/teleport-update
...
Updated teleport for new args system.
2014-11-09 00:35:33 -05:00
994e98c5c1
Use name of now-identified field
...
Ready for DFHack 40.15-r1 and later
2014-11-09 09:18:53 +11:00
ae001c60ad
Update export-dt-ini.lua
...
From https://github.com/splintermind/Dwarf-Therapist/blob/DF2014/export-dt-ini.lua
2014-11-07 16:40:53 -05:00
82dade1ae0
interaction-trigger documentation tweak.
2014-11-07 14:14:49 -05:00
6b2b13b186
Updated teleport for new args system.
...
Also updated the teleport function to properly check for units at
destination.
2014-11-06 22:15:21 -08:00
e4d4f7230b
modtools/item-trigger: fix equip/unequip bug and correct minor documentation error
2014-11-06 23:46:10 -05:00
scamtank
Lethosor
Peridexis Errant
Wes Malone
lethosor
Putnam3145
PeridexisErrant
Ben Lubar
Warmist
expwnent
Chris Dombroski
AndreasPK
Casey Link
Josh
expwnent
Patrick Dawson
Yoann Guillot
expwnent
hobotron-df