incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

color unidentified weapon names in $what

Browse Source
This commit is contained in:
Martin Michelsen
2024-02-23 09:25:29 -08:00
parent 680a1a797c
commit 66571d751f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ItemNameIndex.cc
+5 -2
View File
@@ -107,8 +107,9 @@ std::string ItemNameIndex::describe_item(
vector<string> ret_tokens; vector<string> ret_tokens;
// For weapons, specials appear before the weapon name // For weapons, specials appear before the weapon name
bool is_unidentified = false;
if ((item.data1[0] == 0x00) && (item.data1[4] != 0x00) && !item.is_s_rank_weapon()) { if ((item.data1[0] == 0x00) && (item.data1[4] != 0x00) && !item.is_s_rank_weapon()) {
bool is_unidentified = item.data1[4] & 0x80; is_unidentified = item.data1[4] & 0x80;
bool is_present = item.data1[4] & 0x40; bool is_present = item.data1[4] & 0x40;
uint8_t special_id = item.data1[4] & 0x3F; uint8_t special_id = item.data1[4] & 0x3F;
if (is_present) { if (is_present) {
@@ -325,7 +326,9 @@ std::string ItemNameIndex::describe_item(
string ret = join(ret_tokens, " "); string ret = join(ret_tokens, " ");
if (include_color_escapes) { if (include_color_escapes) {
if (item.is_s_rank_weapon()) { if (is_unidentified) {
return "$C3" + ret;
} else if (item.is_s_rank_weapon()) {
return "$C4" + ret; return "$C4" + ret;
} else if (this->item_parameter_table->is_item_rare(item)) { } else if (this->item_parameter_table->is_item_rare(item)) {
return "$C6" + ret; return "$C6" + ret;