bnstooltips 1.19.1 → 1.19.2

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, masteryValue, masteryIsPercentage, }: SkillTooltipProps): JSX.Element;
+declare function SkillTooltip({ data, debug, masteryPoints, masteryIsCooldown, }: SkillTooltipProps): JSX.Element;
 export default SkillTooltip;

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

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

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

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

package/build/Utilities/Helpers.d.ts

@@ -13,3 +13,4 @@ export interface IBnsMoney {
     Copper: number;
 }
 export declare function getMoneyObj(money: number): IBnsMoney | null;
+export declare function GetSkillMasteryValue(points: number, isCd: boolean): number;

package/build/index.es.js

@@ -316,6 +316,53 @@ function getMoneyObj(money) {
         Gold: gold,
         Silver: silver
     };
+}
+function GetSkillMasteryValue(points, isCd) {
+    if (points <= 0)
+        return 0;
+    return isCd ? GetSkillMasteryCdValueForPoints(points) : GetSkillMasteryValueForPoints(points);
+}
+function GetSkillMasteryCdValueForPoints(points) {
+    var value = 0;
+    if (points >= 4) {
+        value += 1;
+    }
+    if (points >= 12) {
+        value += 2;
+    }
+    if (points >= 24) {
+        value += 2;
+    }
+    return 0 - 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;
+    }
+    return value;
 }
 
 //----------------------
@@ -8672,7 +8719,7 @@ function JsonArrayToJsxArray(stringArray) {
     return jsxArray;
 }
 
