@rpg-engine/long-bow 0.8.81 → 0.8.83

package/dist/components/SkillProgressBar.d.ts

@@ -1,13 +1,15 @@
+import { CharacterClass } from '@rpg-engine/shared';
 import React from 'react';
 export interface ISkillProgressBarProps {
     skillName: string;
+    skillKey?: string;
+    characterClass?: CharacterClass;
     bgColor: string;
     level: number;
     skillPoints: number;
     texturePath: string;
     showSkillPoints?: boolean;
     skillPointsToNextLevel: number;
-    skillPointsForCurrentLevel: number;
     atlasJSON: any;
     atlasIMG: any;
     buffAndDebuff?: number;

package/dist/components/SkillsContainer.d.ts

@@ -1,8 +1,8 @@
-import { CharacterClass, ISkill } from '@rpg-engine/shared';
+import { ISkill, CharacterClass } from '@rpg-engine/shared';
 import React from 'react';
 export interface ISkillContainerProps {
     skill: ISkill;
-    characterClass: CharacterClass;
+    characterClass?: CharacterClass;
     onCloseButton: () => void;
     atlasJSON: any;
     atlasIMG: any;

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

@@ -36512,22 +36512,52 @@ var Tooltip = /*#__PURE__*/styled__default.div.withConfig({
 var SkillProgressBar = function SkillProgressBar(_ref) {
   var bgColor = _ref.bgColor,
     skillName = _ref.skillName,
+    skillKey = _ref.skillKey,
+    characterClass = _ref.characterClass,
     level = _ref.level,
     currentSkillPoints = _ref.skillPoints,
-    skillPointsToNextLevel = _ref.skillPointsToNextLevel,
-    skillPointsForCurrentLevel = _ref.skillPointsForCurrentLevel,
     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 (passed from parent, calculated with correct formula)
-  var baseSkillPoints = skillPointsForCurrentLevel;
+  // 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
+    }
+    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(c, actualLevel); // At least starting level
+  };
+  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;
+    // 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));
   };
   var progress = calculateProgress();
   var formatBuffAndDebuff = function formatBuffAndDebuff(value) {
@@ -36538,7 +36568,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,
@@ -36677,39 +36707,48 @@ var SkillsContainer = function SkillsContainer(_ref) {
     var skillCategory = skillProps[category];
     var skillCategoryColor = skillCategory.color;
     var output = [];
+    var _loop = function _loop() {
+        var _Object$entries$_i = _Object$entries[_i],
+          key = _Object$entries$_i[0],
+          value = _Object$entries$_i[1];
+        if (key === 'stamina') {
+          return 0; // continue
+        }
+        //@ts-ignore
+        var skillDetails = skill[key];
+        if (!skillDetails) {
+          return 0; // continue
+        }
+        // Calculate skillPointsToNextLevel using exponential formula if characterClass available
+        var calcSkillPointsToNextLevel = function calcSkillPointsToNextLevel() {
+          if (characterClass) {
+            var _getSkillConstants = shared.getSkillConstants(key, characterClass),
+              A = _getSkillConstants.A,
+              b = _getSkillConstants.b,
+              c = _getSkillConstants.c;
+            return Math.round(shared.getSPForLevelExponential(skillDetails.level + 1, A, b, c));
+          }
+          return Math.round(shared.getSPForLevel(skillDetails.level + 1));
+        };
+        output.push(React__default.createElement(SkillProgressBar, {
+          key: key,
+          skillName: skillNameMap[key],
+          skillKey: key,
+          characterClass: characterClass,
+          bgColor: skillCategoryColor,
+          level: skillDetails.level || 0,
+          skillPoints: Math.round(skillDetails.skillPoints) || 0,
+          skillPointsToNextLevel: calcSkillPointsToNextLevel(),
+          texturePath: value,
+          atlasIMG: atlasIMG,
+          atlasJSON: atlasJSON,
+          buffAndDebuff: skillDetails.buffAndDebuff
+        }));
+      },
+      _ret;
     for (var _i = 0, _Object$entries = Object.entries(skillCategory.values); _i < _Object$entries.length; _i++) {
-      var _Object$entries$_i = _Object$entries[_i],
-        key = _Object$entries$_i[0],
-        value = _Object$entries$_i[1];
-      if (key === 'stamina') {
-        continue;
-      }
-      //@ts-ignore
-      var skillDetails = skill[key];
-      if (!skillDetails) {
-        continue;
-      }
-      // Get the skill constants for this skill and character class
-      var _getSkillConstants = shared.getSkillConstants(key, characterClass),
-        A = _getSkillConstants.A,
-        b = _getSkillConstants.b,
-        c = _getSkillConstants.c;
-      // Calculate SP thresholds using exponential formula
-      var skillPointsForCurrentLevel = shared.getSPForLevelExponential(skillDetails.level, A, b, c);
-      var skillPointsToNextLevel = shared.getSPForLevelExponential(skillDetails.level + 1, A, b, c);
-      output.push(React__default.createElement(SkillProgressBar, {
-        key: key,
-        skillName: skillNameMap[key],
-        bgColor: skillCategoryColor,
-        level: skillDetails.level || 0,
-        skillPoints: Math.round(skillDetails.skillPoints) || 0,
-        skillPointsToNextLevel: skillPointsToNextLevel,
-        skillPointsForCurrentLevel: skillPointsForCurrentLevel,
-        texturePath: value,
-        atlasIMG: atlasIMG,
-        atlasJSON: atlasJSON,
-        buffAndDebuff: skillDetails.buffAndDebuff
-      }));
+      _ret = _loop();
+      if (_ret === 0) continue;
     }
     return output;
   };
@@ -36730,7 +36769,6 @@ var SkillsContainer = function SkillsContainer(_ref) {
     level: Math.round(skill.level) || 0,
     skillPoints: Math.round(skill.experience) || 0,
     skillPointsToNextLevel: Math.round(shared.getXPForLevel(skill.level + 1)) || 0,
-    skillPointsForCurrentLevel: Math.round(shared.getXPForLevel(skill.level)) || 0,
     texturePath: 'swords/broad-sword.png',
     atlasIMG: atlasIMG,
     atlasJSON: atlasJSON