@rpg-engine/long-bow 0.8.94 → 0.8.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.8.94",
+  "version": "0.8.95",
   "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.41",
+    "@rpg-engine/shared": "^0.10.42",
     "dayjs": "^1.11.2",
     "font-awesome": "^4.7.0",
     "fs-extra": "^10.1.0",

package/src/components/SkillProgressBar.tsx

@@ -1,8 +1,10 @@
 import {
   CharacterClass,
   getLevelFromSP,
+  getLevelFromXP,
   getSPForLevelExponential,
   getSkillConstants,
+  getXPForLevel,
 } from '@rpg-engine/shared';
 import React from 'react';
 import styled from 'styled-components';
@@ -32,7 +34,7 @@ export const SkillProgressBar: React.FC<ISkillProgressBarProps> = ({
   skillName,
   skillKey,
   characterClass,
-  level,
+  // level prop kept in interface for API compatibility, but calculated from skillPoints
   skillPoints: currentSkillPoints,
 
   texturePath,
@@ -45,12 +47,14 @@ export const SkillProgressBar: React.FC<ISkillProgressBarProps> = ({
   // 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)
+  // Calculate the effective level based on actual SP/XP (handles data inconsistencies)
   const calculateEffectiveLevel = (): number => {
     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
     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
@@ -58,12 +62,23 @@ export const SkillProgressBar: React.FC<ISkillProgressBarProps> = ({
 
   const effectiveLevel = calculateEffectiveLevel();
 
-  // Calculate progress based on actual SP position
+  // Calculate progress based on actual SP/XP position
   const calculateProgress = (): number => {
-    // Use exponential formula for all skill progress calculations
-    // For character XP (when skillKey is not provided), use default constants
-    const skillName = skillKey ?? 'level';
-    const { A, b, c } = getSkillConstants(skillName, effectiveClass);
+    // Character level uses cubic XP formula, skills use exponential SP formula
+    if (!skillKey) {
+      // Character level: uses cubic formula (level³ * 3)
+      const actualLevel = Math.max(1, getLevelFromXP(currentSkillPoints));
+      const currentLevelXP = getXPForLevel(actualLevel);
+      const nextLevelXP = getXPForLevel(actualLevel + 1);
+
+      const range = nextLevelXP - currentLevelXP;
+      const 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
+    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));