diff options
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt | 30 |
1 files changed, 25 insertions, 5 deletions
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 |