@rpg-engine/long-bow 0.6.49 → 0.6.51

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

@@ -32129,44 +32129,29 @@ var ProgressBarContainer = /*#__PURE__*/styled__default.div.withConfig({
 var SkillProgressBar = function SkillProgressBar(_ref) {
   var bgColor = _ref.bgColor,
     skillName = _ref.skillName,
-    initialLevel = _ref.level,
-    initialSkillPoints = _ref.skillPoints,
-    initialSkillPointsToNextLevel = _ref.skillPointsToNextLevel,
+    level = _ref.level,
+    currentSkillPoints = _ref.skillPoints,
     texturePath = _ref.texturePath,
     _ref$showSkillPoints = _ref.showSkillPoints,
     showSkillPoints = _ref$showSkillPoints === void 0 ? true : _ref$showSkillPoints,
     atlasIMG = _ref.atlasIMG,
     atlasJSON = _ref.atlasJSON,
     buffAndDebuff = _ref.buffAndDebuff;
-  var _useState = React.useState(initialLevel),
-    level = _useState[0],
-    setLevel = _useState[1];
-  var _useState2 = React.useState(initialSkillPoints),
-    skillPoints = _useState2[0],
-    setSkillPoints = _useState2[1];
-  var _useState3 = React.useState(initialSkillPointsToNextLevel || shared.getSPForLevel(initialLevel + 1)),
-    skillPointsToNextLevel = _useState3[0],
-    setSkillPointsToNextLevel = _useState3[1];
-  // Update skill points and level from props when they change
-  React.useEffect(function () {
-    setLevel(initialLevel);
-    setSkillPoints(initialSkillPoints);
-    setSkillPointsToNextLevel(initialSkillPointsToNextLevel || shared.getSPForLevel(initialLevel + 1));
-  }, [initialLevel, initialSkillPoints, initialSkillPointsToNextLevel]);
-  React.useEffect(function () {
-    if (skillPoints >= skillPointsToNextLevel) {
-      var excessSkillPoints = skillPoints - skillPointsToNextLevel;
-      var newLevel = level + 1;
-      setLevel(newLevel);
-      setSkillPoints(excessSkillPoints);
-      setSkillPointsToNextLevel(shared.getSPForLevel(newLevel + 1));
-    }
-  }, [skillPoints, skillPointsToNextLevel, level]);
-  // Calculate the ratio, ensuring it doesn't exceed 100%
-  var ratio = Math.min(skillPoints / skillPointsToNextLevel * 100, 100);
+  // Base skill points for the previous level (0 for level 1)
+  var baseSkillPointsPrevLevel = level > 1 ? shared.getSPForLevel(level - 1) : 0;
+  // Total skill points needed for the next level
+  var nextLevelSkillPoints = shared.getSPForLevel(level + 1);
+  // Calculate excess skill points above the previous level
+  var excessSkillPoints = currentSkillPoints - baseSkillPointsPrevLevel;
+  // Calculate progress percentage towards the next level
+  var progress = nextLevelSkillPoints > baseSkillPointsPrevLevel ? Math.max(Math.min(excessSkillPoints / (nextLevelSkillPoints - baseSkillPointsPrevLevel) * 100, 100), 0) : 0;
   var skillsBuffsCalc = function skillsBuffsCalc(level, buffAndDebuff) {
     var result = level * (buffAndDebuff / 100);
-    return result > 0 ? "+" + result : "" + result;
+    if (result > 0) {
+      return "+" + result.toFixed(2);
+    } else {
+      return "" + 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,
@@ -32176,9 +32161,9 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
     grayScale: true,
     opacity: 0.5
   }))) : React__default.createElement(React__default.Fragment, null)), React__default.createElement(ProgressBarContainer$1, null, React__default.createElement(SimpleProgressBar, {
-    value: ratio,
+    value: progress,
     bgColor: bgColor
-  }))), showSkillPoints && React__default.createElement(SkillDisplayContainer, null, React__default.createElement(SkillPointsDisplay, null, skillPoints, " / ", skillPointsToNextLevel, " (", ratio.toFixed(2), "%)")));
+  }))), 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",