diff options
| -rw-r--r-- | features/slayers/index.js | 16 | ||||
| -rw-r--r-- | utils/numberUtils.js | 12 |
2 files changed, 11 insertions, 17 deletions
diff --git a/features/slayers/index.js b/features/slayers/index.js index f7d5c9f..590c5b6 100644 --- a/features/slayers/index.js +++ b/features/slayers/index.js @@ -2,7 +2,7 @@ /// <reference lib="es2015" /> import Feature from "../../featureClass/class"; import { f, m } from "../../../mappings/mappings"; -import { numberWithCommas, timeNumber, timeNumberDetailed } from "../../utils/numberUtils"; +import { numberWithCommas, timeNumber } from "../../utils/numberUtils"; import { drawBoxAtBlock, drawBoxAtEntity, drawCoolWaypoint, drawFilledBox, drawLine } from "../../utils/renderUtils"; import HudTextElement from "../hud/HudTextElement"; import LocationSetting from "../settings/settingThings/location"; @@ -200,15 +200,17 @@ class Slayers extends Feature { ChatLib.chat("&r &r&aYou have &d" + numberWithCommas(this.slayerExp[this.lastSlayerType]) + " " + this.lastSlayerType + " XP&r&7!&r"); ChatLib.chat("&r &r&aYou have &d" + numberWithCommas(Object.values(this.slayerExp).reduce((a, t) => t + a, 0)) + " total XP&r&7!&r"); if (this.bossSpawnKillTime.getValue() && Date.now() - this.lastBossSlain < 60000 * 10) { - let time = timeNumber(Date.now() - this.lastBossSlain); - let v = parseInt(this.bossSpawnKillTimeDetalied.getValue()) || 0 - if (v > 0) time = timeNumberDetailed(Date.now() - this.lastBossSlain, v); + let decimals = parseInt(this.bossSpawnKillTimeDetalied.getValue()) || 0 + + let time = timeNumber(Date.now() - this.lastBossSlain, decimals); + ChatLib.chat(`&r &r&aBoss took &d${time} &ato spawn and kill&r&7!`); } if (this.bossKillTime.getValue() && Date.now() - this.lastBossSpawned < 60000 * 4.6) { - let time = timeNumber(Date.now() - this.lastBossSpawned); - let v = parseInt(this.bossKillTimeDetalied.getValue()) || 0 - if (v > 0) time = timeNumberDetailed(Date.now() - this.lastBossSpawned, v); + let decimals = parseInt(this.bossKillTimeDetalied.getValue()) || 0 + + let time = timeNumber(Date.now() - this.lastBossSpawned, decimals); + ChatLib.chat(`&r &r&aBoss took &d${time} &ato kill&r&7!`); } } diff --git a/utils/numberUtils.js b/utils/numberUtils.js index 97693e1..327f875 100644 --- a/utils/numberUtils.js +++ b/utils/numberUtils.js @@ -84,20 +84,12 @@ let utils = { } return utils.timeNumber(time) }, - timeNumber: (time) => { + timeNumber: (time, secondDecimals = 0) => { let mins = Math.floor(time / 1000 / 60) let secs = Math.floor(time / 1000) % 60 if (mins === 0) return secs + "s" - return `${mins}m ${secs}s` - }, - timeNumberDetailed: (time, decimalPoint) => { - let mins = Math.floor(time / 1000 / 60) - let tenToDecimalPower = 10 ** decimalPoint - let secs = Math.floor((time / 1000) * tenToDecimalPower)/tenToDecimalPower % 60 - - if (mins === 0) return secs + "s" - return `${mins}m ${secs}s` + return `${mins}m ${secs.toFixed(secondDecimals)}s` }, timeNumber2: (time) => { let hours = Math.floor(time / 1000 / 60 / 60) |