#184: Added commands to toggle rain / fog, command bug fix, minor improvements
This commit is contained in:
parent
26dbaa45a7
commit
c4a42066ab
@ -31,6 +31,32 @@ class WeatherManager {
|
|||||||
appLogger.info('Weather manager loaded')
|
appLogger.info('Weather manager loaded')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async toggleRain(): Promise<void> {
|
||||||
|
this.weatherState.isRainEnabled = !this.weatherState.isRainEnabled
|
||||||
|
this.weatherState.rainPercentage = this.weatherState.isRainEnabled
|
||||||
|
? Math.floor(Math.random() * 50) + 50 // 50-100%
|
||||||
|
: 0
|
||||||
|
|
||||||
|
// Save weather
|
||||||
|
await this.saveWeather()
|
||||||
|
|
||||||
|
// Emit weather
|
||||||
|
this.emitWeather()
|
||||||
|
}
|
||||||
|
|
||||||
|
public async toggleFog(): Promise<void> {
|
||||||
|
this.weatherState.isFogEnabled = !this.weatherState.isFogEnabled
|
||||||
|
this.weatherState.fogDensity = this.weatherState.isFogEnabled
|
||||||
|
? Math.random() * 0.7 + 0.3 // 0.3-1.0
|
||||||
|
: 0
|
||||||
|
|
||||||
|
// Save weather
|
||||||
|
await this.saveWeather()
|
||||||
|
|
||||||
|
// Emit weather
|
||||||
|
this.emitWeather()
|
||||||
|
}
|
||||||
|
|
||||||
private async loadWeather(): Promise<void> {
|
private async loadWeather(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
this.weatherState.isRainEnabled = await readJsonValue<boolean>(this.getWorldFilePath(), 'isRainEnabled')
|
this.weatherState.isRainEnabled = await readJsonValue<boolean>(this.getWorldFilePath(), 'isRainEnabled')
|
||||||
@ -50,7 +76,9 @@ class WeatherManager {
|
|||||||
this.intervalId = setInterval(() => {
|
this.intervalId = setInterval(() => {
|
||||||
this.updateWeather()
|
this.updateWeather()
|
||||||
this.emitWeather()
|
this.emitWeather()
|
||||||
this.saveWeather()
|
this.saveWeather().catch((error) => {
|
||||||
|
appLogger.error(`Failed to save weather: ${error instanceof Error ? error.message : String(error)}`)
|
||||||
|
})
|
||||||
}, WeatherManager.UPDATE_INTERVAL)
|
}, WeatherManager.UPDATE_INTERVAL)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -24,16 +24,24 @@ export default class AlertCommandEvent {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const args = getArgs('alert', data.message)
|
// Check if character exists
|
||||||
|
const character = await CharacterRepository.getByUserAndId(this.socket.user?.id as number, this.socket.characterId as number)
|
||||||
if (!args) {
|
if (!character) {
|
||||||
|
gameLogger.error('chat:alert_command error', 'Character not found')
|
||||||
callback(false)
|
callback(false)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const character = await CharacterRepository.getByUserAndId(this.socket.user?.id as number, this.socket.characterId as number)
|
// Check if the user is the GM
|
||||||
if (!character) {
|
if (character.role !== 'gm') {
|
||||||
gameLogger.error('chat:alert_command error', 'Character not found')
|
gameLogger.info(`User ${character.id} tried to set time but is not a game master.`)
|
||||||
|
callback(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const args = getArgs('alert', data.message)
|
||||||
|
|
||||||
|
if (!args) {
|
||||||
callback(false)
|
callback(false)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
import { Server } from 'socket.io'
|
import { Server } from 'socket.io'
|
||||||
import { TSocket } from '../../../utilities/types'
|
import { ExtendedCharacter, TSocket } from '../../../utilities/types'
|
||||||
import { getArgs, isCommand } from '../../../utilities/chat'
|
import { getArgs, isCommand } from '../../../utilities/chat'
|
||||||
import ZoneRepository from '../../../repositories/zoneRepository'
|
import ZoneRepository from '../../../repositories/zoneRepository'
|
||||||
import CharacterManager from '../../../managers/characterManager'
|
import CharacterManager from '../../../managers/characterManager'
|
||||||
import { gameMasterLogger } from '../../../utilities/logger'
|
import { gameLogger, gameMasterLogger } from '../../../utilities/logger'
|
||||||
|
import CharacterRepository from '../../../repositories/characterRepository'
|
||||||
|
|
||||||
type TypePayload = {
|
type TypePayload = {
|
||||||
message: string
|
message: string
|
||||||
@ -21,9 +22,18 @@ export default class TeleportCommandEvent {
|
|||||||
|
|
||||||
private async handleTeleportCommand(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
|
private async handleTeleportCommand(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
|
||||||
try {
|
try {
|
||||||
const character = CharacterManager.getCharacterFromSocket(this.socket)
|
// Check if character exists
|
||||||
|
const character = await CharacterRepository.getByUserAndId(this.socket.user?.id as number, this.socket.characterId as number) as ExtendedCharacter
|
||||||
if (!character) {
|
if (!character) {
|
||||||
this.socket.emit('notification', { title: 'Server message', message: 'Character not found' })
|
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
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
51
src/socketEvents/chat/gameMaster/toggleFogCommand.ts
Normal file
51
src/socketEvents/chat/gameMaster/toggleFogCommand.ts
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
import { Server } from 'socket.io'
|
||||||
|
import { TSocket } from '../../../utilities/types'
|
||||||
|
import { isCommand } from '../../../utilities/chat'
|
||||||
|
import CharacterRepository from '../../../repositories/characterRepository'
|
||||||
|
import { gameLogger } from '../../../utilities/logger'
|
||||||
|
import WeatherManager from '../../../managers/weatherManager'
|
||||||
|
|
||||||
|
type TypePayload = {
|
||||||
|
message: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export default class ToggleFogCommand {
|
||||||
|
constructor(
|
||||||
|
private readonly io: Server,
|
||||||
|
private readonly socket: TSocket
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public listen(): void {
|
||||||
|
this.socket.on('chat:send_message', this.handleAlertCommand.bind(this))
|
||||||
|
}
|
||||||
|
|
||||||
|
private async handleAlertCommand(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
|
||||||
|
try {
|
||||||
|
if (!isCommand(data.message, 'fog')) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if character exists
|
||||||
|
const character = await CharacterRepository.getByUserAndId(this.socket.user?.id as number, this.socket.characterId as number)
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
51
src/socketEvents/chat/gameMaster/toggleRainCommand.ts
Normal file
51
src/socketEvents/chat/gameMaster/toggleRainCommand.ts
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
import { Server } from 'socket.io'
|
||||||
|
import { TSocket } from '../../../utilities/types'
|
||||||
|
import { isCommand } from '../../../utilities/chat'
|
||||||
|
import CharacterRepository from '../../../repositories/characterRepository'
|
||||||
|
import { gameLogger } from '../../../utilities/logger'
|
||||||
|
import WeatherManager from '../../../managers/weatherManager'
|
||||||
|
|
||||||
|
type TypePayload = {
|
||||||
|
message: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export default class ToggleRainCommand {
|
||||||
|
constructor(
|
||||||
|
private readonly io: Server,
|
||||||
|
private readonly socket: TSocket
|
||||||
|
) {}
|
||||||
|
|
||||||
|
public listen(): void {
|
||||||
|
this.socket.on('chat:send_message', this.handleAlertCommand.bind(this))
|
||||||
|
}
|
||||||
|
|
||||||
|
private async handleAlertCommand(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
|
||||||
|
try {
|
||||||
|
if (!isCommand(data.message, 'rain')) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if character exists
|
||||||
|
const character = await CharacterRepository.getByUserAndId(this.socket.user?.id as number, this.socket.characterId as number)
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,6 +1,6 @@
|
|||||||
export function isCommand(message: string, command?: string) {
|
export function isCommand(message: string, command?: string) {
|
||||||
if (command) {
|
if (command) {
|
||||||
return message.startsWith(`/${command} `)
|
return message === `/${command}` || message.startsWith(`/${command} `)
|
||||||
}
|
}
|
||||||
return message.startsWith('/')
|
return message.startsWith('/')
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user