-var css_248z$6 = ".TooltipBase_bns_upgradeRed_color {\n  color: #FF2818;\n}\n\n.TooltipBase_bns_downgradeBlue_color {\n  color: #28A9F0;\n}\n\n.SkillTooltip_skillIconContainer {\n  width: 60px;\n  height: 60px;\n  padding: 0;\n  float: left;\n  position: relative;\n}\n.SkillTooltip_skillIcon {\n  width: 60px;\n  height: 60px;\n  position: relative;\n}\n.SkillTooltip_skillIconCanvas {\n  width: 60px;\n  height: 60px;\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  filter: blur(30px);\n  opacity: 0.5;\n}\n.SkillTooltip_buttonIcon {\n  position: absolute;\n  right: 1px;\n  bottom: 1px;\n  height: 18px;\n  opacity: 0.9;\n}\n.SkillTooltip_buttonIconMouse {\n  background-color: rgba(0, 0, 0, 0.8);\n}\n.SkillTooltip_mainText {\n  font-weight: 500;\n}\n.SkillTooltip_smallText {\n  font-size: 12px;\n}\n.SkillTooltip_subTextMargin {\n  margin-bottom: 0.3rem;\n}\n.SkillTooltip_boundaryContainer {\n  display: flex;\n  width: 100%;\n  margin-bottom: 0.5rem;\n  line-height: 17px;\n}\n.SkillTooltip_boundary {\n  flex: 1;\n  flex-basis: 0px;\n  min-width: 0;\n  display: flex;\n  flex-direction: column;\n  color: black;\n  margin: 0.15rem;\n}\n.SkillTooltip_boundary:first-of-type > .SkillTooltip_boundaryHead {\n  border-radius: 3px 0 0 0;\n}\n.SkillTooltip_boundary:last-of-type > .SkillTooltip_boundaryHead {\n  border-radius: 0 3px 0 0;\n}\n.SkillTooltip_boundary:first-of-type > .SkillTooltip_boundaryBody {\n  border-radius: 0 0 0 3px;\n}\n.SkillTooltip_boundary:last-of-type > .SkillTooltip_boundaryBody {\n  border-radius: 0 0 3px 0;\n}\n.SkillTooltip_boundaryHead {\n  color: white;\n  font-weight: 500;\n  font-size: 12px;\n  text-overflow: ellipsis;\n  overflow: hidden;\n  padding: 0.3rem;\n  text-align: center;\n  flex: 1;\n  min-height: 26px;\n  background-color: rgba(127, 127, 127, 0.4);\n}\n.SkillTooltip_boundaryBody {\n  color: white;\n  padding: 0.5rem 0.3rem;\n  margin-top: 0.15rem;\n  text-align: center;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  min-height: 40px;\n  flex: 2;\n  background-color: rgba(127, 127, 127, 0.4);\n}\n.SkillTooltip_boundaryBodyModifier {\n  min-height: 33px !important;\n}\n.SkillTooltip_boundaryHasIcon {\n  min-height: 50px !important;\n}\n.SkillTooltip_conditionRow {\n  display: flex;\n  align-items: center;\n  font-size: 12px;\n}\n.SkillTooltip_conditionRow:not(:last-of-type) {\n  margin-bottom: 0.1rem;\n}\n.SkillTooltip_conditionIcon {\n  width: 20px;\n  height: 20px;\n  margin-right: 0.33rem;\n}\n.SkillTooltip_conditionIconSmall {\n  width: 12px;\n  height: 12px;\n  margin-right: 0.22rem;\n}\n\n.tooltipArg {\n  color: #00D9FF;\n  font-weight: 600;\n}\n\n.wordbreakall {\n  word-break: break-all;\n}\n\n.wordbreakword {\n  word-break: break-word;\n}\n\n.target-360 {\n  background-image: url(\"./360.png\");\n  background-repeat: no-repeat;\n  background-position: 50% 60%;\n  background-size: auto 64px;\n}\n\n.target-front-180 {\n  background-image: url(\"./180.png\");\n  background-repeat: no-repeat;\n  background-position: 50% 70%;\n  background-size: auto 64px;\n}\n\n.laser {\n  background-image: url(\"./laser.png\");\n  background-repeat: no-repeat;\n  background-position: 50% 50%;\n  background-size: auto 64px;\n}\n\n.arcanemark {\n  background-image: url(\"./arcanemark.png\");\n  width: 24px;\n  height: 24px;\n  background-position: 50% 50%;\n  background-size: auto 24px;\n  margin-left: 0.33rem;\n  margin-right: 0.05rem;\n}";
+var css_248z$6 = ".TooltipBase_bns_upgradeRed_color {\n  color: #FF2818;\n}\n\n.TooltipBase_bns_downgradeBlue_color {\n  color: #28A9F0;\n}\n\n.SkillTooltip_skillIconContainer {\n  width: 60px;\n  height: 60px;\n  padding: 0;\n  float: left;\n  position: relative;\n}\n.SkillTooltip_skillIcon {\n  width: 60px;\n  height: 60px;\n  position: relative;\n}\n.SkillTooltip_skillIconCanvas {\n  width: 60px;\n  height: 60px;\n  position: absolute;\n  top: 50%;\n  left: 50%;\n  transform: translate(-50%, -50%);\n  filter: blur(30px);\n  opacity: 0.5;\n}\n.SkillTooltip_buttonIcon {\n  position: absolute;\n  right: 1px;\n  bottom: 1px;\n  height: 18px;\n  opacity: 0.9;\n}\n.SkillTooltip_buttonIconMouse {\n  background-color: rgba(0, 0, 0, 0.8);\n}\n.SkillTooltip_mainText {\n  font-weight: 500;\n}\n.SkillTooltip_smallText {\n  font-size: 12px;\n}\n.SkillTooltip_subTextMargin {\n  margin-bottom: 0.3rem;\n}\n.SkillTooltip_boundaryContainer {\n  display: flex;\n  width: 100%;\n  margin-bottom: 0.5rem;\n  line-height: 17px;\n}\n.SkillTooltip_boundary {\n  flex: 1;\n  flex-basis: 0px;\n  min-width: 0;\n  display: flex;\n  flex-direction: column;\n  color: black;\n  margin: 0.15rem;\n}\n.SkillTooltip_boundary:first-of-type > .SkillTooltip_boundaryHead {\n  border-radius: 3px 0 0 0;\n}\n.SkillTooltip_boundary:last-of-type > .SkillTooltip_boundaryHead {\n  border-radius: 0 3px 0 0;\n}\n.SkillTooltip_boundary:first-of-type > .SkillTooltip_boundaryBody {\n  border-radius: 0 0 0 3px;\n}\n.SkillTooltip_boundary:last-of-type > .SkillTooltip_boundaryBody {\n  border-radius: 0 0 3px 0;\n}\n.SkillTooltip_boundaryHead {\n  color: white;\n  font-weight: 500;\n  font-size: 12px;\n  text-overflow: ellipsis;\n  overflow: hidden;\n  padding: 0.3rem;\n  text-align: center;\n  flex: 1;\n  min-height: 26px;\n  background-color: rgba(127, 127, 127, 0.4);\n}\n.SkillTooltip_boundaryBody {\n  color: white;\n  padding: 0.5rem 0.3rem;\n  margin-top: 0.15rem;\n  text-align: center;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  min-height: 40px;\n  flex: 2;\n  background-color: rgba(127, 127, 127, 0.4);\n}\n.SkillTooltip_boundaryBodyModifier {\n  min-height: 33px !important;\n}\n.SkillTooltip_boundaryHasIcon {\n  min-height: 50px !important;\n}\n.SkillTooltip_conditionRow {\n  display: flex;\n  align-items: center;\n  font-size: 12px;\n}\n.SkillTooltip_conditionRow:not(:last-of-type) {\n  margin-bottom: 0.1rem;\n}\n.SkillTooltip_conditionIcon {\n  width: 20px;\n  height: 20px;\n  margin-right: 0.33rem;\n}\n.SkillTooltip_conditionIconSmall {\n  width: 12px;\n  height: 12px;\n  margin-right: 0.22rem;\n}\n\n.tooltipArg {\n  color: #00D9FF;\n  font-weight: 600;\n}\n\n.wordbreakall {\n  word-break: break-all;\n}\n\n.wordbreakword {\n  word-break: break-word;\n}\n\n.target-360 {\n  background-image: url(\"./360.png\");\n  background-repeat: no-repeat;\n  background-position: 50% 60%;\n  background-size: auto 64px;\n}\n\n.target-front-180 {\n  background-image: url(\"./180.png\");\n  background-repeat: no-repeat;\n  background-position: 50% 70%;\n  background-size: auto 64px;\n}\n\n.laser {\n  background-image: url(\"./laser.png\");\n  background-repeat: no-repeat;\n  background-position: 50% 50%;\n  background-size: auto 64px;\n}\n\n.arcanemark {\n  background-image: url(\"./arcanemark.png\");\n  width: 24px;\n  height: 24px;\n  background-position: 50% 50%;\n  background-size: auto 24px;\n  margin-left: 0.25rem;\n}";
 styleInject(css_248z$6);
 
 function getButtonIconPath(button) {
@@ -8838,7 +8885,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.masteryValue, masteryValue = _d === void 0 ? 0 : _d, _e = _a.masteryIsPercentage, masteryIsPercentage = _e === void 0 ? false : _e;
+    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 skill = data;
     var tooltipBaseProps = {
         title: skill.Name,
@@ -8858,7 +8905,7 @@ function SkillTooltip(_a) {
         //bottomPart
         AddSubTexts(tooltipBaseProps.subInfoGroups, skill);
         AddBreakValue(tooltipBaseProps.subInfoGroups, skill);
-        AddSkillMastery(tooltipBaseProps.subInfoGroups, masteryPoints, masteryValue, masteryIsPercentage);
+        AddSkillMastery(tooltipBaseProps.subInfoGroups, masteryPoints, masteryIsCooldown);
         AddPvpModifiers(tooltipBaseProps.subInfoGroups, skill);
         AddBoundaries(tooltipBaseProps.subInfoGroups, skill);
         AddConditions(tooltipBaseProps.subInfoGroups, skill);
@@ -8910,8 +8957,11 @@ function AddBreakValue(subInfoGroups, skill) {
         });
     }
 }
