Skip to content

fix: don't assume first death has Spirit Pet #49

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

Open
lunaynx wants to merge 2 commits into
base: main
Choose a base branch
from
+25 −6
Open

fix: don't assume first death has Spirit Pet #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
739385c
fix: don't assume first death has Spirit Pet
lunaynx Jan 7, 2026
76714a9
fix: actually increment teammate deaths
lunaynx Jan 7, 2026
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
20 changes: 19 additions & 1 deletion src/main/kotlin/com/odtheking/odin/utils/skyblock/dungeon/DungeonListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ import com.odtheking.odin.events.core.onReceive
import com.odtheking.odin.features.impl.dungeon.LeapMenu
import com.odtheking.odin.features.impl.dungeon.LeapMenu.odinSorting
import com.odtheking.odin.features.impl.dungeon.Mimic
import com.odtheking.odin.utils.modMessage
import com.odtheking.odin.utils.network.WebUtils.hasBonusPaulScore
import com.odtheking.odin.utils.network.hypixelapi.RequestUtils
import com.odtheking.odin.utils.romanToInt
import com.odtheking.odin.utils.skyblock.dungeon.DungeonUtils.getDungeonTeammates
import com.odtheking.odin.utils.skyblock.dungeon.tiles.Room
Expand All @@ -38,6 +40,9 @@ object DungeonListener {
var inBoss = false
var paul = false

private var firstDeath: DungeonPlayer? = null
var firstDeathHasSpirit = false

private fun getBoss(): Boolean = with(mc.player) {
if (this == null || floor?.floorNumber == null) return false
when (floor?.floorNumber) {
Expand Down Expand Up @@ -105,7 +110,20 @@ object DungeonListener {
deathRegex.find(value)?.let { match ->
dungeonTeammates.find { teammate ->
teammate.name == (match.groupValues[1].takeUnless { it == "You" } ?: mc.player?.name?.string)
}?.deaths?.inc()
}?.let { teammate ->
teammate.deaths++
if (firstDeath == null) {
firstDeath = teammate
scope.launch {
val profile = RequestUtils.getProfile(teammate.name)
val memberData = profile.getOrElse { return@launch modMessage(it.message) }.memberData
?: return@launch modMessage("Could not find member data for ${teammate.name}")
firstDeathHasSpirit = memberData.pets.pets.any {
it.type.equals("SPIRIT", true) && it.tier == "LEGENDARY"
}
}
}
}
}

when (partyMessageRegex.find(value)?.groupValues?.get(1)?.lowercase() ?: return@on) {
Expand Down
11 changes: 6 additions & 5 deletions src/main/kotlin/com/odtheking/odin/utils/skyblock/dungeon/DungeonUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ object DungeonUtils {
inline val deathCount: Int
get() = DungeonListener.dungeonStats.deaths

inline val deathPenalty: Int
get() = ((deathCount * 2) - (if (DungeonListener.firstDeathHasSpirit) 1 else 0)).coerceAtLeast(0)

inline val cryptCount: Int
get() = DungeonListener.dungeonStats.crypts

Expand Down Expand Up @@ -130,19 +133,17 @@ object DungeonUtils {
val skillRooms = floor(completed.toFloat() / total * 80f).coerceIn(0f, 80f).toInt()
val puzzlePenalty = (puzzleCount - puzzles.count { it.status == PuzzleStatus.Completed }) * 10

return exploration + (20 + skillRooms - puzzlePenalty - (deathCount * 2 - 1).coerceAtLeast(0)).coerceIn(
return exploration + (20 + skillRooms - puzzlePenalty - deathPenalty).coerceIn(
20,
100
) + getBonusScore + 100
}

inline val neededSecretsAmount: Int
get() =
DungeonListener.floor?.let {
DungeonListener.floor?.let { floor ->
ceil(
(totalSecrets * it.secretPercentage) * (40 - getBonusScore + (deathCount * 2 - 1).coerceAtLeast(
0
)) / 40f
(totalSecrets * floor.secretPercentage) * (40 - getBonusScore + deathPenalty) / 40f
).toInt()
} ?: 0

Expand Down