@rpg-engine/long-bow 0.6.53 → 0.6.54

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,7 +4,6 @@ export interface ISkillProgressBarProps {
4
4
  bgColor: string;
5
5
  level: number;
6
6
  skillPoints: number;
7
- skillPointsToNextLevel?: number;
8
7
  texturePath: string;
9
8
  showSkillPoints?: boolean;
10
9
  atlasJSON: any;
@@ -32131,7 +32131,6 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
32131
32131
  skillName = _ref.skillName,
32132
32132
  level = _ref.level,
32133
32133
  currentSkillPoints = _ref.skillPoints,
32134
- skillPointsToNextLevel = _ref.skillPointsToNextLevel,
32135
32134
  texturePath = _ref.texturePath,
32136
32135
  _ref$showSkillPoints = _ref.showSkillPoints,
32137
32136
  showSkillPoints = _ref$showSkillPoints === void 0 ? true : _ref$showSkillPoints,
@@ -32139,18 +32138,16 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
32139
32138
  atlasJSON = _ref.atlasJSON,
32140
32139
  buffAndDebuff = _ref.buffAndDebuff;
32141
32140
  // Base skill points for the previous level (0 for level 1)
32142
- var baseSkillPointsPrevLevel = shared.getSPForLevel(level);
32141
+ var baseSkillPointsPrevLevel = level > 1 ? shared.getSPForLevel(level - 1) : 0;
32142
+ // Total skill points needed for the next level
32143
+ var nextLevelSkillPoints = shared.getSPForLevel(level + 1);
32143
32144
  // Calculate excess skill points above the previous level
32144
- var excessSkillPoints = currentSkillPoints - baseSkillPointsPrevLevel;
32145
+ var excessSkillPoints = Math.max(currentSkillPoints - baseSkillPointsPrevLevel, 0);
32145
32146
  // Calculate progress percentage towards the next level
32146
- var progress = excessSkillPoints / (skillPointsToNextLevel != null ? skillPointsToNextLevel : 1) * 100;
32147
+ var progress = Math.min(100, Math.max(0, excessSkillPoints / nextLevelSkillPoints * 100));
32147
32148
  var skillsBuffsCalc = function skillsBuffsCalc(level, buffAndDebuff) {
32148
32149
  var result = level * (buffAndDebuff / 100);
32149
- if (result > 0) {
32150
- return "+" + result.toFixed(2);
32151
- } else {
32152
- return "" + result.toFixed(2);
32153
- }
32150
+ return result > 0 ? "+" + result.toFixed(2) : "" + result.toFixed(2);
32154
32151
  };
32155
32152
  return React__default.createElement(React__default.Fragment, null, React__default.createElement(ProgressTitle, null, buffAndDebuff !== undefined && React__default.createElement(React__default.Fragment, null, buffAndDebuff > 0 ? React__default.createElement(BuffAndDebuffContainer, null, React__default.createElement(TitleNameContainer, null, React__default.createElement(TitleNameBuff, null, skillName), React__default.createElement(TitleNameBuff, null, "lv ", level, " (", skillsBuffsCalc(level, buffAndDebuff), ")")), React__default.createElement(TitleNameBuffContainer, null, React__default.createElement(TitleNameBuff, null, "(+", buffAndDebuff, "%)"))) : buffAndDebuff < 0 ? React__default.createElement(React__default.Fragment, null, React__default.createElement(TitleNameContainer, null, React__default.createElement(TitleNameDebuff, null, skillName), React__default.createElement(TitleNameDebuff, null, "lv ", level, " (", skillsBuffsCalc(level, buffAndDebuff), ")")), React__default.createElement("div", null, React__default.createElement(TitleNameDebuff, null, "(", buffAndDebuff, "%)"))) : React__default.createElement(TitleName, null, skillName)), !buffAndDebuff && React__default.createElement(TitleNameContainer, null, React__default.createElement(TitleName, null, skillName), React__default.createElement(ValueDisplay, null, "lv ", level))), React__default.createElement(ProgressBody, null, React__default.createElement(ProgressIconContainer, null, atlasIMG && atlasJSON ? React__default.createElement(SpriteContainer$2, null, React__default.createElement(ErrorBoundary, null, React__default.createElement(SpriteFromAtlas, {
32156
32153
  atlasIMG: atlasIMG,
@@ -32162,7 +32159,7 @@ var SkillProgressBar = function SkillProgressBar(_ref) {
32162
32159
  }))) : React__default.createElement(React__default.Fragment, null)), React__default.createElement(ProgressBarContainer$1, null, React__default.createElement(SimpleProgressBar, {
32163
32160
  value: progress,
32164
32161
  bgColor: bgColor
32165
- }))), showSkillPoints && React__default.createElement(SkillDisplayContainer, null, React__default.createElement(SkillPointsDisplay, null, currentSkillPoints, "/", skillPointsToNextLevel)));
32162
+ }))), showSkillPoints && React__default.createElement(SkillDisplayContainer, null, React__default.createElement(SkillPointsDisplay, null, progress.toFixed(2), "%")));
32166
32163
  };
32167
32164
  var ProgressBarContainer$1 = /*#__PURE__*/styled__default.div.withConfig({
32168
32165
  displayName: "SkillProgressBar__ProgressBarContainer",
@@ -32308,7 +32305,6 @@ var SkillsContainer = function SkillsContainer(_ref) {
32308
32305
  bgColor: skillCategoryColor,
32309
32306
  level: skillDetails.level || 0,
32310
32307
  skillPoints: Math.round(skillDetails.skillPoints) || 0,
32311
- skillPointsToNextLevel: Math.round(shared.getSPForLevel(skillDetails.level + 1)) || 0,
32312
32308
  texturePath: value,
32313
32309
  atlasIMG: atlasIMG,
32314
32310
  atlasJSON: atlasJSON,
@@ -32333,7 +32329,6 @@ var SkillsContainer = function SkillsContainer(_ref) {
32333
32329
  bgColor: uiColors.navyBlue,
32334
32330
  level: Math.round(skill.level) || 0,
32335
32331
  skillPoints: Math.round(skill.experience) || 0,
32336
- skillPointsToNextLevel: Math.round(shared.getXPForLevel(skill.level + 1)) || 0,
32337
32332
  texturePath: 'swords/broad-sword.png',
32338
32333
  atlasIMG: atlasIMG,
32339
32334
  atlasJSON: atlasJSON