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

Moved models to simplify and improve prisma schemas , added logic to update characterTypes

Browse Source
This commit is contained in:
Dennis Postma 2024-11-17 17:53:25 +01:00
parent 27f8bc8784
commit ec3bf0f51e
14 changed files with 80 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prisma/migrations/20241117163808_added_selectable_field_to_character_types/migration.sql Normal file
View File

@ -0,0 +1,2 @@
-- AlterTable
ALTER TABLE `CharacterType` ADD COLUMN `isEnabledForCharCreation` BOOLEAN NOT NULL DEFAULT false;

34
prisma/schema/game.prisma
View File

@ -5,3 +5,37 @@ model World {
isFogEnabled Boolean @default(false)
fogDensity Int @default(0)
}
model Chat {
id Int @id @default(autoincrement())
characterId Int
character Character @relation(fields: [characterId], references: [id], onDelete: Cascade)
zoneId Int
zone Zone @relation(fields: [zoneId], references: [id], onDelete: Cascade)
message String
createdAt DateTime @default(now())
}
model Sprite {
id String @id @default(uuid())
name String
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
spriteActions SpriteAction[]
characterTypes CharacterType[]
}
model SpriteAction {
id String @id @default(uuid())
spriteId String
sprite Sprite @relation(fields: [spriteId], references: [id], onDelete: Cascade)
action String
sprites Json?
originX Decimal @default(0)
originY Decimal @default(0)
isAnimated Boolean @default(false)
isLooping Boolean @default(false)
frameWidth Int @default(0)
frameHeight Int @default(0)
frameSpeed Int @default(0)
}

10
prisma/schema/schema.prisma
View File

@ -19,13 +19,3 @@ datasource db {
provider = "mysql"
url = env("DATABASE_URL")
}
model Chat {
id Int @id @default(autoincrement())
characterId Int
character Character @relation(fields: [characterId], references: [id], onDelete: Cascade)
zoneId Int
zone Zone @relation(fields: [zoneId], references: [id], onDelete: Cascade)
message String
createdAt DateTime @default(now())
}

23
prisma/schema/sprite.prisma
View File

@ -1,23 +0,0 @@
model Sprite {
id String @id @default(uuid())
name String
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
spriteActions SpriteAction[]
characterTypes CharacterType[]
}
model SpriteAction {
id String @id @default(uuid())
spriteId String
sprite Sprite @relation(fields: [spriteId], references: [id], onDelete: Cascade)
action String
sprites Json?
originX Decimal @default(0)
originY Decimal @default(0)
isAnimated Boolean @default(false)
isLooping Boolean @default(false)
frameWidth Int @default(0)
frameHeight Int @default(0)
frameSpeed Int @default(0)
}

33
prisma/schema/user.prisma
View File

