aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at
diff options
context:
space:
mode:
authormartimavocado <39881008+martimavocado@users.noreply.github.com>2024-03-29 14:07:11 +0000
committerGitHub <noreply@github.com>2024-03-29 15:07:11 +0100
commit627ad521b556b79ed1c38bbef0f1ad5806dbb1f6 (patch)
tree413ec429fbc36b898674fab0210edc854722b85e /src/main/java/at
parent34d4bd8d9269572d8188635108b695ca368f0c06 (diff)
downloadskyhanni-627ad521b556b79ed1c38bbef0f1ad5806dbb1f6.tar.gz
skyhanni-627ad521b556b79ed1c38bbef0f1ad5806dbb1f6.tar.bz2
skyhanni-627ad521b556b79ed1c38bbef0f1ad5806dbb1f6.zip
Fix: Party Finder patterns (#1303)
Diffstat (limited to 'src/main/java/at')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt10
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 =