Merge branch 'master' into dev

This commit is contained in:
b 2021-04-10 15:05:04 -07:00
commit 43e82ef261

View file

@ -61,7 +61,7 @@ function calculate_skillpoints(equipment, weapon) {
}
}
if (item.get("reqs")[i] == 0) continue;
skillpoint_min[i] = Math.max(skillpoint_min[i], item.get("reqs")[i]);// + item.get("skillpoints")[i]);
skillpoint_min[i] = Math.max(skillpoint_min[i], item.get("reqs")[i] + item.get("skillpoints")[i]);
const req = item.get("reqs")[i];
const cur = skillpoints[i];
if (req > cur) {