@ -1,11 +1,11 @@
model User {
id Int @id @default(autoincrement())
username String @unique
email String @unique
password String
online Boolean @default(false)
characters Character[]
passwordResetTokens PasswordResetToken[]
id Int @id @default(autoincrement())
username String @unique
email String @unique
password String
online Boolean @default(false)
characters Character[]
passwordResetTokens PasswordResetToken[]
}
model PasswordResetToken {
@ -30,15 +30,16 @@ enum CharacterRace {
}
model CharacterType {
id Int @id @default(autoincrement())
name String
gender CharacterGender
race CharacterRace
characters Character[]
spriteId String?
sprite Sprite? @relation(fields: [spriteId], references: [id], onDelete: Cascade)
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
id Int @id @default(autoincrement())
name String
gender CharacterGender
race CharacterRace
isEnabledForCharCreation Boolean @default(false)
characters Character[]
spriteId String?
sprite Sprite? @relation(fields: [spriteId], references: [id], onDelete: Cascade)
createdAt DateTime @default(now())
updatedAt DateTime @updatedAt
}
model Character {

11
src/socketEvents/chat/gameMaster/alertCommand.ts
View File

@ -28,26 +28,23 @@ export default class AlertCommandEvent {
const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
if (!character) {
gameLogger.error('chat:alert_command error', 'Character not found')
callback(false)
return
return callback(false)
}
// Check if the user is the GM
if (character.role !== 'gm') {
gameLogger.info(`User ${character.id} tried to set time but is not a game master.`)
callback(false)
return
return callback(false)
}
const args = getArgs('alert', data.message)
if (!args) {
callback(false)
return
return callback(false)
}
this.io.emit('notification', { title: 'Message from GM', message: args.join(' ') })
callback(true)
return callback(true)
} catch (error: any) {
gameLogger.error('chat:alert_command error', error.message)
callback(false)

6
src/socketEvents/chat/gameMaster/setTimeCommand.ts
View File

@ -29,14 +29,12 @@ export default class SetTimeCommand {
const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
if (!character) {
gameLogger.error('chat:alert_command error', 'Character not found')
callback(false)
return
}
// Check if the user is the GM
if (character.role !== 'gm') {
gameLogger.info(`User ${character.id} tried to set time but is not a game master.`)
callback(false)
return
}
@ -44,20 +42,16 @@ export default class SetTimeCommand {
const args = getArgs('time', data.message)
if (!args) {
callback(false)
return
}
const time = args[0] // 24h time, e.g. 17:34
if (!time) {
callback(false)
return
}
await DateManager.setTime(time)
callback(true)
} catch (error: any) {
gameLogger.error('command error', error.message)
callback(false)

4
src/socketEvents/chat/gameMaster/teleportCommand.ts
View File

@ -26,7 +26,6 @@ export default class TeleportCommandEvent {
const zoneCharacter = ZoneManager.getCharacter(this.socket.characterId!)
if (!zoneCharacter) {
gameLogger.error('chat:message error', 'Character not found')
callback(false)
return
}
@ -35,7 +34,6 @@ export default class TeleportCommandEvent {
// Check if the user is the GM
if (character.role !== 'gm') {
gameLogger.info(`User ${character.id} tried to set time but is not a game master.`)
callback(false)
return
}
@ -86,8 +84,6 @@ export default class TeleportCommandEvent {
this.socket.emit('notification', { title: 'Server message', message: `You have been teleported to ${zone.name}` })
gameMasterLogger.info('teleport', `Character ${character.id} teleported to zone ${zone.id}`)
callback(true)
} catch (error: any) {
gameMasterLogger.error(`Error in teleport command: ${error.message}`)
this.socket.emit('notification', { title: 'Server message', message: 'An error occurred while teleporting' })

4
src/socketEvents/chat/gameMaster/toggleFogCommand.ts
View File

@ -29,20 +29,16 @@ export default class ToggleFogCommand {
const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
if (!character) {
gameLogger.error('chat:alert_command error', 'Character not found')
callback(false)
return
}
// Check if the user is the GM
if (character.role !== 'gm') {
gameLogger.info(`User ${character.id} tried to set time but is not a game master.`)
callback(false)
return
}
await WeatherManager.toggleFog()
callback(true)
} catch (error: any) {
gameLogger.error('command error', error.message)
callback(false)

4
src/socketEvents/chat/gameMaster/toggleRainCommand.ts
View File

@ -29,20 +29,16 @@ export default class ToggleRainCommand {
const character = await CharacterRepository.getByUserAndId(this.socket.userId!, this.socket.characterId!)
if (!character) {
gameLogger.error('chat:alert_command error', 'Character not found')
callback(false)
return
}
// Check if the user is the GM
if (character.role !== 'gm') {
gameLogger.info(`User ${character.id} tried to set time but is not a game master.`)
callback(false)
return
}
await WeatherManager.toggleRain()
callback(true)
} catch (error: any) {
gameLogger.error('command error', error.message)
callback(false)

4
src/socketEvents/gameMaster/assetManager/characterType/create.ts
View File

@ -11,10 +11,10 @@ export default class CharacterTypeCreateEvent {
) {}
public listen(): void {
this.socket.on('gm:characterType:create', this.handleCharacterTypeCreate.bind(this))
this.socket.on('gm:characterType:create', this.handleEvent.bind(this))
}
private async handleCharacterTypeCreate(data: undefined, callback: (response: boolean, characterType?: any) => void): Promise<void> {
private async handleEvent(data: undefined, callback: (response: boolean, characterType?: any) => void): Promise<void> {
try {
const character = await characterRepository.getById(this.socket.characterId as number)
if (!character) return callback(false)

6
src/socketEvents/gameMaster/assetManager/characterType/remove.ts → src/socketEvents/gameMaster/assetManager/characterType/delete.ts
View File

@ -10,17 +10,17 @@ interface IPayload {
object: string
}
export default class ObjectRemoveEvent {
export default class CharacterTypeDeleteEvent {
constructor(
private readonly io: Server,
private readonly socket: TSocket
) {}
public listen(): void {
this.socket.on('gm:object:remove', this.handleObjectRemove.bind(this))
this.socket.on('gm:characterType:remove', this.handleEvent.bind(this))
}
private async handleObjectRemove(data: IPayload, callback: (response: boolean) => void): Promise<void> {
private async handleEvent(data: IPayload, callback: (response: boolean) => void): Promise<void> {
const character = await characterRepository.getById(this.socket.characterId as number)
if (!character) return callback(false)

4
src/socketEvents/gameMaster/assetManager/characterType/list.ts
View File

@ -14,10 +14,10 @@ export default class CharacterTypeListEvent {
) {}
public listen(): void {
this.socket.on('gm:characterType:list', this.handleCharacterTypeList.bind(this))
this.socket.on('gm:characterType:list', this.handleEvent.bind(this))
}
private async handleCharacterTypeList(data: IPayload, callback: (response: CharacterType[]) => void): Promise<void> {
private async handleEvent(data: IPayload, callback: (response: CharacterType[]) => void): Promise<void> {
const character = await characterRepository.getById(this.socket.characterId as number)
if (!character) {
gameMasterLogger.error('gm:characterType:list error', 'Character not found')

36
src/socketEvents/gameMaster/assetManager/characterType/update.ts
View File

@ -2,27 +2,25 @@ import { Server } from 'socket.io'
import { TSocket } from '../../../../utilities/types'
import prisma from '../../../../utilities/prisma'
import characterRepository from '../../../../repositories/characterRepository'
import { CharacterGender, CharacterRace } from '@prisma/client'
type Payload = {
id: string
id: number
name: string
tags: string[]
originX: number
originY: number
isAnimated: boolean
frameSpeed: number
frameWidth: number
frameHeight: number
gender: CharacterGender
race: CharacterRace
isEnabledForCharCreation: boolean
spriteId: string
}
export default class ObjectUpdateEvent {
export default class CharacterTypeUpdateEvent {
constructor(
private readonly io: Server,
private readonly socket: TSocket
) {}
public listen(): void {
this.socket.on('gm:object:update', this.handleObjectUpdate.bind(this))
this.socket.on('gm:characterType:update', this.handleObjectUpdate.bind(this))
}
private async handleObjectUpdate(data: Payload, callback: (success: boolean) => void): Promise<void> {
@ -34,21 +32,17 @@ export default class ObjectUpdateEvent {
}
try {
await prisma.object.update({
where: {
id: data.id
},
await prisma.characterType.update({
where: { id: data.id },
data: {
name: data.name,
tags: data.tags,
originX: data.originX,
originY: data.originY,
isAnimated: data.isAnimated,
frameSpeed: data.frameSpeed,
frameWidth: data.frameWidth,
frameHeight: data.frameHeight
gender: data.gender,
race: data.race,
isEnabledForCharCreation: data.isEnabledForCharCreation,
spriteId: data.spriteId
}
})
callback(true)
} catch (error) {
console.error(error)