fixed wording, added support for missing previous floor check

2 files changed, 5 insertions, 5 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java
index 7c00afcd0..9625dd68e 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DungeonConfig.java
@@ -169,6 +169,7 @@ public class DungeonConfig {
     @ConfigOption(name = "Party Finder", desc = "")
     @Accordion
     public PartyFinderConfig partyFinder = new PartyFinderConfig();
+
     public static class PartyFinderConfig {
         @Expose
         @ConfigOption(name = "Colored Class Level", desc = "Color class levels in Party Finder.")
@@ -187,9 +188,9 @@ public class DungeonConfig {
         public boolean markPaidCarries = true;
 
         @Expose
-        @ConfigOption(name = "Mark Low Levels", desc = "Highlight groups with players at or below the specified level to make them easier to find/skip.")
+        @ConfigOption(name = "Mark Low Levels", desc = "Highlight groups with players at or below the specified class level to make them easier to find/skip.")
         @ConfigEditorSlider(minValue = 0, maxValue = 50, minStep = 1)
-        public int markGroupsBelowLevel = 0;
+        public int markBelowClassLevel = 0;
 
         @Expose
         @ConfigOption(name = "Mark Ineligible Groups", desc = "Highlight groups with requirements that you do not meet.")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
index 5661c9e2a..eceb28ad1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
@@ -11,7 +11,6 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.ItemUtils.name

 import at.hannibal2.skyhanni.utils.LorenzColor

 import at.hannibal2.skyhanni.utils.LorenzUtils

-import at.hannibal2.skyhanni.utils.LorenzUtils.equalsOneOf

 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNeeded

 import at.hannibal2.skyhanni.utils.RenderUtils.highlight

 import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher

@@ -27,7 +26,7 @@ class DungeonFinderFeatures {
     private val pricePattern = "([0-9]{2,3}K|[0-9]{1,3}M|[0-9]+\\.[0-9]M|[0-9] ?mil)".toRegex(RegexOption.IGNORE_CASE)

     private val carryPattern = "(carry|cary|carries|caries|comp|to cata [0-9]{2})".toRegex(RegexOption.IGNORE_CASE)

     private val memberPattern = "^ §.*?§.: §.([A-Z]+)§. \\(§.([0-9]+)§.\\)".toRegex(RegexOption.IGNORE_CASE)

-    private val ineligiblePattern = "^§c(Requires .*$|You don't meet the requirement!$)".toRegex()

+    private val ineligiblePattern = "^§c(Requires .*$|You don't meet the requirement!|Complete previous floor first!$)".toRegex()

     private val classLevelPattern = " §.(?<playerName>.*)§f: §e(?<className>.*)§b \\(§e(?<level>.*)§b\\)".toPattern()

     private val notePattern = "^(§7§7Note: |§f[^§])".toRegex()

 

@@ -124,7 +123,7 @@ class DungeonFinderFeatures {
             val memberLevels = members.map { memberPattern.matchEntire(it)?.groupValues?.get(2)?.toInt() ?: 0 }

             val memberClasses = members.map { memberPattern.matchEntire(it)?.groupValues?.get(1) ?: "" }

 

-            if (memberLevels.any { it <= config.markGroupsBelowLevel }) {

+            if (memberLevels.any { it <= config.markBelowClassLevel }) {

                 slot highlight LorenzColor.YELLOW

                 continue

             }