Remove duplicate overload timer methods

GregHib · Feb 11, 2024 · 5190c9b · 5190c9b
1 parent 333d4b0
commit 5190c9b
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/.../kotlin/world/gregs/voidps/world/interact/entity/player/combat/consume/drink/Overload.kts b/.../kotlin/world/gregs/voidps/world/interact/entity/player/combat/consume/drink/Overload.kts
@@ -27,7 +27,7 @@ on<Consumable>({ item.id.startsWith("overload") }) { player: Player ->
     }
 }
 
-consume("overload*") { player: Player ->
+consume("overload_#") { player: Player ->
     player["overload_refreshes_remaining"] = 20
     player.timers.start("overload")
 }
@@ -38,15 +38,12 @@ playerSpawn { player: Player ->
     }
 }
 
-timerStart("overload") { _: Player ->
-    interval = 25
-}
-
 timerStart("overload") { player: Player ->
+    interval = 25
     if (restart) {
         return@timerStart
     }
-    player.queue(name = "hit") {
+    player.queue(name = "overload_hits") {
         repeat(5) {
             player.directHit(100)
             player.setAnimation("overload")