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

Merge pull request #3194 from ab9rf/prospect 

add raw/cooked z level output to prospector
develop
Myk 2023-04-09 11:18:14 -07:00 committed by GitHub
parent 882573bc4f 95fb4e7eaa
commit be7e904f6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 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

@ -41,6 +41,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- ``launchdf``: launch Dwarf Fortress via the Steam client so Steam Workshop is functional - ``launchdf``: launch Dwarf Fortress via the Steam client so Steam Workshop is functional
- `blueprint`: interpret saplings, shrubs, and twigs as floors instead of walls - `blueprint`: interpret saplings, shrubs, and twigs as floors instead of walls
- `combine`: fix error processing stockpiles with boundaries that extend outside of the map - `combine`: fix error processing stockpiles with boundaries that extend outside of the map
- `prospector`: display both "raw" Z levels and "cooked" elevations
## Misc Improvements ## Misc Improvements
- `buildingplan`: items in the item selection dialog should now use the same item quality symbols as the base game - `buildingplan`: items in the item selection dialog should now use the same item quality symbols as the base game

8
plugins/prospector.cpp
Unescape Escape View File

@ -168,9 +168,13 @@ static void printMatdata(color_ostream &con, const matdata &data, bool only_z =
con << std::setw(9) << int(data.count); con << std::setw(9) << int(data.count);
if(data.lower_z != data.upper_z) if(data.lower_z != data.upper_z)
con <<" Z:" << std::setw(4) << data.lower_z << ".." << data.upper_z << std::endl; con <<" Z:" << std::setw(4) << data.lower_z << " .." << std::setw(4) << data.upper_z
<<" Elev:" << std::setw(4) << (data.lower_z - 100) << " .." << std::setw(4) << (data.upper_z - 100)
<< std::endl;
else else
con <<" Z:" << std::setw(4) << data.lower_z << std::endl; con <<" Z:" << std::setw(4) << data.lower_z << " "
<<" Elev:" << std::setw(4) << (data.lower_z - 100)
<< std::endl;
} }
static int getValue(const df::inorganic_raw &info) static int getValue(const df::inorganic_raw &info)