Feature: Fann pet leveling costs Coins/XP and XP/Bits #2604
+284
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CalMWolfs
requested changes
Oct 8, 2024
src/main/java/at/hannibal2/skyhanni/config/features/inventory/FannCostConfig.java
Outdated
Show resolved
Hide resolved
src/main/java/at/hannibal2/skyhanni/config/features/inventory/FannCostConfig.java
Outdated
Show resolved
Hide resolved
Comment on lines
+128
to
+139
| // To avoid duplicate code | ||
| private fun <T> Pattern.read(lore: List<String>, func: (String) -> T): T? { | ||
| for (line in lore) { | ||
| val linePlain = line.removeColor() | ||
| val matcher = matcher(linePlain) | ||
| if (matcher.find()) { | ||
| val res = matcher.group(1) | ||
| return func(res) | ||
| } | ||
| } | ||
| return null | ||
| } |
There was a problem hiding this comment.
im sure a function that does this is already in RegexUtils
src/main/java/at/hannibal2/skyhanni/features/inventory/FannCost.kt
Outdated
Show resolved
Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/FannCost.kt
Outdated
Show resolved
Hide resolved
src/main/java/at/hannibal2/skyhanni/features/inventory/FannCost.kt
Outdated
Show resolved
Hide resolved
Comment on lines
+165
to
+167
| for (line in this) { | ||
| val linePlain = line.removeColor() | ||
| val matcher = durationPattern.matcher(linePlain) |
There was a problem hiding this comment.
should use Pattern.firstMatcher(list)
src/main/java/at/hannibal2/skyhanni/features/inventory/FannCost.kt
Outdated
Show resolved
Hide resolved
Comment on lines
+118
to
+126
| private fun MutableList<String>.insertLineAfter(pattern: Pattern, content: String) { | ||
| val iter = this.listIterator() | ||
| while (iter.hasNext()) { | ||
| val line = iter.next().removeColor() | ||
| if (pattern.matcher(line).find()) { | ||
| iter.add(content) | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
This seems like a cool function that could be used elsewhere in the mod, maybe move it to a utils class such as collection utils
Comment on lines
25
to
64
| private val trainingSlotInventoryPattern by patternGroup.pattern( | ||
| "training", | ||
| "Training Slot [1-3]", | ||
| ) | ||
| private val anvilPattern by patternGroup.pattern( | ||
| "anvil", | ||
| "§aBegin Training", | ||
| ) | ||
| private val expEarnedPattern by patternGroup.pattern( | ||
| "exp.total", | ||
| """Will earn a total of (\d{1,3}(?:,\d{3})*(?:\.\d+)?|\d+\.?\d*) EXP\.?""", | ||
| ) | ||
| private val dailyExpPattern by patternGroup.pattern( | ||
| "exp.daily", | ||
| """EXP Per Day: ([\d,]+)(?: \(\+\d{1,2}(\.\d{1,2})?%\))?""", | ||
| ) | ||
| private val durationPattern by patternGroup.pattern( | ||
| "training.duration.pattern", | ||
| """Will take: (?<day>\d+)d (?<hr>\d{1,2})h (?<min>\d{1,2})m (?<sec>\d{1,2})s""", | ||
| ) | ||
| private val coinsPattern by patternGroup.pattern( | ||
| "coin", | ||
| """(\d{1,3}(?:,\d{3})*(?:\.\d+)?|\d+\.?\d*) Coins(?: \([1-5]% off\))?""", | ||
| ) | ||
| private val bitsPattern by patternGroup.pattern( | ||
| "bits", | ||
| """(\d{1,3}(?:,\d{3})*(?:\.\d+)?|\d+\.?\d*) Bits""", | ||
| ) | ||
| private val desiredLevelPatter by patternGroup.pattern( | ||
| "slot24.name.level", | ||
| "Desired Level: (200|1?[0-9]?[0-9])", | ||
| ) | ||
| private val userInputPattern by patternGroup.pattern( | ||
| "slot24.name.input", | ||
| "User Input", | ||
| ) | ||
| private val trainingTypePattern by patternGroup.pattern( | ||
| "training.type", | ||
| "Type: (Free|Light|Moderate|Expert|Ultra|Turbo!)", | ||
| ) |
There was a problem hiding this comment.
all of these need regex tests, they also need named pattern groups and none of them should include triple quotes
github-actions
bot
added
the
Merge Conflicts
|
This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
https://discord.com/channels/997079228510117908/1192656223741427804
Images
Changelog New Features