@rpg-engine/long-bow 0.4.83 → 0.4.85

package/dist/long-bow.esm.js

@@ -1,6 +1,6 @@
 import React, { Component, useState, useEffect, useRef, useMemo, Fragment } from 'react';
 import styled from 'styled-components';
-import { GRID_WIDTH, GRID_HEIGHT, ShortcutType, getItemTextureKeyPath, ItemContainerType, ItemType, DepotSocketEvents, ItemSocketEvents, ItemSocketEventsDisplayLabels, ActionsForInventory, ActionsForEquipmentSet, ActionsForLoot, ActionsForMapContainer, ItemRarities, ItemSubType, ItemSlotType, isMobileOrTablet, getSPForLevel, PeriodOfDay } from '@rpg-engine/shared';
+import { GRID_WIDTH, GRID_HEIGHT, ShortcutType, getItemTextureKeyPath, ItemContainerType, ItemType, DepotSocketEvents, ItemSocketEvents, ItemSocketEventsDisplayLabels, ActionsForInventory, ActionsForEquipmentSet, ActionsForLoot, ActionsForMapContainer, ItemRarities, ItemSubType, ItemSlotType, isMobileOrTablet, getSPForLevel, getXPForLevel, PeriodOfDay } from '@rpg-engine/shared';
 import dayjs from 'dayjs';
 import { ErrorBoundary as ErrorBoundary$1 } from 'react-error-boundary';
 import { RxPaperPlane } from 'react-icons/rx';
@@ -16679,12 +16679,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 = getSPForLevel(level + 1);
   }
-  var nextLevelSPWillbe = skillPoints + skillPointsToNextLevel;
-  var ratio = skillPoints / nextLevelSPWillbe * 100;
   var skillsBuffsCalc = function skillsBuffsCalc() {
     if (buffAndDebuff) {
       return 1 + buffAndDebuff / 100;
@@ -16701,7 +16700,7 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
   }))) : React.createElement(React.Fragment, null)), React.createElement(ProgressBarContainer$1, null, React.createElement(SimpleProgressBar, {
     value: ratio,
     bgColor: bgColor
-  }))), showSkillPoints && React.createElement(SkillDisplayContainer, null, React.createElement(SkillPointsDisplay, null, skillPoints, "/", nextLevelSPWillbe)));
+  }))), showSkillPoints && React.createElement(SkillDisplayContainer, null, React.createElement(SkillPointsDisplay, null, skillPoints, "/", skillPointsToNextLevel)));
 };
 var ProgressBarContainer$1 = /*#__PURE__*/styled.div.withConfig({
   displayName: "SkillProgressBar__ProgressBarContainer",
@@ -16823,6 +16822,24 @@ var SkillsContainer = function SkillsContainer(_ref) {
     atlasIMG = _ref.atlasIMG,
     atlasJSON = _ref.atlasJSON,
     scale = _ref.scale;
+  var SPRatio = function SPRatio(level, skillPoints) {
+    var SPLevelActual = getSPForLevel(level + 1);
+    var SPLevelBefore = 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 = getXPForLevel(level + 1);
+    var XPLevelBefore = 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;
@@ -16842,11 +16859,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(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;
@@ -16867,10 +16885,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(getXPForLevel(skill.level + 1)) || 0,
     texturePath: 'swords/broad-sword.png',
     atlasIMG: atlasIMG,
-    atlasJSON: atlasJSON
+    atlasJSON: atlasJSON,
+    ratio: XPRatio(skill.level, skill.experience)
   }), React.createElement("p", null, "Combat Skills"), React.createElement("hr", {
     className: "golden"
   })), onRenderSkillCategory('combat'), React.createElement(SkillSplitDiv, null, React.createElement("p", null, "Crafting Skills"), React.createElement("hr", {