@rpg-engine/long-bow 0.8.92 → 0.8.94

package/package.json

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

package/src/components/SkillsContainer.tsx

@@ -1,7 +1,6 @@
 import {
   ISkill,
   ISkillDetails,
-  getSPForLevel,
   getSPForLevelExponential,
   getSkillConstants,
   CharacterClass,
@@ -115,13 +114,11 @@ export const SkillsContainer: React.FC<ISkillContainerProps> = ({
         continue;
       }
 
-      // Calculate skillPointsToNextLevel using exponential formula if characterClass available
+      // Calculate skillPointsToNextLevel using exponential formula with character class
       const calcSkillPointsToNextLevel = (): number => {
-        if (characterClass) {
-          const { A, b, c } = getSkillConstants(key, characterClass);
-          return Math.round(getSPForLevelExponential(skillDetails.level + 1, A, b, c));
-        }
-        return Math.round(getSPForLevel(skillDetails.level + 1));
+        const effectiveClass = characterClass ?? CharacterClass.None;
+        const { A, b, c } = getSkillConstants(key, effectiveClass);
+        return Math.round(getSPForLevelExponential(skillDetails.level + 1, A, b, c));
       };
 
       output.push(

package/src/components/Spellbook/Spell.tsx

@@ -11,6 +11,7 @@ export interface ISpellProps {
   atlasIMG: any;
   charMana: number;
   charMagicLevel: number;
+  charSkillLevels?: Record<string, number>;
   onPointerUp?: (spellKey: string) => void;
   isSettingShortcut?: boolean;
   spellKey: string;
@@ -18,12 +19,29 @@ export interface ISpellProps {
   activeCooldown?: number;
 }
 
+const SKILL_NAMES: Record<string, string> = {
+  magicLevel: 'magic level',
+  distanceFighting: 'distance fighting',
+  swordFighting: 'sword fighting',
+  axeFighting: 'axe fighting',
+  clubFighting: 'club fighting',
+  shielding: 'shielding',
+  fishing: 'fishing',
+  cooking: 'cooking',
+  fistFighting: 'fist fighting',
+};
+
+const getSkillName = (attribute: string): string => {
+  return SKILL_NAMES[attribute] || attribute;
+};
+
 export const Spell: React.FC<ISpellProps> = ({
   atlasIMG,
   atlasJSON,
   spellKey,
   charMana,
   charMagicLevel,
+  charSkillLevels,
   onPointerUp,
   isSettingShortcut,
   spell,
@@ -32,13 +50,29 @@ export const Spell: React.FC<ISpellProps> = ({
   const {
     manaCost,
     minMagicLevelRequired,
+    minSkillLevelRequired,
+    attribute,
     magicWords,
     name,
     description,
   } = spell;
+
+  const getRequiredLevel = (): number => {
+    return minSkillLevelRequired ?? minMagicLevelRequired;
+  };
+
+  const getCharacterSkillLevel = (): number => {
+    if (attribute && charSkillLevels) {
+      return charSkillLevels[attribute] ?? 0;
+    }
+    return charMagicLevel;
+  };
+
+  const requiredLevel = getRequiredLevel();
+  const characterSkillLevel = getCharacterSkillLevel();
   const disabled = isSettingShortcut
-    ? charMagicLevel < minMagicLevelRequired
-    : manaCost > charMana || charMagicLevel < minMagicLevelRequired;
+    ? characterSkillLevel < requiredLevel
+    : manaCost > charMana || characterSkillLevel < requiredLevel;
 
   const CONTAINER_STYLE = { width: '32px', height: '32px' };
   const IMAGE_SCALE = 2;
@@ -52,8 +86,8 @@ export const Spell: React.FC<ISpellProps> = ({
       >
         {disabled && (
           <Overlay>
-            {charMagicLevel < minMagicLevelRequired
-              ? 'Low magic level'
+            {characterSkillLevel < requiredLevel
+              ? `Low ${getSkillName(attribute || 'magic level')} level`
               : manaCost > charMana && 'No mana'}
           </Overlay>
         )}

package/src/components/Spellbook/Spellbook.tsx

@@ -15,6 +15,7 @@ export interface ISpellbookProps {
   spells: ISpell[];
   magicLevel: number;
   mana: number;
+  charSkillLevels?: Record<string, number>;
   onSpellClick: (spellKey: string) => void;
   setSpellShortcut: (key: string, index: number) => void;
   shortcuts: IShortcut[];
@@ -34,6 +35,7 @@ export const Spellbook: React.FC<ISpellbookProps> = ({
   spells,
   magicLevel,
   mana,
+  charSkillLevels,
   onSpellClick,
   setSpellShortcut,
   shortcuts,
@@ -107,6 +109,7 @@ export const Spellbook: React.FC<ISpellbookProps> = ({
                 atlasJSON={iconAtlasJSON}
                 charMana={mana}
                 charMagicLevel={magicLevel}
+                charSkillLevels={charSkillLevels}
                 onPointerUp={
                   settingShortcutIndex !== -1 ? setShortcut : onSpellClick
                 }