@rpg-engine/long-bow 0.8.83 → 0.8.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.8.83",
+  "version": "0.8.85",
   "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/ProgressBar.tsx

@@ -30,7 +30,8 @@ export const ProgressBar: React.FC<IBarProps> = ({
     if (value > max) {
       value = max;
     }
-    return (value * 100) / max;
+    const percentage = (value * 100) / max;
+    return Math.min(99.99, percentage);
   };
 
   return (

package/src/components/SimpleProgressBar.tsx

@@ -12,8 +12,8 @@ export const SimpleProgressBar: React.FC<ISimpleProgressBarProps> = ({
   bgColor = 'red',
   margin = 20,
 }) => {
-  // Ensure the width is at least 1% if value is greater than 0
-  const width = value > 0 ? Math.max(1, Math.min(100, value)) : 0;
+  // Ensure the width is at least 1% if value is greater than 0, capped at 99.99%
+  const width = value > 0 ? Math.max(1, Math.min(99.99, value)) : 0;
 
   return (
     <Container className="simple-progress-bar">

package/src/components/SkillProgressBar.tsx

@@ -54,7 +54,7 @@ export const SkillProgressBar: React.FC<ISkillProgressBarProps> = ({
 
     const { A, b, c } = getSkillConstants(skillKey, effectiveClass);
     const actualLevel = Math.floor(getLevelFromSP(currentSkillPoints, A, b, c));
-    return Math.max(c, actualLevel); // At least starting level
+    return Math.max(1, actualLevel); // Minimum level is always 1 in our system
   };
 
   const effectiveLevel = calculateEffectiveLevel();
@@ -67,20 +67,24 @@ export const SkillProgressBar: React.FC<ISkillProgressBarProps> = ({
       const spForNextLevel = getSPForLevel(level + 1);
       const range = spForNextLevel - spForCurrentLevel;
       const progress = currentSkillPoints - spForCurrentLevel;
-      return Math.min(100, Math.max(0, (progress / range) * 100));
+      return Math.min(99.99, Math.max(0, (progress / range) * 100));
     }
 
     const { A, b, c } = getSkillConstants(skillKey, effectiveClass);
 
-    // Calculate SP thresholds for current effective level
-    const spForEffectiveLevel = getSPForLevelExponential(effectiveLevel, A, b, c);
-    const spForNextLevel = getSPForLevelExponential(effectiveLevel + 1, A, b, c);
+    // 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 effective level
-    const range = spForNextLevel - spForEffectiveLevel;
-    const progressInLevel = currentSkillPoints - spForEffectiveLevel;
+    // 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));
+    return Math.min(99.99, Math.max(0, (progressInLevel / Math.max(1, range)) * 100));
   };
 
   const progress = calculateProgress();
@@ -162,7 +166,7 @@ export const SkillProgressBar: React.FC<ISkillProgressBarProps> = ({
 
         <ProgressBarWrapper>
           <SimpleProgressBar value={progress} bgColor={bgColor} />
-          <Tooltip>SP: {currentSkillPoints}</Tooltip>
+          <Tooltip>{skillKey ? 'SP' : 'XP'}: {currentSkillPoints}</Tooltip>
         </ProgressBarWrapper>
       </ProgressBody>
       {showSkillPoints && (

package/src/mocks/skills.mocks.ts

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