@rpg-engine/long-bow 0.4.83 → 0.4.85

package/dist/components/SkillProgressBar.d.ts

@@ -10,5 +10,6 @@ export interface ISkillProgressBarProps {
     atlasJSON: any;
     atlasIMG: any;
     buffAndDebuff?: number;
+    ratio: number;
 }
 export declare const SkillProgressBar: React.FC<ISkillProgressBarProps>;

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

@@ -16681,12 +16681,11 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
     showSkillPoints = _ref$showSkillPoints === void 0 ? true : _ref$showSkillPoints,
     atlasIMG = _ref.atlasIMG,
     atlasJSON = _ref.atlasJSON,
-    buffAndDebuff = _ref.buffAndDebuff;
+    buffAndDebuff = _ref.buffAndDebuff,
+    ratio = _ref.ratio;
   if (!skillPointsToNextLevel) {
     skillPointsToNextLevel = shared.getSPForLevel(level + 1);
   }
-  var nextLevelSPWillbe = skillPoints + skillPointsToNextLevel;
-  var ratio = skillPoints / nextLevelSPWillbe * 100;
   var skillsBuffsCalc = function skillsBuffsCalc() {
     if (buffAndDebuff) {
       return 1 + buffAndDebuff / 100;
@@ -16703,7 +16702,7 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
   }))) : React__default.createElement(React__default.Fragment, null)), React__default.createElement(ProgressBarContainer$1, null, React__default.createElement(SimpleProgressBar, {
     value: ratio,
     bgColor: bgColor
-  }))), showSkillPoints && React__default.createElement(SkillDisplayContainer, null, React__default.createElement(SkillPointsDisplay, null, skillPoints, "/", nextLevelSPWillbe)));
+  }))), showSkillPoints && React__default.createElement(SkillDisplayContainer, null, React__default.createElement(SkillPointsDisplay, null, skillPoints, "/", skillPointsToNextLevel)));
 };
 var ProgressBarContainer$1 = /*#__PURE__*/styled.div.withConfig({
   displayName: "SkillProgressBar__ProgressBarContainer",
@@ -16825,6 +16824,24 @@ var SkillsContainer = function SkillsContainer(_ref) {
     atlasIMG = _ref.atlasIMG,
     atlasJSON = _ref.atlasJSON,
     scale = _ref.scale;
+  var SPRatio = function SPRatio(level, skillPoints) {
+    var SPLevelActual = shared.getSPForLevel(level + 1);
+    var SPLevelBefore = shared.getSPForLevel(level);
+    var SPCalc = SPLevelActual - SPLevelBefore;
+    if (level === 1) {
+      return skillPoints / SPLevelActual * 100;
+    }
+    return (skillPoints - SPLevelBefore) / SPCalc * 100;
+  };
+  var XPRatio = function XPRatio(level, skillPoints) {
+    var XPLevelActual = shared.getXPForLevel(level + 1);
+    var XPLevelBefore = shared.getXPForLevel(level);
+    var XPCalc = XPLevelActual - XPLevelBefore;
+    if (level === 1) {
+      return skillPoints / XPLevelActual * 100;
+    }
+    return (skillPoints - XPLevelBefore) / XPCalc * 100;
+  };
   var onRenderSkillCategory = function onRenderSkillCategory(category) {
     var skillCategory = skillProps[category];
     var skillCategoryColor = skillCategory.color;
@@ -16844,11 +16861,12 @@ var SkillsContainer = function SkillsContainer(_ref) {
         bgColor: skillCategoryColor,
         level: skillDetails.level || 0,
         skillPoints: Math.round(skillDetails.skillPoints) || 0,
-        skillPointsToNextLevel: Math.round(skillDetails.skillPointsToNextLevel) || 0,
+        skillPointsToNextLevel: Math.round(shared.getSPForLevel(skillDetails.level + 1)) || 0,
         texturePath: value,
         atlasIMG: atlasIMG,
         atlasJSON: atlasJSON,
-        buffAndDebuff: skillDetails.buffAndDebuff
+        buffAndDebuff: skillDetails.buffAndDebuff,
+        ratio: SPRatio(skillDetails.level, skillDetails.skillPoints)
       }));
     }
     return output;
@@ -16869,10 +16887,11 @@ var SkillsContainer = function SkillsContainer(_ref) {
     bgColor: uiColors.navyBlue,
     level: Math.round(skill.level) || 0,
     skillPoints: Math.round(skill.experience) || 0,
-    skillPointsToNextLevel: Math.round(skill.xpToNextLevel) || 0,
+    skillPointsToNextLevel: Math.round(shared.getXPForLevel(skill.level + 1)) || 0,
     texturePath: 'swords/broad-sword.png',
     atlasIMG: atlasIMG,
-    atlasJSON: atlasJSON
+    atlasJSON: atlasJSON,
+    ratio: XPRatio(skill.level, skill.experience)
   }), React__default.createElement("p", null, "Combat Skills"), React__default.createElement("hr", {
     className: "golden"
   })), onRenderSkillCategory('combat'), React__default.createElement(SkillSplitDiv, null, React__default.createElement("p", null, "Crafting Skills"), React__default.createElement("hr", {