@d2runewizard/d2s 2.0.94 → 2.0.96
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/d2/stash.js +3 -19
- package/lib/d2/stash.js.map +1 -1
- package/package.json +1 -1
package/lib/d2/stash.js
CHANGED
|
@@ -26,7 +26,6 @@ const items = __importStar(require("./items"));
|
|
|
26
26
|
const attribute_enhancer_1 = require("./attribute_enhancer");
|
|
27
27
|
const bitreader_1 = require("../binary/bitreader");
|
|
28
28
|
const constants_1 = require("./constants");
|
|
29
|
-
const _105_constant_data_1 = require("../data/versions/105_constant_data");
|
|
30
29
|
const defaultConfig = {
|
|
31
30
|
extendedStash: false,
|
|
32
31
|
};
|
|
@@ -38,8 +37,9 @@ async function read(buffer, constants, version, userConfig) {
|
|
|
38
37
|
reader.SeekByte(0);
|
|
39
38
|
if (firstHeader == 0xaa55aa55) {
|
|
40
39
|
stash.pages = [];
|
|
40
|
+
stash.sharedGold = 0;
|
|
41
41
|
let pageCount = 0;
|
|
42
|
-
while (reader.offset < reader.bits.length) {
|
|
42
|
+
while (reader.offset < reader.bits.length && pageCount < 6) {
|
|
43
43
|
pageCount++;
|
|
44
44
|
await readStashHeader(stash, reader);
|
|
45
45
|
const saveVersion = version || parseInt(stash.version);
|
|
@@ -50,15 +50,6 @@ async function read(buffer, constants, version, userConfig) {
|
|
|
50
50
|
}
|
|
51
51
|
stash.pageCount = pageCount;
|
|
52
52
|
}
|
|
53
|
-
else if (firstHeader == 0x55aa55aa) {
|
|
54
|
-
// Reign of the Warlock
|
|
55
|
-
stash.pages = [];
|
|
56
|
-
stash.pageCount = 5;
|
|
57
|
-
for (let i = 0; i < stash.pageCount; i++) {
|
|
58
|
-
await readStashHeader(stash, reader);
|
|
59
|
-
await readStashPart(stash, reader, 0x99, _105_constant_data_1.constants);
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
53
|
else {
|
|
63
54
|
await readStashHeader(stash, reader);
|
|
64
55
|
const saveVersion = version || parseInt(stash.version);
|
|
@@ -78,16 +69,11 @@ async function readStashHeader(stash, reader) {
|
|
|
78
69
|
stash.type = types.EStashType.shared;
|
|
79
70
|
stash.hardcore = reader.ReadUInt32() == 0;
|
|
80
71
|
stash.version = reader.ReadUInt32().toString();
|
|
81
|
-
stash.sharedGold
|
|
72
|
+
stash.sharedGold += reader.ReadUInt32();
|
|
82
73
|
reader.ReadUInt32(); // size of the sector
|
|
83
74
|
reader.SkipBytes(44); // empty
|
|
84
75
|
break;
|
|
85
76
|
// LoD
|
|
86
|
-
case 0x55aa55aa:
|
|
87
|
-
stash.type = types.EStashType.shared;
|
|
88
|
-
reader.SkipBytes(8); // unknown
|
|
89
|
-
break;
|
|
90
|
-
// LoD
|
|
91
77
|
case 0x535353: // SSS
|
|
92
78
|
case 0x4d545343: // CSTM
|
|
93
79
|
stash.version = reader.ReadString(2);
|
|
@@ -137,8 +123,6 @@ async function readStashPart(stash, reader, version, constants) {
|
|
|
137
123
|
name: "",
|
|
138
124
|
type: 0,
|
|
139
125
|
};
|
|
140
|
-
page.gold = reader.ReadUInt32();
|
|
141
|
-
reader.SkipBytes(48); // empty
|
|
142
126
|
page.items = await items.readItems(reader, version, constants, defaultConfig);
|
|
143
127
|
attribute_enhancer_1.enhanceItems(page.items, constants, 1);
|
|
144
128
|
stash.pages.push(page);
|
package/lib/d2/stash.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stash.js","sourceRoot":"","sources":["../../src/d2/stash.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AACjC,mDAAgD;AAChD,+CAAiC;AACjC,6DAAoD;AACpD,mDAAgD;AAEhD,2CAA8C;
|
|
1
|
+
{"version":3,"file":"stash.js","sourceRoot":"","sources":["../../src/d2/stash.ts"],"names":[],"mappings":"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"}
|