diff options
| author | ILike2WatchMemes <ilike2watchmemes@gmail.com> | 2024-09-14 09:04:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-14 09:04:56 +0200 |
| commit | c20e817af5cd0e297c2414adab6ffee46b88bb90 (patch) | |
| tree | 99ca00e594eefc47fd451eb471c91eccd090d5e3 /src/main/java/at/hannibal2/skyhanni/features/event | |
| parent | 7160089c812f97929105878d5b3c91e48066e9db (diff) | |
| download | skyhanni-c20e817af5cd0e297c2414adab6ffee46b88bb90.tar.gz skyhanni-c20e817af5cd0e297c2414adab6ffee46b88bb90.tar.bz2 skyhanni-c20e817af5cd0e297c2414adab6ffee46b88bb90.zip | |
Fix: Zombie Shootout QOL (#2507)
Co-authored-by: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/event')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt index cae5cbda1..d57903a57 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/carnival/CarnivalZombieShootout.kt @@ -61,9 +61,9 @@ object CarnivalZombieShootout { ) enum class ZombieType(val points: Int, val helmet: String, val color: Color) { - LEATHER(30, "Leather Cap", Color(165, 42, 42)), //Brown - IRON(50, "Iron Helmet", Color(192, 192, 192)), //Silver - GOLD(80, "Golden Helmet", Color(255, 215, 0)), //Gold + LEATHER(30, "Leather Cap", Color(165, 42, 42)), //Brown + IRON(50, "Iron Helmet", Color(192, 192, 192)), //Silver + GOLD(80, "Golden Helmet", Color(255, 215, 0)), //Gold DIAMOND(120, "Diamond Helmet", Color(185, 242, 255)) //Diamond } @@ -86,7 +86,10 @@ object CarnivalZombieShootout { zombie to type }.toMap() - drawZombies = nearbyZombies.filterValues { it == nearbyZombies.values.maxByOrNull { it.points } } + drawZombies = + if (config.highestOnly) nearbyZombies.filterValues { zombieType -> zombieType == nearbyZombies.values.maxByOrNull { it.points } } + else nearbyZombies + lastUpdate.zombie = SimpleTimeMark.now() } |