aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoopyboo32 <49228220+Soopyboo32@users.noreply.github.com>2022-09-27 15:41:25 +0800
committerSoopyboo32 <49228220+Soopyboo32@users.noreply.github.com>2022-09-27 15:41:25 +0800
commit22bbcec4bceba8e8b314d18bf9b54bfc2c591ba3 (patch)
tree6572f91b391b651dd80d856a755786ff291d1802
parentc24f8369cb7a368c1c89404c2860f4f2f4b78014 (diff)
downloadSoopyV2-22bbcec4bceba8e8b314d18bf9b54bfc2c591ba3.tar.gz
SoopyV2-22bbcec4bceba8e8b314d18bf9b54bfc2c591ba3.tar.bz2
SoopyV2-22bbcec4bceba8e8b314d18bf9b54bfc2c591ba3.zip
+ fix double powder not disabling
+ (possibly) fix diana warp hotkey being buggy
-rw-r--r--src/features/events/index.js2
-rw-r--r--src/features/hud/index.js4
-rw-r--r--src/features/specialMining/index.js4
3 files changed, 6 insertions, 4 deletions
diff --git a/src/features/events/index.js b/src/features/events/index.js
index aea1fea..ab26ce0 100644
--- a/src/features/events/index.js
+++ b/src/features/events/index.js
@@ -344,7 +344,7 @@ class Events extends Feature {
this.hasWarps.forEach(w => {
if (!warpData[w]) return
- let d = calculateDistance(warpData[w], this.guessPoint2)
+ let d = calculateDistance(warpData[w], this.guessPoint)
if (d < minDist) {
warp = "warp " + w
minDist = d
diff --git a/src/features/hud/index.js b/src/features/hud/index.js
index 352a9d0..fad13c5 100644
--- a/src/features/hud/index.js
+++ b/src/features/hud/index.js
@@ -628,7 +628,7 @@ class Hud extends Feature {
let godPotTime = -1
if (this.potsExpireAt["water_breathing"]?.level === 6
&& this.potsExpireAt["resistance"]?.level === 8
- && basiclyEqual(this.potsExpireAt["water_breathing"]?.time, this.potsExpireAt["resistance"]?.time, 1000)) {
+ && basiclyEqual(this.potsExpireAt["water_breathing"]?.time, this.potsExpireAt["resistance"]?.time, 10000)) {
godPotTime = this.potsExpireAt["water_breathing"].time
}
@@ -651,7 +651,7 @@ class Hud extends Feature {
Object.keys(this.potsExpireAt).forEach(k => {
let potData = this.potsExpireAt[k]
if (potData.infinite) return
- if (basiclyEqual(potData.time, godPotTime, 1000)) return
+ if (basiclyEqual(potData.time, godPotTime, 10000)) return
if (potData.time < Date.now()) return
if (k === "haste" && potData.level === 1) return
diff --git a/src/features/specialMining/index.js b/src/features/specialMining/index.js
index e548b87..8b13ac3 100644
--- a/src/features/specialMining/index.js
+++ b/src/features/specialMining/index.js
@@ -192,7 +192,7 @@ class PowderAndScatha extends Feature {
if (this.chestUncoverAlertSound.getValue()) World.playSound("random.levelup", 1, 1);
})
- this.registerChat("&r&r&r${space}&r&b&l2X POWDER ${status}!&r", (space, status, e) => {
+ this.registerChat("${space}&r&b&l2X POWDER ${status}!&r", (space, status, e) => {
if (status.removeFormatting() === "STARTED") {
this.dPowder = Date.now() + 15 * 1000 * 60
} else this.dPowder = 0
@@ -385,6 +385,8 @@ class PowderAndScatha extends Feature {
});
}
+ if (Date.now() > this.dPowder) this.dPowder = 0
+
this.overlayLeft = []
this.overlayRight = []