Skip to content
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

Jump to bottom

Attempt to fix Entrance score & update floor time requirement #394

Closed
wants to merge 3 commits into from
Closed

Attempt to fix Entrance score & update floor time requirement #394

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e082225
Attempt to fix Entrance score & update floor time requirement
zealerker22 Jun 25, 2023
339af2a
Merge branch 'Skytils:1.x' into patch-1
zealerker22 Jun 25, 2023
464c980
Add files via upload
zealerker22 Jun 26, 2023
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: 45 additions & 21 deletions src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/ScoreCalculation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ object ScoreCalculation {
private val roomCompletedPattern = Regex("§r Completed Rooms: §r§d(?<count>\\d+)§r")

val floorRequirements = hashMapOf(
"E" to FloorRequirement(.3),
"E" to FloorRequirement(.3, 20 * 60),
"F1" to FloorRequirement(.3),
"F2" to FloorRequirement(.4),
"F3" to FloorRequirement(.5),
"F4" to FloorRequirement(.6),
"F5" to FloorRequirement(.7, 10 * 60),
"F4" to FloorRequirement(.6, 12 * 60),
zealerker22 marked this conversation as resolved.
Show resolved Hide resolved
"F5" to FloorRequirement(.7),
"F6" to FloorRequirement(.85, 12 * 60),
"F7" to FloorRequirement(speed = 12 * 60),
"F7" to FloorRequirement(speed = 14 * 60),
"M1" to FloorRequirement(speed = 8 * 60),
"M2" to FloorRequirement(speed = 8 * 60),
"M3" to FloorRequirement(speed = 8 * 60),
Expand All @@ -81,7 +81,6 @@ object ScoreCalculation {
"default" to FloorRequirement()
)


// clear stuff
var completedRooms = BasicState(0)
var clearedPercentage = BasicState(0)
Expand Down Expand Up @@ -135,7 +134,8 @@ object ScoreCalculation {

val discoveryScore = (roomClearScore.zip(secretScore)).map { (clear, secret) ->
printDevMessage("clear $clear secret $secret", "scorecalcexplore")
clear.toInt() + secret.toInt()
if(DungeonFeatures.dungeonFloor == "E") (clear * 0.7).toInt() + (secret * 0.7).toInt()
else clear.toInt() + secret.toInt()
}


Expand All @@ -160,8 +160,9 @@ object ScoreCalculation {

val skillScore = (calcingClearPercentage.zip(deathPenalty.zip(puzzlePenalty))).map { (clear, penalties) ->
printDevMessage("puzzle penalty ${penalties.second}", "scorecalcpuzzle")
(20.0 + clear * 80.0 - penalties.first - penalties.second)
.toInt()
if(DungeonFeatures.dungeonFloor == "E")
((20.0 + clear * 80.0 - penalties.first - penalties.second) * 0.7).toInt()
else (20.0 + clear * 80.0 - penalties.first - penalties.second).toInt()
}

// speed stuff
Expand All @@ -173,22 +174,34 @@ object ScoreCalculation {
seconds + 480 - req.speed
}
val speedScore = totalElapsed.map { time ->
when {
time < 492.0 -> 100.0
time < 600.0 -> 140 - time / 12.0
time < 840.0 -> 115 - time / 24.0
time < 1140.0 -> 108 - time / 30.0
time < 3940.0 -> 98.5 - time / 40.0
else -> 0.0
}.toInt()
if(DungeonFeatures.dungeonFloor == "E"){
when {
time < 492.0 -> 70.0
time < 600.0 -> (140 - time / 12.0) * 0.7
time < 840.0 -> (115 - time / 24.0) * 0.7
time < 1140.0 -> (108 - time / 30.0) * 0.7
time < 3570.0 -> (98.5 - time / 40.0) * 0.7
else -> 0.0
}.toInt()
}
else {
when {
time < 492.0 -> 100.0
time < 600.0 -> 140 - time / 12.0
time < 840.0 -> 115 - time / 24.0
time < 1140.0 -> 108 - time / 30.0
time < 3570.0 -> 98.5 - time / 40.0
else -> 0.0
}.toInt()
}
}

// bonus stuff
var crypts = BasicState(0)
var mimicKilled = BasicState(false)
var isPaul = BasicState(false)
val bonusScore = (crypts.zip(mimicKilled.zip(isPaul))).map { (crypts, bools) ->
(if (bools.first) 2 else 0) + crypts.coerceAtMost(5) + if (bools.second) 10 else 0
((if (bools.first) 2 else 0) + crypts.coerceAtMost(5) + if (bools.second) 10 else 0)
}

var hasSaid270 = false
Expand All @@ -201,7 +214,9 @@ object ScoreCalculation {
"skill ${first.first} disc ${first.second} speed ${second.first} bonus ${second.second}",
"scorecalctotal"
)
first.first.coerceIn(20, 100) + first.second + second.first + second.second
if(DungeonFeatures.dungeonFloor == "E")
first.first.coerceIn(14, 70) + first.second + second.first + (second.second * 0.7).toInt()
else first.first.coerceIn(20, 100) + first.second + second.first + second.second
}.also { state ->
state.onSetValue { score ->
updateText(score)
Expand Down Expand Up @@ -269,15 +284,24 @@ object ScoreCalculation {
}
ScoreCalculationElement.text.add("")
ScoreCalculationElement.text.add("§6Score")
ScoreCalculationElement.text.add("§f• §eSkill Score:§a ${skillScore.get().coerceIn(20, 100)}")
if(DungeonFeatures.dungeonFloor == "E")
ScoreCalculationElement.text.add("§f• §eSkill Score:§a ${skillScore.get().coerceIn(14, 70)}")
else
ScoreCalculationElement.text.add("§f• §eSkill Score:§a ${skillScore.get().coerceIn(20, 100)}")
ScoreCalculationElement.text.add(
"§f• §eExplore Score:§a ${discoveryScore.get()} §7(§e${
roomClearScore.get().toInt()
} §7+ §6${secretScore.get().toInt()}§7)"
)
ScoreCalculationElement.text.add("§f• §eSpeed Score:§a ${speedScore.get()}")
ScoreCalculationElement.text.add("§f• §eBonus Score:§a ${bonusScore.get()}")
ScoreCalculationElement.text.add("§f• §eTotal Score:§a $score" + if (isPaul.get()) " §7(§6+10§7)" else "")

if(DungeonFeatures.dungeonFloor == "E"){
ScoreCalculationElement.text.add("§f• §eBonus Score:§a ${(bonusScore.get() * 0.7).toInt()}")
ScoreCalculationElement.text.add("§f• §eTotal Score:§a $score" + if (isPaul.get()) " §7(§6+7§7)" else "")
} else {
ScoreCalculationElement.text.add("§f• §eBonus Score:§a ${bonusScore.get()}")
ScoreCalculationElement.text.add("§f• §eTotal Score:§a $score" + if (isPaul.get()) " §7(§6+10§7)" else "")
}
ScoreCalculationElement.text.add("§f• §eRank: $rank")

}
Expand Down