@rpg-engine/long-bow 0.6.53 → 0.6.55

package/dist/components/SkillProgressBar.d.ts

@@ -4,9 +4,9 @@ export interface ISkillProgressBarProps {
     bgColor: string;
     level: number;
     skillPoints: number;
-    skillPointsToNextLevel?: number;
     texturePath: string;
     showSkillPoints?: boolean;
+    skillPointsToNextLevel: number;
     atlasJSON: any;
     atlasIMG: any;
     buffAndDebuff?: number;

package/dist/long-bow.cjs.development.js

@@ -32139,18 +32139,16 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
     atlasJSON = _ref.atlasJSON,
     buffAndDebuff = _ref.buffAndDebuff;
   // Base skill points for the previous level (0 for level 1)
-  var baseSkillPointsPrevLevel = shared.getSPForLevel(level);
+  var baseSkillPointsPrevLevel = level > 1 ? shared.getSPForLevel(level - 1) : 0;
+  // Total skill points needed for the next level
+  var nextLevelSkillPoints = skillPointsToNextLevel;
   // Calculate excess skill points above the previous level
-  var excessSkillPoints = currentSkillPoints - baseSkillPointsPrevLevel;
+  var excessSkillPoints = Math.max(currentSkillPoints - baseSkillPointsPrevLevel, 0);
   // Calculate progress percentage towards the next level
-  var progress = excessSkillPoints / (skillPointsToNextLevel != null ? skillPointsToNextLevel : 1) * 100;
+  var progress = Math.min(100, Math.max(0, excessSkillPoints / nextLevelSkillPoints * 100));
   var skillsBuffsCalc = function skillsBuffsCalc(level, buffAndDebuff) {
     var result = level * (buffAndDebuff / 100);
-    if (result > 0) {
-      return "+" + result.toFixed(2);
-    } else {
-      return "" + result.toFixed(2);
-    }
+    return result > 0 ? "+" + result.toFixed(2) : "" + result.toFixed(2);
   };
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(ProgressTitle, null, buffAndDebuff !== undefined && React__default.createElement(React__default.Fragment, null, buffAndDebuff > 0 ? React__default.createElement(BuffAndDebuffContainer, null, React__default.createElement(TitleNameContainer, null, React__default.createElement(TitleNameBuff, null, skillName), React__default.createElement(TitleNameBuff, null, "lv ", level, " (", skillsBuffsCalc(level, buffAndDebuff), ")")), React__default.createElement(TitleNameBuffContainer, null, React__default.createElement(TitleNameBuff, null, "(+", buffAndDebuff, "%)"))) : buffAndDebuff < 0 ? React__default.createElement(React__default.Fragment, null, React__default.createElement(TitleNameContainer, null, React__default.createElement(TitleNameDebuff, null, skillName), React__default.createElement(TitleNameDebuff, null, "lv ", level, " (", skillsBuffsCalc(level, buffAndDebuff), ")")), React__default.createElement("div", null, React__default.createElement(TitleNameDebuff, null, "(", buffAndDebuff, "%)"))) : React__default.createElement(TitleName, null, skillName)), !buffAndDebuff && React__default.createElement(TitleNameContainer, null, React__default.createElement(TitleName, null, skillName), React__default.createElement(ValueDisplay, null, "lv ", level))), React__default.createElement(ProgressBody, null, React__default.createElement(ProgressIconContainer, null, atlasIMG && atlasJSON ? React__default.createElement(SpriteContainer$2, null, React__default.createElement(ErrorBoundary, null, React__default.createElement(SpriteFromAtlas, {
     atlasIMG: atlasIMG,
@@ -32162,7 +32160,7 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
   }))) : React__default.createElement(React__default.Fragment, null)), React__default.createElement(ProgressBarContainer$1, null, React__default.createElement(SimpleProgressBar, {
     value: progress,
     bgColor: bgColor
-  }))), showSkillPoints && React__default.createElement(SkillDisplayContainer, null, React__default.createElement(SkillPointsDisplay, null, currentSkillPoints, "/", skillPointsToNextLevel)));
+  }))), showSkillPoints && React__default.createElement(SkillDisplayContainer, null, React__default.createElement(SkillPointsDisplay, null, progress.toFixed(2), "%")));
 };
 var ProgressBarContainer$1 = /*#__PURE__*/styled__default.div.withConfig({
   displayName: "SkillProgressBar__ProgressBarContainer",
@@ -32302,13 +32300,14 @@ var SkillsContainer = function SkillsContainer(_ref) {
       if (!skillDetails) {
         continue;
       }
+      var skillPointsToNextLevel = shared.calculateSPToNextLevel(skillDetails.skillPoints, skillDetails.level);
       output.push(React__default.createElement(SkillProgressBar, {
         key: key,
         skillName: skillNameMap[key],
         bgColor: skillCategoryColor,
         level: skillDetails.level || 0,
         skillPoints: Math.round(skillDetails.skillPoints) || 0,
-        skillPointsToNextLevel: Math.round(shared.getSPForLevel(skillDetails.level + 1)) || 0,
+        skillPointsToNextLevel: skillPointsToNextLevel,
         texturePath: value,
         atlasIMG: atlasIMG,
         atlasJSON: atlasJSON,