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

Merge remote-tracking branch 'ab9rf/autogems-1263' into develop 

Conflicts:
	docs/changelog.txt
develop
lethosor 2021-08-12 00:27:26 -04:00
parent ef0ddb729e 1e44f61060
commit 77e0938dd1
No known key found for this signature in database
GPG Key ID: 76A269552F4F58C1
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -39,6 +39,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
## Fixes ## Fixes
- Core: ``alt`` keydown state is now cleared when DF loses and regains focus, ensuring the ``alt`` modifier state is not stuck on for systems that don't send standard keyup events in response to ``alt-tab`` window manager events - Core: ``alt`` keydown state is now cleared when DF loses and regains focus, ensuring the ``alt`` modifier state is not stuck on for systems that don't send standard keyup events in response to ``alt-tab`` window manager events
- Lua: ``memscan.field_offset()``: fixed an issue causing `devel/export-dt-ini` to crash sometimes, especially on Windows - Lua: ``memscan.field_offset()``: fixed an issue causing `devel/export-dt-ini` to crash sometimes, especially on Windows
- `autogems`: no longer assigns gem cutting jobs to workshops with gem cutting prohibited in the workshop profile
## Misc Improvements ## Misc Improvements
- `buildingplan`: now displays which items are attached and which items are still missing for planned buildings - `buildingplan`: now displays which items are attached and which items are still missing for planned buildings

6
plugins/autogems.cpp
Unescape Escape View File

@ -155,6 +155,12 @@ void create_jobs() {
continue; continue;
} }
auto profile = workshop->getWorkshopProfile();
if (profile && profile->blocked_labors[df::unit_labor::CUT_GEM]) {
// workshop profile does not allow cut gem jobs (fixes #1263)
continue;
}
if (links.size() > 0) { if (links.size() > 0) {
for (auto l = links.begin(); l != links.end() && workshop->jobs.size() <= MAX_WORKSHOP_JOBS; ++l) { for (auto l = links.begin(); l != links.end() && workshop->jobs.size() <= MAX_WORKSHOP_JOBS; ++l) {
auto stockpile = virtual_cast<df::building_stockpilest>(*l); auto stockpile = virtual_cast<df::building_stockpilest>(*l);