Simplify Tick and Predicate suspension into one

GregHib · Jan 17, 2025 · 57a8746 · 57a8746
1 parent 7c98a64
commit 57a8746
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 69 deletions.
diff --git a/...e/src/main/kotlin/world/gregs/voidps/engine/entity/character/mode/interact/Interaction.kt b/...e/src/main/kotlin/world/gregs/voidps/engine/entity/character/mode/interact/Interaction.kt
@@ -5,7 +5,7 @@ import world.gregs.voidps.engine.entity.character.Character
 import world.gregs.voidps.engine.event.CancellableEvent
 import world.gregs.voidps.engine.event.SuspendableEvent
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.TickSuspension
+import world.gregs.voidps.engine.suspend.Suspension
 
 abstract class Interaction<C : Character> : CancellableEvent(), SuspendableEvent, SuspendableContext<C> {
     var approach = false
@@ -22,7 +22,7 @@ abstract class Interaction<C : Character> : CancellableEvent(), SuspendableEvent
      * interaction will have finished and there will be nothing to resume the suspension
      */
     override suspend fun pause(ticks: Int) {
-        TickSuspension.start(character, ticks)
+        Suspension.start(character, ticks)
     }
 
     /**

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/mode/move/AreaEntered.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/mode/move/AreaEntered.kt
@@ -7,7 +7,7 @@ import world.gregs.voidps.engine.event.EventDispatcher
 import world.gregs.voidps.engine.event.Events
 import world.gregs.voidps.engine.event.SuspendableEvent
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.TickSuspension
+import world.gregs.voidps.engine.suspend.Suspension
 import world.gregs.voidps.type.Area
 
 data class AreaEntered<C : Character>(
@@ -22,7 +22,7 @@ data class AreaEntered<C : Character>(
     override val size = 5
 
     override suspend fun pause(ticks: Int) {
-        TickSuspension.start(character, ticks)
+        Suspension.start(character, ticks)
     }
 
     override fun parameter(dispatcher: EventDispatcher, index: Int): Any? = when (index) {

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/mode/move/AreaExited.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/mode/move/AreaExited.kt
@@ -7,7 +7,7 @@ import world.gregs.voidps.engine.event.EventDispatcher
 import world.gregs.voidps.engine.event.Events
 import world.gregs.voidps.engine.event.SuspendableEvent
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.TickSuspension
+import world.gregs.voidps.engine.suspend.Suspension
 import world.gregs.voidps.type.Area
 
 data class AreaExited<C : Character>(
@@ -21,7 +21,7 @@ data class AreaExited<C : Character>(
     override val size = 5
 
     override suspend fun pause(ticks: Int) {
-        TickSuspension.start(character, ticks)
+        Suspension.start(character, ticks)
     }
 
     override fun parameter(dispatcher: EventDispatcher, index: Int): Any? = when (index) {

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/mode/move/Moved.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/mode/move/Moved.kt
@@ -8,7 +8,7 @@ import world.gregs.voidps.engine.event.EventDispatcher
 import world.gregs.voidps.engine.event.Events
 import world.gregs.voidps.engine.event.SuspendableEvent
 import world.gregs.voidps.engine.suspend.SuspendableContext
-import world.gregs.voidps.engine.suspend.TickSuspension
+import world.gregs.voidps.engine.suspend.Suspension
 import world.gregs.voidps.type.Tile
 
 /**
@@ -24,7 +24,7 @@ data class Moved<C : Character>(
     override val size = 4
 
     override suspend fun pause(ticks: Int) {
-        TickSuspension.start(character, ticks)
+        Suspension.start(character, ticks)
     }
 
     override fun parameter(dispatcher: EventDispatcher, index: Int): Any? = when (index) {

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/suspend/PredicateSuspension.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/suspend/PredicateSuspension.kt
diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/suspend/Suspend.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/suspend/Suspend.kt
@@ -24,12 +24,12 @@ fun Character.resumeSuspension(): Boolean {
 }
 
 suspend fun SuspendableContext<Player>.awaitDialogues(): Boolean {
-    PredicateSuspension.start(character) { player.dialogue == null }
+    Suspension.start(character) { player.dialogue == null }
     return true
 }
 
 suspend fun SuspendableContext<Player>.awaitInterfaces(): Boolean {
-    PredicateSuspension.start(character) { player.menu == null }
+    Suspension.start(character) { player.menu == null }
     return true
 }
 

diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/suspend/Suspension.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/suspend/Suspension.kt
@@ -1,14 +1,37 @@
 package world.gregs.voidps.engine.suspend
 
 import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.suspendCancellableCoroutine
+import world.gregs.voidps.engine.GameLoop
+import world.gregs.voidps.engine.entity.character.Character
 import kotlin.coroutines.resume
 
-abstract class Suspension {
-    lateinit var continuation: CancellableContinuation<Unit>
+data class Suspension(
+    private val predicate: () -> Boolean
+) {
+    private lateinit var continuation: CancellableContinuation<Unit>
 
-    abstract fun ready(): Boolean
+    fun ready(): Boolean {
+        return predicate.invoke()
+    }
 
-    open fun resume() {
+    fun resume() {
         continuation.resume(Unit)
     }
+
+    companion object {
+        suspend fun start(character: Character, predicate: () -> Boolean) {
+            val suspension = Suspension(predicate)
+            suspendCancellableCoroutine {
+                suspension.continuation = it
+                character.suspension = suspension
+            }
+            character.suspension = null
+        }
+
+        suspend fun start(character: Character, ticks: Int) {
+            val tick = GameLoop.tick + ticks
+            start(character) { GameLoop.tick >= tick }
+        }
+    }
 }
diff --git a/engine/src/main/kotlin/world/gregs/voidps/engine/suspend/TickSuspension.kt b/engine/src/main/kotlin/world/gregs/voidps/engine/suspend/TickSuspension.kt
diff --git a/.../src/test/kotlin/world/gregs/voidps/engine/entity/character/mode/interact/InteractTest.kt b/.../src/test/kotlin/world/gregs/voidps/engine/entity/character/mode/interact/InteractTest.kt
@@ -29,7 +29,7 @@ import world.gregs.voidps.engine.entity.character.player.equip.BodyParts
 import world.gregs.voidps.engine.event.Events
 import world.gregs.voidps.engine.map.collision.Collisions
 import world.gregs.voidps.engine.script.KoinMock
-import world.gregs.voidps.engine.suspend.TickSuspension
+import world.gregs.voidps.engine.suspend.Suspension
 import world.gregs.voidps.network.login.protocol.visual.NPCVisuals
 import world.gregs.voidps.network.login.protocol.visual.PlayerVisuals
 import world.gregs.voidps.type.Tile
@@ -96,15 +96,15 @@ internal class InteractTest : KoinMock() {
         if (operate) {
             Events.handle<Player, NPCOption<Player>>("player_operate_npc", "*", "*") {
                 if (suspend) {
-                    TickSuspension.start(character, 2)
+                    Suspension.start(character, 2)
                 }
                 operated = true
             }
         }
         if (approach) {
             Events.handle<Player, NPCOption<Player>>("player_approach_npc", "*", "*") {
                 if (suspend) {
-                    TickSuspension.start(character, 2)
+                    Suspension.start(character, 2)
                 }
                 approached = true
             }