Revert map scale changes and dungeon warp change

BiscuitDevelopment · Mar 18, 2022 · 4687b8e · 4687b8e
1 parent bfef1e8
commit 4687b8e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiChestHook.java b/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiChestHook.java
@@ -171,6 +171,13 @@ public static void drawScreenIslands(int mouseX, int mouseY, ReturnValue<?> retu
                         }
                     }
 
+                    /*
+                    Special case: We have an extra dungeon hub warp as a separate island for convenience, so we have to
+                    add it manually.
+                     */
+                    markers.put(IslandWarpGui.Marker.DUNGEON_HUB_ISLAND,
+                            markers.getOrDefault(IslandWarpGui.Marker.DUNGEON_HUB, IslandWarpGui.UnlockedStatus.UNKNOWN));
+
                     if (islandWarpGui == null || !islandWarpGui.getMarkers().equals(markers)) {
                         islandWarpGui = new IslandWarpGui(markers);
                         ScaledResolution scaledresolution = new ScaledResolution(mc);

diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/dungeonmap/DungeonMapManager.java b/src/main/java/codes/biscuit/skyblockaddons/features/dungeonmap/DungeonMapManager.java
@@ -209,7 +209,7 @@ public static void drawDungeonsMap(Minecraft mc, float scale, ButtonLocation but
                     }
 
                     MapItemRenderer.Instance instance = mc.entityRenderer.getMapItemRenderer().getMapRendererInstance(mapData);
-                    drawMapEdited(instance, isScoreSummary, totalScaleFactor);
+                    drawMapEdited(instance, isScoreSummary, zoomScaleFactor);
                 }
             } catch (Exception ex) {
                 ex.printStackTrace();
@@ -336,7 +336,7 @@ else if (player == mc.thePlayer) {
             }
         }
 
-        markerScale = (float) (-0.75F * Math.pow((markerScale - 1.5F), 2F) + 3F);
+        markerScale = 4.0F / markerScale;
 
         for (MapMarker mapMarker : allMarkers) {
             GlStateManager.pushMatrix();