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.

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

Feature: Hitman Statistics #2991

Merged
merged 41 commits into from
Dec 13, 2024
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
29ab635
Done
DavidArthurCole Nov 26, 2024
89bf974
Detekt
DavidArthurCole Nov 26, 2024
205d602
Fix infinite loop
DavidArthurCole Nov 26, 2024
aa7c365
Impr
DavidArthurCole Nov 26, 2024
aaadd83
Detekt
DavidArthurCole Nov 26, 2024
e98bddd
Runaway prot
DavidArthurCole Nov 26, 2024
b3c11ec
....
DavidArthurCole Nov 26, 2024
16160ef
Add open slots as option
DavidArthurCole Nov 26, 2024
132f657
Possible logic fix
DavidArthurCole Nov 26, 2024
ab3fec7
Nerf full slots, stat calc is bugged
DavidArthurCole Nov 26, 2024
2c76682
Detekt
DavidArthurCole Nov 27, 2024
07d3b71
Fix bugged calcs
DavidArthurCole Nov 27, 2024
a86725d
Cap at event end
DavidArthurCole Nov 27, 2024
d96f5bc
Color when cutoff by event end
DavidArthurCole Nov 27, 2024
f760d36
Up
DavidArthurCole Nov 27, 2024
9d52095
Merge branch 'hannibal002:beta' into HoppityHitman
DavidArthurCole Nov 29, 2024
471970b
Fixes
DavidArthurCole Dec 1, 2024
d35cf2f
Revert, potential fix?
DavidArthurCole Dec 1, 2024
45e8e2b
Detekt
DavidArthurCole Dec 1, 2024
7749e87
More attempts at fixes
DavidArthurCole Dec 1, 2024
dfbf8ac
Another attempt
DavidArthurCole Dec 1, 2024
53ef120
Detekt
DavidArthurCole Dec 1, 2024
0231d09
Offset
DavidArthurCole Dec 1, 2024
c8043f5
Still broken
DavidArthurCole Dec 1, 2024
2920e85
Functional, finally
DavidArthurCole Dec 2, 2024
c83a839
Merge branch 'hannibal002:beta' into HoppityHitman
DavidArthurCole Dec 2, 2024
06f0a80
Bump
DavidArthurCole Dec 2, 2024
8377514
Bump again
DavidArthurCole Dec 2, 2024
ea8c988
Merge branch 'hannibal002:beta' into HoppityHitman
DavidArthurCole Dec 4, 2024
1c6242d
Merge branch 'beta' into HoppityHitman
DavidArthurCole Dec 5, 2024
1e9ab17
Detekt
DavidArthurCole Dec 5, 2024
e552b10
Merge branch 'refs/heads/beta' into fork/DavidArthurCole/HoppityHitman
CalMWolfs Dec 6, 2024
cfddb93
Fix logic for unclaimed eggs
DavidArthurCole Dec 6, 2024
e5c061f
Changes (gramatic and syntactic, no functionality changed)
DavidArthurCole Dec 6, 2024
0f5dc94
Merge branch 'hannibal002:beta' into HoppityHitman
DavidArthurCole Dec 9, 2024
d629d92
Merge branch 'hannibal002:beta' into HoppityHitman
DavidArthurCole Dec 10, 2024
e32999b
Requested changes
DavidArthurCole Dec 10, 2024
257174a
Fixes
DavidArthurCole Dec 11, 2024
c351912
Fix logical error
DavidArthurCole Dec 12, 2024
85e3559
Merge remote-tracking branch 'upstream/beta' into HoppityHitman
DavidArthurCole Dec 12, 2024
e6b8049
Account for available in open slots
DavidArthurCole Dec 12, 2024
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
Prev Previous commit
Next Next commit
Possible logic fix
  • Loading branch information
DavidArthurCole committed Nov 26, 2024
commit 132f657809276e2ccca02aff45c317ef97dc8715
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ object ChocolateFactoryStats {
val sortedEntries = HoppityEggType.resettingEntries.sortedBy { it.resetsAt }
val nextMeal = sortedEntries.firstOrNull {
it.resetsAt > sbTimeThen.hour && it.altDay == sbTimeThen.isAlternateDay()
} ?: sortedEntries.firstOrNull {
it.resetsAt < sbTimeThen.hour && it.altDay != sbTimeThen.isAlternateDay()
}
} ?: sortedEntries.filter {
it.altDay != sbTimeThen.isAlternateDay()
}.minByOrNull { it.resetsAt }
sbTimeThen.copy(hour = nextMeal?.resetsAt ?: 0, minute = 0, second = 0).asTimeMark().timeUntil()
}
}
Expand Down
Loading