@rpg-engine/long-bow 0.8.91 → 0.8.93

package/dist/components/Spellbook/Spell.d.ts

@@ -5,6 +5,7 @@ export interface ISpellProps {
     atlasIMG: any;
     charMana: number;
     charMagicLevel: number;
+    charSkillLevels?: Record<string, number>;
     onPointerUp?: (spellKey: string) => void;
     isSettingShortcut?: boolean;
     spellKey: string;

package/dist/components/Spellbook/Spellbook.d.ts

@@ -7,6 +7,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[];

package/dist/long-bow.cjs.development.js

@@ -36557,15 +36557,10 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
   var effectiveLevel = calculateEffectiveLevel();
   // Calculate progress based on actual SP position
   var calculateProgress = function calculateProgress() {
-    if (!skillKey) {
-      // Fallback for general "Level" display: simple ratio of current SP to next level
-      var spForCurrentLevel = shared.getSPForLevel(level);
-      var _spForNextLevel = shared.getSPForLevel(level + 1);
-      var _range = _spForNextLevel - spForCurrentLevel;
-      var _progress = currentSkillPoints - spForCurrentLevel;
-      return Math.min(99.99, Math.max(0, _progress / _range * 100));
-    }
-    var _getSkillConstants2 = shared.getSkillConstants(skillKey, effectiveClass),
+    // 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 = shared.getSkillConstants(skillName, effectiveClass),
       A = _getSkillConstants2.A,
       b = _getSkillConstants2.b,
       c = _getSkillConstants2.c;
@@ -36573,11 +36568,11 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
     var actualLevel = Math.floor(shared.getLevelFromSP(currentSkillPoints, A, b, c));
     var calcLevel = Math.max(c, actualLevel); // Use c as minimum for calculation
     // Calculate SP thresholds based on actual position
-    var spForCalcLevel = shared.getSPForLevelExponential(calcLevel, A, b, c);
-    var spForNextLevel = shared.getSPForLevelExponential(calcLevel + 1, A, b, c);
-    // Progress within current level range
-    var range = spForNextLevel - spForCalcLevel;
-    var progressInLevel = currentSkillPoints - spForCalcLevel;
+    var currentLevelSP = shared.getSPForLevelExponential(calcLevel, A, b, c);
+    var nextLevelSP = shared.getSPForLevelExponential(calcLevel + 1, A, b, c);
+    // Progress within current level range: (currentSP - currentLevelSP) / (nextLevelSP - currentLevelSP)
+    var range = nextLevelSP - currentLevelSP;
+    var progressInLevel = currentSkillPoints - currentLevelSP;
     return Math.min(99.99, Math.max(0, progressInLevel / Math.max(1, range) * 100));
   };
   var progress = calculateProgress();
@@ -37150,6 +37145,20 @@ var SpellInfoWrapper = function SpellInfoWrapper(_ref) {
   }));
 };
 
+var SKILL_NAMES = {
+  magicLevel: 'magic level',
+  distanceFighting: 'distance fighting',
+  swordFighting: 'sword fighting',
+  axeFighting: 'axe fighting',
+  clubFighting: 'club fighting',
+  shielding: 'shielding',
+  fishing: 'fishing',
+  cooking: 'cooking',
+  firstAid: 'first aid'
+};
+var getSkillName = function getSkillName(attribute) {
+  return SKILL_NAMES[attribute] || attribute;
+};
 var Spell = function Spell(_ref) {
   var _spell$texturePath;
   var atlasIMG = _ref.atlasIMG,
@@ -37157,16 +37166,31 @@ var Spell = function Spell(_ref) {
     spellKey = _ref.spellKey,
     charMana = _ref.charMana,
     charMagicLevel = _ref.charMagicLevel,
+    charSkillLevels = _ref.charSkillLevels,
     onPointerUp = _ref.onPointerUp,
     isSettingShortcut = _ref.isSettingShortcut,
     spell = _ref.spell,
     activeCooldown = _ref.activeCooldown;
   var manaCost = spell.manaCost,
     minMagicLevelRequired = spell.minMagicLevelRequired,
+    minSkillLevelRequired = spell.minSkillLevelRequired,
+    attribute = spell.attribute,
     magicWords = spell.magicWords,
     name = spell.name,
     description = spell.description;
-  var disabled = isSettingShortcut ? charMagicLevel < minMagicLevelRequired : manaCost > charMana || charMagicLevel < minMagicLevelRequired;
+  var getRequiredLevel = function getRequiredLevel() {
+    return minSkillLevelRequired != null ? minSkillLevelRequired : minMagicLevelRequired;
+  };
+  var getCharacterSkillLevel = function getCharacterSkillLevel() {
+    if (attribute && charSkillLevels) {
+      var _charSkillLevels$attr;
+      return (_charSkillLevels$attr = charSkillLevels[attribute]) != null ? _charSkillLevels$attr : 0;
+    }
+    return charMagicLevel;
+  };
+  var requiredLevel = getRequiredLevel();
+  var characterSkillLevel = getCharacterSkillLevel();
+  var disabled = isSettingShortcut ? characterSkillLevel < requiredLevel : manaCost > charMana || characterSkillLevel < requiredLevel;
   var CONTAINER_STYLE = {
     width: '32px',
     height: '32px'
@@ -37178,7 +37202,7 @@ var Spell = function Spell(_ref) {
     onPointerUp: onPointerUp == null ? void 0 : onPointerUp.bind(null, spellKey),
     isSettingShortcut: isSettingShortcut && !disabled,
     className: "spell"
-  }, disabled && React__default.createElement(Overlay$3, null, charMagicLevel < minMagicLevelRequired ? 'Low magic level' : manaCost > charMana && 'No mana'), React__default.createElement(SpellImage, null, activeCooldown && activeCooldown > 0 ? React__default.createElement("span", {
+  }, disabled && React__default.createElement(Overlay$3, null, characterSkillLevel < requiredLevel ? "Low " + getSkillName(attribute || 'magic level') + " level" : manaCost > charMana && 'No mana'), React__default.createElement(SpellImage, null, activeCooldown && activeCooldown > 0 ? React__default.createElement("span", {
     className: "cooldown"
   }, activeCooldown.toFixed(activeCooldown > 10 ? 0 : 1)) : null, React__default.createElement(SpriteFromAtlas, {
     atlasIMG: atlasIMG,
@@ -37236,6 +37260,7 @@ var Spellbook = function Spellbook(_ref) {
     spells = _ref.spells,
     magicLevel = _ref.magicLevel,
     mana = _ref.mana,
+    charSkillLevels = _ref.charSkillLevels,
     onSpellClick = _ref.onSpellClick,
     setSpellShortcut = _ref.setSpellShortcut,
     shortcuts = _ref.shortcuts,
@@ -37296,6 +37321,7 @@ var Spellbook = function Spellbook(_ref) {
       atlasJSON: iconAtlasJSON,
       charMana: mana,
       charMagicLevel: magicLevel,
+      charSkillLevels: charSkillLevels,
       onPointerUp: settingShortcutIndex !== -1 ? setShortcut : onSpellClick,
       spellKey: spell.key,
       isSettingShortcut: settingShortcutIndex !== -1,