diff options
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt | 10 |
1 files changed, 4 insertions, 6 deletions
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 c34c22ae1..1614ad8ab 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt @@ -29,15 +29,15 @@ class DungeonFinderFeatures { private val patternGroup = RepoPattern.group("dungeon.finder") private val pricePattern by patternGroup.pattern( "price", - "([0-9]{2,3}K|[0-9]{1,3}M|[0-9]+\\.[0-9]M|[0-9] ?MIL)" + "(?i).*([0-9]{2,3}K|[0-9]{1,3}M|[0-9]+\\.[0-9]M|[0-9] ?MIL).*" ) private val carryPattern by patternGroup.pattern( "carry", - "(CARRY|CARY|CARRIES|CARIES|COMP|TO CATA [0-9]{2})" + "(?i).*(CARRY|CARY|CARRIES|CARIES|COMP|TO CATA [0-9]{2}).*" ) private val nonPugPattern by patternGroup.pattern( "nonpug", - "(PERM|VC|DISCORD)" + "(?i).*(PERM|VC|DISCORD).*" ) private val memberPattern by patternGroup.pattern( "member", @@ -53,7 +53,7 @@ class DungeonFinderFeatures { ) private val notePattern by patternGroup.pattern( "note", - "(§7§7Note: |§f[^§])" + "§7§7Note: §f(?<note>.*)" ) private val floorTypePattern by patternGroup.pattern( "floor.type", @@ -167,7 +167,6 @@ class DungeonFinderFeatures { val floorNum = floorNumberPattern.matchMatcher(floor) { group("floorNum").romanToDecimalIfNecessary() } - map[slot] = getFloorName(floor, dungeon, floorNum) } } @@ -192,7 +191,6 @@ class DungeonFinderFeatures { } ?: continue map[slot] = getFloorName(name, name, floorNum) } - } private fun getFloorName(floor: String, dungeon: String, floorNum: Int?): String = |