From db895fe62e0a7eabc2f9e36e7701c554a4b204a9 Mon Sep 17 00:00:00 2001 From: Soopyboo32 <49228220+Soopyboo32@users.noreply.github.com> Date: Fri, 17 Jun 2022 21:19:12 +0800 Subject: + toggle for icons on dungeon map + diana inquis waypoints now send a alert when one is added --- features/dungeonMap/index.js | 25 ++++++++++++++----------- features/dungeonSolvers/index.js | 2 +- features/events/index.js | 1 + 3 files changed, 16 insertions(+), 12 deletions(-) (limited to 'features') diff --git a/features/dungeonMap/index.js b/features/dungeonMap/index.js index 3285e55..4199626 100644 --- a/features/dungeonMap/index.js +++ b/features/dungeonMap/index.js @@ -35,6 +35,7 @@ class DungeonMap extends Feature { this.mapInfo = new SettingBase("NOTE: The more players in the party with this", "category enabled the more accurate the map will be.", undefined, "map_info", this) this.renderMap = new ToggleSetting("Render Map", "Toggles Rendering the map on the hud", false, "dmap_render", this) + this.mapIcons = new ToggleSetting("Icons for puzzles on map", "Toggles Rendering the puzzle icons on map", true, "dmap_icons", this).requires(this.renderMap) this.mapLocation = new ImageLocationSetting("Map Location", "Sets the location of the map on the hud", "dmap_location", this, [10, 10, 1], new Image(javax.imageio.ImageIO.read(new java.io.File("./config/ChatTriggers/modules/SoopyV2/features/dungeonMap/map.png"))), 100, 100).requires(this.renderMap) this.mapBackground = new ToggleSetting("Map Background And Border", "Puts a grey background behind the map + Black border", true, "dmap_background", this) this.showMapInBoss = new ToggleSetting("Keep showing the map in the dungeon boss room", "This will center the map when in boss to still be usefull", true, "dmap_enable_boss", this) @@ -301,20 +302,22 @@ class DungeonMap extends Feature { drawOtherMisc(x2, y2, size2, scale) { if (this.currDungeonBossImage) return - Object.keys(this.puzzles).forEach(loc => { - if (!this.puzzles[loc]) return - if (this.puzzles[loc][1]) return - let y = (loc % 128) / 128 * 100 - let x = (Math.floor(loc / 128)) / 128 * 100 + if (this.mapIcons.getValue()) { + Object.keys(this.puzzles).forEach(loc => { + if (!this.puzzles[loc]) return + if (this.puzzles[loc][1]) return + let y = (loc % 128) / 128 * 100 + let x = (Math.floor(loc / 128)) / 128 * 100 - let item = this.puzzleItems[this.puzzles[loc][0]] || this.barrier_block_item + let item = this.puzzleItems[this.puzzles[loc][0]] || this.barrier_block_item - // lines.forEach((l, i)=>{ - // renderLibs.drawStringCentered("&0&l" + l, x*scale*2+x2-l.length/2*scale*2, y*scale*2+y2-this.roomWidth/3*scale*2+this.roomWidth/3*scale*2+i*6*scale*2-((lines.length-1)*3+4)*scale*2, scale*2) - // }) + // lines.forEach((l, i)=>{ + // renderLibs.drawStringCentered("&0&l" + l, x*scale*2+x2-l.length/2*scale*2, y*scale*2+y2-this.roomWidth/3*scale*2+this.roomWidth/3*scale*2+i*6*scale*2-((lines.length-1)*3+4)*scale*2, scale*2) + // }) - item.draw(x * scale * 2 + x2 - this.roomWidth / 4 * scale * 2, y * scale * 2 + y2 - this.roomWidth / 4 * scale * 2, 1.5 * scale) - }) + item.draw(x * scale * 2 + x2 - this.roomWidth / 4 * scale * 2, y * scale * 2 + y2 - this.roomWidth / 4 * scale * 2, 1.5 * scale) + }) + } } drawPlayersLocations(x, y, size, scale) { diff --git a/features/dungeonSolvers/index.js b/features/dungeonSolvers/index.js index 787f5fa..e602de7 100644 --- a/features/dungeonSolvers/index.js +++ b/features/dungeonSolvers/index.js @@ -186,7 +186,7 @@ class DungeonSolvers extends Feature { this.goneInBonus = true; }); this.registerChat("[BOSS] The Watcher: You have proven yourself. You may pass.", () => { - delay(5000,()=>{ + delay(5000, () => { this.bloodOpenedBonus = false; this.goneInBonus = true; }) diff --git a/features/events/index.js b/features/events/index.js index 9e08d94..5a1420b 100644 --- a/features/events/index.js +++ b/features/events/index.js @@ -80,6 +80,7 @@ class Events extends Feature { return } this.slayerLocationDataH[user] = [loc, Date.now()] + if (this.otherInquisWaypoints.getValue()) Client.showTitle(user + "'s inquis spawned", "", 20, 60, 20) } renderWorld(ticks) { -- cgit