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

fix wrapped descriptions for units and tools

Browse Source
This commit is contained in:
Martin Michelsen
2023-06-21 14:28:45 -07:00
parent 4bbb31b0c6
commit 16bfaf8910
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ItemData.cc
+11 -7
View File
@@ -1646,7 +1646,11 @@ ItemData::ItemData(const string& orig_description, bool skip_special) {
} }
if (is_wrapped) { if (is_wrapped) {
this->data1[3] |= 0x40; if (this->is_stackable()) {
throw runtime_error("stackable items cannot be wrapped");
} else {
this->data1[3] |= 0x40;
}
} }
} else { } else {
throw logic_error("invalid item class"); throw logic_error("invalid item class");
@@ -1687,12 +1691,12 @@ string ItemData::name(bool include_color_codes) const {
} }
} }
} }
// Mags can be wrapped as well // Armors, shields, and units (0x01) can be wrapped, as can mags (0x02) and
if ((this->data1[0] == 0x02) && (this->data2[2] & 0x40)) { // non-stackable tools (0x03). However, each of these item classes has its
ret_tokens.emplace_back("Wrapped"); // flags in a different location.
} if (((this->data1[1] == 0x01) && (this->data1[4] & 0x40)) ||
// And tools can be wrapped if they aren't stackable ((this->data1[0] == 0x02) && (this->data2[2] & 0x40)) ||
if ((this->data1[0] == 0x03) && !this->is_stackable() && (this->data1[3] & 0x40)) { ((this->data1[0] == 0x03) && !this->is_stackable() && (this->data1[3] & 0x40))) {
ret_tokens.emplace_back("Wrapped"); ret_tokens.emplace_back("Wrapped");
} }