@rpg-engine/long-bow 0.8.82 → 0.8.84

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

@@ -36516,29 +36516,51 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
     characterClass = _ref.characterClass,
     level = _ref.level,
     currentSkillPoints = _ref.skillPoints,
-    skillPointsToNextLevel = _ref.skillPointsToNextLevel,
     texturePath = _ref.texturePath,
     _ref$showSkillPoints = _ref.showSkillPoints,
     showSkillPoints = _ref$showSkillPoints === void 0 ? true : _ref$showSkillPoints,
     atlasIMG = _ref.atlasIMG,
     atlasJSON = _ref.atlasJSON,
     buffAndDebuff = _ref.buffAndDebuff;
-  // Skill points needed to start the current level
-  var baseSkillPoints = React.useMemo(function () {
-    if (skillKey && characterClass) {
-      var _getSkillConstants = shared.getSkillConstants(skillKey, characterClass),
-        A = _getSkillConstants.A,
-        b = _getSkillConstants.b,
-        c = _getSkillConstants.c;
-      return shared.getSPForLevelExponential(level, A, b, c);
+  // Use CharacterClass.None as default if skillKey is provided but characterClass is not
+  var effectiveClass = characterClass != null ? characterClass : shared.CharacterClass.None;
+  // Calculate the effective level based on actual SP (handles data inconsistencies)
+  var calculateEffectiveLevel = function calculateEffectiveLevel() {
+    if (!skillKey) {
+      return level; // Fallback to stored level for general "Level" display
     }
-    // Fallback to old formula for backwards compatibility
-    return shared.getSPForLevel(level);
-  }, [level, skillKey, characterClass]);
+    var _getSkillConstants = shared.getSkillConstants(skillKey, effectiveClass),
+      A = _getSkillConstants.A,
+      b = _getSkillConstants.b,
+      c = _getSkillConstants.c;
+    var actualLevel = Math.floor(shared.getLevelFromSP(currentSkillPoints, A, b, c));
+    return Math.max(1, actualLevel); // Minimum level is always 1 in our system
+  };
+  var effectiveLevel = calculateEffectiveLevel();
+  // Calculate progress based on actual SP position
   var calculateProgress = function calculateProgress() {
-    var totalPointsForLevelUp = Math.max(1, skillPointsToNextLevel - baseSkillPoints);
-    var excessSkillPoints = Math.max(0, currentSkillPoints - baseSkillPoints);
-    return Math.min(100, Math.max(0, excessSkillPoints / totalPointsForLevelUp * 100));
+    if (!skillKey) {
+      // Fallback for general "Level" display: simple ratio of current SP to next level
+      var spForCurrentLevel = shared.getSPForLevel(level);
+      var _spForNextLevel = shared.getSPForLevel(level + 1);
+      var _range = _spForNextLevel - spForCurrentLevel;
+      var _progress = currentSkillPoints - spForCurrentLevel;
+      return Math.min(100, Math.max(0, _progress / _range * 100));
+    }
+    var _getSkillConstants2 = shared.getSkillConstants(skillKey, effectiveClass),
+      A = _getSkillConstants2.A,
+      b = _getSkillConstants2.b,
+      c = _getSkillConstants2.c;
+    // 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(100, Math.max(0, progressInLevel / Math.max(1, range) * 100));
   };
   var progress = calculateProgress();
   var formatBuffAndDebuff = function formatBuffAndDebuff(value) {
@@ -36549,7 +36571,7 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
     var result = level * (buffAndDebuff / 100);
     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, "(+", formatBuffAndDebuff(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, "(", formatBuffAndDebuff(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$4, null, React__default.createElement(ErrorBoundary, null, React__default.createElement(SpriteFromAtlas, {
+  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 ", effectiveLevel, " (", skillsBuffsCalc(effectiveLevel, buffAndDebuff), ")")), React__default.createElement(TitleNameBuffContainer, null, React__default.createElement(TitleNameBuff, null, "(+", formatBuffAndDebuff(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 ", effectiveLevel, " (", skillsBuffsCalc(effectiveLevel, buffAndDebuff), ")")), React__default.createElement("div", null, React__default.createElement(TitleNameDebuff, null, "(", formatBuffAndDebuff(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 ", effectiveLevel))), React__default.createElement(ProgressBody, null, React__default.createElement(ProgressIconContainer, null, atlasIMG && atlasJSON ? React__default.createElement(SpriteContainer$4, null, React__default.createElement(ErrorBoundary, null, React__default.createElement(SpriteFromAtlas, {
     atlasIMG: atlasIMG,
     atlasJSON: atlasJSON,
     spriteKey: texturePath,