noxious/server
6
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More TP work

Browse Source
This commit is contained in:
Dennis Postma
2024-08-26 21:22:03 +02:00
parent e8d100e063
commit 1aa3d1a208
5 changed files with 68 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/character/characterMoveService.ts
View File

@ -10,6 +10,8 @@ export class CharacterMoveService {
public async updatePosition(character: ExtendedCharacter, position: { x: number; y: number }, newZoneId?: number): Promise<void> {
const oldZoneId = character.zoneId
console.log('newZoneId', newZoneId)
Object.assign(character, {
positionX: position.x,
positionY: position.y,
@ -30,7 +32,7 @@ export class CharacterMoveService {
positionX: position.x,
positionY: position.y,
rotation: character.rotation,
zoneId: character.zoneId
zoneId: newZoneId
}
})
}

17
src/services/character/movementValidator.ts
View File

@ -1,17 +0,0 @@
import { ExtendedCharacter } from '../../utilities/types'
import ZoneManager from '../../managers/zoneManager'
export class MovementValidator {
public async isValidMove(character: ExtendedCharacter, position: { x: number; y: number }): Promise<boolean> {
const grid = await ZoneManager.getGrid(character.zoneId)
if (!grid?.length) return false
return !this.isObstacle(position, grid)
}
private isObstacle({ x, y }: { x: number; y: number }, grid: number[][]): boolean {
const gridX = Math.floor(x)
const gridY = Math.floor(y)
return grid[gridY]?.[gridX] === 1 || grid[gridY]?.[Math.ceil(x)] === 1 || grid[Math.ceil(y)]?.[gridX] === 1 || grid[Math.ceil(y)]?.[Math.ceil(x)] === 1
}
}

37
src/services/character/teleportService.ts
View File

@ -1,37 +0,0 @@
import { ExtendedCharacter, TSocket } from '../../utilities/types'
import prisma from '../../utilities/prisma'
import ZoneRepository from '../../repositories/zoneRepository'
import ZoneManager from '../../managers/zoneManager'
export class TeleportService {
public async checkForTeleport(character: ExtendedCharacter, position: { x: number; y: number }): Promise<any | null> {
return prisma.zoneEventTile.findFirst({
where: {
zoneId: character.zoneId,
type: 'TELEPORT',
positionX: Math.floor(position.x),
positionY: Math.floor(position.y)
},
include: { teleport: true }
})
}
public async handleTeleport(socket: TSocket, character: ExtendedCharacter, teleport: any): Promise<void> {
if (teleport.toZoneId === character.zoneId) return
const zone = await ZoneRepository.getById(teleport.toZoneId)
if (!zone) return
character.zoneId = teleport.toZoneId
character.positionX = teleport.toPositionX
character.positionY = teleport.toPositionY
socket.leave(character.zoneId.toString())
socket.join(teleport.toZoneId.toString())
socket.emit('zone:teleport', {
zone,
characters: ZoneManager.getCharactersInZone(zone.id)
})
}
}

26
src/services/zoneEventTileService.ts Normal file
View File

@ -0,0 +1,26 @@
import { ExtendedCharacter, TSocket } from '../utilities/types'
import prisma from '../utilities/prisma'
import ZoneRepository from '../repositories/zoneRepository'
import ZoneManager from '../managers/zoneManager'
import { ZoneEventTile, ZoneEventTileTeleport } from '@prisma/client'
export class ZoneEventTileService {
public async handleTeleport(socket: TSocket, character: ExtendedCharacter, teleport: ZoneEventTileTeleport): Promise<void> {
if (teleport.toZoneId === character.zoneId) return
const zone = await ZoneRepository.getById(teleport.toZoneId)
if (!zone) return
character.zoneId = teleport.toZoneId
character.positionX = teleport.toPositionX
character.positionY = teleport.toPositionY
socket.leave(character.zoneId.toString())
socket.join(teleport.toZoneId.toString())
socket.emit('zone:teleport', {
zone,
characters: ZoneManager.getCharactersInZone(zone.id)
})
}
}