Dungeon Score improvements (on another branch)

mod/src/main/kotlin/gg/skytils/skytilsmod/Skytils.kt

@@ -361,6 +361,7 @@ object Skytils : CoroutineScope, EventSubscriber {
             RandomStuff,
             RelicWaypoints,
             ScamCheck,
+            ScoreCalculation,
             SelectAllColorSolver,
             ServerPayloadInterceptor,
             ShootTheTargetSolver,

mod/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt

@@ -449,14 +449,18 @@ object Config : Vigilant(
     var showScoreCalculation = false
 
     @Property(
-        type = PropertyType.SWITCH, name = "Minimized Dungeon Score Estimate",
-        description = "Only shows the dungeon score.",
-        category = "Dungeons", subcategory = "Score Calculation",
-        i18nName = "skytils.config.dungeons.score_calculation.minimized_dungeon_score_estimate",
-        i18nCategory = "skytils.config.dungeons",
-        i18nSubcategory = "skytils.config.dungeons.score_calculation"
+        type = PropertyType.SWITCH, name = "Show Dungeon Status",
+        description = "Shows information about the current dungeon run that affects its score.",
+        category = "Dungeons", subcategory = "Score Calculation"
+    )
+    var showDungeonStatus = false
+
+    @Property(
+        type = PropertyType.SWITCH, name = "Dungeon Score Breakdown",
+        description = "Shows every score category as opposed to only total score.",
+        category = "Dungeons", subcategory = "Score Calculation"
     )
-    var minimizedScoreCalculation = false
+    var showScoreBreakdown = false
 
     @Property(
         type = PropertyType.SWITCH, name = "Score Calculation Party Assist",
@@ -1132,14 +1136,24 @@ object Config : Vigilant(
 
     @Property(
         type = PropertyType.SWITCH, name = "Boulder Solver",
-        description = "§b[WIP] §rShow which boxes to move on the Boulder puzzle.",
+        description = "Show which boxes to move on the Boulder puzzle.",
         category = "Dungeons", subcategory = "Solvers",
         i18nName = "skytils.config.dungeons.solvers.boulder_solver",
         i18nCategory = "skytils.config.dungeons",
         i18nSubcategory = "skytils.config.dungeons.solvers"
     )
     var boulderSolver = false
 
+    @Property(
+        type = PropertyType.COLOR, name = "Boulder Solver Color",
+        description = "Color of the box that shows which button to click in the Boulder puzzle.",
+        category = "Dungeons", subcategory = "Solvers",
+        i18nName = "skytils.config.dungeons.solvers.boulder_solver_color",
+        i18nCategory = "skytils.config.dungeons",
+        i18nSubcategory = "skytils.config.dungeons.solvers"
+    )
+    var boulderSolverColor = Color(255, 0, 0, 255)
+
     @Property(
         type = PropertyType.SWITCH, name = "Creeper Beams Solver",
         description = "Shows pairs on the Creeper Beams puzzle.",
@@ -1182,7 +1196,7 @@ object Config : Vigilant(
 
     @Property(
         type = PropertyType.COLOR, name = "Teleport Maze Solver Color",
-        description = "Color of the thing that shows which pads you've stepped on in the Teleport Maze puzzle.",
+        description = "Color of the box that shows which pads you've stepped on in the Teleport Maze puzzle.",
         category = "Dungeons", subcategory = "Solvers",
         i18nName = "skytils.config.dungeons.solvers.teleport_maze_solver_color",
         i18nCategory = "skytils.config.dungeons",
@@ -1200,9 +1214,19 @@ object Config : Vigilant(
     )
     var threeWeirdosSolver = false
 
+    @Property(
+        type = PropertyType.COLOR, name = "Three Weirdos Solver Color",
+        description = "Color of the chest to click on the Three Weirdos puzzle.",
+        category = "Dungeons", subcategory = "Solvers",
+        i18nName = "skytils.config.dungeons.solvers.three_weirdos_solver_color",
+        i18nCategory = "skytils.config.dungeons",
+        i18nSubcategory = "skytils.config.dungeons.solvers"
+    )
+    var threeWeirdosSolverColor = Color(255, 0, 0, 255)
+
     @Property(
         type = PropertyType.SWITCH, name = "Tic Tac Toe Solver",
-        description = "§b[WIP] §rDisplays the best move on the Tic Tac Toe puzzle.",
+        description = "Displays the best move on the Tic Tac Toe puzzle.",
         category = "Dungeons", subcategory = "Solvers",
         i18nName = "skytils.config.dungeons.solvers.tic_tac_toe_solver",
         i18nCategory = "skytils.config.dungeons",
@@ -1212,7 +1236,7 @@ object Config : Vigilant(
 
     @Property(
         type = PropertyType.COLOR, name = "Tic Tac Toe Solver Color",
-        description = "Color of the thing that displays the best move on the Tic Tac Toe puzzle.",
+        description = "Color of the outline that displays the best move on the Tic Tac Toe puzzle.",
         category = "Dungeons", subcategory = "Solvers",
         i18nName = "skytils.config.dungeons.solvers.tic_tac_toe_solver_color",
         i18nCategory = "skytils.config.dungeons",
@@ -4350,6 +4374,9 @@ object Config : Vigilant(
         addDependency("kuudraChestProfitIncludesEssence", "kuudraChestProfit")
         addDependency("kuudraChestProfitCountsKey", "kuudraChestProfit")
 
+        addDependency("showDungeonStatus", "showScoreCalculation")
+        addDependency("showScoreBreakdown", "showScoreCalculation")
+
         addDependency("message270Score", "sendMessageOn270Score")
         addDependency("messageTitle270Score", "createTitleOn270Score")
 

mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonChestProfit.kt

@@ -98,7 +98,7 @@ object DungeonChestProfit : EventSubscriber {
             GlStateManager.pushMatrix()
             GlStateManager.translate(
                 (-(event.gui as AccessorGuiContainer).guiLeft).toDouble(),
-                -(event.gui as AccessorGuiContainer).guiTop.toDouble(),
+                -(event.gui as AccessorGuiContainer).guiTop.toDouble() + DungeonChest.entries.count { it.items.isNotEmpty() } * ScreenRenderer.fontRenderer.FONT_HEIGHT,
                 299.0
             )
             drawChestProfit(chestType)
@@ -181,7 +181,7 @@ object DungeonChestProfit : EventSubscriber {
         } else {
             val unformatted = name.stripControlCodes().replace("Shiny ", "")
             ItemFeatures.itemIdToNameLookup.entries.find {
-                it.value == unformatted && !it.value.contains("STARRED")
+                it.value == unformatted && !it.key.contains("STARRED")
             }?.key
         }
     }

mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonFeatures.kt

@@ -103,7 +103,7 @@ object DungeonFeatures : EventSubscriber {
     private var lastLitUpTime = -1L
     private val lastBlockPos = BlockPos(7, 77, 34)
     private var startWithoutFullParty = false
-    private var blazes = 0
+    var blazes = 0
     var hasClearedText = false
     private var terracottaSpawns = hashMapOf<BlockPos, Long>()
     private val dungeonMobSpawns = setOf(