From 24bc95265a12c491316268f40047c4d559ef0f24 Mon Sep 17 00:00:00 2001
From: ReyMaratov <77993433+ReyMaratov@users.noreply.github.com>
Date: Wed, 1 Nov 2023 10:51:00 +0100
Subject: fixed (hopefully) the bingo step helper having an old "bug" from
 Hypixel hardcoded, also fixed a small typo in the name of the original
 variable (#655)

Fixed wrong Rhys (Deep Caverns NPC) items needed for Dwarven Mines unlock in Bingo Step Helper. #655
---
 .../skyhanni/features/bingo/BingoNextStepHelper.kt | 30 ++++++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'src/main/java/at')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
index 9222764b9..a09a611b9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
@@ -36,7 +36,7 @@ class BingoNextStepHelper {
     private val collectionPattern = "Reach (?<amount>[0-9]+(?:,\\d+)*) (?<name>.*) Collection\\.".toPattern()
     private val crystalPattern = "Obtain a (?<name>\\w+) Crystal in the Crystal Hollows\\.".toPattern()
     private val skillPattern = "Obtain level (?<level>.*) in the (?<skill>.*) Skill.".toPattern()
-    private val rhysTaskName = "30x Enchanted Redstone (for Rhys)"
+    private val rhysTaskName = "30x Enchanted Minerals (Redstone, Lapis Lazuli, Coal) (for Rhys)"
 
     companion object {
         private val finalSteps = mutableListOf<NextStep>()
@@ -303,6 +303,8 @@ class BingoNextStepHelper {
 
         itemIslandRequired["Acacia Wood"] = IslandType.THE_PARK.getStep()
         itemIslandRequired["Redstone"] = IslandType.DEEP_CAVERNS.getStep()
+        itemIslandRequired["Lapis Lazuli"] = IslandType.DEEP_CAVERNS.getStep()
+        itemIslandRequired["Coal"] = IslandType.DEEP_CAVERNS.getStep()
         itemIslandRequired["Slimeball"] = IslandType.DEEP_CAVERNS.getStep()
         itemIslandRequired["Emerald"] = IslandType.DEEP_CAVERNS.getStep()
         itemIslandRequired["Mithril"] = IslandType.DEEP_CAVERNS.getStep()
@@ -313,15 +315,33 @@ class BingoNextStepHelper {
         IslandType.DEEP_CAVERNS.getStep() requires IslandType.GOLD_MINES.getStep()
         IslandType.DEEP_CAVERNS.getStep() requires SkillLevelStep("Mining", 5)
 
-        val redstoneForThys = PartialProgressItemsStep(
+        val redstoneForRhys = PartialProgressItemsStep(
             rhysTaskName,
             "Redstone",
-            160 * 10 * 3,
+            160 * 10,
             mapOf("Redstone" to 1, "Enchanted Redstone" to 160)
         )
-        redstoneForThys requires IslandType.DEEP_CAVERNS.getStep()
+        redstoneForRhys requires IslandType.DEEP_CAVERNS.getStep()
 
-        IslandType.DWARVEN_MINES.getStep() requires redstoneForThys
+        val lapisForRhys = PartialProgressItemsStep(
+            rhysTaskName,
+            "Lapis Lazuli",
+            160 * 10,
+            mapOf("Lapis Lazuli" to 1, "Enchanted Lapis Lazuli" to 160)
+        )
+        lapisForRhys requires IslandType.DEEP_CAVERNS.getStep()
+
+        val coalForRhys = PartialProgressItemsStep(
+            rhysTaskName,
+            "Coal",
+            160 * 10,
+            mapOf("Coal" to 1, "Enchanted Coal" to 160)
+        )
+        coalForRhys requires IslandType.DEEP_CAVERNS.getStep()
+
+        IslandType.DWARVEN_MINES.getStep() requires redstoneForRhys
+        IslandType.DWARVEN_MINES.getStep() requires lapisForRhys
+        IslandType.DWARVEN_MINES.getStep() requires coalForRhys
         IslandType.DWARVEN_MINES.getStep() requires SkillLevelStep(
             "Mining",
             12
-- 
cgit