From cd40728731f045f6dc59e3700be2b54fdb6991b6 Mon Sep 17 00:00:00 2001
From: Soopyboo32 <49228220+Soopyboo32@users.noreply.github.com>
Date: Sat, 9 Jul 2022 23:05:29 +0800
Subject: +make secret count render over heads + make secret count green when
 should be + meta

---
 features/changeLogGUI/index.js |  4 ++--
 features/dungeonMap/index.js   | 27 ++++++++++++++++++---------
 2 files changed, 20 insertions(+), 11 deletions(-)

(limited to 'features')

diff --git a/features/changeLogGUI/index.js b/features/changeLogGUI/index.js
index 6b50fdb..d370b50 100644
--- a/features/changeLogGUI/index.js
+++ b/features/changeLogGUI/index.js
@@ -24,7 +24,7 @@ class ChangeLogGui extends Feature {
 
     onEnable() {
         this.initVariables()
-
+        
         this.ChangelogPage = new ChangelogPage()
 
         this.latestAnnouncedVersion = this.ChangelogPage.currVersionId
@@ -168,7 +168,7 @@ class ChangelogPage extends GuiPage {
 
         this.openSidebarPage(this.updatingSidebar)
     }
-
+    
     downloadUpdate() {
         new Thread(() => {
             this.updatingSidebarConfirmPage.location.location.x.set(-1, 500)
diff --git a/features/dungeonMap/index.js b/features/dungeonMap/index.js
index c675a43..b1f5eaa 100644
--- a/features/dungeonMap/index.js
+++ b/features/dungeonMap/index.js
@@ -189,6 +189,7 @@ class DungeonMap extends Feature {
                 lastXY = loc.join(",")
                 return
             }
+            if (curr === max) curr = "§a" + curr
             if (this.roomDataStuff.get(loc.join(",")) !== curr + "  " + max) {
                 this.roomDataStuff.set(loc.join(","), curr + "  " + max)
 
@@ -313,6 +314,8 @@ class DungeonMap extends Feature {
                 this.drawOtherMisc(x + xOff, y + yOff, size, scale)
 
                 this.drawPlayersLocations(x + xOff, y + yOff, size, scale)
+
+                this.drawOtherMisc2(x + xOff, y + yOff, size, scale)
             } catch (e) {
                 console.error(e)
                 console.error(e.stack)
@@ -345,23 +348,29 @@ class DungeonMap extends Feature {
                 item.draw(x * scale * 2 + x2 - this.roomWidth / 4 * scale * 2, y * scale * 2 + y2 - this.roomWidth / 4 * scale * 2, 1.5 * scale)
             })
         }
+    }
+
+    drawOtherMisc2(x2, y2, size, scale) {
+        if (this.currDungeonBossImage) return
         if (this.roomsecrets.getValue()) {
             for (let ent of this.roomDataStuff.entries()) {
                 let [loc, val] = ent
                 let [x, y] = loc.split(",")
 
+                let val2 = ChatLib.removeFormatting(val)
+
                 let renderX = (parseInt(x) + 16) / this.mapScale / 128 * size + this.offset[0] / 128 * size
                 let renderY = (parseInt(y) + 16) / this.mapScale / 128 * size + this.offset[1] / 128 * size
 
-                Renderer.translate(0, 0, 100)
-                renderLibs.drawStringCentered("§0" + val, x2 + renderX + scale * 1.25, y2 + renderY - 2 * scale * 1.25, scale * 1.25)
-                Renderer.translate(0, 0, 100)
-                renderLibs.drawStringCentered("§0" + val, x2 + renderX - scale * 1.25, y2 + renderY - 2 * scale * 1.25, scale * 1.25)
-                Renderer.translate(0, 0, 100)
-                renderLibs.drawStringCentered("§0" + val, x2 + renderX, y2 + renderY + scale * 1.25 - 2 * scale * 1.25, scale * 1.25)
-                Renderer.translate(0, 0, 100)
-                renderLibs.drawStringCentered("§0" + val, x2 + renderX, y2 + renderY - scale * 1.25 - 2 * scale * 1.25, scale * 1.25)
-                Renderer.translate(0, 0, 100)
+                Renderer.translate(0, 0, 1000)
+                renderLibs.drawStringCentered("§0" + val2, x2 + renderX + scale * 1.25, y2 + renderY - 2 * scale * 1.25, scale * 1.25)
+                Renderer.translate(0, 0, 1000)
+                renderLibs.drawStringCentered("§0" + val2, x2 + renderX - scale * 1.25, y2 + renderY - 2 * scale * 1.25, scale * 1.25)
+                Renderer.translate(0, 0, 1000)
+                renderLibs.drawStringCentered("§0" + val2, x2 + renderX, y2 + renderY + scale * 1.25 - 2 * scale * 1.25, scale * 1.25)
+                Renderer.translate(0, 0, 1000)
+                renderLibs.drawStringCentered("§0" + val2, x2 + renderX, y2 + renderY - scale * 1.25 - 2 * scale * 1.25, scale * 1.25)
+                Renderer.translate(0, 0, 1000)
                 renderLibs.drawStringCentered("§f" + val, x2 + renderX, y2 + renderY - 2 * scale * 1.25, scale * 1.25)
             }
         }
-- 
cgit