Fix large npc rotation (#1010)

* Fix npc rotation closes #846

* Client connection tweaks to avoid update errors #829

* Fix rotation calc

Author: GregHib

data/minigame/first_of_guthix/fist_of_guthix.npc-spawns.toml

@@ -5,5 +5,5 @@ spawns = [
   { id = "getorix", x = 1693, y = 5598 },
   { id = "pontimer", x = 1696, y = 5600 },
   { id = "alran", x = 1699, y = 5599 },
-  { id = "fiara", x = 1714, y = 5602, direction = "SOUTH_EAST", members = true },
+  { id = "fiara", x = 1714, y = 5602, direction = "SOUTH", members = true },
 ]

engine/src/main/kotlin/world/gregs/voidps/engine/client/update/npc/NPCUpdateTask.kt

@@ -30,8 +30,9 @@ class NPCUpdateTask(
         processAdditions(player, viewport, writer, updates, npcs)
         writer.stopBitAccess()
 
-        player.client?.updateNPCs(writer, updates)
-        player.client?.flush()
+        val client = player.client ?: return
+        client.updateNPCs(writer, updates)
+        client.flush()
         writer.position(0)
         updates.position(0)
     }
@@ -128,7 +129,9 @@ class NPCUpdateTask(
                 sync.writeBits(1, visuals.tele)
                 sync.writeBits(5, delta.y + if (delta.y < 15) 32 else 0)
                 sync.writeBits(5, delta.x + if (delta.x < 15) 32 else 0)
-                sync.writeBits(3, (visuals.face.direction shr 11) - 4)
+                val roundedSector = ((visuals.face.direction + 1024) and 0x3fff) shr 11
+                val bitsToWrite = (roundedSector - 4) and 0x7
+                sync.writeBits(3, bitsToWrite)
                 sync.writeBits(1, flag != 0)
                 sync.writeBits(14, npc.def.id)
                 encodeVisuals(updates, flag, visuals, client.index)

engine/src/main/kotlin/world/gregs/voidps/engine/client/update/player/PlayerUpdateTask.kt

@@ -54,8 +54,9 @@ class PlayerUpdateTask {
         processGlobals(player, writer, updates, players, viewport, true)
         processGlobals(player, writer, updates, players, viewport, false)
 
-        player.client?.updatePlayers(writer, updates)
-        player.client?.flush()
+        val client = player.client ?: return
+        client.updatePlayers(writer, updates)
+        client.flush()
         writer.position(0)
         updates.position(0)
     }

engine/src/main/kotlin/world/gregs/voidps/engine/entity/character/Character.kt

@@ -197,12 +197,14 @@ interface Character :
      * The direction the character is currently facing
      */
     val direction: Direction
-        get() = Direction.of(visuals.face.targetX - tile.x, visuals.face.targetY - tile.y)
+        get() = Direction.of((visuals.face.targetX - tile.x).coerceIn(-1, 1), (visuals.face.targetY - tile.y).coerceIn(-1, 1))
 
     /**
      * Turn to face a [direction]
      */
-    fun face(direction: Direction, update: Boolean = true) = face(direction.delta, update)
+    fun face(direction: Direction, update: Boolean = true): Boolean {
+        return face(Delta(direction.delta.x * 100, direction.delta.y * 100), update)
+    }
 
     /**
      * Turn to face a [tile]

network/src/main/kotlin/world/gregs/voidps/network/client/Client.kt

@@ -72,7 +72,7 @@ open class Client(
     open fun send(opcode: Int, block: suspend ByteWriteChannel.() -> Unit) = send(opcode, -1, FIXED, block)
 
     open fun send(opcode: Int, size: Int, type: Int, block: suspend ByteWriteChannel.() -> Unit) {
-        if (disconnected) {
+        if (disconnected || state != ClientState.Connected) {
             return
         }
         runBlocking(handler) {

network/src/main/kotlin/world/gregs/voidps/network/login/protocol/visual/encode/npc/NPCFaceEncoder.kt

@@ -5,13 +5,13 @@ import world.gregs.voidps.network.login.protocol.visual.NPCVisuals
 import world.gregs.voidps.network.login.protocol.visual.VisualEncoder
 import world.gregs.voidps.network.login.protocol.visual.VisualMask.NPC_FACE_MASK
 
-class NPCFaceEncoder : VisualEncoder<NPCVisuals>(NPC_FACE_MASK, initial = true) {
+class NPCFaceEncoder : VisualEncoder<NPCVisuals>(NPC_FACE_MASK) {
 
     override fun encode(writer: Writer, visuals: NPCVisuals) {
         val (targetX, targetY) = visuals.face
         writer.apply {
-            writeShortAdd(targetX * 2 + 1)
-            writeShortLittle(targetY * 2 + 1)
+            writeShortAdd((targetX * 2) + 1)
+            writeShortLittle((targetY * 2) + 1)
         }
     }
 }