@rpg-engine/long-bow 0.8.93 → 0.8.95

package/dist/long-bow.esm.js

@@ -2,7 +2,7 @@ import React, { useState, useEffect, Component, useRef, useCallback, useContext,
 import styled, { css, keyframes, createGlobalStyle } from 'styled-components';
 import { BeatLoader } from 'react-spinners';
 import { v4 } from 'uuid';
-import { GRID_WIDTH, GRID_HEIGHT, ShortcutType, getItemTextureKeyPath, ItemContainerType, ItemType, DepotSocketEvents, ItemSocketEvents, ItemSocketEventsDisplayLabels, ActionsForInventory, ActionsForEquipmentSet, ActionsForLoot, ActionsForMapContainer, ItemQualityLevel, ItemRarities, ItemSubType, isMobile, TaskType, TaskStatus, isMobileOrTablet, RewardType, ItemSlotType, NPCSubtype, EntityAttackType, NPCAlignment, VideoGuideCategory, VideoGuideLanguage, CharacterClass, QuestStatus, getSkillConstants, getLevelFromSP, getSPForLevelExponential, getXPForLevel, getSPForLevel, MetadataType, PurchaseType, UserAccountTypes, PaymentCurrency, PeriodOfDay } from '@rpg-engine/shared';
+import { GRID_WIDTH, GRID_HEIGHT, ShortcutType, getItemTextureKeyPath, ItemContainerType, ItemType, DepotSocketEvents, ItemSocketEvents, ItemSocketEventsDisplayLabels, ActionsForInventory, ActionsForEquipmentSet, ActionsForLoot, ActionsForMapContainer, ItemQualityLevel, ItemRarities, ItemSubType, isMobile, TaskType, TaskStatus, isMobileOrTablet, RewardType, ItemSlotType, NPCSubtype, EntityAttackType, NPCAlignment, VideoGuideCategory, VideoGuideLanguage, CharacterClass, QuestStatus, getLevelFromXP, getSkillConstants, getLevelFromSP, getXPForLevel, getSPForLevelExponential, MetadataType, PurchaseType, UserAccountTypes, PaymentCurrency, PeriodOfDay } from '@rpg-engine/shared';
 import dayjs from 'dayjs';
 import { ErrorBoundary as ErrorBoundary$1 } from 'react-error-boundary';
 import { FaTimes, FaDiscord, FaWhatsapp, FaSearch, FaThumbtack, FaBoxOpen, FaChevronLeft, FaChevronRight, FaClipboardList, FaChevronUp, FaChevronDown, FaReddit, FaTrash, FaShoppingBag, FaInfoCircle, FaCartPlus, FaArrowLeft, FaHistory, FaShoppingCart } from 'react-icons/fa';
@@ -36529,7 +36529,6 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
     skillName = _ref.skillName,
     skillKey = _ref.skillKey,
     characterClass = _ref.characterClass,
-    level = _ref.level,
     currentSkillPoints = _ref.skillPoints,
     texturePath = _ref.texturePath,
     _ref$showSkillPoints = _ref.showSkillPoints,
@@ -36539,11 +36538,13 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
     buffAndDebuff = _ref.buffAndDebuff;
   // Use CharacterClass.None as default if skillKey is provided but characterClass is not
   var effectiveClass = characterClass != null ? characterClass : CharacterClass.None;
-  // Calculate the effective level based on actual SP (handles data inconsistencies)
+  // Calculate the effective level based on actual SP/XP (handles data inconsistencies)
   var calculateEffectiveLevel = function calculateEffectiveLevel() {
     if (!skillKey) {
-      return level; // Fallback to stored level for general "Level" display
+      // Character level: uses cubic formula (level³ * 3)
+      return Math.max(1, getLevelFromXP(currentSkillPoints));
     }
+    // Skills: use exponential formula with class-based constants
     var _getSkillConstants = getSkillConstants(skillKey, effectiveClass),
       A = _getSkillConstants.A,
       b = _getSkillConstants.b,
@@ -36552,12 +36553,20 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
     return Math.max(1, actualLevel); // Minimum level is always 1 in our system
   };
   var effectiveLevel = calculateEffectiveLevel();
-  // Calculate progress based on actual SP position
+  // Calculate progress based on actual SP/XP position
   var calculateProgress = function calculateProgress() {
-    // Use exponential formula for all skill progress calculations
-    // For character XP (when skillKey is not provided), use default constants
-    var skillName = skillKey != null ? skillKey : 'level';
-    var _getSkillConstants2 = getSkillConstants(skillName, effectiveClass),
+    // Character level uses cubic XP formula, skills use exponential SP formula
+    if (!skillKey) {
+      // Character level: uses cubic formula (level³ * 3)
+      var _actualLevel = Math.max(1, getLevelFromXP(currentSkillPoints));
+      var currentLevelXP = getXPForLevel(_actualLevel);
+      var nextLevelXP = getXPForLevel(_actualLevel + 1);
+      var _range = nextLevelXP - currentLevelXP;
+      var _progressInLevel = currentSkillPoints - currentLevelXP;
+      return Math.min(99.99, Math.max(0, _progressInLevel / Math.max(1, _range) * 100));
+    }
+    // Skills: use exponential formula with class-based constants
+    var _getSkillConstants2 = getSkillConstants(skillKey, effectiveClass),
       A = _getSkillConstants2.A,
       b = _getSkillConstants2.b,
       c = _getSkillConstants2.c;
@@ -36732,16 +36741,14 @@ var SkillsContainer = function SkillsContainer(_ref) {
         if (!skillDetails) {
           return 0; // continue
         }
-        // Calculate skillPointsToNextLevel using exponential formula if characterClass available
+        // Calculate skillPointsToNextLevel using exponential formula with character class
         var calcSkillPointsToNextLevel = function calcSkillPointsToNextLevel() {
-          if (characterClass) {
-            var _getSkillConstants = getSkillConstants(key, characterClass),
-              A = _getSkillConstants.A,
-              b = _getSkillConstants.b,
-              c = _getSkillConstants.c;
-            return Math.round(getSPForLevelExponential(skillDetails.level + 1, A, b, c));
-          }
-          return Math.round(getSPForLevel(skillDetails.level + 1));
+          var effectiveClass = characterClass != null ? characterClass : CharacterClass.None;
+          var _getSkillConstants = getSkillConstants(key, effectiveClass),
+            A = _getSkillConstants.A,
+            b = _getSkillConstants.b,
+            c = _getSkillConstants.c;
+          return Math.round(getSPForLevelExponential(skillDetails.level + 1, A, b, c));
         };
         output.push(React.createElement(SkillProgressBar, {
           key: key,
@@ -37151,7 +37158,7 @@ var SKILL_NAMES = {
   shielding: 'shielding',
   fishing: 'fishing',
   cooking: 'cooking',
-  firstAid: 'first aid'
+  fistFighting: 'fist fighting'
 };
 var getSkillName = function getSkillName(attribute) {
   return SKILL_NAMES[attribute] || attribute;