bnstooltips 1.19.2 → 1.20.1

package/build/SkillTooltip/SkillTooltip.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
 import { SkillTooltipProps } from "./SkillTooltip.types";
 import "./SkillTooltip.scss";
-declare function SkillTooltip({ data, debug, masteryPoints, masteryIsCooldown, }: SkillTooltipProps): JSX.Element;
+declare function SkillTooltip({ data, debug, masteryPoints }: SkillTooltipProps): JSX.Element;
 export default SkillTooltip;

package/build/SkillTooltip/SkillTooltip.types.d.ts

@@ -2,6 +2,5 @@ import { Skill } from "../Utilities/ISkill";
 export interface SkillTooltipProps {
     data: Skill;
     masteryPoints?: number;
-    masteryIsCooldown?: boolean;
     debug?: boolean;
 }

package/build/SkillTooltipWrapper/SkillTooltipWrapper.types.d.ts

@@ -3,6 +3,5 @@ import { ITooltipWrapper } from "../Utilities/Models";
 export interface SkillTooltipWrapperProps extends ITooltipWrapper {
     data: Skill;
     masteryPoints?: number;
-    masteryIsCooldown?: boolean;
     debug?: boolean;
 }

package/build/Utilities/Helpers.d.ts

@@ -1,4 +1,4 @@
-import { Skill } from "./ISkill";
+import { Skill, SkillArcaneInfo } from "./ISkill";
 export declare function BuildIconPath(iconPath: string, iconIndex?: number): string;
 export declare function IsNullOrEmpty(property?: string): boolean;
 export declare function ReplaceIconsInHtmlString(htmlString: string): string;
@@ -13,4 +13,4 @@ export interface IBnsMoney {
     Copper: number;
 }
 export declare function getMoneyObj(money: number): IBnsMoney | null;
-export declare function GetSkillMasteryValue(points: number, isCd: boolean): number;
+export declare function GetSkillMasteryValue(points: number, arcaneInfo: SkillArcaneInfo): number;

package/build/Utilities/ISkill.d.ts

@@ -23,6 +23,16 @@ export interface Skill {
     };
     RealCastCondition: RealCastCondition;
     RealEffects: RealEffects;
