@rpg-engine/long-bow 0.8.83 → 0.8.85

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

@@ -36041,7 +36041,8 @@ var ProgressBar$1 = function ProgressBar(_ref) {
     if (value > max) {
       value = max;
     }
-    return value * 100 / max;
+    var percentage = value * 100 / max;
+    return Math.min(99.99, percentage);
   };
   return React__default.createElement(Container$B, {
     className: "rpgui-progress",
@@ -36470,8 +36471,8 @@ var SimpleProgressBar = function SimpleProgressBar(_ref) {
     bgColor = _ref$bgColor === void 0 ? 'red' : _ref$bgColor,
     _ref$margin = _ref.margin,
     margin = _ref$margin === void 0 ? 20 : _ref$margin;
-  // Ensure the width is at least 1% if value is greater than 0
-  var width = value > 0 ? Math.max(1, Math.min(100, value)) : 0;
+  // Ensure the width is at least 1% if value is greater than 0, capped at 99.99%
+  var width = value > 0 ? Math.max(1, Math.min(99.99, value)) : 0;
   return React__default.createElement(Container$D, {
     className: "simple-progress-bar"
   }, React__default.createElement(ProgressBarContainer, {
@@ -36534,7 +36535,7 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
       b = _getSkillConstants.b,
       c = _getSkillConstants.c;
     var actualLevel = Math.floor(shared.getLevelFromSP(currentSkillPoints, A, b, c));
-    return Math.max(c, actualLevel); // At least starting level
+    return Math.max(1, actualLevel); // Minimum level is always 1 in our system
   };
   var effectiveLevel = calculateEffectiveLevel();
   // Calculate progress based on actual SP position
@@ -36545,19 +36546,22 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
       var _spForNextLevel = shared.getSPForLevel(level + 1);
       var _range = _spForNextLevel - spForCurrentLevel;
       var _progress = currentSkillPoints - spForCurrentLevel;
-      return Math.min(100, Math.max(0, _progress / _range * 100));
+      return Math.min(99.99, Math.max(0, _progress / _range * 100));
     }
     var _getSkillConstants2 = shared.getSkillConstants(skillKey, effectiveClass),
       A = _getSkillConstants2.A,
       b = _getSkillConstants2.b,
       c = _getSkillConstants2.c;
-    // Calculate SP thresholds for current effective level
-    var spForEffectiveLevel = shared.getSPForLevelExponential(effectiveLevel, A, b, c);
-    var spForNextLevel = shared.getSPForLevelExponential(effectiveLevel + 1, A, b, c);
-    // Progress within current effective level
-    var range = spForNextLevel - spForEffectiveLevel;
-    var progressInLevel = currentSkillPoints - spForEffectiveLevel;
-    return Math.min(100, Math.max(0, progressInLevel / Math.max(1, range) * 100));
+    // Get the actual calculated level (might be 0 for magic)
+    var actualLevel = Math.floor(shared.getLevelFromSP(currentSkillPoints, A, b, c));
+    var calcLevel = Math.max(c, actualLevel); // Use c as minimum for calculation
+    // Calculate SP thresholds based on actual position
+    var spForCalcLevel = shared.getSPForLevelExponential(calcLevel, A, b, c);
+    var spForNextLevel = shared.getSPForLevelExponential(calcLevel + 1, A, b, c);
+    // Progress within current level range
+    var range = spForNextLevel - spForCalcLevel;
+    var progressInLevel = currentSkillPoints - spForCalcLevel;
+    return Math.min(99.99, Math.max(0, progressInLevel / Math.max(1, range) * 100));
   };
   var progress = calculateProgress();
   var formatBuffAndDebuff = function formatBuffAndDebuff(value) {
@@ -36578,7 +36582,7 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
   }))) : React__default.createElement(React__default.Fragment, null)), React__default.createElement(ProgressBarWrapper, null, React__default.createElement(SimpleProgressBar, {
     value: progress,
     bgColor: bgColor
-  }), React__default.createElement(Tooltip, null, "SP: ", currentSkillPoints))), showSkillPoints && React__default.createElement(SkillDisplayContainer, null, React__default.createElement(SkillPointsDisplay, null, progress.toFixed(2), "%")));
+  }), React__default.createElement(Tooltip, null, skillKey ? 'SP' : 'XP', ": ", currentSkillPoints))), showSkillPoints && React__default.createElement(SkillDisplayContainer, null, React__default.createElement(SkillPointsDisplay, null, progress.toFixed(2), "%")));
 };
 var ProgressBarWrapper = /*#__PURE__*/styled__default.div.withConfig({
   displayName: "SkillProgressBar__ProgressBarWrapper",