diff options
| -rw-r--r-- | features/dataLoader/index.js | 5 | ||||
| -rw-r--r-- | features/dungeonSolvers/index.js | 8 | ||||
| -rw-r--r-- | features/slayers/index.js | 40 |
3 files changed, 52 insertions, 1 deletions
diff --git a/features/dataLoader/index.js b/features/dataLoader/index.js index 9389c03..01bc26c 100644 --- a/features/dataLoader/index.js +++ b/features/dataLoader/index.js @@ -95,6 +95,7 @@ class DataLoader extends Feature { } this.dungeonFloor = undefined + this.slayerXpToSpawn = undefined Scoreboard.getLines().forEach(line=>{ let name = ChatLib.removeFormatting(line.getName()).replace(/[^A-z0-9 \:\(\)\.]/g, "") if(this.isInDungeon){ @@ -111,6 +112,10 @@ class DataLoader extends Feature { if(name.startsWith("Bits: ")){ this.bits = parseInt(name.split("Bits: ")[1].split(" ")[0]) } + + if(name.endsWith("Combat XP")){ + this.slayerXpToSpawn = ChatLib.removeFormatting(name).split("(")[1].split(")")[0].split("/").map(parseInt) + } }) this.isInSkyblock = Scoreboard.getTitle()?.removeFormatting().includes("SKYBLOCK") diff --git a/features/dungeonSolvers/index.js b/features/dungeonSolvers/index.js index 52c0406..afbaa79 100644 --- a/features/dungeonSolvers/index.js +++ b/features/dungeonSolvers/index.js @@ -55,7 +55,7 @@ class DungeonSolvers extends Feature { this.bloodCampAssist = new ToggleSetting("Assist blood camp", "Helps guess where and when blood mobs will spawn", true, "blood_camp_assist", this) this.runSpeedRates = new ToggleSetting("Show run speed and exp rates", "(Run speed includes downtime inbetween runs, only shows while doing dungeon runs)", true, "run_speed_rates", this) - this.runSpeedRatesElement = new HudTextElement().setText("&eRun Speed: &floading...\n&eExp/hour: &floading...") + this.runSpeedRatesElement = new HudTextElement().setText("&6Run speed&7> &floading...\n&6Exp/hour&7> &floading...\n&6Runs/hour&7> &floading...") .setToggleSetting(this.runSpeedRates) .setLocationSetting(new LocationSetting("Run speed and exp rates location", "Allows you to edit the location of the information", "run_speed_rates_location", this, [10, 100, 1, 1]) .requires(this.runSpeedRates) @@ -85,6 +85,12 @@ class DungeonSolvers extends Feature { ChatLib.chat(player + " forgor ☠") } }) + this.registerChat("&r&c ☠ &r${player} was killed by Withermancer&r&7 and became a ghost&r&7.&r", (player, e)=>{ + if(this.forgorEnabled.getValue()){ + cancel(e) + ChatLib.chat(player + " forgor ☠") + } + }) this.spiritBowPickUps = [] this.registerChat("&r&aYou picked up the &r&5Spirit Bow&r&a! Use it to attack &r&cThorn&r&a!&r", ()=>{ diff --git a/features/slayers/index.js b/features/slayers/index.js index 8035953..02d6d71 100644 --- a/features/slayers/index.js +++ b/features/slayers/index.js @@ -34,6 +34,17 @@ class Slayers extends Feature { .editTempText("&6Enderman&7> &f&l30 Hits")) this.hudElements.push(this.emanHpElement) + this.slayerSpeedRates = new ToggleSetting("Show slayer speed and exp rates", "(Slayer speed includes downtime inbetween slayers, only shows while doing slayers)", true, "slayer_speed_rates", this) + this.slayerSpeedRatesElement = new HudTextElement().setText("&6Slayer speed&7> &floading...\n&6Exp/hour&7> &floading...\n&6Kills/hour&7> &floading...") + .setToggleSetting(this.slayerSpeedRates) + .setLocationSetting(new LocationSetting("Slayer speed and exp rates location", "Allows you to edit the location of the information", "slayer_speed_rates_location", this, [10, 100, 1, 1]) + .requires(this.slayerSpeedRates) + .editTempText("&6Slayer speed&7> &f4:30\n&6Exp/hour&7> &f1,234,567\n&6Kills/hour&7> &f17")) + + this.hudElements.push(this.slayerSpeedRatesElement) + + this.lastSlayerFinishes = [] + this.lastSlayerExps = [] this.slayerExp = {} this.slayerExpLoaded = false @@ -41,6 +52,17 @@ class Slayers extends Feature { this.lastSlayerExp = 0 this.lastBossSlain = 0 this.registerChat("&r &r&a&lSLAYER QUEST COMPLETE!&r",(e)=>{ + + this.lastSlayerExps.push(this.lastSlayerExp) + if(this.lastSlayerExps.length > 5){ + this.lastSlayerExps.shift() + } + + this.lastSlayerFinishes.push(Date.now()) + if(this.lastSlayerFinishes.length > 5){ + this.lastSlayerFinishes.shift() + } + this.slayerExp[this.lastSlayerType] = this.lastSlayerExp + (this.slayerExp[this.lastSlayerType] || 0) if(this.expOnKill.getValue()){ cancel(e) @@ -84,6 +106,7 @@ class Slayers extends Feature { this.registerEvent("renderWorld", this.renderWorld) this.registerEvent("worldLoad", this.worldLoad) this.registerEvent("renderOverlay", this.renderHud) + this.registerStep(true, 2, this.step) } renderHud(){ @@ -373,6 +396,23 @@ class Slayers extends Feature { } } + step(){ + let averageExp = this.lastSlayerExps.reduce((a, b) => a + b, 0) / this.lastSlayerExps.length + let averageLength = (this.lastSlayerFinishes[this.lastSlayerFinishes.length-1] - this.lastSlayerFinishes[0])/(this.lastSlayerFinishes.length-1) + let runsperHour = 60000*60/averageLength + let expPerHour = averageExp*runsperHour + + if(Date.now()-this.lastSlayerFinishes[this.lastSlayerFinishes.length-1] < 60000*5 || (this.FeatureManager.features["dataLoader"].class.slayerXpToSpawn && this.FeatureManager.features["dataLoader"].class.slayerXpToSpawn[0] !== 0)){ + if(this.lastSlayerFinishes.length > 1){ + this.slayerSpeedRatesElement.setText("&6Slayer speed&7> &f" + Math.floor(averageLength/60000) + ":" + ((Math.floor(averageLength/1000)%60<10?"0":"") + Math.floor(averageLength/1000)%60) + "\n&6Exp/hour&7> &f" + numberWithCommas(Math.round(expPerHour)) + "\n&6Kills/hour&7> &f" + Math.floor(runsperHour)) + }else{ + this.slayerSpeedRatesElement.setText("&6Slayer speed&7> &floading...\n&6Exp/hour&7> &floading...\n&6Kills/hour&7> &floading...") + } + }else{ + this.slayerSpeedRatesElement.setText("") + } + } + initVariables(){ this.expOnKill = undefined this.slainAlert = undefined |