@rpg-engine/long-bow 0.8.82 → 0.8.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.8.82",
+  "version": "0.8.84",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -84,7 +84,7 @@
   "dependencies": {
     "@capacitor/core": "^6.1.0",
     "@rollup/plugin-image": "^2.1.1",
-    "@rpg-engine/shared": "^0.10.32",
+    "@rpg-engine/shared": "^0.10.33",
     "dayjs": "^1.11.2",
     "font-awesome": "^4.7.0",
     "fs-extra": "^10.1.0",

package/src/components/SkillProgressBar.tsx

@@ -1,10 +1,11 @@
 import {
+  CharacterClass,
+  getLevelFromSP,
   getSPForLevel,
   getSPForLevelExponential,
   getSkillConstants,
-  CharacterClass,
 } from '@rpg-engine/shared';
-import React, { useMemo } from 'react';
+import React from 'react';
 import styled from 'styled-components';
 import { uiColors } from '../constants/uiColors';
 import { ErrorBoundary } from './Item/Inventory/ErrorBoundary';
@@ -34,7 +35,7 @@ export const SkillProgressBar: React.FC<ISkillProgressBarProps> = ({
   characterClass,
   level,
   skillPoints: currentSkillPoints,
-  skillPointsToNextLevel,
+
   texturePath,
   showSkillPoints = true,
   atlasIMG,
@@ -42,26 +43,48 @@ export const SkillProgressBar: React.FC<ISkillProgressBarProps> = ({
 
   buffAndDebuff,
 }) => {
-  // Skill points needed to start the current level
-  const baseSkillPoints = useMemo(() => {
-    if (skillKey && characterClass) {
-      const { A, b, c } = getSkillConstants(skillKey, characterClass);
-      return getSPForLevelExponential(level, A, b, c);
+  // Use CharacterClass.None as default if skillKey is provided but characterClass is not
+  const effectiveClass = characterClass ?? CharacterClass.None;
+
+  // Calculate the effective level based on actual SP (handles data inconsistencies)
+  const calculateEffectiveLevel = (): number => {
+    if (!skillKey) {
+      return level; // Fallback to stored level for general "Level" display
     }
-    // Fallback to old formula for backwards compatibility
-    return getSPForLevel(level);
-  }, [level, skillKey, characterClass]);
+
+    const { A, b, c } = getSkillConstants(skillKey, effectiveClass);
+    const actualLevel = Math.floor(getLevelFromSP(currentSkillPoints, A, b, c));
+    return Math.max(1, actualLevel); // Minimum level is always 1 in our system
+  };
+
+  const effectiveLevel = calculateEffectiveLevel();
+
+  // Calculate progress based on actual SP position
   const calculateProgress = (): number => {
-    const totalPointsForLevelUp = Math.max(
-      1,
-      skillPointsToNextLevel - baseSkillPoints
-    );
-    const 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
+      const spForCurrentLevel = getSPForLevel(level);
+      const spForNextLevel = getSPForLevel(level + 1);
+      const range = spForNextLevel - spForCurrentLevel;
+      const progress = currentSkillPoints - spForCurrentLevel;
+      return Math.min(100, Math.max(0, (progress / range) * 100));
+    }
+
+    const { A, b, c } = getSkillConstants(skillKey, effectiveClass);
+
+    // Get the actual calculated level (might be 0 for magic)
+    const actualLevel = Math.floor(getLevelFromSP(currentSkillPoints, A, b, c));
+    const calcLevel = Math.max(c, actualLevel); // Use c as minimum for calculation
+
+    // Calculate SP thresholds based on actual position
+    const spForCalcLevel = getSPForLevelExponential(calcLevel, A, b, c);
+    const spForNextLevel = getSPForLevelExponential(calcLevel + 1, A, b, c);
+
+    // Progress within current level range
+    const range = spForNextLevel - spForCalcLevel;
+    const progressInLevel = currentSkillPoints - spForCalcLevel;
+
+    return Math.min(100, Math.max(0, (progressInLevel / Math.max(1, range)) * 100));
   };
 
   const progress = calculateProgress();
@@ -85,7 +108,7 @@ export const SkillProgressBar: React.FC<ISkillProgressBarProps> = ({
                 <TitleNameContainer>
                   <TitleNameBuff>{skillName}</TitleNameBuff>
                   <TitleNameBuff>
-                    lv {level} ({skillsBuffsCalc(level, buffAndDebuff)})
+                    lv {effectiveLevel} ({skillsBuffsCalc(effectiveLevel, buffAndDebuff)})
                   </TitleNameBuff>
                 </TitleNameContainer>
                 <TitleNameBuffContainer>
@@ -99,7 +122,7 @@ export const SkillProgressBar: React.FC<ISkillProgressBarProps> = ({
                 <TitleNameContainer>
                   <TitleNameDebuff>{skillName}</TitleNameDebuff>
                   <TitleNameDebuff>
-                    lv {level} ({skillsBuffsCalc(level, buffAndDebuff)})
+                    lv {effectiveLevel} ({skillsBuffsCalc(effectiveLevel, buffAndDebuff)})
                   </TitleNameDebuff>
                 </TitleNameContainer>
                 <div>
@@ -116,7 +139,7 @@ export const SkillProgressBar: React.FC<ISkillProgressBarProps> = ({
         {!buffAndDebuff && (
           <TitleNameContainer>
             <TitleName>{skillName}</TitleName>
-            <ValueDisplay>lv {level}</ValueDisplay>
+            <ValueDisplay>lv {effectiveLevel}</ValueDisplay>
           </TitleNameContainer>
         )}
       </ProgressTitle>

package/src/mocks/skills.mocks.ts

@@ -1,7 +1,6 @@
 import {
   ISkill,
   SkillType,
-  getSPForLevel,
   getSPForLevelExponential,
   getSkillConstants,
   CharacterClass,

package/src/stories/Character/skills/SkillsContainer.stories.tsx

@@ -1,3 +1,4 @@
+import { CharacterClass } from '@rpg-engine/shared';
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
 import { RPGUIRoot } from '../../../components/RPGUI/RPGUIRoot';
@@ -21,6 +22,7 @@ const Template: Story<ISkillContainerProps> = args => (
     <SkillsContainer
       {...args}
       skill={skillMock}
+      characterClass={CharacterClass.Warrior}
       onCloseButton={() => console.log('close skill container')}
       atlasIMG={atlasIMG}
       atlasJSON={atlasJSON}
@@ -32,4 +34,5 @@ export const Default = Template.bind([]);
 
 Default.args = {
   skill: skillMock,
+  characterClass: CharacterClass.Warrior,
 };