diff --git a/public/ui/items-atlas.png b/public/ui/items-atlas.png index f607ba1..e1ef27b 100644 Binary files a/public/ui/items-atlas.png and b/public/ui/items-atlas.png differ diff --git a/public/ui/manifest.json b/public/ui/manifest.json index d9b6239..0fed377 100644 --- a/public/ui/manifest.json +++ b/public/ui/manifest.json @@ -1,9 +1,9 @@ { "version": "1.13c", - "decodedDc6Count": 453, + "decodedDc6Count": 466, "dc6DecodeFailures": 0, "atlasWidth": 1024, - "atlasHeight": 1882, + "atlasHeight": 1938, "questsAtlasWidth": 432, "questsAtlasHeight": 774, "codeToInvFile": { @@ -1199,6 +1199,19 @@ "invch7": "invch7", "invch8": "invch8", "invch9": "invch9", + "invrin1": "invrin1", + "invrin2": "invrin2", + "invrin3": "invrin3", + "invrin4": "invrin4", + "invrin5": "invrin5", + "invamu1": "invamu1", + "invamu3": "invamu3", + "invjw1": "invjw1", + "invjw2": "invjw2", + "invjw3": "invjw3", + "invjw4": "invjw4", + "invjw5": "invjw5", + "invjw6": "invjw6", "gheeds": "invch3", "Gheed's Fortune": "invch3", "anni": "invmss", @@ -1384,2228 +1397,2306 @@ "w": 28, "h": 28 }, - "invamu2": { + "invamu1": { "x": 408, "y": 114, "w": 28, "h": 28 }, + "invamu2": { + "x": 438, + "y": 114, + "w": 28, + "h": 28 + }, + "invamu3": { + "x": 468, + "y": 114, + "w": 28, + "h": 28 + }, "invaxe": { - "x": 438, + "x": 498, "y": 114, "w": 56, "h": 84 }, "invaxeu": { - "x": 496, + "x": 556, "y": 114, "w": 56, "h": 84 }, "invaxf": { - "x": 554, + "x": 614, "y": 114, "w": 28, "h": 84 }, "invaxfu": { - "x": 584, + "x": 644, "y": 114, "w": 28, "h": 84 }, "invba1": { - "x": 614, + "x": 674, "y": 114, "w": 56, "h": 56 }, "invba2": { - "x": 672, + "x": 732, "y": 114, "w": 56, "h": 56 }, "invba3": { - "x": 730, + "x": 790, "y": 114, "w": 56, "h": 56 }, "invba4": { - "x": 788, + "x": 848, "y": 114, "w": 56, "h": 56 }, "invba5": { - "x": 846, + "x": 906, "y": 114, "w": 56, "h": 56 }, "invbal": { - "x": 904, + "x": 964, "y": 114, "w": 56, "h": 84 }, "invbar": { - "x": 962, - "y": 114, + "x": 0, + "y": 228, "w": 56, "h": 112 }, "invbbb": { - "x": 0, + "x": 58, "y": 228, "w": 56, "h": 56 }, "invbbk": { - "x": 58, + "x": 116, "y": 228, "w": 28, "h": 56 }, "invbet": { - "x": 88, + "x": 146, "y": 228, "w": 28, "h": 28 }, "invbhm": { - "x": 118, + "x": 176, "y": 228, "w": 56, "h": 56 }, "invbhmu": { - "x": 176, + "x": 234, "y": 228, "w": 56, "h": 56 }, "invbkf": { - "x": 234, + "x": 292, "y": 228, "w": 28, "h": 56 }, "invbld": { - "x": 264, + "x": 322, "y": 228, "w": 28, "h": 84 }, "invbox": { - "x": 294, + "x": 352, "y": 228, "w": 56, "h": 56 }, "invbpl": { - "x": 352, + "x": 410, "y": 228, "w": 28, "h": 28 }, "invbps": { - "x": 382, + "x": 440, "y": 228, "w": 28, "h": 28 }, "invbrn": { - "x": 412, + "x": 470, "y": 228, "w": 56, "h": 112 }, "invbrnz": { - "x": 470, + "x": 528, "y": 228, "w": 28, "h": 28 }, "invbrs": { - "x": 500, - "y": 228, - "w": 56, - "h": 84 - }, - "invbrx": { "x": 558, "y": 228, "w": 56, "h": 84 }, - "invbsc": { + "invbrx": { "x": 616, "y": 228, + "w": 56, + "h": 84 + }, + "invbsc": { + "x": 674, + "y": 228, "w": 28, "h": 28 }, "invbsd": { - "x": 646, - "y": 228, - "w": 56, - "h": 84 - }, - "invbsdu": { "x": 704, "y": 228, "w": 56, "h": 84 }, - "invbsh": { + "invbsdu": { "x": 762, "y": 228, "w": 56, "h": 84 }, + "invbsh": { + "x": 820, + "y": 228, + "w": 56, + "h": 84 + }, "invbshu": { - "x": 820, + "x": 878, "y": 228, "w": 56, "h": 84 }, "invbst": { - "x": 878, + "x": 936, "y": 228, "w": 28, "h": 112 }, "invbsw": { - "x": 908, + "x": 966, "y": 228, "w": 28, "h": 112 }, "invbswu": { - "x": 938, + "x": 996, "y": 228, "w": 28, "h": 112 }, "invbtx": { - "x": 968, - "y": 228, + "x": 0, + "y": 342, "w": 56, "h": 84 }, "invbtxu": { - "x": 0, + "x": 58, "y": 342, "w": 56, "h": 84 }, "invbuc": { - "x": 58, + "x": 116, "y": 342, "w": 56, "h": 56 }, "invbucu": { - "x": 116, + "x": 174, "y": 342, "w": 56, "h": 56 }, "invbwn": { - "x": 174, + "x": 232, "y": 342, "w": 28, "h": 56 }, "invbwnu": { - "x": 204, + "x": 262, "y": 342, "w": 28, "h": 56 }, "invcap": { - "x": 234, + "x": 292, "y": 342, "w": 56, "h": 56 }, "invcapu": { - "x": 292, + "x": 350, "y": 342, "w": 56, "h": 56 }, "invcbw": { - "x": 350, - "y": 342, - "w": 56, - "h": 84 - }, - "invcbwu": { "x": 408, "y": 342, "w": 56, "h": 84 }, - "invceh": { + "invcbwu": { "x": 466, "y": 342, + "w": 56, + "h": 84 + }, + "invceh": { + "x": 524, + "y": 342, "w": 28, "h": 28 }, "invch1": { - "x": 496, + "x": 554, "y": 342, "w": 28, "h": 28 }, "invch2": { - "x": 526, + "x": 584, "y": 342, "w": 28, "h": 56 }, "invch3": { - "x": 556, + "x": 614, "y": 342, "w": 28, "h": 84 }, "invch4": { - "x": 586, + "x": 644, "y": 342, "w": 28, "h": 28 }, "invch5": { - "x": 616, + "x": 674, "y": 342, "w": 28, "h": 56 }, "invch6": { - "x": 646, + "x": 704, "y": 342, "w": 28, "h": 84 }, "invch7": { - "x": 676, + "x": 734, "y": 342, "w": 28, "h": 28 }, "invch8": { - "x": 706, + "x": 764, "y": 342, "w": 28, "h": 56 }, "invch9": { - "x": 736, + "x": 794, "y": 342, "w": 28, "h": 84 }, "invchm": { - "x": 766, + "x": 824, "y": 342, "w": 28, "h": 28 }, "invchn": { - "x": 796, + "x": 854, "y": 342, "w": 56, "h": 84 }, "invci0": { - "x": 854, - "y": 342, - "w": 56, - "h": 56 - }, - "invci1": { "x": 912, "y": 342, "w": 56, "h": 56 }, - "invci2": { + "invci1": { "x": 0, "y": 428, "w": 56, "h": 56 }, + "invci2": { + "x": 58, + "y": 428, + "w": 56, + "h": 56 + }, "invci3": { - "x": 58, + "x": 116, "y": 428, "w": 56, "h": 56 }, "invclb": { - "x": 116, + "x": 174, "y": 428, "w": 28, "h": 84 }, "invclbu": { - "x": 146, + "x": 204, "y": 428, "w": 28, "h": 84 }, "invclm": { - "x": 176, + "x": 234, "y": 428, "w": 28, "h": 112 }, "invclw": { - "x": 206, + "x": 264, "y": 428, "w": 28, "h": 84 }, "invcqv": { - "x": 236, + "x": 294, "y": 428, "w": 28, "h": 84 }, "invcrn": { - "x": 266, + "x": 324, "y": 428, "w": 56, "h": 56 }, "invcrs": { - "x": 324, + "x": 382, "y": 428, "w": 56, "h": 84 }, "invcrsu": { - "x": 382, + "x": 440, "y": 428, "w": 56, "h": 84 }, "invcst": { - "x": 440, + "x": 498, "y": 428, "w": 28, "h": 112 }, "invcstu": { - "x": 470, + "x": 528, "y": 428, "w": 28, "h": 112 }, "invd33": { - "x": 500, + "x": 558, "y": 428, "w": 28, "h": 56 }, "invdgr": { - "x": 530, + "x": 588, "y": 428, "w": 28, "h": 56 }, "invdir": { - "x": 560, + "x": 618, "y": 428, "w": 28, "h": 56 }, "invdr1": { - "x": 590, - "y": 428, - "w": 56, - "h": 56 - }, - "invdr2": { "x": 648, "y": 428, "w": 56, "h": 56 }, - "invdr3": { + "invdr2": { "x": 706, "y": 428, "w": 56, "h": 56 }, - "invdr4": { + "invdr3": { "x": 764, "y": 428, "w": 56, "h": 56 }, - "invdr5": { + "invdr4": { "x": 822, "y": 428, "w": 56, "h": 56 }, - "invear": { + "invdr5": { "x": 880, "y": 428, + "w": 56, + "h": 56 + }, + "invear": { + "x": 938, + "y": 428, "w": 28, "h": 28 }, "inveye": { - "x": 910, + "x": 968, "y": 428, "w": 28, "h": 28 }, "invfang": { - "x": 940, - "y": 428, + "x": 0, + "y": 542, "w": 28, "h": 28 }, "invfed": { - "x": 970, - "y": 428, + "x": 30, + "y": 542, "w": 28, "h": 28 }, "invfhl": { - "x": 0, + "x": 60, "y": 542, "w": 56, "h": 56 }, "invfhlu": { - "x": 58, + "x": 118, "y": 542, "w": 56, "h": 56 }, "invfla": { - "x": 116, + "x": 176, "y": 542, "w": 56, "h": 84 }, "invflag": { - "x": 174, + "x": 234, "y": 542, "w": 28, "h": 28 }, "invflb": { - "x": 204, + "x": 264, "y": 542, "w": 56, "h": 112 }, "invflc": { - "x": 262, + "x": 322, "y": 542, "w": 28, "h": 84 }, "invflcu": { - "x": 292, + "x": 352, "y": 542, "w": 28, "h": 84 }, "invfld": { - "x": 322, + "x": 382, "y": 542, "w": 56, "h": 84 }, "invful": { - "x": 380, + "x": 440, "y": 542, "w": 56, "h": 84 }, "invfulu": { - "x": 438, + "x": 498, "y": 542, "w": 56, "h": 84 }, "invg33": { - "x": 496, + "x": 556, "y": 542, "w": 28, "h": 56 }, "invgax": { - "x": 526, + "x": 586, "y": 542, "w": 56, "h": 112 }, "invgaxu": { - "x": 584, + "x": 644, "y": 542, "w": 56, "h": 112 }, "invgbi": { - "x": 642, + "x": 702, "y": 542, "w": 28, "h": 56 }, "invghm": { - "x": 672, + "x": 732, "y": 542, "w": 56, "h": 56 }, "invgis": { - "x": 730, + "x": 790, "y": 542, "w": 28, "h": 112 }, "invgisu": { - "x": 760, + "x": 820, "y": 542, "w": 28, "h": 112 }, "invgix": { - "x": 790, + "x": 850, "y": 542, "w": 56, "h": 84 }, "invgld": { - "x": 848, + "x": 908, "y": 542, "w": 28, "h": 28 }, "invglv": { - "x": 878, + "x": 938, "y": 542, "w": 28, "h": 112 }, "invgma": { - "x": 908, + "x": 968, "y": 542, "w": 56, "h": 84 }, "invgpl": { - "x": 966, - "y": 542, + "x": 0, + "y": 656, "w": 28, "h": 28 }, "invgpm": { - "x": 996, - "y": 542, + "x": 30, + "y": 656, "w": 28, "h": 28 }, "invgps": { - "x": 0, + "x": 60, "y": 656, "w": 28, "h": 28 }, "invgsba": { - "x": 30, + "x": 90, "y": 656, "w": 28, "h": 28 }, "invgsbb": { - "x": 60, + "x": 120, "y": 656, "w": 28, "h": 28 }, "invgsbc": { - "x": 90, + "x": 150, "y": 656, "w": 28, "h": 28 }, "invgsbd": { - "x": 120, + "x": 180, "y": 656, "w": 28, "h": 28 }, "invgsbe": { - "x": 150, + "x": 210, "y": 656, "w": 28, "h": 28 }, "invgsc": { - "x": 180, + "x": 240, "y": 656, "w": 28, "h": 84 }, "invgsd": { - "x": 210, + "x": 270, "y": 656, "w": 56, "h": 112 }, "invgsdu": { - "x": 268, + "x": 328, "y": 656, "w": 56, "h": 112 }, "invgsga": { - "x": 326, - "y": 656, - "w": 28, - "h": 28 - }, - "invgsgb": { - "x": 356, - "y": 656, - "w": 28, - "h": 28 - }, - "invgsgc": { "x": 386, "y": 656, "w": 28, "h": 28 }, - "invgsgd": { + "invgsgb": { "x": 416, "y": 656, "w": 28, "h": 28 }, - "invgsge": { + "invgsgc": { "x": 446, "y": 656, "w": 28, "h": 28 }, - "invgsra": { + "invgsgd": { "x": 476, "y": 656, "w": 28, "h": 28 }, - "invgsrb": { + "invgsge": { "x": 506, "y": 656, "w": 28, "h": 28 }, - "invgsrc": { + "invgsra": { "x": 536, "y": 656, "w": 28, "h": 28 }, - "invgsrd": { + "invgsrb": { "x": 566, "y": 656, "w": 28, "h": 28 }, - "invgsre": { + "invgsrc": { "x": 596, "y": 656, "w": 28, "h": 28 }, - "invgsva": { + "invgsrd": { "x": 626, "y": 656, "w": 28, "h": 28 }, - "invgsvb": { + "invgsre": { "x": 656, "y": 656, "w": 28, "h": 28 }, - "invgsvc": { + "invgsva": { "x": 686, "y": 656, "w": 28, "h": 28 }, - "invgsvd": { + "invgsvb": { "x": 716, "y": 656, "w": 28, "h": 28 }, - "invgsve": { + "invgsvc": { "x": 746, "y": 656, "w": 28, "h": 28 }, - "invgswa": { + "invgsvd": { "x": 776, "y": 656, "w": 28, "h": 28 }, - "invgswb": { + "invgsve": { "x": 806, "y": 656, "w": 28, "h": 28 }, - "invgswc": { + "invgswa": { "x": 836, "y": 656, "w": 28, "h": 28 }, - "invgswd": { + "invgswb": { "x": 866, "y": 656, "w": 28, "h": 28 }, - "invgswe": { + "invgswc": { "x": 896, "y": 656, "w": 28, "h": 28 }, - "invgsya": { + "invgswd": { "x": 926, "y": 656, "w": 28, "h": 28 }, - "invgsyb": { + "invgswe": { "x": 956, "y": 656, "w": 28, "h": 28 }, - "invgsyc": { + "invgsya": { "x": 986, "y": 656, "w": 28, "h": 28 }, - "invgsyd": { + "invgsyb": { "x": 0, "y": 770, "w": 28, "h": 28 }, + "invgsyc": { + "x": 30, + "y": 770, + "w": 28, + "h": 28 + }, + "invgsyd": { + "x": 60, + "y": 770, + "w": 28, + "h": 28 + }, "invgsye": { - "x": 30, + "x": 90, "y": 770, "w": 28, "h": 28 }, "invgth": { - "x": 60, + "x": 120, "y": 770, "w": 56, "h": 84 }, "invgts": { - "x": 118, + "x": 178, "y": 770, "w": 56, "h": 112 }, "invgtsu": { - "x": 176, + "x": 236, "y": 770, "w": 56, "h": 112 }, "invgwn": { - "x": 234, + "x": 294, "y": 770, "w": 28, "h": 56 }, "invhal": { - "x": 264, + "x": 324, "y": 770, "w": 56, "h": 112 }, "invhax": { - "x": 322, + "x": 382, "y": 770, "w": 28, "h": 84 }, "invhaxu": { - "x": 352, + "x": 412, "y": 770, "w": 28, "h": 84 }, "invhbl": { - "x": 382, + "x": 442, "y": 770, "w": 56, "h": 28 }, "invhbt": { - "x": 440, + "x": 500, "y": 770, "w": 56, "h": 56 }, "invhbw": { - "x": 498, + "x": 558, "y": 770, "w": 56, "h": 84 }, "invhfh": { - "x": 556, + "x": 616, "y": 770, "w": 56, "h": 84 }, "invhgl": { - "x": 614, + "x": 674, "y": 770, "w": 56, "h": 56 }, "invhla": { - "x": 672, + "x": 732, "y": 770, "w": 56, "h": 84 }, "invhlm": { - "x": 730, + "x": 790, "y": 770, "w": 56, "h": 56 }, "invhlmu": { - "x": 788, + "x": 848, "y": 770, "w": 56, "h": 56 }, "invhmr": { - "x": 846, + "x": 906, "y": 770, "w": 28, "h": 56 }, "invhorn": { - "x": 876, + "x": 936, "y": 770, "w": 28, "h": 28 }, "invhp1": { - "x": 906, + "x": 966, "y": 770, "w": 28, "h": 28 }, "invhp2": { - "x": 936, + "x": 996, "y": 770, "w": 28, "h": 28 }, "invhp3": { - "x": 966, - "y": 770, + "x": 0, + "y": 884, "w": 28, "h": 28 }, "invhp4": { - "x": 996, - "y": 770, + "x": 30, + "y": 884, "w": 28, "h": 28 }, "invhp5": { - "x": 0, + "x": 60, "y": 884, "w": 28, "h": 28 }, "invhrb": { - "x": 30, + "x": 90, "y": 884, "w": 28, "h": 28 }, "invhrt": { - "x": 60, + "x": 120, "y": 884, "w": 28, "h": 28 }, "invhscr": { - "x": 90, + "x": 150, "y": 884, "w": 56, "h": 56 }, "invhst": { - "x": 148, + "x": 208, "y": 884, "w": 28, "h": 112 }, "invhxb": { - "x": 178, + "x": 238, "y": 884, "w": 56, "h": 112 }, "invhxbu": { - "x": 236, + "x": 296, "y": 884, "w": 56, "h": 112 }, "invjav": { - "x": 294, + "x": 354, "y": 884, "w": 28, "h": 84 }, "invjaw": { - "x": 324, - "y": 884, - "w": 28, - "h": 28 - }, - "invjbi": { - "x": 354, - "y": 884, - "w": 28, - "h": 56 - }, - "invkey": { "x": 384, "y": 884, "w": 28, "h": 28 }, - "invkit": { + "invjbi": { "x": 414, "y": 884, + "w": 28, + "h": 56 + }, + "invjw1": { + "x": 444, + "y": 884, + "w": 28, + "h": 28 + }, + "invjw2": { + "x": 474, + "y": 884, + "w": 28, + "h": 28 + }, + "invjw3": { + "x": 504, + "y": 884, + "w": 28, + "h": 28 + }, + "invjw4": { + "x": 534, + "y": 884, + "w": 28, + "h": 28 + }, + "invjw5": { + "x": 564, + "y": 884, + "w": 28, + "h": 28 + }, + "invjw6": { + "x": 594, + "y": 884, + "w": 28, + "h": 28 + }, + "invkey": { + "x": 624, + "y": 884, + "w": 28, + "h": 28 + }, + "invkit": { + "x": 654, + "y": 884, "w": 56, "h": 84 }, "invkitu": { - "x": 472, + "x": 712, "y": 884, "w": 56, "h": 84 }, "invkrs": { - "x": 530, + "x": 770, "y": 884, "w": 28, "h": 84 }, "invkrsu": { - "x": 560, + "x": 800, "y": 884, "w": 28, "h": 84 }, "invktr": { - "x": 590, + "x": 830, "y": 884, "w": 28, "h": 84 }, "invlax": { - "x": 620, + "x": 860, "y": 884, "w": 56, "h": 84 }, "invlbb": { - "x": 678, + "x": 918, "y": 884, "w": 56, "h": 112 }, "invlbl": { - "x": 736, - "y": 884, + "x": 0, + "y": 998, "w": 56, "h": 28 }, "invlbt": { - "x": 794, - "y": 884, + "x": 58, + "y": 998, "w": 56, "h": 56 }, "invlbw": { - "x": 852, - "y": 884, + "x": 116, + "y": 998, "w": 56, "h": 112 }, "invlea": { - "x": 910, - "y": 884, + "x": 174, + "y": 998, "w": 56, "h": 84 }, "invleg": { - "x": 968, - "y": 884, + "x": 232, + "y": 998, "w": 28, "h": 84 }, "invlgl": { - "x": 0, + "x": 262, "y": 998, "w": 56, "h": 56 }, "invlrg": { - "x": 58, + "x": 320, "y": 998, "w": 56, "h": 84 }, "invlrgu": { - "x": 116, + "x": 378, "y": 998, "w": 56, "h": 84 }, "invlsd": { - "x": 174, + "x": 436, "y": 998, "w": 56, "h": 84 }, "invlsdu": { - "x": 232, + "x": 494, "y": 998, "w": 56, "h": 84 }, "invlst": { - "x": 290, + "x": 552, "y": 998, "w": 28, "h": 112 }, "invltp": { - "x": 320, + "x": 582, "y": 998, "w": 56, "h": 84 }, "invlwb": { - "x": 378, + "x": 640, "y": 998, "w": 56, "h": 112 }, "invlxb": { - "x": 436, + "x": 698, "y": 998, "w": 56, "h": 84 }, "invlxbu": { - "x": 494, + "x": 756, "y": 998, "w": 56, "h": 84 }, "invmac": { - "x": 552, + "x": 814, "y": 998, "w": 28, "h": 84 }, "invmau": { - "x": 582, + "x": 844, "y": 998, "w": 56, "h": 112 }, "invmauu": { - "x": 640, + "x": 902, "y": 998, "w": 56, "h": 112 }, "invmbl": { - "x": 698, + "x": 960, "y": 998, "w": 56, "h": 28 }, "invmbt": { - "x": 756, - "y": 998, + "x": 0, + "y": 1112, "w": 56, "h": 56 }, "invmgl": { - "x": 814, - "y": 998, + "x": 58, + "y": 1112, "w": 56, "h": 56 }, "invmp1": { - "x": 872, - "y": 998, + "x": 116, + "y": 1112, "w": 28, "h": 28 }, "invmp2": { - "x": 902, - "y": 998, + "x": 146, + "y": 1112, "w": 28, "h": 28 }, "invmp3": { - "x": 932, - "y": 998, + "x": 176, + "y": 1112, "w": 28, "h": 28 }, "invmp4": { - "x": 962, - "y": 998, + "x": 206, + "y": 1112, "w": 28, "h": 28 }, "invmp5": { - "x": 992, - "y": 998, + "x": 236, + "y": 1112, "w": 28, "h": 28 }, "invmph": { - "x": 0, + "x": 266, "y": 1112, "w": 28, "h": 56 }, "invmpi": { - "x": 30, + "x": 296, "y": 1112, "w": 56, "h": 84 }, "invmpiu": { - "x": 88, + "x": 354, "y": 1112, "w": 56, "h": 84 }, "invmsf": { - "x": 146, + "x": 412, "y": 1112, "w": 28, "h": 84 }, "invmsk": { - "x": 176, + "x": 442, "y": 1112, "w": 56, "h": 56 }, "invmss": { - "x": 234, + "x": 500, "y": 1112, "w": 28, "h": 28 }, "invmst": { - "x": 264, + "x": 530, "y": 1112, "w": 28, "h": 84 }, "invmstu": { - "x": 294, + "x": 560, "y": 1112, "w": 28, "h": 84 }, "invmxb": { - "x": 324, + "x": 590, "y": 1112, "w": 56, "h": 84 }, "invmxbu": { - "x": 382, + "x": 648, "y": 1112, "w": 56, "h": 84 }, "invne1": { - "x": 440, + "x": 706, "y": 1112, "w": 56, "h": 56 }, "invne2": { - "x": 498, + "x": 764, "y": 1112, "w": 56, "h": 56 }, "invne3": { - "x": 556, + "x": 822, "y": 1112, "w": 56, "h": 56 }, "invne4": { - "x": 614, + "x": 880, "y": 1112, "w": 56, "h": 56 }, "invne5": { - "x": 672, + "x": 938, "y": 1112, "w": 56, "h": 56 }, "invnps": { - "x": 730, + "x": 996, "y": 1112, "w": 28, "h": 28 }, "invob1": { - "x": 760, - "y": 1112, + "x": 0, + "y": 1198, "w": 28, "h": 56 }, "invob2": { - "x": 790, - "y": 1112, + "x": 30, + "y": 1198, "w": 28, "h": 56 }, "invob3": { - "x": 820, - "y": 1112, + "x": 60, + "y": 1198, "w": 28, "h": 56 }, "invob4": { - "x": 850, - "y": 1112, + "x": 90, + "y": 1198, "w": 28, "h": 56 }, "invob5": { - "x": 880, - "y": 1112, + "x": 120, + "y": 1198, "w": 28, "h": 84 }, "invopl": { - "x": 910, - "y": 1112, + "x": 150, + "y": 1198, "w": 28, "h": 28 }, "invopm": { - "x": 940, - "y": 1112, + "x": 180, + "y": 1198, "w": 28, "h": 28 }, "invops": { - "x": 970, - "y": 1112, + "x": 210, + "y": 1198, "w": 28, "h": 28 }, "invpa1": { - "x": 0, + "x": 240, "y": 1198, "w": 56, "h": 56 }, "invpa2": { - "x": 58, + "x": 298, "y": 1198, "w": 56, "h": 56 }, "invpa3": { - "x": 116, + "x": 356, "y": 1198, "w": 56, "h": 112 }, "invpa4": { - "x": 174, + "x": 414, "y": 1198, "w": 56, "h": 112 }, "invpa5": { - "x": 232, + "x": 472, "y": 1198, "w": 56, "h": 56 }, "invpax": { - "x": 290, + "x": 530, "y": 1198, "w": 56, "h": 112 }, "invpik": { - "x": 348, + "x": 588, "y": 1198, "w": 56, "h": 112 }, "invpil": { - "x": 406, + "x": 646, "y": 1198, "w": 28, "h": 84 }, "invplt": { - "x": 436, + "x": 676, "y": 1198, "w": 56, "h": 84 }, "invpot": { - "x": 494, + "x": 734, "y": 1198, "w": 28, "h": 28 }, "invqf1": { - "x": 524, + "x": 764, "y": 1198, "w": 56, "h": 84 }, "invqf2": { - "x": 582, + "x": 822, "y": 1198, "w": 56, "h": 84 }, "invqlt": { - "x": 640, + "x": 880, "y": 1198, "w": 56, "h": 84 }, "invquil": { - "x": 698, - "y": 1198, - "w": 28, - "h": 28 - }, - "invqvr": { - "x": 728, - "y": 1198, - "w": 28, - "h": 84 - }, - "invramn": { - "x": 758, - "y": 1198, - "w": 28, - "h": 28 - }, - "invrber": { - "x": 788, - "y": 1198, - "w": 28, - "h": 28 - }, - "invrbk": { - "x": 818, - "y": 1198, - "w": 28, - "h": 56 - }, - "invrcham": { - "x": 848, - "y": 1198, - "w": 28, - "h": 28 - }, - "invrdol": { - "x": 878, - "y": 1198, - "w": 28, - "h": 28 - }, - "invrel": { - "x": 908, - "y": 1198, - "w": 28, - "h": 28 - }, - "invreld": { "x": 938, "y": 1198, "w": 28, "h": 28 }, - "invreth": { + "invqvr": { "x": 968, "y": 1198, "w": 28, - "h": 28 + "h": 84 }, - "invrfal": { + "invramn": { "x": 0, "y": 1312, "w": 28, "h": 28 }, - "invrgul": { + "invrber": { "x": 30, "y": 1312, "w": 28, "h": 28 }, - "invrhel": { + "invrbk": { "x": 60, "y": 1312, "w": 28, - "h": 28 + "h": 56 }, - "invrin": { + "invrcham": { "x": 90, "y": 1312, "w": 28, "h": 28 }, - "invrio": { + "invrdol": { "x": 120, "y": 1312, "w": 28, "h": 28 }, - "invrist": { + "invrel": { "x": 150, "y": 1312, "w": 28, "h": 28 }, - "invrith": { + "invreld": { "x": 180, "y": 1312, "w": 28, "h": 28 }, - "invrjo": { + "invreth": { "x": 210, "y": 1312, "w": 28, "h": 28 }, - "invrko": { + "invrfal": { "x": 240, "y": 1312, "w": 28, "h": 28 }, - "invrlem": { + "invrgul": { "x": 270, "y": 1312, "w": 28, "h": 28 }, - "invrlo": { + "invrhel": { "x": 300, "y": 1312, "w": 28, "h": 28 }, - "invrlum": { + "invrin": { "x": 330, "y": 1312, "w": 28, "h": 28 }, - "invrmal": { + "invrin1": { "x": 360, "y": 1312, "w": 28, "h": 28 }, - "invrnef": { + "invrin2": { "x": 390, "y": 1312, "w": 28, "h": 28 }, - "invrng": { + "invrin3": { "x": 420, "y": 1312, + "w": 28, + "h": 28 + }, + "invrin4": { + "x": 450, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrin5": { + "x": 480, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrio": { + "x": 510, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrist": { + "x": 540, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrith": { + "x": 570, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrjo": { + "x": 600, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrko": { + "x": 630, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrlem": { + "x": 660, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrlo": { + "x": 690, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrlum": { + "x": 720, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrmal": { + "x": 750, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrnef": { + "x": 780, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrng": { + "x": 810, + "y": 1312, "w": 56, "h": 84 }, "invrohm": { - "x": 478, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrort": { - "x": 508, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrpl": { - "x": 538, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrps": { - "x": 568, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrpul": { - "x": 598, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrral": { - "x": 628, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrsc": { - "x": 658, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrshae": { - "x": 688, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrsol": { - "x": 718, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrsur": { - "x": 748, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrtal": { - "x": 778, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrthul": { - "x": 808, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrtir": { - "x": 838, - "y": 1312, - "w": 28, - "h": 28 - }, - "invrum": { "x": 868, "y": 1312, "w": 28, "h": 28 }, - "invrvex": { + "invrort": { "x": 898, "y": 1312, "w": 28, "h": 28 }, - "invrxb": { + "invrpl": { "x": 928, "y": 1312, + "w": 28, + "h": 28 + }, + "invrps": { + "x": 958, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrpul": { + "x": 988, + "y": 1312, + "w": 28, + "h": 28 + }, + "invrral": { + "x": 0, + "y": 1398, + "w": 28, + "h": 28 + }, + "invrsc": { + "x": 30, + "y": 1398, + "w": 28, + "h": 28 + }, + "invrshae": { + "x": 60, + "y": 1398, + "w": 28, + "h": 28 + }, + "invrsol": { + "x": 90, + "y": 1398, + "w": 28, + "h": 28 + }, + "invrsur": { + "x": 120, + "y": 1398, + "w": 28, + "h": 28 + }, + "invrtal": { + "x": 150, + "y": 1398, + "w": 28, + "h": 28 + }, + "invrthul": { + "x": 180, + "y": 1398, + "w": 28, + "h": 28 + }, + "invrtir": { + "x": 210, + "y": 1398, + "w": 28, + "h": 28 + }, + "invrum": { + "x": 240, + "y": 1398, + "w": 28, + "h": 28 + }, + "invrvex": { + "x": 270, + "y": 1398, + "w": 28, + "h": 28 + }, + "invrxb": { + "x": 300, + "y": 1398, "w": 56, "h": 84 }, "invrxbu": { - "x": 0, + "x": 358, "y": 1398, "w": 56, "h": 84 }, "invrzod": { - "x": 58, + "x": 416, "y": 1398, "w": 28, "h": 28 }, "invsbb": { - "x": 88, + "x": 446, "y": 1398, "w": 56, "h": 84 }, "invsbbu": { - "x": 146, + "x": 504, "y": 1398, "w": 56, "h": 84 }, "invsbk": { - "x": 204, + "x": 562, "y": 1398, "w": 56, "h": 56 }, "invsbr": { - "x": 262, + "x": 620, "y": 1398, "w": 28, "h": 84 }, "invsbru": { - "x": 292, + "x": 650, "y": 1398, "w": 28, "h": 84 }, "invsbw": { - "x": 322, + "x": 680, "y": 1398, "w": 56, "h": 84 }, "invscb": { - "x": 380, + "x": 738, "y": 1398, "w": 56, "h": 56 }, "invscl": { - "x": 438, + "x": 796, "y": 1398, "w": 56, "h": 84 }, "invscm": { - "x": 496, + "x": 854, "y": 1398, "w": 28, "h": 84 }, "invscmu": { - "x": 526, + "x": 884, "y": 1398, "w": 28, "h": 84 }, "invscp": { - "x": 556, + "x": 914, "y": 1398, "w": 28, "h": 84 }, "invscy": { - "x": 586, + "x": 944, "y": 1398, "w": 56, "h": 112 }, "invscyu": { - "x": 644, - "y": 1398, + "x": 0, + "y": 1512, "w": 56, "h": 112 }, "invskc": { - "x": 702, - "y": 1398, + "x": 58, + "y": 1512, "w": 28, "h": 28 }, "invskf": { - "x": 732, - "y": 1398, + "x": 88, + "y": 1512, "w": 28, "h": 28 }, "invskl": { - "x": 762, - "y": 1398, + "x": 118, + "y": 1512, "w": 28, "h": 28 }, "invskp": { - "x": 792, - "y": 1398, + "x": 148, + "y": 1512, "w": 56, "h": 56 }, "invskr": { - "x": 850, - "y": 1398, + "x": 206, + "y": 1512, "w": 28, "h": 84 }, "invskru": { - "x": 880, - "y": 1398, + "x": 236, + "y": 1512, "w": 28, "h": 84 }, "invsku": { - "x": 910, - "y": 1398, + "x": 266, + "y": 1512, "w": 28, "h": 28 }, "invskz": { - "x": 940, - "y": 1398, + "x": 296, + "y": 1512, "w": 28, "h": 28 }, "invsml": { - "x": 0, + "x": 326, "y": 1512, "w": 56, "h": 56 }, "invsmlu": { - "x": 58, + "x": 384, "y": 1512, "w": 56, "h": 56 }, "invspc": { - "x": 116, + "x": 442, "y": 1512, "w": 28, "h": 84 }, "invspcu": { - "x": 146, + "x": 472, "y": 1512, "w": 28, "h": 84 }, "invspk": { - "x": 176, + "x": 502, "y": 1512, "w": 56, "h": 84 }, "invspku": { - "x": 234, + "x": 560, "y": 1512, "w": 56, "h": 84 }, "invspl": { - "x": 292, + "x": 618, "y": 1512, "w": 56, "h": 84 }, "invsple": { - "x": 350, + "x": 676, "y": 1512, "w": 28, "h": 28 }, "invspr": { - "x": 380, + "x": 706, "y": 1512, "w": 56, "h": 112 }, "invspt": { - "x": 438, + "x": 764, "y": 1512, "w": 56, "h": 112 }, "invssd": { - "x": 496, + "x": 822, "y": 1512, "w": 28, "h": 84 }, "invssp": { - "x": 526, + "x": 852, "y": 1512, "w": 28, "h": 84 }, "invsst": { - "x": 556, + "x": 882, "y": 1512, "w": 28, "h": 84 }, "invstu": { - "x": 586, + "x": 912, "y": 1512, "w": 56, "h": 84 }, "invswb": { - "x": 644, - "y": 1512, + "x": 0, + "y": 1626, "w": 56, "h": 84 }, "invswbu": { - "x": 702, - "y": 1512, + "x": 58, + "y": 1626, "w": 56, "h": 84 }, "invtail": { - "x": 760, - "y": 1512, + "x": 116, + "y": 1626, "w": 28, "h": 28 }, "invtax": { - "x": 790, - "y": 1512, + "x": 146, + "y": 1626, "w": 28, "h": 56 }, "invtbl": { - "x": 820, - "y": 1512, + "x": 176, + "y": 1626, "w": 56, "h": 28 }, "invtbt": { - "x": 878, - "y": 1512, + "x": 234, + "y": 1626, "w": 56, "h": 56 }, "invtes": { - "x": 936, - "y": 1512, + "x": 292, + "y": 1626, "w": 28, "h": 28 }, "invtgl": { - "x": 966, - "y": 1512, + "x": 322, + "y": 1626, "w": 56, "h": 56 }, "invtk3": { - "x": 0, + "x": 380, "y": 1626, "w": 28, "h": 56 }, "invtkn": { - "x": 30, + "x": 410, "y": 1626, "w": 28, "h": 56 }, "invtoa": { - "x": 60, + "x": 440, "y": 1626, "w": 28, "h": 28 }, "invtow": { - "x": 90, + "x": 470, "y": 1626, "w": 56, "h": 84 }, "invtowu": { - "x": 148, + "x": 528, "y": 1626, "w": 56, "h": 84 }, "invtrch": { - "x": 206, + "x": 586, "y": 1626, "w": 28, "h": 56 }, "invtri": { - "x": 236, + "x": 616, "y": 1626, "w": 56, "h": 112 }, "invtriu": { - "x": 294, + "x": 674, "y": 1626, "w": 56, "h": 112 }, "invtsp": { - "x": 352, + "x": 732, "y": 1626, "w": 28, "h": 112 }, "invuhms": { - "x": 382, + "x": 762, "y": 1626, "w": 56, "h": 56 }, "invutss": { - "x": 440, + "x": 820, "y": 1626, "w": 56, "h": 112 }, "invvbl": { - "x": 498, + "x": 878, "y": 1626, "w": 56, "h": 28 }, "invvbt": { - "x": 556, + "x": 936, "y": 1626, "w": 56, "h": 56 }, "invvgl": { - "x": 614, - "y": 1626, + "x": 0, + "y": 1740, "w": 56, "h": 56 }, "invvip": { - "x": 672, - "y": 1626, + "x": 58, + "y": 1740, "w": 28, "h": 28 }, "invvou": { - "x": 702, - "y": 1626, + "x": 88, + "y": 1740, "w": 56, "h": 112 }, "invvpl": { - "x": 760, - "y": 1626, + "x": 146, + "y": 1740, "w": 28, "h": 28 }, "invvps": { - "x": 790, - "y": 1626, + "x": 176, + "y": 1740, "w": 28, "h": 28 }, "invwax": { - "x": 820, - "y": 1626, + "x": 206, + "y": 1740, "w": 56, "h": 84 }, "invwhm": { - "x": 878, - "y": 1626, + "x": 264, + "y": 1740, "w": 56, "h": 84 }, "invwnd": { - "x": 936, - "y": 1626, + "x": 322, + "y": 1740, "w": 28, "h": 56 }, "invwndu": { - "x": 966, - "y": 1626, + "x": 352, + "y": 1740, "w": 28, "h": 56 }, "invwps": { - "x": 996, - "y": 1626, + "x": 382, + "y": 1740, "w": 28, "h": 28 }, "invwsc": { - "x": 0, + "x": 412, "y": 1740, "w": 56, "h": 112 }, "invwsd": { - "x": 58, + "x": 470, "y": 1740, "w": 28, "h": 84 }, "invwsp": { - "x": 88, + "x": 500, "y": 1740, "w": 56, "h": 84 }, "invwst": { - "x": 146, + "x": 558, "y": 1740, "w": 56, "h": 112 }, "invxaru": { - "x": 204, + "x": 616, "y": 1740, "w": 56, "h": 84 }, "invxkpu": { - "x": 262, + "x": 674, "y": 1740, "w": 56, "h": 56 }, "invxmlu": { - "x": 320, + "x": 732, "y": 1740, "w": 56, "h": 56 }, "invxpku": { - "x": 378, + "x": 790, "y": 1740, "w": 56, "h": 84 }, "invxrgu": { - "x": 436, + "x": 848, "y": 1740, "w": 56, "h": 84 }, "invxrnu": { - "x": 494, + "x": 906, "y": 1740, "w": 56, "h": 56 }, "invxrss": { - "x": 552, + "x": 964, "y": 1740, "w": 56, "h": 84 }, "invxshu": { - "x": 610, - "y": 1740, + "x": 0, + "y": 1854, "w": 56, "h": 84 }, "invxtuu": { - "x": 668, - "y": 1740, + "x": 58, + "y": 1854, "w": 56, "h": 84 }, "invxyz": { - "x": 726, - "y": 1740, + "x": 116, + "y": 1854, "w": 28, "h": 28 }, "invyps": { - "x": 756, - "y": 1740, + "x": 146, + "y": 1854, "w": 28, "h": 28 }, "invywn": { - "x": 786, - "y": 1740, + "x": 176, + "y": 1854, "w": 28, "h": 56 }, "invcap_cgrn": { - "x": 816, - "y": 1740, + "x": 206, + "y": 1854, "w": 56, "h": 56 }, "invgth_dpur": { - "x": 874, - "y": 1740, + "x": 264, + "y": 1854, "w": 56, "h": 84 }, "invtgl_lgry": { - "x": 932, - "y": 1740, + "x": 322, + "y": 1854, "w": 56, "h": 56 }, "invvbl_blac": { - "x": 0, + "x": 380, "y": 1854, "w": 56, "h": 28 }, "invlbl_blac": { - "x": 58, + "x": 438, "y": 1854, "w": 56, "h": 28 @@ -4127,6 +4218,7 @@ "levelSocket": "/ui/level-socket.png", "skillPoints": "/ui/skillpoints.png", "genericSkills": "/ui/generic-skills.png", + "attackIcon": "/ui/icon_0.png", "cursorHand": "/ui/cursor-hand.png", "cursorAtlas": "/ui/cursor.png", "questTabs": "/ui/quest-tabs.png", diff --git a/scripts/pack-ui.ts b/scripts/pack-ui.ts index 5a803aa..742ed28 100644 --- a/scripts/pack-ui.ts +++ b/scripts/pack-ui.ts @@ -472,6 +472,30 @@ async function main(): Promise { } } + // Register authentic ring DC6 icons (invrin1..invrin5 per ItemTypes.txt VarInvGfx = 5) + for (let i = 1; i <= 5; i++) { + const ringInv = `invrin${i}` + if (archives.has(`data/global/items/${ringInv}.dc6`)) { + uniqueInvFiles.add(ringInv) + } + } + + // Register authentic amulet DC6 icons (invamu1..invamu3 per ItemTypes.txt VarInvGfx = 3) + for (let i = 1; i <= 3; i++) { + const amuInv = `invamu${i}` + if (archives.has(`data/global/items/${amuInv}.dc6`)) { + uniqueInvFiles.add(amuInv) + } + } + + // Register authentic jewel DC6 icons (invjw1..invjw6 per ItemTypes.txt VarInvGfx = 6) + for (let i = 1; i <= 6; i++) { + const jwInv = `invjw${i}` + if (archives.has(`data/global/items/${jwInv}.dc6`)) { + uniqueInvFiles.add(jwInv) + } + } + // Identity mapping for every invfile: codeToInvFile[inv] = inv for (const inv of uniqueInvFiles) { codeToInvFile[inv] = inv diff --git a/src/ui/baked-ui-meta.ts b/src/ui/baked-ui-meta.ts index 4f0f089..631c28e 100644 --- a/src/ui/baked-ui-meta.ts +++ b/src/ui/baked-ui-meta.ts @@ -81,10 +81,10 @@ export const ACT_QUEST_ASSET_MAP: Readonly { + it('bakes all ring (5), amulet (3), and jewel (6) graphic variants into itemRects', () => { + // Rings: invrin1 to invrin5 + for (let i = 1; i <= 5; i++) { + const key = `invrin${i}` + expect(itemRects[key], `Expected ${key} in itemRects`).toBeDefined() + expect(itemRects[key]!.w).toBe(28) + expect(itemRects[key]!.h).toBe(28) + } + + // Amulets: invamu1 to invamu3 + for (let i = 1; i <= 3; i++) { + const key = `invamu${i}` + expect(itemRects[key], `Expected ${key} in itemRects`).toBeDefined() + expect(itemRects[key]!.w).toBe(28) + expect(itemRects[key]!.h).toBe(28) + } + + // Jewels: invjw1 to invjw6 + for (let i = 1; i <= 6; i++) { + const key = `invjw${i}` + expect(itemRects[key], `Expected ${key} in itemRects`).toBeDefined() + expect(itemRects[key]!.w).toBe(28) + expect(itemRects[key]!.h).toBe(28) + } + }) + + it('resolves all ring variants 0..4 correctly', () => { + for (let v = 0; v < 5; v++) { + const rect = resolveItemSpriteRect({ code: 'rin', variant: v }, itemRects) + expect(rect).toEqual(itemRects[`invrin${v + 1}`]) + } + // Direct invFile + expect(resolveItemSpriteRect({ code: 'rin', invFile: 'invrin3' }, itemRects)).toEqual(itemRects['invrin3']) + }) + + it('resolves all amulet variants 0..2 correctly', () => { + for (let v = 0; v < 3; v++) { + const rect = resolveItemSpriteRect({ code: 'amu', variant: v }, itemRects) + expect(rect).toEqual(itemRects[`invamu${v + 1}`]) + } + // Direct invFile + expect(resolveItemSpriteRect({ code: 'amu', invFile: 'invamu2' }, itemRects)).toEqual(itemRects['invamu2']) + }) + + it('resolves all jewel variants 0..5 correctly', () => { + for (let v = 0; v < 6; v++) { + const rect = resolveItemSpriteRect({ code: 'jew', variant: v }, itemRects) + expect(rect).toEqual(itemRects[`invjw${v + 1}`]) + } + // Direct invFile + expect(resolveItemSpriteRect({ code: 'jew', invFile: 'invjw5' }, itemRects)).toEqual(itemRects['invjw5']) + }) + + it('resolves charm variants when variant property is specified', () => { + expect(resolveItemSpriteRect({ code: 'cm1', variant: 0 }, itemRects)).toEqual(itemRects['invch1']) + expect(resolveItemSpriteRect({ code: 'cm1', variant: 1 }, itemRects)).toEqual(itemRects['invch4']) + expect(resolveItemSpriteRect({ code: 'cm1', variant: 2 }, itemRects)).toEqual(itemRects['invch7']) + + expect(resolveItemSpriteRect({ code: 'cm2', variant: 0 }, itemRects)).toEqual(itemRects['invch2']) + expect(resolveItemSpriteRect({ code: 'cm2', variant: 1 }, itemRects)).toEqual(itemRects['invch5']) + expect(resolveItemSpriteRect({ code: 'cm2', variant: 2 }, itemRects)).toEqual(itemRects['invch8']) + + expect(resolveItemSpriteRect({ code: 'cm3', variant: 0 }, itemRects)).toEqual(itemRects['invch3']) + expect(resolveItemSpriteRect({ code: 'cm3', variant: 1 }, itemRects)).toEqual(itemRects['invch6']) + expect(resolveItemSpriteRect({ code: 'cm3', variant: 2 }, itemRects)).toEqual(itemRects['invch9']) + }) + }) }) }) +