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

Merge pull request #3167 from TaxiService/develop 

clean up Items.cpp quality symbols definitions
develop
Myk 2023-04-03 15:26:42 -07:00 committed by GitHub
parent d9b6e3b3f0 824f7ed038
commit a1f41c4992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
library/modules/Items.cpp
Unescape Escape View File

@ -720,13 +720,14 @@ df::coord Items::getPosition(df::item *item)
return item->pos;
}
// These '\xFF' chars refer to quality markers from curses.png, namely: 250 (≡), 15 (☼), 174 («) and 175 (»).
static const char MARKER_EXCEPTIONAL = '\xF0';
static const char MARKER_MASTERWORK = '\x0F';
static const char MARKER_IMPROVED_LEFT = '\xAE';
static const char MARKER_IMPROVED_RIGHT = '\xAF';
static char quality_table[] = { 0, '-', '+', '*', MARKER_EXCEPTIONAL, MARKER_MASTERWORK };
static const char quality_table[] = {
'\0', // (base)
'-', // well-crafted
'+', // finely-crafted
'*', // superior quality
'\xF0', // (≡) exceptional
'\x0F' // (☼) masterful
};
static void addQuality(std::string &tmp, int quality)
{
@ -831,7 +832,7 @@ std::string Items::getDescription(df::item *item, int type, bool decorate)
addQuality(tmp, item->getQuality());
if (item->isImproved()) {
tmp = MARKER_IMPROVED_LEFT + tmp + MARKER_IMPROVED_RIGHT;
tmp = '\xAE' + tmp + '\xAF'; // («) + tmp + (»)
addQuality(tmp, item->getImprovementQuality());
}
}