Skip to content

Feature + Improvement: Crate Prio Pearl Lineups + Lineup Accuracy #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Jordyrat wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

Feature + Improvement: Crate Prio Pearl Lineups + Lineup Accuracy #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9e4618d
Improves existing pearl waypoints and adds option for prio waypoints …
Jordyrat May 16, 2025
55dc657
Merge branch 'odtheking:main' into improvement/pearl-waypoints
Jordyrat May 16, 2025
6697a9e
Unused import
Jordyrat May 16, 2025
2c4acb9
cleanup and add dynamic waypoints (only for supply placement spots)
Jordyrat May 17, 2025
1a00902
Credit calculatePearl function
Jordyrat May 17, 2025
c6958c1
Fix NullPointError Crash
Jordyrat May 17, 2025
8e49ee1
Merge branch 'odtheking:main' into improvement/pearl-waypoints
Jordyrat May 19, 2025
81f67bb
Requested Changes
Jordyrat May 19, 2025
d4b7efa
Better Lineup
Jordyrat May 19, 2025
2018d77
Merge branch 'odtheking:main' into improvement/pearl-waypoints
Jordyrat Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 34 additions & 32 deletions src/main/kotlin/me/odinmain/features/impl/nether/NoPre.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ object NoPre : Module(

private var preSpot = SupplyPickUpSpot.None
var missing = SupplyPickUpSpot.None
var prio = SupplyPickUpSpot.None

init {
onMessage(Regex("\\[NPC] Elle: Head over to the main platform, I will join you when I get a bite!")) {
Expand Down Expand Up @@ -66,7 +67,8 @@ object NoPre : Module(
onMessage(Regex("^Party > (\\[[^]]*?])? ?(\\w{1,16}): No ?(Triangle|X|Equals|Slash|xCannon|Square|Shop)!\$")) {
missing = SupplyPickUpSpot.valueOf(it.groupValues.lastOrNull() ?: return@onMessage)
if (!showCratePriority) return@onMessage
val cratePriority = cratePriority(missing).ifEmpty { return@onMessage }
val (prio, cratePriority) = cratePriority(missing)
cratePriority.ifEmpty { return@onMessage }
PlayerUtils.alert(cratePriority, time = cratePriorityTitleTime)
modMessage("Crate Priority: $cratePriority")
}
Expand All @@ -77,66 +79,66 @@ object NoPre : Module(
}
}

private fun cratePriority(missing: SupplyPickUpSpot): String {
private fun cratePriority(missing: SupplyPickUpSpot): Pair<SupplyPickUpSpot, String> {
return when (missing) {
// Shop Missing
SupplyPickUpSpot.Shop -> when (preSpot) {
SupplyPickUpSpot.Triangle, SupplyPickUpSpot.X -> "Go X Cannon"
SupplyPickUpSpot.Equals, SupplyPickUpSpot.Slash -> "Go Square, place on Shop"
else -> ""
SupplyPickUpSpot.Triangle, SupplyPickUpSpot.X -> SupplyPickUpSpot.xCannon to "Go X Cannon"
SupplyPickUpSpot.Equals, SupplyPickUpSpot.Slash -> SupplyPickUpSpot.Square to "Go Square, place on Shop"
else -> SupplyPickUpSpot.None to ""
}

// Triangle Missing
SupplyPickUpSpot.Triangle -> when (preSpot) {
SupplyPickUpSpot.Triangle -> if (advanced) "Pull Square and X Cannon. Next: collect Shop" else "Pull Square. Next: collect Shop"
SupplyPickUpSpot.X -> "Go X Cannon"
SupplyPickUpSpot.Equals -> if (advanced) "Go Shop" else "Go X Cannon"
SupplyPickUpSpot.Slash -> "Go Square, place on Triangle"
else -> ""
SupplyPickUpSpot.Triangle -> SupplyPickUpSpot.None to if (advanced) "Pull Square and X Cannon. Next: collect Shop" else "Pull Square. Next: collect Shop"
SupplyPickUpSpot.X -> SupplyPickUpSpot.xCannon to "Go X Cannon"
SupplyPickUpSpot.Equals -> if (advanced) SupplyPickUpSpot.Shop to "Go Shop" else SupplyPickUpSpot.xCannon to "Go X Cannon"
SupplyPickUpSpot.Slash -> SupplyPickUpSpot.Square to "Go Square, place on Triangle"
else -> SupplyPickUpSpot.None to ""
}

// Equals Missing
SupplyPickUpSpot.Equals -> when (preSpot) {
SupplyPickUpSpot.Triangle -> if (advanced) "Go Shop" else "Go X Cannon"
SupplyPickUpSpot.X -> "Go X Cannon"
SupplyPickUpSpot.Equals -> if (advanced) "Pull Square and X Cannon. Next: collect Shop" else "Pull Square. Next: collect Shop"
SupplyPickUpSpot.Slash -> "Go Square, place on Equals"
else -> ""
SupplyPickUpSpot.Triangle -> if (advanced) SupplyPickUpSpot.Shop to "Go Shop" else SupplyPickUpSpot.xCannon to "Go X Cannon"
SupplyPickUpSpot.X -> SupplyPickUpSpot.xCannon to "Go X Cannon"
SupplyPickUpSpot.Equals -> SupplyPickUpSpot.Shop to if (advanced) "Pull Square and X Cannon. Next: collect Shop" else "Pull Square. Next: collect Shop"
SupplyPickUpSpot.Slash -> SupplyPickUpSpot.Square to "Go Square, place on Equals"
else -> SupplyPickUpSpot.None to ""
}

// Slash Missing
SupplyPickUpSpot.Slash -> when (preSpot) {
SupplyPickUpSpot.Triangle -> "Go Square, place on Slash"
SupplyPickUpSpot.X -> "Go X Cannon"
SupplyPickUpSpot.Equals -> if (advanced) "Go Shop" else "Go X Cannon"
SupplyPickUpSpot.Slash -> if (advanced) "Pull Square and X Cannon. Next: collect Shop" else "Pull Square. Next: collect Shop"
else -> ""
SupplyPickUpSpot.Triangle -> SupplyPickUpSpot.Square to "Go Square, place on Slash"
SupplyPickUpSpot.X -> SupplyPickUpSpot.xCannon to "Go X Cannon"
SupplyPickUpSpot.Equals -> if (advanced) SupplyPickUpSpot.Shop to "Go Shop" else SupplyPickUpSpot.xCannon to "Go X Cannon"
SupplyPickUpSpot.Slash -> SupplyPickUpSpot.Shop to if (advanced) "Pull Square and X Cannon. Next: collect Shop" else "Pull Square. Next: collect Shop"
else -> SupplyPickUpSpot.None to ""
}

// Square Missing
SupplyPickUpSpot.Square -> when (preSpot) {
SupplyPickUpSpot.Triangle, SupplyPickUpSpot.Equals -> "Go Shop"
SupplyPickUpSpot.X, SupplyPickUpSpot.Slash -> "Go X Cannon"
else -> ""
SupplyPickUpSpot.Triangle, SupplyPickUpSpot.Equals -> SupplyPickUpSpot.Shop to "Go Shop"
SupplyPickUpSpot.X, SupplyPickUpSpot.Slash -> SupplyPickUpSpot.xCannon to "Go X Cannon"
else -> SupplyPickUpSpot.None to ""
}

// X Cannon Missing
SupplyPickUpSpot.xCannon -> when (preSpot) {
SupplyPickUpSpot.Triangle, SupplyPickUpSpot.Equals -> "Go Shop"
SupplyPickUpSpot.Slash, SupplyPickUpSpot.X -> "Go Square, place on X Cannon"
else -> ""
SupplyPickUpSpot.Triangle, SupplyPickUpSpot.Equals -> SupplyPickUpSpot.Shop to "Go Shop"
SupplyPickUpSpot.Slash, SupplyPickUpSpot.X -> SupplyPickUpSpot.Square to "Go Square, place on X Cannon"
else -> SupplyPickUpSpot.None to ""
}

// X Missing
SupplyPickUpSpot.X -> when (preSpot) {
SupplyPickUpSpot.Triangle -> "Go X Cannon"
SupplyPickUpSpot.X -> if (advanced) "Pull Square and X Cannon. Next: collect Shop" else "Pull Square. Next: collect Shop"
SupplyPickUpSpot.Equals -> if (advanced) "Go Shop" else "Go X Cannon"
SupplyPickUpSpot.Slash -> "Go Square, place on X"
else -> ""
SupplyPickUpSpot.Triangle -> SupplyPickUpSpot.xCannon to "Go X Cannon"
SupplyPickUpSpot.X -> SupplyPickUpSpot.Shop to if (advanced) "Pull Square and X Cannon. Next: collect Shop" else "Pull Square. Next: collect Shop"
SupplyPickUpSpot.Equals -> if (advanced) SupplyPickUpSpot.Shop to "Go Shop" else SupplyPickUpSpot.xCannon to "Go X Cannon"
SupplyPickUpSpot.Slash -> SupplyPickUpSpot.Square to "Go Square, place on X"
else -> SupplyPickUpSpot.None to ""
}

else -> ""
else -> SupplyPickUpSpot.None to ""
}
}
}
Loading
Loading