@rpg-engine/long-bow 0.8.92 → 0.8.94

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

@@ -36735,16 +36735,14 @@ var SkillsContainer = function SkillsContainer(_ref) {
         if (!skillDetails) {
           return 0; // continue
         }
-        // Calculate skillPointsToNextLevel using exponential formula if characterClass available
+        // Calculate skillPointsToNextLevel using exponential formula with character class
         var calcSkillPointsToNextLevel = function calcSkillPointsToNextLevel() {
-          if (characterClass) {
-            var _getSkillConstants = shared.getSkillConstants(key, characterClass),
-              A = _getSkillConstants.A,
-              b = _getSkillConstants.b,
-              c = _getSkillConstants.c;
-            return Math.round(shared.getSPForLevelExponential(skillDetails.level + 1, A, b, c));
-          }
-          return Math.round(shared.getSPForLevel(skillDetails.level + 1));
+          var effectiveClass = characterClass != null ? characterClass : shared.CharacterClass.None;
+          var _getSkillConstants = shared.getSkillConstants(key, effectiveClass),
+            A = _getSkillConstants.A,
+            b = _getSkillConstants.b,
+            c = _getSkillConstants.c;
+          return Math.round(shared.getSPForLevelExponential(skillDetails.level + 1, A, b, c));
         };
         output.push(React__default.createElement(SkillProgressBar, {
           key: key,
@@ -37145,6 +37143,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',
+  fistFighting: 'fist fighting'
+};
+var getSkillName = function getSkillName(attribute) {
+  return SKILL_NAMES[attribute] || attribute;
+};
 var Spell = function Spell(_ref) {
   var _spell$texturePath;
   var atlasIMG = _ref.atlasIMG,
@@ -37152,16 +37164,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'
@@ -37173,7 +37200,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,
@@ -37231,6 +37258,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,
@@ -37291,6 +37319,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,