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

Merge pull request #3478 from myk002/myk_buildingplan_artifact 

[buildingplan] don't select artifacts as masterful quality
develop
Myk 2023-06-17 09:27:48 -07:00 committed by GitHub
parent 9562897258 dfeac78aae
commit 4a26dab8e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog.txt
Unescape Escape View File

@ -37,6 +37,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- `logistics`: automatically mark and route items or animals that come to monitored stockpiles. options are toggleable on an overlay that comes up when you have a stockpile selected. - `logistics`: automatically mark and route items or animals that come to monitored stockpiles. options are toggleable on an overlay that comes up when you have a stockpile selected.
## Fixes ## Fixes
- `buildingplan`: don't include artifacts when max quality is masterful
- `dig-now`: clear item occupancy flags for channeled tiles that had items on them - `dig-now`: clear item occupancy flags for channeled tiles that had items on them
- `RemoteFortressReader`: fix a crash with engravings with undefined images - `RemoteFortressReader`: fix a crash with engravings with undefined images

5
plugins/buildingplan/itemfilter.cpp
Unescape Escape View File

@ -152,9 +152,10 @@ bool ItemFilter::matches(DFHack::MaterialInfo &material) const {
} }
bool ItemFilter::matches(df::item *item) const { bool ItemFilter::matches(df::item *item) const {
if (item->getQuality() < min_quality || item->getQuality() > max_quality) { int16_t quality = (item->flags.bits.artifact ? df::item_quality::Artifact : item->getQuality());
if (quality < min_quality || quality > max_quality) {
TRACE(cycle).print("item outside of quality range (%d not between %d and %d)\n", TRACE(cycle).print("item outside of quality range (%d not between %d and %d)\n",
item->getQuality(), min_quality, max_quality); quality, min_quality, max_quality);
return false; return false;
} }