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

fix unit modifiers in ItemData

Browse Source
This commit is contained in:
Martin Michelsen
2023-11-02 23:19:24 -07:00
parent 008e59b892
commit f1b00d3ee0
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ItemData.hh
+1 -1
View File
@@ -53,7 +53,7 @@ struct ItemData { // 0x14 bytes
// Weapon: 00ZZZZGG SS00AABB AABBAABB 00000000 // Weapon: 00ZZZZGG SS00AABB AABBAABB 00000000
// Armor: 0101ZZ00 FFTTDDDD EEEE0000 00000000 // Armor: 0101ZZ00 FFTTDDDD EEEE0000 00000000
// Shield: 0102ZZ00 FFTTDDDD EEEE0000 00000000 // Shield: 0102ZZ00 FFTTDDDD EEEE0000 00000000
// Unit: 0103ZZ00 FF0000RR RR000000 00000000 // Unit: 0103ZZ00 FF00RRRR 00000000 00000000
// Mag: 02ZZLLWW HHHHIIII JJJJKKKK YYQQPPVV // Mag: 02ZZLLWW HHHHIIII JJJJKKKK YYQQPPVV
// Tool: 03ZZZZFF 00CC0000 00000000 00000000 // Tool: 03ZZZZFF 00CC0000 00000000 00000000
// Meseta: 04000000 00000000 00000000 MMMMMMMM // Meseta: 04000000 00000000 00000000 MMMMMMMM
src/ItemNameIndex.cc
+1 -1
View File
@@ -250,7 +250,7 @@ std::string ItemNameIndex::describe_item(
// For armors, add the slots, unit modifiers, and/or DEF/EVP bonuses // For armors, add the slots, unit modifiers, and/or DEF/EVP bonuses
} else if (item.data1[0] == 0x01) { } else if (item.data1[0] == 0x01) {
if (item.data1[1] == 0x03) { // Units if (item.data1[1] == 0x03) { // Units
uint16_t modifier = (item.data1[8] << 8) | item.data1[7]; uint16_t modifier = item.data1w[3];
if (modifier == 0x0001 || modifier == 0x0002) { if (modifier == 0x0001 || modifier == 0x0002) {
ret_tokens.back().append("+"); ret_tokens.back().append("+");
} else if (modifier == 0x0003 || modifier == 0x0004) { } else if (modifier == 0x0003 || modifier == 0x0004) {