+    ArcaneInfo: SkillArcaneInfo;
+}
+export interface SkillArcaneInfo {
+    IsCooldown: boolean;
+    DamageSections: {
+        [id: number]: number;
+    };
+    CooldownBreakpoints: {
+        [id: number]: number;
+    };
 }
 export interface RealEffects {
     Effects: {

package/build/index.es.js

@@ -317,52 +317,62 @@ function getMoneyObj(money) {
         Silver: silver
     };
 }
-function GetSkillMasteryValue(points, isCd) {
-    if (points <= 0)
+function GetSkillMasteryValue(points, arcaneInfo) {
+    if (points <= 0 || arcaneInfo == null)
         return 0;
-    return isCd ? GetSkillMasteryCdValueForPoints(points) : GetSkillMasteryValueForPoints(points);
+    return arcaneInfo.IsCooldown ? GetSkillMasteryCdValueForPoints(points, arcaneInfo.CooldownBreakpoints) : GetSkillMasteryValueForPoints(points, arcaneInfo.DamageSections);
 }
-function GetSkillMasteryCdValueForPoints(points) {
-    var value = 0;
-    if (points >= 4) {
-        value += 1;
-    }
-    if (points >= 12) {
-        value += 2;
-    }
-    if (points >= 24) {
-        value += 2;
+/**
+ * Calculates the cooldown reduction value based on skill mastery points and defined breakpoints.
+ *
+ * @param mastery - The total skill mastery points.
+ * @param cooldownBreakpoints - An object mapping breakpoints to their corresponding cooldown reduction values.
+ * @returns The total cooldown reduction value.
+ */
+function GetSkillMasteryCdValueForPoints(mastery, cooldownBreakpoints) {
+    var value = 0; // Accumulator for the total cooldown reduction value
+    // Convert the object keys (breakpoints) to an array of numbers and sort them in ascending order
+    var sortedBreakpoints = Object.keys(cooldownBreakpoints)
+        .map(Number) // Convert string keys to numbers
+        .sort(function (a, b) { return a - b; }); // Sort breakpoints in ascending order
+    // Iterate over the sorted breakpoints
+    for (var _i = 0, sortedBreakpoints_1 = sortedBreakpoints; _i < sortedBreakpoints_1.length; _i++) {
+        var breakpoint = sortedBreakpoints_1[_i];
+        if (mastery >= breakpoint) {
+            // Add the cooldown reduction value for this breakpoint (converted from milliseconds to seconds)
+            value += cooldownBreakpoints[breakpoint] / 1000;
+        }
     }
-    return 0 - value;
+    return value; // Return the total cooldown reduction value
 }
-function GetSkillMasteryValueForPoints(points) {
-    var value = 0;
-    if (points > 0) {
-        var firstRange = Math.min(points, 15);
-        value += firstRange * 1.9;
-        points -= firstRange;
-    }
-    if (points > 0) {
-        var secondRange = Math.min(points, 35 - 15);
-        value += secondRange * 1.5;
-        points -= secondRange;
-    }
-    if (points > 0) {
-        var thirdRange = Math.min(points, 100 - 35);
-        value += thirdRange * 1.1;
-        points -= thirdRange;
-    }
-    if (points > 0) {
-        var fourthRange = Math.min(points, 165 - 100);
-        value += fourthRange * 0.7;
-        points -= fourthRange;
-    }
-    if (points > 0) {
-        var fifthRange = Math.min(points, 1000 - 165);
-        value += fifthRange * 0.3;
-        points -= fifthRange;
+/**
+ * Calculates the total skill bonus based on mastery points and the given damage sections.
+ *
+ * @param mastery - The total mastery points.
+ * @param damageSections - An object defining breakpoints and corresponding multipliers.
+ * @returns The total bonus percentage.
+ */
+function GetSkillMasteryValueForPoints(mastery, damageSections) {
+    var bonus = 0; // Stores the accumulated bonus percentage
+    var previousLimit = 0; // Keeps track of the previous breakpoint
+    // Iterate over the damageSections object, sorted by its keys (breakpoints)
+    for (var _i = 0, _a = Object.entries(damageSections); _i < _a.length; _i++) {
+        var _b = _a[_i], limitStr = _b[0], multiplier = _b[1];
+        var limit = parseInt(limitStr, 10); // Convert the key (string) to a number
+        if (mastery > previousLimit) {
+            // Calculate how many points fall within this range
+            var pointsInRange = Math.min(mastery - previousLimit, limit - previousLimit);
+            // Multiply points by the corresponding multiplier (converted to percentage)
+            bonus += pointsInRange * (multiplier / 10);
+        }
+        // Update the previous limit for the next iteration
+        previousLimit = limit;
+        // Stop iterating if mastery has been fully allocated
+        if (mastery <= limit) {
+            break;
+        }
     }
-    return value;
+    return bonus;
 }
 
 //----------------------
@@ -8885,7 +8895,7 @@ function SkillConditions(_a) {
 }
 
 function SkillTooltip(_a) {
-    var data = _a.data, _b = _a.debug, debug = _b === void 0 ? false : _b, _c = _a.masteryPoints, masteryPoints = _c === void 0 ? 0 : _c, _d = _a.masteryIsCooldown, masteryIsCooldown = _d === void 0 ? false : _d;
+    var data = _a.data, _b = _a.debug, debug = _b === void 0 ? false : _b, _c = _a.masteryPoints, masteryPoints = _c === void 0 ? 0 : _c;
     var skill = data;
     var tooltipBaseProps = {
         title: skill.Name,
@@ -8905,7 +8915,7 @@ function SkillTooltip(_a) {
         //bottomPart
         AddSubTexts(tooltipBaseProps.subInfoGroups, skill);
         AddBreakValue(tooltipBaseProps.subInfoGroups, skill);
-        AddSkillMastery(tooltipBaseProps.subInfoGroups, masteryPoints, masteryIsCooldown);
+        AddSkillMastery(tooltipBaseProps.subInfoGroups, masteryPoints, skill.ArcaneInfo);
         AddPvpModifiers(tooltipBaseProps.subInfoGroups, skill);
         AddBoundaries(tooltipBaseProps.subInfoGroups, skill);
         AddConditions(tooltipBaseProps.subInfoGroups, skill);
@@ -8957,11 +8967,11 @@ function AddBreakValue(subInfoGroups, skill) {
         });
     }
 }
-function AddSkillMastery(subInfoGroups, masteryPoints, masteryIsCooldown) {
-    if (masteryPoints == null || masteryPoints == 0)
+function AddSkillMastery(subInfoGroups, masteryPoints, arcaneInfo) {
+    if (masteryPoints == null || masteryPoints == 0 || arcaneInfo == null)
         return;
-    var masteryValue = GetSkillMasteryValue(masteryPoints, masteryIsCooldown);
-    if (masteryValue == null || masteryValue == 0)
+    var masteryValue = GetSkillMasteryValue(masteryPoints, arcaneInfo);
+    if (masteryValue == null)
         return;
     var formattedMasteryValue = Number.isInteger(masteryValue) ? masteryValue.toString() : masteryValue.toFixed(2).replace(',', '.');
     subInfoGroups.push({
@@ -8972,7 +8982,7 @@ function AddSkillMastery(subInfoGroups, masteryPoints, masteryIsCooldown) {
                     React.createElement("span", { className: "tooltipArg", style: { fontSize: "14px" } }, "Skill Grandmaster"),
                     React.createElement("div", { className: "arcanemark" }),
                     React.createElement("span", { className: "tooltipArg", style: { fontSize: "14px" } }, masteryPoints)),
-                !masteryIsCooldown ?
+                !arcaneInfo.IsCooldown ?
                     React.createElement("div", null,
                         "Damage increase:\u00A0",
                         React.createElement("span", { className: "tooltipArg" },
@@ -9195,9 +9205,9 @@ var css_248z$5 = ".TooltipBase_bns_upgradeRed_color {\n  color: #FF2818;\n}\n\n.
 styleInject(css_248z$5);
 
 var SkillTooltipWrapper = function (_a) {
-    var data = _a.data, children = _a.children, _b = _a.interactive, interactive = _b === void 0 ? false : _b, _c = _a.placement, placement = _c === void 0 ? "right" : _c, _d = _a.followCursor, followCursor$1 = _d === void 0 ? false : _d, _e = _a.trigger, trigger = _e === void 0 ? "mouseenter focus" : _e, _f = _a.showArrow, showArrow = _f === void 0 ? true : _f, _g = _a.debug, debug = _g === void 0 ? false : _g, _h = _a.masteryPoints, masteryPoints = _h === void 0 ? 0 : _h, _j = _a.masteryIsCooldown, masteryIsCooldown = _j === void 0 ? false : _j;
+    var data = _a.data, children = _a.children, _b = _a.interactive, interactive = _b === void 0 ? false : _b, _c = _a.placement, placement = _c === void 0 ? "right" : _c, _d = _a.followCursor, followCursor$1 = _d === void 0 ? false : _d, _e = _a.trigger, trigger = _e === void 0 ? "mouseenter focus" : _e, _f = _a.showArrow, showArrow = _f === void 0 ? true : _f, _g = _a.debug, debug = _g === void 0 ? false : _g, _h = _a.masteryPoints, masteryPoints = _h === void 0 ? 0 : _h;
     var spanRef = useRef(null);
-    var _k = useState(null), childRef = _k[0], setChildRef = _k[1];
+    var _j = useState(null), childRef = _j[0], setChildRef = _j[1];
     /**
      * Mount the temporary span element.
      * retrieve and store the target element's reference.
@@ -9210,7 +9220,7 @@ var SkillTooltipWrapper = function (_a) {
     }, []);
     return (React.createElement(React.Fragment, null,
         children,
-        childRef ? (React.createElement(Tippy, { arrow: showArrow, trigger: trigger, plugins: [followCursor], followCursor: followCursor$1 && (!interactive && !debug), appendTo: document.body, placement: placement, animation: "fade", interactive: interactive || debug, content: React.createElement(SkillTooltip, { data: data, debug: debug, masteryPoints: masteryPoints, masteryIsCooldown: masteryIsCooldown }), theme: "grade" + 4, reference: childRef })) : (React.createElement("span", { "data-testid": "TooltipWrapper", ref: spanRef, style: { display: "none" } }))));
+        childRef ? (React.createElement(Tippy, { arrow: showArrow, trigger: trigger, plugins: [followCursor], followCursor: followCursor$1 && (!interactive && !debug), appendTo: document.body, placement: placement, animation: "fade", interactive: interactive || debug, content: React.createElement(SkillTooltip, { data: data, debug: debug, masteryPoints: masteryPoints }), theme: "grade" + 4, reference: childRef })) : (React.createElement("span", { "data-testid": "TooltipWrapper", ref: spanRef, style: { display: "none" } }))));
 };
 
 var ServerRegion;