Improvement: Berberis Helper Rework
What
Berberis is a crop in the Rift that grows one at a time, then needs to be broken in the same order they grew in. The base game guides you to each bush using particles. The problem with this is that the particles don't have the best visibility, and you can break the next bush as soon as the previous was broken, having you waste time waiting to see where the particles lead you.
SkyHanni already has a helper for this, which solves the particle visibility. It highlights the bush the particles are currently on when not moving, and follows them to the next bush while moving.
This new system shows you two bushes ahead of the one you need to break so you no longer have to wait for the particles!
It does this by watching them as they spawn in, and remembering the order they did so. It then highlights the next one to break, and the next two after that.
Images
https://github.com/user-attachments/assets/cca6b6c1-2db4-45e9-9260-b19b1deb1733
Changelog Improvements
- Reworked Berberis Farming Helper in the Rift. - Maj
- Previews what bushes need to be broken after the current one if you were in the plot when they last regrew.
- If you were in another plot when they grew, or it is wrong about the order for any reason, it will fall back to the original helper.
I have detected some issues with your pull request:
Body issues:
Change should end with a full stop in text: Initial Rework
Please fix these issues. For the correct format, refer to the pull request template.
One or more Detekt Failures were detected:
- RiftWiltedBerberisHelper.kt#L30: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L36: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L39: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L49: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L51: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L61: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L65: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L67: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L71: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L75: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L82: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L85: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L95: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L106: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L125: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L127: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L132: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L62: Missing spacing after "if"
- RiftWiltedBerberisHelper.kt#L72: Missing spacing after "if"
- RiftWiltedBerberisHelper.kt#L133: Missing spacing after "if"
- RiftWiltedBerberisHelper.kt#L41: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L41: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L41: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L41: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L42: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L42: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L42: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L42: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L43: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L43: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L43: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L43: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L44: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L44: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L44: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L44: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L45: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L45: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L45: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L45: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L46: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L46: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L46: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L46: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L66: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L66: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L66: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L66: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L66: Missing spacing after ","
-
RiftWiltedBerberisHelper.kt#L66: Using
Array<Primitive>leads to implicit boxing and a performance hit. - RiftWiltedBerberisHelper.kt#L67: Line detected, which is longer than the defined maximum line length in the code style.
- RiftWiltedBerberisHelper.kt#L66: Variable 'plotDistances' could be val.
One or more Detekt Failures were detected:
- RiftWiltedBerberisHelper.kt#L128: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L134: Missing newline after "{"
One or more Detekt Failures were detected:
- RiftWiltedBerberisHelper.kt#L160: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L167: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L254: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L255: Missing spacing after "if"
- RiftWiltedBerberisHelper.kt#L122: Missing newline before ")"
- RiftWiltedBerberisHelper.kt#L256: Missing spacing after ","
- RiftWiltedBerberisHelper.kt#L119: Unexpected spacing before "("
- RiftWiltedBerberisHelper.kt#L179: Unexpected spacing before "("
- RiftWiltedBerberisHelper.kt#L222: Unexpected spacing before "("
If you use IntelliJ, please click the auto refomat hotkey (control + alt + L) before every commit
oh my god thank you so much
One or more Detekt Failures were detected:
- RiftWiltedBerberisHelper.kt#L257: Expected space after opening comment.
- RiftWiltedBerberisHelper.kt#L124: Line must not begin with "&&"
ok it didnt fix everything ig
torry I'm struggling with this so much 😭
the wording of the changelog should be readable for users without technical knowledge (except the technical details/backend category). their "main line" should explain in a whole sentence what got changed in a broad statement, the "small line below" can include additional information about that change.
Your current wording is neither explanatory nor user ready, please change that
Updated. I hope this is better :)
im talking about those two statements. they dont mean anything on its own. they are the only lines showing up in the changelog, the pr name or the description above is not there. so the user lacks the context what is this about at all. and the extra text below should not provide context but rather better explain what this change means.
e.g. you could call them "Reworked Berberis Particle Helper in the Rift", then mention that the new design will remember the order after one full clean of the field and additionally still use the legacy system as fallback/while the order is not loaded yet. also you can merge both entires into one and have two smaller sentences below. e.g.
+ title. - your name
* line 1
* line 2
Ohh sorry my bad, 1 sec
That better?
yes, way better. thanks!
How does that look?
One or more Detekt Failures were detected:
- RiftWiltedBerberisHelper.kt#L246: Missing spacing around "+"
there :)
please click on the resolve button when a comment is done. also please rerequest a review from me when you want me to look again at that pr
Oh sorry, this is my first time doing a pull request if it wasn't obvious :P
This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.
Conflicts have been resolved! 🎉
This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.
One or more Detekt Failures were detected:
- RiftWiltedBerberisHelper.kt#L200: Line detected, which is longer than the defined maximum line length in the code style.
- RiftWiltedBerberisHelper.kt#L190: Variable 'blockLocation' could be val.
- RiftWiltedBerberisHelper.kt#L257: Variable 'highlightColor' could be val.
This is getting a bit overwhelming and outside what I know how to do. I wanted to make this work but I don't think I can handle much further than this.
Solved you the problems you had with the requests of hannibal. The three changes work together, so I suggest implementing all at the same time (otherwise they might not work).
Seriously thank you so much
why is detekt angry :( it looks like the handle event stuff but idk what it wants me to do-?
oops loll I see that now 😭
Conflicts have been resolved! 🎉
One or more Detekt Failures were detected:
- RiftWiltedBerberisHelper.kt#L185: Line must not begin with "&&"
- RiftWiltedBerberisHelper.kt#L201: Line must not begin with "&&"