imshvc/noxious_server
1
0
Fork 0
forked from noxious/server
Code Pull Requests Activity

aids

Browse Source
This commit is contained in:
Dennis Postma 2024-09-09 20:41:59 +02:00
parent d2e1837e75
commit 839fec1c06
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/events/disconnect.ts
View File

@ -1,6 +1,7 @@
import { Server } from 'socket.io' import { Server } from 'socket.io'
import { TSocket } from '../utilities/types' import { TSocket } from '../utilities/types'
import ZoneManager from '../managers/zoneManager' import ZoneManager from '../managers/zoneManager'
import CharacterManager from '../managers/characterManager'
export default function (socket: TSocket, io: Server) { export default function (socket: TSocket, io: Server) {
socket.on('disconnect', (data: any) => { socket.on('disconnect', (data: any) => {
@ -18,7 +19,7 @@ export default function (socket: TSocket, io: Server) {
console.log('User disconnected along with their character') console.log('User disconnected along with their character')
ZoneManager.removeCharacterFromZone(socket.character.zoneId, socket.character) CharacterManager.removeCharacter(socket.character)
io.in(socket.character.zoneId.toString()).emit('zone:character:leave', socket.character.id) io.in(socket.character.zoneId.toString()).emit('zone:character:leave', socket.character.id)
io.emit('character:disconnect', socket.character.id) io.emit('character:disconnect', socket.character.id)

11
src/events/zone/characterMoveEvent.ts → src/events/zone/characterMove.ts
View File

@ -2,7 +2,6 @@ import { Server } from 'socket.io'
import { TSocket, ExtendedCharacter } from '../../utilities/types' import { TSocket, ExtendedCharacter } from '../../utilities/types'
import { CharacterMoveService } from '../../services/character/characterMoveService' import { CharacterMoveService } from '../../services/character/characterMoveService'
import { ZoneEventTileService } from '../../services/zoneEventTileService' import { ZoneEventTileService } from '../../services/zoneEventTileService'
import { MovementValidator } from '../../utilities/character/movementValidator'
import prisma from '../../utilities/prisma' import prisma from '../../utilities/prisma'
import { ZoneEventTile, ZoneEventTileTeleport } from '@prisma/client' import { ZoneEventTile, ZoneEventTileTeleport } from '@prisma/client'
import Rotation from '../../utilities/character/rotation' import Rotation from '../../utilities/character/rotation'
@ -12,10 +11,9 @@ type ZoneEventTileWithTeleport = ZoneEventTile & {
teleport: ZoneEventTileTeleport teleport: ZoneEventTileTeleport
} }
export default class CharacterMoveEvent { export default class CharacterMove {
private characterMoveService: CharacterMoveService private characterMoveService: CharacterMoveService
private zoneEventTileService: ZoneEventTileService private zoneEventTileService: ZoneEventTileService
private movementValidator: MovementValidator
private nextPath: { [index: number]: { x: number; y: number }[] } = [] private nextPath: { [index: number]: { x: number; y: number }[] } = []
constructor( constructor(
@ -24,7 +22,6 @@ export default class CharacterMoveEvent {
) { ) {
this.characterMoveService = new CharacterMoveService() this.characterMoveService = new CharacterMoveService()
this.zoneEventTileService = new ZoneEventTileService() this.zoneEventTileService = new ZoneEventTileService()
this.movementValidator = new MovementValidator()
} }
public listen(): void { public listen(): void {
@ -57,9 +54,9 @@ export default class CharacterMoveEvent {
const start = path[i] const start = path[i]
const end = path[i + 1] const end = path[i + 1]
if (!(await this.movementValidator.isValidMove(character, end))) { // if (!(await this.movementValidator.isValidMove(character, end))) {
break // break
} // }
if (character.isMoving && character.resetMovement) { if (character.isMoving && character.resetMovement) {
character.isMoving = false character.isMoving = false

4
src/managers/characterManager.ts
View File

@ -12,6 +12,10 @@ class CharacterManager {
this.characters = [...this.characters, character] this.characters = [...this.characters, character]
} }
public removeCharacter(character: ExtendedCharacter) {
this.characters = this.characters.filter(x => x.id !== character.id);
}
public getCharactersInZone(zone: Zone) { public getCharactersInZone(zone: Zone) {
return this.characters.filter(x => x.zoneId === zone.id); return this.characters.filter(x => x.zoneId === zone.id);
} }