MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into quickfort_filter

develop
Myk Taylor 2020-08-19 19:47:32 -07:00
parent 9a3e9d5b12 7bac4c89c4
commit be9cf43186
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/Lua API.rst
Unescape Escape View File

@ -1076,15 +1076,17 @@ Job module
Returns the unit performing the job. Returns the unit performing the job.
* ``dfhack.job.setJobCooldown(building,worker,timeout)`` * ``dfhack.job.setJobCooldown(building,worker,cooldown)``
Prevent the worker from taking jobs at the specified workshop for the specified time. Prevent the worker from taking jobs at the specified workshop for the
This doesn't decrease the timeout in any circumstances. specified cooldown period (in ticks). This doesn't decrease the cooldown
period in any circumstances.
* ``dfhack.job.removeWorker(job,timeout)`` * ``dfhack.job.removeWorker(job,cooldown)``
Removes the worker from the specified workshop job, and sets the cooldown. Removes the worker from the specified workshop job, and sets the cooldown
Returns *true* on success. period (using the same logic as ``setJobCooldown``). Returns *true* on
success.
* ``dfhack.job.checkBuildingsNow()`` * ``dfhack.job.checkBuildingsNow()``

3
docs/changelog.txt
Unescape Escape View File

@ -33,6 +33,9 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
# Future # Future
## Fixes
- `stockpiles`: fixed a crash when loading food stockpiles
# 0.47.04-r2 # 0.47.04-r2
## New Tweaks ## New Tweaks

2
plugins/stockpiles/OrganicMatLookup.cpp
Unescape Escape View File

@ -152,4 +152,4 @@ MaterialInfo OrganicMatLookup::food_mat_by_token ( std::ostream &out, const std:
} }
bool OrganicMatLookup::index_built = false; bool OrganicMatLookup::index_built = false;
std::vector<OrganicMatLookup::FoodMatMap> OrganicMatLookup::food_index = std::vector<OrganicMatLookup::FoodMatMap> ( 37 ); std::vector<OrganicMatLookup::FoodMatMap> OrganicMatLookup::food_index = std::vector<OrganicMatLookup::FoodMatMap> ( df::enum_traits< df::organic_mat_category >::last_item_value + 1 );