Worked on character animations

src/events/character/Connect.ts

@@ -1,7 +1,6 @@
-import { Socket, Server } from 'socket.io'
-import { TSocket } from '../../utilities/Types'
+import { Server } from 'socket.io'
+import { TSocket, ExtendedCharacter } from '../../utilities/Types'
 import CharacterRepository from '../../repositories/CharacterRepository'
-import { Character, User } from '@prisma/client'
 
 type SocketResponseT = {
   character_id: number
@@ -11,7 +10,7 @@ export default function (socket: TSocket, io: Server) {
   socket.on('character:connect', async (data: SocketResponseT) => {
     console.log('character:connect requested', data)
     try {
-      socket.character = (await CharacterRepository.getByUserAndId(socket.user?.id as number, data.character_id)) as Character
+      socket.character = (await CharacterRepository.getByUserAndId(socket.user?.id as number, data.character_id)) as ExtendedCharacter
       socket.emit('character:connect', socket.character)
     } catch (error: any) {
       console.log('character:connect error', error)

src/events/character/Move.ts

@@ -2,22 +2,15 @@ import { Server } from 'socket.io'
 import { TSocket } from '../../utilities/Types'
 import ZoneManager from '../../managers/ZoneManager'
 import prisma from '../../utilities/Prisma'
-import AStar, { type Node } from '../../utilities/Player/AStar'
+import { AStar, type Node } from '../../utilities/Player/AStar'
 import Rotation from '../../utilities/Player/Rotation'
+import { ExtendedCharacter as Character } from '../../utilities/Types'
 
 interface SocketResponse {
   position_x: number
   position_y: number
 }
 
-interface Character {
-  id: number
-  position_x: number
-  position_y: number
-  rotation: number
-  zoneId: number
-}
-
 export default function setupCharacterMove(socket: TSocket, io: Server) {
   socket.on('character:move', async (data: SocketResponse) => {
     try {
@@ -41,12 +34,23 @@ export default function setupCharacterMove(socket: TSocket, io: Server) {
       const path = AStar.findPath(start, end, grid)
 
       if (path.length > 0) {
-        await moveAlongPath(socket, io, path, grid)
+        socket.character.isMoving = true
+        io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character)
+        try {
+          await moveAlongPath(socket, io, path, grid)
+        } finally {
+          socket.character.isMoving = false
+          io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character)
+        }
       } else {
         console.log('character:move error', 'No valid path found')
       }
     } catch (error) {
       console.error('character:move error', error)
+      if (socket.character) {
+        socket.character.isMoving = false
+        io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character)
+      }
     }
   })
 }
@@ -73,8 +77,6 @@ async function moveAlongPath(socket: TSocket, io: Server, path: Node[], grid: nu
     ZoneManager.updateCharacterInZone(socket.character.zoneId, socket.character)
     io.in(socket.character.zoneId.toString()).emit('character:moved', socket.character)
 
-    console.log('Character moved to', position)
-
     // Add a small delay between moves to avoid overwhelming the server
     await new Promise((resolve) => setTimeout(resolve, 100))
   }
@@ -93,4 +95,4 @@ async function updateCharacterPosition(character: Character, x: number, y: numbe
     where: { id: character.id },
     data: { position_x: x, position_y: y, rotation }
   })
-}
+}

src/events/gm/zone/Update.ts

@@ -3,6 +3,7 @@ import { TSocket } from '../../../utilities/Types'
 import ZoneRepository from '../../../repositories/ZoneRepository'
 import { ZoneEventTile, ZoneObject } from '@prisma/client'
 import prisma from '../../../utilities/Prisma'
+import zoneManager from '../../../managers/ZoneManager'
 
 interface IPayload {
   zoneId: number
@@ -82,8 +83,16 @@ export default function (socket: TSocket, io: Server) {
 
       zone = await ZoneRepository.getById(data.zoneId)
 
+      if (!zone) {
+        console.log(`---Zone not found.`)
+        return
+      }
+
       // send over zone and characters to socket
       socket.emit('gm:zone_editor:zone:load', zone)
+
+      zoneManager.unloadZone(data.zoneId)
+      await zoneManager.loadZone(zone)
     } catch (error: any) {
       console.log(`---Error updating zone: ${error.message}`)
     }