-function AddSkillMastery(subInfoGroups, masteryPoints, masteryValue, masteryIsPercentage) {
-    if (masteryPoints == null || masteryPoints == 0 || masteryValue == null || masteryValue == 0)
+function AddSkillMastery(subInfoGroups, masteryPoints, masteryIsCooldown) {
+    if (masteryPoints == null || masteryPoints == 0)
+        return;
+    var masteryValue = GetSkillMasteryValue(masteryPoints, masteryIsCooldown);
+    if (masteryValue == null || masteryValue == 0)
         return;
     var formattedMasteryValue = Number.isInteger(masteryValue) ? masteryValue.toString() : masteryValue.toFixed(2).replace(',', '.');
     subInfoGroups.push({
@@ -8922,7 +8972,7 @@ function AddSkillMastery(subInfoGroups, masteryPoints, masteryValue, masteryIsPe
                     React.createElement("span", { className: "tooltipArg", style: { fontSize: "14px" } }, "Skill Grandmaster"),
                     React.createElement("div", { className: "arcanemark" }),
                     React.createElement("span", { className: "tooltipArg", style: { fontSize: "14px" } }, masteryPoints)),
-                masteryIsPercentage ?
+                !masteryIsCooldown ?
                     React.createElement("div", null,
                         "Damage increase:\u00A0",
                         React.createElement("span", { className: "tooltipArg" },
@@ -9145,9 +9195,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.masteryValue, masteryValue = _j === void 0 ? 0 : _j, _k = _a.masteryIsPercentage, masteryIsPercentage = _k === void 0 ? false : _k;
+    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 spanRef = useRef(null);
-    var _l = useState(null), childRef = _l[0], setChildRef = _l[1];
+    var _k = useState(null), childRef = _k[0], setChildRef = _k[1];
     /**
      * Mount the temporary span element.
      * retrieve and store the target element's reference.
@@ -9160,7 +9210,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, masteryValue: masteryValue, masteryIsPercentage: masteryIsPercentage }), 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, masteryIsCooldown: masteryIsCooldown }), theme: "grade" + 4, reference: childRef })) : (React.createElement("span", { "data-testid": "TooltipWrapper", ref: spanRef, style: { display: "none" } }))));
 };
 
 var ServerRegion;