diff options
Diffstat (limited to 'features')
| -rw-r--r-- | features/dungeonMap/index.js | 2 | ||||
| -rw-r--r-- | features/hud/index.js | 13 | ||||
| -rw-r--r-- | features/mining/index.js | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/features/dungeonMap/index.js b/features/dungeonMap/index.js index d349fa6..207d480 100644 --- a/features/dungeonMap/index.js +++ b/features/dungeonMap/index.js @@ -101,7 +101,7 @@ class DungeonMap extends Feature { this.dungeonBrBoxElm.stopRender() }) - this.registerChat("&r${*}&r&f &r&ehas obtained &r&a&r&${*} Key&r&e!&r", () => { + this.registerChat("${*} &r&ehas obtained &r&a&r&${*} Key&r&e!&r", () => { this.keys++ this.dungeonBrBoxElm.setRGBA(0, 1, 0, 1) }) diff --git a/features/hud/index.js b/features/hud/index.js index 7c679ff..d7da499 100644 --- a/features/hud/index.js +++ b/features/hud/index.js @@ -10,6 +10,7 @@ import DropdownSetting from "../settings/settingThings/dropdownSetting"; import { getLevelByXp } from "../../utils/statUtils"; import { firstLetterCapital } from "../../utils/stringUtils"; import renderLibs from "../../../guimanager/renderLibs"; +import { numberWithCommas } from "../../utils/numberUtils.js"; const ProcessBuilder = Java.type("java.lang.ProcessBuilder") const Scanner = Java.type("java.util.Scanner") @@ -173,6 +174,10 @@ class Hud extends Feature { hudStatTypes["completions_dungeon_" + i] = "Dungeon " + i + " completions" } + + hudStatTypes["mythril_powder"] = "Mithril Powder" + hudStatTypes["gemstone_powder"] = "Gemstone Powder" + this.hudStat = [] for (let i = 0; i < 5; i++) { this.hudStat[i] = {} @@ -405,7 +410,6 @@ class Hud extends Feature { step() { if (!Player.getPlayer()) return - this.updateHudThingos() let fps = 0 if (this.fpsEnabledSetting.getValue() && this.fpsFastSetting.getValue()) { @@ -478,6 +482,7 @@ class Hud extends Feature { } step_5second() { + this.updateHudThingos() if (!this.soulflowEnabledSetting.getValue()) return if (!Player.getPlayer()) return if (!Player.getInventory()) return @@ -669,6 +674,12 @@ class Hud extends Feature { let cataData = getLevelByXp(this.lastStatData.dungeons.dungeon_types.catacombs.experience, 2, Infinity) string = "&6Cata&7> &f" + (~~((cataData.level + cataData.progress) * 100) / 100).toFixed(2) + " &7(" + this.numberUtils.numberWithCommas(cataData.xpCurrent) + (cataData.level === 50 ? "" : "/" + this.numberUtils.numberWithCommas(cataData.xpForNext)) + ")" } + if (type === "mythril_powder") { + string = "&6Mithril Powder&7> &f" + numberWithCommas(this.lastStatData.mining_core.powder_mithril_total) + } + if (type === "gemstone_powder") { + string = "&6Gemstone Powder&7> &f" + numberWithCommas(this.lastStatData.mining_core.powder_gemstone_total) + } Object.keys(this.skillLevelCaps).forEach(skill => { if (type === skill) { diff --git a/features/mining/index.js b/features/mining/index.js index 31fa716..7b0c520 100644 --- a/features/mining/index.js +++ b/features/mining/index.js @@ -55,6 +55,7 @@ class Mining extends Feature { .setLocationSetting(new LocationSetting("HUD Location", "Allows you to edit the location of the gemstone $/h", "gemstone_money_location", this, [10, 60, 1, 1]) .requires(this.gemstoneMoneyHud) .editTempText("&6$/h&7> &f$12,345,678\n&6$ made&7> &f$123,456,789\n&6Time tracked&7> &f123m")) + this.gemstoneMoneyHudMoneyOnly = new ToggleSetting("Force npc price", "(Eg if u are ironman)", true, "gemstone_money_hud_npc", this).requires(this.gemstoneMoneyHud) this.hudElements.push(this.gemstoneMoneyHudElement) this.nextChEvent = new ToggleSetting("Show the current and next crystal hollows event", "(syncs the data between all users in ch)", true, "chevent_hud", this) @@ -121,6 +122,9 @@ class Mining extends Feature { Object.keys(data.products).forEach(id => { if (id.startsWith("FLAWED_")) { gemstoneCosts[id] = Math.max(240, data.products[id].quick_status.sellPrice) + if (this.gemstoneMoneyHudMoneyOnly.getValue()) { + gemstoneCosts[id] = 240 + } // console.log(id + ": " + gemstoneCosts[id]) } }) |