From 929942a6a2066d70af7841884f8ba7077e7d7952 Mon Sep 17 00:00:00 2001
From: b <a>
Date: Fri, 5 Mar 2021 12:14:25 -0800
Subject: [PATCH] Fix skillpoint bug (now matching nbcss version)

---
 builder.js     |  2 +-
 skillpoints.js | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/builder.js b/builder.js
index 6f87440..5a6183c 100644
--- a/builder.js
+++ b/builder.js
@@ -2,7 +2,7 @@ const url_tag = location.hash.slice(1);
 console.log(url_base);
 console.log(url_tag);
 
-const BUILD_VERSION = "6.9.40";
+const BUILD_VERSION = "6.9.41";
 
 function setTitle() {
     let text;
diff --git a/skillpoints.js b/skillpoints.js
index 25811b0..a8ac92e 100644
--- a/skillpoints.js
+++ b/skillpoints.js
@@ -47,16 +47,20 @@ function calculate_skillpoints(equipment, weapon) {
         }
     }
 
-    function apply_to_fit(skillpoints, item, skillpoint_filter, activeSetCounts) {
+    function apply_to_fit(skillpoints, item, skillpoint_min, activeSetCounts) {
         let applied = [0, 0, 0, 0, 0];
         let total = 0;
         for (let i = 0; i < 5; i++) {
-            if (item.get("skillpoints")[i] < 0 && skillpoint_filter[i]) {
-                applied[i] -= item.get("skillpoints")[i];
-                total -= item.get("skillpoints")[i];
+            if (item.get("skillpoints")[i] < 0 && skillpoint_min[i]) {
+                unadjusted = skillpoints[i] + item.get("skillpoints")[i];
+                delta = skillpoint_min[i] - unadjusted;
+                if (delta > 0) {
+                    applied[i] += delta;
+                    total += delta;
+                }
             }
             if (item.get("reqs")[i] == 0) continue;
-            if (skillpoint_filter) skillpoint_filter[i] = true;
+            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) {
@@ -75,7 +79,7 @@ function calculate_skillpoints(equipment, weapon) {
                 //let skp_order = ["str","dex","int","def","agi"];
                 for (const i in skp_order) {
                     const delta = (new_bonus[skp_order[i]] || 0) - (old_bonus[skp_order[i]] || 0);
-                    if (delta < 0 && skillpoint_filter[i]) {
+                    if (delta < 0 && skillpoint_min[i]) {
                         applied[i] -= delta;
                         total -= delta;
                     }