From e1f1b22a1f05f25e4b198344bb270fed6c2fd7fb Mon Sep 17 00:00:00 2001 From: Bill Date: Sun, 24 Jul 2022 23:17:40 -0400 Subject: [PATCH] Eslint --fix --- src/core/asset/AssetManager.ts | 48 +- src/core/common/logger/NitroLogger.ts | 4 +- .../connections/SocketConnection.ts | 78 +- src/core/events/EventDispatcher.ts | 26 +- .../avatar/AvatarAssetDownloadManager.ts | 94 +- src/nitro/avatar/AvatarRenderManager.ts | 92 +- .../avatar/EffectAssetDownloadManager.ts | 76 +- .../structure/AvatarStructureDownload.ts | 4 +- .../demo/NitroCommunicationDemo.ts | 26 +- src/nitro/room/RoomContentLoader.ts | 158 +-- src/nitro/room/RoomEngine.ts | 922 +++++++++--------- src/nitro/room/RoomObjectEventHandler.ts | 602 ++++++------ src/nitro/room/RoomObjectLogicFactory.ts | 38 +- .../object/RoomObjectVisualizationFactory.ts | 20 +- .../logic/furniture/FurnitureYoutubeLogic.ts | 4 +- .../FurnitureFireworksVisualization.ts | 28 +- src/nitro/room/utils/TileObjectMap.ts | 34 +- src/nitro/session/RoomSession.ts | 24 +- src/nitro/session/SessionDataManager.ts | 98 +- src/nitro/session/badge/BadgeImageManager.ts | 9 +- src/nitro/session/handler/RoomUsersHandler.ts | 102 +- 21 files changed, 1244 insertions(+), 1243 deletions(-) diff --git a/src/core/asset/AssetManager.ts b/src/core/asset/AssetManager.ts index a77d2d98..d7b2aa1b 100644 --- a/src/core/asset/AssetManager.ts +++ b/src/core/asset/AssetManager.ts @@ -34,33 +34,33 @@ export class AssetManager extends Disposable implements IAssetManager public getTexture(name: string): Texture { - if (!name) return null; + if(!name) return null; const existing = this._textures.get(name); - if (!existing) return null; + if(!existing) return null; return existing; } public setTexture(name: string, texture: Texture): void { - if (!name || !texture) return; + if(!name || !texture) return; this._textures.set(name, texture); } public getAsset(name: string): IGraphicAsset { - if (!name) return null; + if(!name) return null; - for (const collection of this._collections.values()) + for(const collection of this._collections.values()) { - if (!collection) continue; + if(!collection) continue; const existing = collection.getAsset(name); - if (!existing) continue; + if(!existing) continue; return existing; } @@ -70,24 +70,24 @@ export class AssetManager extends Disposable implements IAssetManager public getCollection(name: string): IGraphicAssetCollection { - if (!name) return null; + if(!name) return null; const existing = this._collections.get(name); - if (!existing) return null; + if(!existing) return null; return existing; } public createCollection(data: IAssetData, spritesheet: Spritesheet): IGraphicAssetCollection { - if (!data) return null; + if(!data) return null; const collection = new GraphicAssetCollection(data, spritesheet); - if (collection) + if(collection) { - for (const [name, texture] of collection.textures.entries()) this.setTexture(name, texture); + for(const [name, texture] of collection.textures.entries()) this.setTexture(name, texture); this._collections.set(collection.name, collection); } @@ -102,7 +102,7 @@ export class AssetManager extends Disposable implements IAssetManager public downloadAssets(assetUrls: string[], cb: (status: boolean) => void): void { - if (!assetUrls || !assetUrls.length) + if(!assetUrls || !assetUrls.length) { cb(true); @@ -111,9 +111,9 @@ export class AssetManager extends Disposable implements IAssetManager const loader = new Loader(); - for (const url of assetUrls) + for(const url of assetUrls) { - if (!url) continue; + if(!url) continue; loader .add({ @@ -128,7 +128,7 @@ export class AssetManager extends Disposable implements IAssetManager const onDownloaded = (status: boolean, url: string) => { - if (!status) + if(!status) { this._logger.error('Failed to download asset', url); @@ -141,7 +141,7 @@ export class AssetManager extends Disposable implements IAssetManager remaining--; - if (!remaining) + if(!remaining) { loader.destroy(); @@ -153,11 +153,11 @@ export class AssetManager extends Disposable implements IAssetManager loader.load((loader, resources) => { - for (const key in resources) + for(const key in resources) { const resource = resources[key]; - if (!resource || resource.error || !resource.xhr) + if(!resource || resource.error || !resource.xhr) { onDownloaded(false, resource.url); @@ -166,7 +166,7 @@ export class AssetManager extends Disposable implements IAssetManager const resourceType = (resource.xhr.getResponseHeader('Content-Type') || 'application/octet-stream'); - if (resourceType === 'application/octet-stream') + if(resourceType === 'application/octet-stream') { const nitroBundle = new NitroBundle(resource.data); @@ -178,12 +178,12 @@ export class AssetManager extends Disposable implements IAssetManager continue; } - if ((resourceType === 'image/png') || (resourceType === 'image/jpeg') || (resourceType === 'image/gif')) + if((resourceType === 'image/png') || (resourceType === 'image/jpeg') || (resourceType === 'image/gif')) { const base64 = ArrayBufferToBase64(resource.data); const baseTexture = new BaseTexture(`data:${resourceType};base64,${base64}`); - if (baseTexture.valid) + if(baseTexture.valid) { const texture = new Texture(baseTexture); @@ -215,7 +215,7 @@ export class AssetManager extends Disposable implements IAssetManager { const spritesheetData = data.spritesheet; - if (!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) + if(!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) { this.createCollection(data, null); @@ -236,7 +236,7 @@ export class AssetManager extends Disposable implements IAssetManager }); }; - if (baseTexture.valid) + if(baseTexture.valid) { createAsset(); } diff --git a/src/core/common/logger/NitroLogger.ts b/src/core/common/logger/NitroLogger.ts index cb995b52..0cc8bdda 100644 --- a/src/core/common/logger/NitroLogger.ts +++ b/src/core/common/logger/NitroLogger.ts @@ -30,7 +30,7 @@ export class NitroLogger implements INitroLogger public printMessage(modus: string, ...message: any[]): void { - if (!this._print) return; + if(!this._print) return; NitroLogger.log(this._name, modus, ...message); } @@ -39,7 +39,7 @@ export class NitroLogger implements INitroLogger { const logPrefix = `[Nitro] [${name}]`; - switch (modus) + switch(modus) { case 'error': console.error(logPrefix, ...message); diff --git a/src/core/communication/connections/SocketConnection.ts b/src/core/communication/connections/SocketConnection.ts index 38301ef7..bdb4d056 100644 --- a/src/core/communication/connections/SocketConnection.ts +++ b/src/core/communication/connections/SocketConnection.ts @@ -53,7 +53,7 @@ export class SocketConnection extends EventDispatcher implements IConnection public init(socketUrl: string): void { - if (this._stateListener) + if(this._stateListener) { this._stateListener.connectionInit(socketUrl); } @@ -76,13 +76,13 @@ export class SocketConnection extends EventDispatcher implements IConnection public onReady(): void { - if (this._isReady) return; + if(this._isReady) return; this._isReady = true; - if (this._pendingServerMessages && this._pendingServerMessages.length) this.processWrappers(...this._pendingServerMessages); + if(this._pendingServerMessages && this._pendingServerMessages.length) this.processWrappers(...this._pendingServerMessages); - if (this._pendingClientMessages && this._pendingClientMessages.length) this.send(...this._pendingClientMessages); + if(this._pendingClientMessages && this._pendingClientMessages.length) this.send(...this._pendingClientMessages); this._pendingServerMessages = []; this._pendingClientMessages = []; @@ -90,7 +90,7 @@ export class SocketConnection extends EventDispatcher implements IConnection private createSocket(socketUrl: string): void { - if (!socketUrl) return; + if(!socketUrl) return; this.destroySocket(); @@ -105,14 +105,14 @@ export class SocketConnection extends EventDispatcher implements IConnection private destroySocket(): void { - if (!this._socket) return; + if(!this._socket) return; this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_OPENED, this.onOpen); this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_CLOSED, this.onClose); this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_ERROR, this.onError); this._socket.removeEventListener(WebSocketEventEnum.CONNECTION_MESSAGE, this.onMessage); - if (this._socket.readyState === WebSocket.OPEN) this._socket.close(); + if(this._socket.readyState === WebSocket.OPEN) this._socket.close(); this._socket = null; } @@ -134,7 +134,7 @@ export class SocketConnection extends EventDispatcher implements IConnection private onMessage(event: MessageEvent): void { - if (!event) return; + if(!event) return; //this.dispatchConnectionEvent(SocketConnectionEvent.CONNECTION_MESSAGE, event); @@ -162,28 +162,28 @@ export class SocketConnection extends EventDispatcher implements IConnection public send(...composers: IMessageComposer[]): boolean { - if (this.disposed || !composers) return false; + if(this.disposed || !composers) return false; composers = [...composers]; - if (this._isAuthenticated && !this._isReady) + if(this._isAuthenticated && !this._isReady) { - if (!this._pendingClientMessages) this._pendingClientMessages = []; + if(!this._pendingClientMessages) this._pendingClientMessages = []; this._pendingClientMessages.push(...composers); return false; } - for (const composer of composers) + for(const composer of composers) { - if (!composer) continue; + if(!composer) continue; const header = this._messages.getComposerId(composer); - if (header === -1) + if(header === -1) { - if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log(`Unknown Composer: ${composer.constructor.name}`); + if(Nitro.instance.getConfiguration('system.packet.log')) this.logger.log(`Unknown Composer: ${composer.constructor.name}`); continue; } @@ -191,14 +191,14 @@ export class SocketConnection extends EventDispatcher implements IConnection const message = composer.getMessageArray(); const encoded = this._codec.encode(header, message); - if (!encoded) + if(!encoded) { - if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('Encoding Failed', composer.constructor.name); + if(Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('Encoding Failed', composer.constructor.name); continue; } - if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('OutgoingComposer', header, composer.constructor.name, message); + if(Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('OutgoingComposer', header, composer.constructor.name, message); this.write(encoded.getBuffer()); } @@ -208,7 +208,7 @@ export class SocketConnection extends EventDispatcher implements IConnection private write(buffer: ArrayBuffer): void { - if (this._socket.readyState !== WebSocket.OPEN) return; + if(this._socket.readyState !== WebSocket.OPEN) return; this._socket.send(buffer); } @@ -230,11 +230,11 @@ export class SocketConnection extends EventDispatcher implements IConnection { const wrappers = this.splitReceivedMessages(); - if (!wrappers || !wrappers.length) return; + if(!wrappers || !wrappers.length) return; - if (this._isAuthenticated && !this._isReady) + if(this._isAuthenticated && !this._isReady) { - if (!this._pendingServerMessages) this._pendingServerMessages = []; + if(!this._pendingServerMessages) this._pendingServerMessages = []; this._pendingServerMessages.push(...wrappers); @@ -246,17 +246,17 @@ export class SocketConnection extends EventDispatcher implements IConnection private processWrappers(...wrappers: IMessageDataWrapper[]): void { - if (!wrappers || !wrappers.length) return; + if(!wrappers || !wrappers.length) return; - for (const wrapper of wrappers) + for(const wrapper of wrappers) { - if (!wrapper) continue; + if(!wrapper) continue; const messages = this.getMessagesForWrapper(wrapper); - if (!messages || !messages.length) continue; + if(!messages || !messages.length) continue; - if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, messages[0].constructor.name, messages[0].parser); + if(Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, messages[0].constructor.name, messages[0].parser); this.handleMessages(...messages); } @@ -264,7 +264,7 @@ export class SocketConnection extends EventDispatcher implements IConnection private splitReceivedMessages(): IMessageDataWrapper[] { - if (!this._dataBuffer || !this._dataBuffer.byteLength) return null; + if(!this._dataBuffer || !this._dataBuffer.byteLength) return null; return this._codec.decode(this); } @@ -281,13 +281,13 @@ export class SocketConnection extends EventDispatcher implements IConnection private getMessagesForWrapper(wrapper: IMessageDataWrapper): IMessageEvent[] { - if (!wrapper) return null; + if(!wrapper) return null; const events = this._messages.getEvents(wrapper.header); - if (!events || !events.length) + if(!events || !events.length) { - if (Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, 'UNREGISTERED', wrapper); + if(Nitro.instance.getConfiguration('system.packet.log')) this.logger.log('IncomingMessage', wrapper.header, 'UNREGISTERED', wrapper); return; } @@ -297,9 +297,9 @@ export class SocketConnection extends EventDispatcher implements IConnection //@ts-ignore const parser = new events[0].parserClass(); - if (!parser || !parser.flush() || !parser.parse(wrapper)) return null; + if(!parser || !parser.flush() || !parser.parse(wrapper)) return null; - for (const event of events) (event.parser = parser); + for(const event of events) (event.parser = parser); } catch (e) @@ -316,33 +316,33 @@ export class SocketConnection extends EventDispatcher implements IConnection { messages = [...messages]; - for (const message of messages) + for(const message of messages) { - if (!message) continue; + if(!message) continue; message.connection = this; - if (message.callBack) message.callBack(message); + if(message.callBack) message.callBack(message); } } public registerMessages(configuration: IMessageConfiguration): void { - if (!configuration) return; + if(!configuration) return; this._messages.registerMessages(configuration); } public addMessageEvent(event: IMessageEvent): void { - if (!event || !this._messages) return; + if(!event || !this._messages) return; this._messages.registerMessageEvent(event); } public removeMessageEvent(event: IMessageEvent): void { - if (!event || !this._messages) return; + if(!event || !this._messages) return; this._messages.removeMessageEvent(event); } diff --git a/src/core/events/EventDispatcher.ts b/src/core/events/EventDispatcher.ts index 0673592a..f83ba7a3 100644 --- a/src/core/events/EventDispatcher.ts +++ b/src/core/events/EventDispatcher.ts @@ -28,11 +28,11 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi public addEventListener(type: string, callback: Function): void { - if (!type || !callback) return; + if(!type || !callback) return; const existing = this._listeners.get(type); - if (!existing) + if(!existing) { this._listeners.set(type, [callback]); @@ -44,19 +44,19 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi public removeEventListener(type: string, callback: any): void { - if (!type || !callback) return; + if(!type || !callback) return; const existing = this._listeners.get(type); - if (!existing || !existing.length) return; + if(!existing || !existing.length) return; - for (const [i, cb] of existing.entries()) + for(const [i, cb] of existing.entries()) { - if (!cb || (cb !== callback)) continue; + if(!cb || (cb !== callback)) continue; existing.splice(i, 1); - if (!existing.length) this._listeners.delete(type); + if(!existing.length) this._listeners.delete(type); return; } @@ -64,9 +64,9 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi public dispatchEvent(event: NitroEvent): boolean { - if (!event) return false; + if(!event) return false; - if (Nitro.instance.getConfiguration('system.dispatcher.log')) this._logger.log('Dispatched Event', event.type); + if(Nitro.instance.getConfiguration('system.dispatcher.log')) this._logger.log('Dispatched Event', event.type); this.processEvent(event); @@ -77,18 +77,18 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi { const existing = this._listeners.get(event.type); - if (!existing || !existing.length) return; + if(!existing || !existing.length) return; const callbacks = []; - for (const callback of existing) + for(const callback of existing) { - if (!callback) continue; + if(!callback) continue; callbacks.push(callback); } - while (callbacks.length) + while(callbacks.length) { const callback = callbacks.shift(); diff --git a/src/nitro/avatar/AvatarAssetDownloadManager.ts b/src/nitro/avatar/AvatarAssetDownloadManager.ts index c9210080..736dbdf6 100644 --- a/src/nitro/avatar/AvatarAssetDownloadManager.ts +++ b/src/nitro/avatar/AvatarAssetDownloadManager.ts @@ -66,7 +66,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher request.onloadend = e => { - if (request.responseText) + if(request.responseText) { const data = JSON.parse(request.responseText); @@ -94,16 +94,16 @@ export class AvatarAssetDownloadManager extends EventDispatcher private processFigureMap(data: any): void { - if (!data) return; + if(!data) return; - for (const library of data) + for(const library of data) { - if (!library) continue; + if(!library) continue; const id = (library.id as string); const revision = (library.revision || ''); - if (this._libraryNames.indexOf(id) >= 0) continue; + if(this._libraryNames.indexOf(id) >= 0) continue; this._libraryNames.push(id); @@ -111,7 +111,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher downloadLibrary.addEventListener(AvatarRenderLibraryEvent.DOWNLOAD_COMPLETE, this.onLibraryLoaded); - for (const part of library.parts) + for(const part of library.parts) { const id = (part.id as string); const type = (part.type as string); @@ -119,7 +119,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher let existing = this._figureMap.get(partString); - if (!existing) existing = []; + if(!existing) existing = []; existing.push(downloadLibrary); @@ -130,9 +130,9 @@ export class AvatarAssetDownloadManager extends EventDispatcher private onAvatarRenderReady(event: NitroEvent): void { - if (!event) return; + if(!event) return; - for (const [container, listener] of this._pendingContainers) + for(const [container, listener] of this._pendingContainers) { this.downloadAvatarFigure(container, listener); } @@ -142,34 +142,34 @@ export class AvatarAssetDownloadManager extends EventDispatcher private onLibraryLoaded(event: AvatarRenderLibraryEvent): void { - if (!event || !event.library) return; + if(!event || !event.library) return; const loadedFigures: string[] = []; - for (const [figure, libraries] of this._incompleteFigures.entries()) + for(const [figure, libraries] of this._incompleteFigures.entries()) { let isReady = true; - for (const library of libraries) + for(const library of libraries) { - if (!library || library.isLoaded) continue; + if(!library || library.isLoaded) continue; isReady = false; break; } - if (isReady) + if(isReady) { loadedFigures.push(figure); const listeners = this._figureListeners.get(figure); - if (listeners) + if(listeners) { - for (const listener of listeners) + for(const listener of listeners) { - if (!listener || listener.disposed) continue; + if(!listener || listener.disposed) continue; listener.resetFigure(figure); } @@ -181,22 +181,22 @@ export class AvatarAssetDownloadManager extends EventDispatcher } } - for (const figure of loadedFigures) + for(const figure of loadedFigures) { - if (!figure) continue; + if(!figure) continue; this._incompleteFigures.delete(figure); } let index = 0; - while (index < this._currentDownloads.length) + while(index < this._currentDownloads.length) { const download = this._currentDownloads[index]; - if (download) + if(download) { - if (download.libraryName === event.library.libraryName) this._currentDownloads.splice(index, 1); + if(download.libraryName === event.library.libraryName) this._currentDownloads.splice(index, 1); } index++; @@ -207,19 +207,19 @@ export class AvatarAssetDownloadManager extends EventDispatcher { const libraries = this._missingMandatoryLibs.slice(); - for (const library of libraries) + for(const library of libraries) { - if (!library) continue; + if(!library) continue; const map = this._figureMap.get(library); - if (map) for (const avatar of map) avatar && this.downloadLibrary(avatar); + if(map) for(const avatar of map) avatar && this.downloadLibrary(avatar); } } public isAvatarFigureContainerReady(container: IAvatarFigureContainer): boolean { - if (!this._isReady || !this._structure.renderManager.isReady) + if(!this._isReady || !this._structure.renderManager.isReady) { return false; } @@ -233,38 +233,38 @@ export class AvatarAssetDownloadManager extends EventDispatcher { const pendingLibraries: AvatarAssetDownloadLibrary[] = []; - if (!container || !this._structure) return pendingLibraries; + if(!container || !this._structure) return pendingLibraries; const figureData = this._structure.figureData; - if (!figureData) return pendingLibraries; + if(!figureData) return pendingLibraries; const setKeys = container.getPartTypeIds(); - for (const key of setKeys) + for(const key of setKeys) { const set = figureData.getSetType(key); - if (!set) continue; + if(!set) continue; const figurePartSet = set.getPartSet(container.getPartSetId(key)); - if (!figurePartSet) continue; + if(!figurePartSet) continue; - for (const part of figurePartSet.parts) + for(const part of figurePartSet.parts) { - if (!part) continue; + if(!part) continue; const name = (part.type + ':' + part.id); const existing = this._figureMap.get(name); - if (existing === undefined) continue; + if(existing === undefined) continue; - for (const library of existing) + for(const library of existing) { - if (!library || library.isLoaded) continue; + if(!library || library.isLoaded) continue; - if (pendingLibraries.indexOf(library) >= 0) continue; + if(pendingLibraries.indexOf(library) >= 0) continue; pendingLibraries.push(library); } @@ -276,7 +276,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher public downloadAvatarFigure(container: IAvatarFigureContainer, listener: IAvatarImageListener): void { - if (!this._isReady || !this._structure.renderManager.isReady) + if(!this._isReady || !this._structure.renderManager.isReady) { this._pendingContainers.push([container, listener]); @@ -286,13 +286,13 @@ export class AvatarAssetDownloadManager extends EventDispatcher const figure = container.getFigureString(); const pendingLibraries = this.getAvatarFigurePendingLibraries(container); - if (pendingLibraries && pendingLibraries.length) + if(pendingLibraries && pendingLibraries.length) { - if (listener && !listener.disposed) + if(listener && !listener.disposed) { let listeners = this._figureListeners.get(figure); - if (!listeners) + if(!listeners) { listeners = []; @@ -304,24 +304,24 @@ export class AvatarAssetDownloadManager extends EventDispatcher this._incompleteFigures.set(figure, pendingLibraries); - for (const library of pendingLibraries) + for(const library of pendingLibraries) { - if (!library) continue; + if(!library) continue; this.downloadLibrary(library); } } else { - if (listener && !listener.disposed) listener.resetFigure(figure); + if(listener && !listener.disposed) listener.resetFigure(figure); } } private downloadLibrary(library: AvatarAssetDownloadLibrary): void { - if (!library || library.isLoaded) return; + if(!library || library.isLoaded) return; - if ((this._pendingDownloadQueue.indexOf(library) >= 0) || (this._currentDownloads.indexOf(library) >= 0)) return; + if((this._pendingDownloadQueue.indexOf(library) >= 0) || (this._currentDownloads.indexOf(library) >= 0)) return; this._pendingDownloadQueue.push(library); @@ -330,7 +330,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher private processDownloadQueue(): void { - while (this._pendingDownloadQueue.length) + while(this._pendingDownloadQueue.length) { const library = this._pendingDownloadQueue[0]; diff --git a/src/nitro/avatar/AvatarRenderManager.ts b/src/nitro/avatar/AvatarRenderManager.ts index 5e269797..cea740cb 100644 --- a/src/nitro/avatar/AvatarRenderManager.ts +++ b/src/nitro/avatar/AvatarRenderManager.ts @@ -86,7 +86,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa this._aliasCollection.init(); - if (!this._avatarAssetDownloadManager) + if(!this._avatarAssetDownloadManager) { this._avatarAssetDownloadManager = new AvatarAssetDownloadManager(Nitro.instance.core.asset, this._structure); @@ -94,7 +94,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa this._avatarAssetDownloadManager.addEventListener(AvatarAssetDownloadManager.LIBRARY_LOADED, this.onAvatarAssetDownloaded); } - if (!this._effectAssetDownloadManager) + if(!this._effectAssetDownloadManager) { this._effectAssetDownloadManager = new EffectAssetDownloadManager(Nitro.instance.core.asset, this._structure); @@ -107,14 +107,14 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public onDispose(): void { - if (this._avatarAssetDownloadManager) + if(this._avatarAssetDownloadManager) { this._avatarAssetDownloadManager.removeEventListener(AvatarAssetDownloadManager.DOWNLOADER_READY, this.onAvatarAssetDownloaderReady); this._avatarAssetDownloadManager.removeEventListener(AvatarAssetDownloadManager.LIBRARY_LOADED, this.onAvatarAssetDownloaded); } - if (this._effectAssetDownloadManager) + if(this._effectAssetDownloadManager) { this._effectAssetDownloadManager.removeEventListener(EffectAssetDownloadManager.DOWNLOADER_READY, this.onEffectAssetDownloaderReady); @@ -124,7 +124,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadGeometry(): void { - if (!this._structure) return; + if(!this._structure) return; this._structure.initGeometry(HabboAvatarGeometry.geometry); @@ -135,7 +135,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadPartSets(): void { - if (!this._structure) return; + if(!this._structure) return; this._structure.initPartSets(HabboAvatarPartSets.partSets); @@ -148,7 +148,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa { const defaultActions = Nitro.instance.getConfiguration('avatar.default.actions'); - if (defaultActions) this._structure.initActions(Nitro.instance.core.asset, defaultActions); + if(defaultActions) this._structure.initActions(Nitro.instance.core.asset, defaultActions); const request = new XMLHttpRequest(); @@ -160,7 +160,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa request.onloadend = e => { - if (!this._structure) return; + if(!this._structure) return; this._structure.updateActions(JSON.parse(request.responseText)); @@ -183,7 +183,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadAnimations(): void { - if (!this._structure) return; + if(!this._structure) return; this._structure.initAnimation(HabboAvatarAnimations.animations); @@ -196,14 +196,14 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa { const defaultFigureData = Nitro.instance.getConfiguration('avatar.default.figuredata'); - if (!defaultFigureData || (typeof defaultFigureData === 'string')) + if(!defaultFigureData || (typeof defaultFigureData === 'string')) { this.logger.error('XML figuredata is no longer supported'); return; } - if (this._structure) this._structure.initFigureData(defaultFigureData); + if(this._structure) this._structure.initFigureData(defaultFigureData); const structureDownloader = new AvatarStructureDownload(Nitro.instance.getConfiguration('avatar.figuredata.url'), (this._structure.figureData as IFigureSetData)); @@ -221,7 +221,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private onAvatarAssetDownloaderReady(event: NitroEvent): void { - if (!event) return; + if(!event) return; this._figureMapReady = true; @@ -230,14 +230,14 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private onAvatarAssetDownloaded(event: NitroEvent): void { - if (!event) return; + if(!event) return; this._aliasCollection.reset(); } private onEffectAssetDownloaderReady(event: NitroEvent): void { - if (!event) return; + if(!event) return; this._effectMapReady = true; @@ -246,20 +246,20 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private onEffectAssetDownloaded(event: NitroEvent): void { - if (!event) return; + if(!event) return; this._aliasCollection.reset(); } private checkReady(): void { - if (this._isReady) return; + if(this._isReady) return; - if (!this._geometryReady || !this._partSetsReady || !this._actionsReady || !this._animationsReady || !this._figureMapReady || !this._effectMapReady || !this._structureReady) return; + if(!this._geometryReady || !this._partSetsReady || !this._actionsReady || !this._animationsReady || !this._figureMapReady || !this._effectMapReady || !this._structureReady) return; this._isReady = true; - if (this.events) this.events.dispatchEvent(new NitroEvent(AvatarRenderEvent.AVATAR_RENDER_READY)); + if(this.events) this.events.dispatchEvent(new NitroEvent(AvatarRenderEvent.AVATAR_RENDER_READY)); } public createFigureContainer(figure: string): IAvatarFigureContainer @@ -269,25 +269,25 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public isFigureContainerReady(container: IAvatarFigureContainer): boolean { - if (!this._avatarAssetDownloadManager) return false; + if(!this._avatarAssetDownloadManager) return false; return this._avatarAssetDownloadManager.isAvatarFigureContainerReady(container); } public createAvatarImage(figure: string, size: string, gender: string, listener: IAvatarImageListener = null, effectListener: IAvatarEffectListener = null): IAvatarImage { - if (!this._structure || !this._avatarAssetDownloadManager) return null; + if(!this._structure || !this._avatarAssetDownloadManager) return null; const figureContainer = new AvatarFigureContainer(figure); - if (gender) this.validateAvatarFigure(figureContainer, gender); + if(gender) this.validateAvatarFigure(figureContainer, gender); - if (this._avatarAssetDownloadManager.isAvatarFigureContainerReady(figureContainer)) + if(this._avatarAssetDownloadManager.isAvatarFigureContainerReady(figureContainer)) { return new AvatarImage(this._structure, this._aliasCollection, figureContainer, size, this._effectAssetDownloadManager, effectListener); } - if (!this._placeHolderFigure) this._placeHolderFigure = new AvatarFigureContainer(AvatarRenderManager.DEFAULT_FIGURE); + if(!this._placeHolderFigure) this._placeHolderFigure = new AvatarFigureContainer(AvatarRenderManager.DEFAULT_FIGURE); this._avatarAssetDownloadManager.downloadAvatarFigure(figureContainer, listener); @@ -296,7 +296,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public downloadAvatarFigure(container: IAvatarFigureContainer, listener: IAvatarImageListener): void { - if (!this._avatarAssetDownloadManager) return; + if(!this._avatarAssetDownloadManager) return; this._avatarAssetDownloadManager.downloadAvatarFigure(container, listener); } @@ -307,17 +307,17 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa const typeIds = this._structure.getMandatorySetTypeIds(gender, 2); - if (typeIds) + if(typeIds) { const figureData = this._structure.figureData; - for (const id of typeIds) + for(const id of typeIds) { - if (!container.hasPartType(id)) + if(!container.hasPartType(id)) { const figurePartSet = this._structure.getDefaultPartSet(id, gender); - if (figurePartSet) + if(figurePartSet) { container.updatePart(id, figurePartSet.id, [0]); @@ -328,15 +328,15 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa { const setType = figureData.getSetType(id); - if (setType) + if(setType) { const figurePartSet = setType.getPartSet(container.getPartSetId(id)); - if (!figurePartSet) + if(!figurePartSet) { const partSet = this._structure.getDefaultPartSet(id, gender); - if (partSet) + if(partSet) { container.updatePart(id, partSet.id, [0]); @@ -353,49 +353,49 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public getFigureClubLevel(container: IAvatarFigureContainer, gender: string, searchParts: string[] = null): number { - if (!this._structure) return 0; + if(!this._structure) return 0; const figureData = this._structure.figureData; const parts = Array.from(container.getPartTypeIds()); let clubLevel = 0; - for (const part of parts) + for(const part of parts) { const set = figureData.getSetType(part); - if (!set) continue; + if(!set) continue; const setId = container.getPartSetId(part); const partSet = set.getPartSet(setId); - if (partSet) + if(partSet) { clubLevel = Math.max(partSet.clubLevel, clubLevel); const palette = figureData.getPalette(set.paletteID); const colors = container.getPartColorIds(part); - for (const colorId of colors) + for(const colorId of colors) { const color = palette.getColor(colorId); - if (!color) continue; + if(!color) continue; clubLevel = Math.max(color.clubLevel, clubLevel); } } } - if (!searchParts) searchParts = this._structure.getBodyPartsUnordered(AvatarSetType.FULL); + if(!searchParts) searchParts = this._structure.getBodyPartsUnordered(AvatarSetType.FULL); - for (const part of searchParts) + for(const part of searchParts) { const set = figureData.getSetType(part); - if (!set) continue; + if(!set) continue; - if (parts.indexOf(part) === -1) clubLevel = Math.max(set.optionalFromClubLevel(gender), clubLevel); + if(parts.indexOf(part) === -1) clubLevel = Math.max(set.optionalFromClubLevel(gender), clubLevel); } return clubLevel; @@ -417,7 +417,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa const partSets: IFigurePartSet[] = this.resolveFigureSets(_arg_3); - for (const partSet of partSets) + for(const partSet of partSets) { container.savePartData(partSet.type, partSet.id, container.getColourIds(partSet.type)); } @@ -430,11 +430,11 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa const structure = this.structureData; const partSets: IFigurePartSet[] = []; - for (const _local_4 of k) + for(const _local_4 of k) { const partSet = structure.getFigurePartSet(_local_4); - if (partSet) partSets.push(partSet); + if(partSet) partSets.push(partSet); } return partSets; @@ -442,7 +442,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public getMandatoryAvatarPartSetIds(k: string, _arg_2: number): string[] { - if (!this._structure) return null; + if(!this._structure) return null; return this._structure.getMandatorySetTypeIds(k, _arg_2); } @@ -469,7 +469,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa public get structureData(): IStructureData { - if (this._structure) return this._structure.figureData; + if(this._structure) return this._structure.figureData; return null; } diff --git a/src/nitro/avatar/EffectAssetDownloadManager.ts b/src/nitro/avatar/EffectAssetDownloadManager.ts index 8354c0ec..a6341e1c 100644 --- a/src/nitro/avatar/EffectAssetDownloadManager.ts +++ b/src/nitro/avatar/EffectAssetDownloadManager.ts @@ -65,7 +65,7 @@ export class EffectAssetDownloadManager extends EventDispatcher request.onloadend = e => { - if (request.responseText) + if(request.responseText) { const data = JSON.parse(request.responseText); @@ -93,17 +93,17 @@ export class EffectAssetDownloadManager extends EventDispatcher private processEffectMap(data: any): void { - if (!data) return; + if(!data) return; - for (const effect of data) + for(const effect of data) { - if (!effect) continue; + if(!effect) continue; const id = (effect.id as string); const lib = (effect.lib as string); const revision = (effect.revision || ''); - if (this._libraryNames.indexOf(lib) >= 0) continue; + if(this._libraryNames.indexOf(lib) >= 0) continue; this._libraryNames.push(lib); @@ -113,7 +113,7 @@ export class EffectAssetDownloadManager extends EventDispatcher let existing = this._effectMap.get(id); - if (!existing) existing = []; + if(!existing) existing = []; existing.push(downloadLibrary); @@ -123,7 +123,7 @@ export class EffectAssetDownloadManager extends EventDispatcher public downloadAvatarEffect(id: number, listener: IAvatarEffectListener): void { - if (!this._isReady || !this._structure.renderManager.isReady) + if(!this._isReady || !this._structure.renderManager.isReady) { this._initDownloadBuffer.push([id, listener]); @@ -132,13 +132,13 @@ export class EffectAssetDownloadManager extends EventDispatcher const pendingLibraries = this.getAvatarEffectPendingLibraries(id); - if (pendingLibraries && pendingLibraries.length) + if(pendingLibraries && pendingLibraries.length) { - if (listener && !listener.disposed) + if(listener && !listener.disposed) { let listeners = this._effectListeners.get(id.toString()); - if (!listeners) listeners = []; + if(!listeners) listeners = []; listeners.push(listener); @@ -147,24 +147,24 @@ export class EffectAssetDownloadManager extends EventDispatcher this._incompleteEffects.set(id.toString(), pendingLibraries); - for (const library of pendingLibraries) + for(const library of pendingLibraries) { - if (!library) continue; + if(!library) continue; this.downloadLibrary(library); } } else { - if (listener && !listener.disposed) listener.resetEffect(id); + if(listener && !listener.disposed) listener.resetEffect(id); } } private onAvatarRenderReady(event: NitroEvent): void { - if (!event) return; + if(!event) return; - for (const [id, listener] of this._initDownloadBuffer) + for(const [id, listener] of this._initDownloadBuffer) { this.downloadAvatarEffect(id, listener); } @@ -174,34 +174,34 @@ export class EffectAssetDownloadManager extends EventDispatcher private onLibraryLoaded(event: AvatarRenderEffectLibraryEvent): void { - if (!event || !event.library) return; + if(!event || !event.library) return; const loadedEffects: string[] = []; this._structure.registerAnimation(event.library.animation); - for (const [id, libraries] of this._incompleteEffects.entries()) + for(const [id, libraries] of this._incompleteEffects.entries()) { let isReady = true; - for (const library of libraries) + for(const library of libraries) { - if (!library || library.isLoaded) continue; + if(!library || library.isLoaded) continue; isReady = false; break; } - if (isReady) + if(isReady) { loadedEffects.push(id); const listeners = this._effectListeners.get(id); - for (const listener of listeners) + for(const listener of listeners) { - if (!listener || listener.disposed) continue; + if(!listener || listener.disposed) continue; listener.resetEffect(parseInt(id)); } @@ -212,17 +212,17 @@ export class EffectAssetDownloadManager extends EventDispatcher } } - for (const id of loadedEffects) this._incompleteEffects.delete(id); + for(const id of loadedEffects) this._incompleteEffects.delete(id); let index = 0; - while (index < this._currentDownloads.length) + while(index < this._currentDownloads.length) { const download = this._currentDownloads[index]; - if (download) + if(download) { - if (download.libraryName === event.library.libraryName) this._currentDownloads.splice(index, 1); + if(download.libraryName === event.library.libraryName) this._currentDownloads.splice(index, 1); } index++; @@ -233,19 +233,19 @@ export class EffectAssetDownloadManager extends EventDispatcher { const libraries = this._missingMandatoryLibs.slice(); - for (const library of libraries) + for(const library of libraries) { - if (!library) continue; + if(!library) continue; const map = this._effectMap.get(library); - if (map) for (const effect of map) effect && this.downloadLibrary(effect); + if(map) for(const effect of map) effect && this.downloadLibrary(effect); } } public isAvatarEffectReady(effect: number): boolean { - if (!this._isReady || !this._structure.renderManager.isReady) + if(!this._isReady || !this._structure.renderManager.isReady) { return false; } @@ -259,17 +259,17 @@ export class EffectAssetDownloadManager extends EventDispatcher { const pendingLibraries: EffectAssetDownloadLibrary[] = []; - if (!this._structure) return pendingLibraries; + if(!this._structure) return pendingLibraries; const libraries = this._effectMap.get(id.toString()); - if (libraries) + if(libraries) { - for (const library of libraries) + for(const library of libraries) { - if (!library || library.isLoaded) continue; + if(!library || library.isLoaded) continue; - if (pendingLibraries.indexOf(library) === -1) pendingLibraries.push(library); + if(pendingLibraries.indexOf(library) === -1) pendingLibraries.push(library); } } @@ -278,9 +278,9 @@ export class EffectAssetDownloadManager extends EventDispatcher private downloadLibrary(library: EffectAssetDownloadLibrary): void { - if (!library || library.isLoaded) return; + if(!library || library.isLoaded) return; - if ((this._pendingDownloadQueue.indexOf(library) >= 0) || (this._currentDownloads.indexOf(library) >= 0)) return; + if((this._pendingDownloadQueue.indexOf(library) >= 0) || (this._currentDownloads.indexOf(library) >= 0)) return; this._pendingDownloadQueue.push(library); @@ -289,7 +289,7 @@ export class EffectAssetDownloadManager extends EventDispatcher private processDownloadQueue(): void { - while (this._pendingDownloadQueue.length) + while(this._pendingDownloadQueue.length) { const library = this._pendingDownloadQueue[0]; diff --git a/src/nitro/avatar/structure/AvatarStructureDownload.ts b/src/nitro/avatar/structure/AvatarStructureDownload.ts index c0e98923..0103c961 100644 --- a/src/nitro/avatar/structure/AvatarStructureDownload.ts +++ b/src/nitro/avatar/structure/AvatarStructureDownload.ts @@ -31,9 +31,9 @@ export class AvatarStructureDownload extends EventDispatcher { const response = request.responseText; - if (!response || !response.length) throw new Error('invalid_figure_data'); + if(!response || !response.length) throw new Error('invalid_figure_data'); - if (this._dataReceiver) this._dataReceiver.appendJSON(JSON.parse(response)); + if(this._dataReceiver) this._dataReceiver.appendJSON(JSON.parse(response)); this.dispatchEvent(new NitroEvent(AvatarStructureDownload.AVATAR_STRUCTURE_DONE)); }; diff --git a/src/nitro/communication/demo/NitroCommunicationDemo.ts b/src/nitro/communication/demo/NitroCommunicationDemo.ts index 493243fc..04a406f4 100644 --- a/src/nitro/communication/demo/NitroCommunicationDemo.ts +++ b/src/nitro/communication/demo/NitroCommunicationDemo.ts @@ -41,7 +41,7 @@ export class NitroCommunicationDemo extends NitroManager { const connection = this._communication.connection; - if (connection) + if(connection) { connection.addEventListener(SocketConnectionEvent.CONNECTION_OPENED, this.onConnectionOpenedEvent); connection.addEventListener(SocketConnectionEvent.CONNECTION_CLOSED, this.onConnectionClosedEvent); @@ -56,7 +56,7 @@ export class NitroCommunicationDemo extends NitroManager { const connection = this._communication.connection; - if (connection) + if(connection) { connection.removeEventListener(SocketConnectionEvent.CONNECTION_OPENED, this.onConnectionOpenedEvent); connection.removeEventListener(SocketConnectionEvent.CONNECTION_CLOSED, this.onConnectionClosedEvent); @@ -74,13 +74,13 @@ export class NitroCommunicationDemo extends NitroManager { const connection = this._communication.connection; - if (!connection) return; + if(!connection) return; this._didConnect = true; this.dispatchCommunicationDemoEvent(NitroCommunicationDemoEvent.CONNECTION_ESTABLISHED, connection); - if (Nitro.instance.getConfiguration('system.pong.manually', false)) this.startPonging(); + if(Nitro.instance.getConfiguration('system.pong.manually', false)) this.startPonging(); this.startHandshake(connection); @@ -93,18 +93,18 @@ export class NitroCommunicationDemo extends NitroManager { const connection = this._communication.connection; - if (!connection) return; + if(!connection) return; this.stopPonging(); - if (this._didConnect) this.dispatchCommunicationDemoEvent(NitroCommunicationDemoEvent.CONNECTION_CLOSED, connection); + if(this._didConnect) this.dispatchCommunicationDemoEvent(NitroCommunicationDemoEvent.CONNECTION_CLOSED, connection); } private onConnectionErrorEvent(event: CloseEvent): void { const connection = this._communication.connection; - if (!connection) return; + if(!connection) return; this.stopPonging(); @@ -113,9 +113,9 @@ export class NitroCommunicationDemo extends NitroManager private tryAuthentication(connection: IConnection): void { - if (!connection || !this.getSSO()) + if(!connection || !this.getSSO()) { - if (!this.getSSO()) + if(!this.getSSO()) { this.logger.error('Login without an SSO ticket is not supported'); } @@ -130,14 +130,14 @@ export class NitroCommunicationDemo extends NitroManager private onClientPingEvent(event: ClientPingEvent): void { - if (!event || !event.connection) return; + if(!event || !event.connection) return; this.sendPong(event.connection); } private onAuthenticatedEvent(event: AuthenticatedEvent): void { - if (!event || !event.connection) return; + if(!event || !event.connection) return; this.completeHandshake(event.connection); @@ -169,7 +169,7 @@ export class NitroCommunicationDemo extends NitroManager private stopPonging(): void { - if (!this._pongInterval) return; + if(!this._pongInterval) return; clearInterval(this._pongInterval); @@ -180,7 +180,7 @@ export class NitroCommunicationDemo extends NitroManager { connection = ((connection || this._communication.connection) || null); - if (!connection) return; + if(!connection) return; connection.send(new PongMessageComposer()); } diff --git a/src/nitro/room/RoomContentLoader.ts b/src/nitro/room/RoomContentLoader.ts index d1bd82ec..7746b051 100644 --- a/src/nitro/room/RoomContentLoader.ts +++ b/src/nitro/room/RoomContentLoader.ts @@ -98,7 +98,7 @@ export class RoomContentLoader implements IFurnitureDataListener this.setFurnitureData(); - for (const [index, name] of Nitro.instance.getConfiguration('pet.types').entries()) this._pets[name] = index; + for(const [index, name] of Nitro.instance.getConfiguration('pet.types').entries()) this._pets[name] = index; } public dispose(): void @@ -110,7 +110,7 @@ export class RoomContentLoader implements IFurnitureDataListener { this._sessionDataManager = sessionData; - if (this._waitingForSessionDataManager) + if(this._waitingForSessionDataManager) { this._waitingForSessionDataManager = false; @@ -125,7 +125,7 @@ export class RoomContentLoader implements IFurnitureDataListener private setFurnitureData(): void { - if (!this._sessionDataManager) + if(!this._sessionDataManager) { this._waitingForSessionDataManager = true; @@ -134,7 +134,7 @@ export class RoomContentLoader implements IFurnitureDataListener const furnitureData = this._sessionDataManager.getAllFurnitureData(this); - if (!furnitureData) return; + if(!furnitureData) return; this._sessionDataManager.removePendingFurniDataListener(this); @@ -145,42 +145,42 @@ export class RoomContentLoader implements IFurnitureDataListener private processFurnitureData(furnitureData: IFurnitureData[]): void { - if (!furnitureData) return; + if(!furnitureData) return; - for (const furniture of furnitureData) + for(const furniture of furnitureData) { - if (!furniture) continue; + if(!furniture) continue; const id = furniture.id; let className = furniture.className; - if (furniture.hasIndexedColor) className = ((className + '*') + furniture.colorIndex); + if(furniture.hasIndexedColor) className = ((className + '*') + furniture.colorIndex); const revision = furniture.revision; const adUrl = furniture.adUrl; - if (adUrl && adUrl.length > 0) this._objectTypeAdUrls.set(className, adUrl); + if(adUrl && adUrl.length > 0) this._objectTypeAdUrls.set(className, adUrl); let name = furniture.className; - if (furniture.type === FurnitureType.FLOOR) + if(furniture.type === FurnitureType.FLOOR) { this._activeObjectTypes.set(id, className); this._activeObjectTypeIds.set(className, id); - if (!this._activeObjects[name]) this._activeObjects[name] = 1; + if(!this._activeObjects[name]) this._activeObjects[name] = 1; } - else if (furniture.type === FurnitureType.WALL) + else if(furniture.type === FurnitureType.WALL) { - if (name === 'post.it') + if(name === 'post.it') { className = 'post_it'; name = 'post_it'; } - if (name === 'post.it.vd') + if(name === 'post.it.vd') { className = 'post_it_vd'; name = 'post_id_vd'; @@ -189,12 +189,12 @@ export class RoomContentLoader implements IFurnitureDataListener this._wallItemTypes.set(id, className); this._wallItemTypeIds.set(className, id); - if (!this._wallItems[name]) this._wallItems[name] = 1; + if(!this._wallItems[name]) this._wallItems[name] = 1; } const existingRevision = this._furniRevisions.get(name); - if (revision > existingRevision) + if(revision > existingRevision) { this._furniRevisions.delete(name); this._furniRevisions.set(name, revision); @@ -213,7 +213,7 @@ export class RoomContentLoader implements IFurnitureDataListener { let type = this._wallItemTypes.get(typeId); - if ((type === 'poster') && (extra !== null)) type = (type + extra); + if((type === 'poster') && (extra !== null)) type = (type + extra); return this.removeColorIndex(type); } @@ -222,7 +222,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const type = this._activeObjectTypes.get(typeId); - if (!type) return -1; + if(!type) return -1; return this.getColorIndexFromName(type); } @@ -231,29 +231,29 @@ export class RoomContentLoader implements IFurnitureDataListener { const type = this._wallItemTypes.get(typeId); - if (!type) return -1; + if(!type) return -1; return this.getColorIndexFromName(type); } private getColorIndexFromName(name: string): number { - if (!name) return -1; + if(!name) return -1; const index = name.indexOf('*'); - if (index === -1) return 0; + if(index === -1) return 0; return parseInt(name.substr(index + 1)); } private removeColorIndex(name: string): string { - if (!name) return null; + if(!name) return null; const index = name.indexOf('*'); - if (index === -1) return name; + if(index === -1) return name; return name.substr(0, index); } @@ -262,7 +262,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const value = this._objectTypeAdUrls.get(type); - if (!value) return ''; + if(!value) return ''; return value; } @@ -271,7 +271,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const colorResults = this._petColors.get(petIndex); - if (!colorResults) return null; + if(!colorResults) return null; return colorResults.get(paletteIndex); } @@ -281,11 +281,11 @@ export class RoomContentLoader implements IFurnitureDataListener const colorResults = this._petColors.get(petIndex); const results: PetColorResult[] = []; - if (colorResults) + if(colorResults) { - for (const result of colorResults.values()) + for(const result of colorResults.values()) { - if (result.tag === tagName) results.push(result); + if(result.tag === tagName) results.push(result); } } @@ -294,15 +294,15 @@ export class RoomContentLoader implements IFurnitureDataListener public getCollection(name: string): IGraphicAssetCollection { - if (!name) return null; + if(!name) return null; const existing = this._collections.get(name); - if (!existing) + if(!existing) { const globalCollection = Nitro.instance.core.asset.getCollection(name); - if (globalCollection) + if(globalCollection) { this._collections.set(name, globalCollection); @@ -317,18 +317,18 @@ export class RoomContentLoader implements IFurnitureDataListener public getGifCollection(name: string): GraphicAssetGifCollection { - if (!name) return null; + if(!name) return null; return this._gifCollections.get(name) || null; } public getImage(name: string): HTMLImageElement { - if (!name) return null; + if(!name) return null; const existing = this._images.get(name); - if (!existing) return null; + if(!existing) return null; const image = new Image(); @@ -341,14 +341,14 @@ export class RoomContentLoader implements IFurnitureDataListener { const collection = this.getCollection(collectionName); - if (!collection) return false; + if(!collection) return false; return collection.addAsset(assetName, texture, override, 0, 0, false, false); } public createGifCollection(collectionName: string, textures: Texture[], durations: number[]): GraphicAssetGifCollection { - if (!collectionName || !textures || !durations) return null; + if(!collectionName || !textures || !durations) return null; const collection = new GraphicAssetGifCollection(collectionName, textures, durations); @@ -359,7 +359,7 @@ export class RoomContentLoader implements IFurnitureDataListener private createCollection(data: IAssetData, spritesheet: Spritesheet): GraphicAssetCollection { - if (!data || !spritesheet) return null; + if(!data || !spritesheet) return null; const collection = new GraphicAssetCollection(data, spritesheet); @@ -367,12 +367,12 @@ export class RoomContentLoader implements IFurnitureDataListener const petIndex = this._pets[collection.name]; - if (petIndex !== undefined) + if(petIndex !== undefined) { const keys = collection.getPaletteNames(); const palettes: Map = new Map(); - for (const key of keys) + for(const key of keys) { const palette = collection.getPalette(key); const paletteData = data.palettes[key]; @@ -395,14 +395,14 @@ export class RoomContentLoader implements IFurnitureDataListener { const category = this.getCategoryForType(type); - switch (category) + switch(category) { case RoomObjectCategory.FLOOR: return RoomContentLoader.PLACE_HOLDER; case RoomObjectCategory.WALL: return RoomContentLoader.PLACE_HOLDER_WALL; default: - if (this._pets[type] !== undefined) return RoomContentLoader.PLACE_HOLDER_PET; + if(this._pets[type] !== undefined) return RoomContentLoader.PLACE_HOLDER_PET; return RoomContentLoader.PLACE_HOLDER_DEFAULT; } @@ -410,27 +410,27 @@ export class RoomContentLoader implements IFurnitureDataListener public getCategoryForType(type: string): number { - if (!type) return RoomObjectCategory.MINIMUM; + if(!type) return RoomObjectCategory.MINIMUM; - if (this._activeObjects[type] !== undefined) return RoomObjectCategory.FLOOR; + if(this._activeObjects[type] !== undefined) return RoomObjectCategory.FLOOR; - if (this._wallItems[type] !== undefined) return RoomObjectCategory.WALL; + if(this._wallItems[type] !== undefined) return RoomObjectCategory.WALL; - if (this._pets[type] !== undefined) return RoomObjectCategory.UNIT; + if(this._pets[type] !== undefined) return RoomObjectCategory.UNIT; - if (type.indexOf('poster') === 0) return RoomObjectCategory.WALL; + if(type.indexOf('poster') === 0) return RoomObjectCategory.WALL; - if (type === 'room') return RoomObjectCategory.ROOM; + if(type === 'room') return RoomObjectCategory.ROOM; - if (type === RoomObjectUserType.USER) return RoomObjectCategory.UNIT; + if(type === RoomObjectUserType.USER) return RoomObjectCategory.UNIT; - if (type === RoomObjectUserType.PET) return RoomObjectCategory.UNIT; + if(type === RoomObjectUserType.PET) return RoomObjectCategory.UNIT; - if (type === RoomObjectUserType.BOT) return RoomObjectCategory.UNIT; + if(type === RoomObjectUserType.BOT) return RoomObjectCategory.UNIT; - if (type === RoomObjectUserType.RENTABLE_BOT) return RoomObjectCategory.UNIT; + if(type === RoomObjectUserType.RENTABLE_BOT) return RoomObjectCategory.UNIT; - if ((type === RoomContentLoader.TILE_CURSOR) || (type === RoomContentLoader.SELECTION_ARROW)) return RoomObjectCategory.CURSOR; + if((type === RoomContentLoader.TILE_CURSOR) || (type === RoomContentLoader.SELECTION_ARROW)) return RoomObjectCategory.CURSOR; return RoomObjectCategory.MINIMUM; } @@ -444,7 +444,7 @@ export class RoomContentLoader implements IFurnitureDataListener { type = RoomObjectUserType.getRealType(type); - if (type === RoomObjectVisualizationType.USER) return false; + if(type === RoomObjectVisualizationType.USER) return false; return true; } @@ -454,13 +454,13 @@ export class RoomContentLoader implements IFurnitureDataListener let typeName: string = null; let assetUrls: string[] = []; - if (type && (type.indexOf(',') >= 0)) + if(type && (type.indexOf(',') >= 0)) { typeName = type; type = typeName.split(',')[0]; } - if (typeName) + if(typeName) { assetUrls = this.getAssetUrls(typeName, param, true); } @@ -469,7 +469,7 @@ export class RoomContentLoader implements IFurnitureDataListener assetUrls = this.getAssetUrls(type, param, true); } - if (assetUrls && assetUrls.length) + if(assetUrls && assetUrls.length) { const url = assetUrls[0]; @@ -505,18 +505,18 @@ export class RoomContentLoader implements IFurnitureDataListener { const assetUrls: string[] = this.getAssetUrls(type); - if (!assetUrls || !assetUrls.length) return; + if(!assetUrls || !assetUrls.length) return; - if ((this._pendingContentTypes.indexOf(type) >= 0) || this.getOrRemoveEventDispatcher(type)) return; + if((this._pendingContentTypes.indexOf(type) >= 0) || this.getOrRemoveEventDispatcher(type)) return; this._pendingContentTypes.push(type); this._events.set(type, events); const loader = new Loader(); - for (const url of assetUrls) + for(const url of assetUrls) { - if (!url || !url.length) continue; + if(!url || !url.length) continue; loader .add({ @@ -531,7 +531,7 @@ export class RoomContentLoader implements IFurnitureDataListener const onDownloaded = (status: boolean, url: string) => { - if (!status) + if(!status) { this._logger.error('Failed to download asset', url); @@ -544,13 +544,13 @@ export class RoomContentLoader implements IFurnitureDataListener remaining--; - if (!remaining) + if(!remaining) { loader.destroy(); const events = this._events.get(type); - if (!events) return; + if(!events) return; events.dispatchEvent(new RoomContentLoadedEvent(RoomContentLoadedEvent.RCLE_SUCCESS, type)); @@ -560,11 +560,11 @@ export class RoomContentLoader implements IFurnitureDataListener loader.load((loader, resources) => { - for (const key in resources) + for(const key in resources) { const resource = resources[key]; - if (!resource || resource.error || !resource.xhr) + if(!resource || resource.error || !resource.xhr) { onDownloaded(false, resource.url); @@ -573,7 +573,7 @@ export class RoomContentLoader implements IFurnitureDataListener const resourceType = (resource.xhr.getResponseHeader('Content-Type') || 'application/octet-stream'); - if (resourceType === 'application/octet-stream') + if(resourceType === 'application/octet-stream') { const nitroBundle = new NitroBundle(resource.data); @@ -592,7 +592,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const spritesheetData = data.spritesheet; - if (!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) + if(!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) { this.createCollection(data, null); @@ -613,7 +613,7 @@ export class RoomContentLoader implements IFurnitureDataListener }); }; - if (baseTexture.valid) + if(baseTexture.valid) { createAsset(); } @@ -633,7 +633,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const existing = this._objectAliases.get(name); - if (!existing) return name; + if(!existing) return name; return existing; } @@ -642,14 +642,14 @@ export class RoomContentLoader implements IFurnitureDataListener { const existing = this._objectOriginalNames.get(name); - if (!existing) return name; + if(!existing) return name; return existing; } public getAssetUrls(type: string, param: string = null, icon: boolean = false): string[] { - switch (type) + switch(type) { case RoomContentLoader.PLACE_HOLDER: return [this.getAssetUrlWithGenericBase(RoomContentLoader.PLACE_HOLDER)]; @@ -666,13 +666,13 @@ export class RoomContentLoader implements IFurnitureDataListener default: { const category = this.getCategoryForType(type); - if ((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL)) + if((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL)) { const name = this.getAssetAliasName(type); let assetUrl = (icon ? this.getAssetUrlWithFurniIconBase(name) : this.getAssetUrlWithFurniBase(type)); - if (icon) + if(icon) { const active = (param && (param !== '') && (this._activeObjectTypeIds.has((name + '*' + param)))); @@ -682,7 +682,7 @@ export class RoomContentLoader implements IFurnitureDataListener return [assetUrl]; } - if (category === RoomObjectCategory.UNIT) + if(category === RoomObjectCategory.UNIT) { return [this.getAssetUrlWithPetBase(type)]; } @@ -697,14 +697,14 @@ export class RoomContentLoader implements IFurnitureDataListener let assetName: string = null; let assetUrls: string[] = []; - if (type && (type.indexOf(',') >= 0)) + if(type && (type.indexOf(',') >= 0)) { assetName = type; type = assetName.split(',')[0]; } - if (assetName) + if(assetName) { assetUrls = this.getAssetUrls(assetName, colorIndex, true); } @@ -713,7 +713,7 @@ export class RoomContentLoader implements IFurnitureDataListener assetUrls = this.getAssetUrls(type, colorIndex, true); } - if (assetUrls && assetUrls.length) return assetUrls[0]; + if(assetUrls && assetUrls.length) return assetUrls[0]; return null; } @@ -742,7 +742,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const model = object && object.model; - if (!model) return; + if(!model) return; model.setValue(RoomObjectVariable.OBJECT_ROOM_ID, roomId); } @@ -751,7 +751,7 @@ export class RoomContentLoader implements IFurnitureDataListener { const existing = this._events.get(type); - if (remove) this._events.delete(type); + if(remove) this._events.delete(type); return existing; } diff --git a/src/nitro/room/RoomEngine.ts b/src/nitro/room/RoomEngine.ts index 36a5e447..1206ab77 100644 --- a/src/nitro/room/RoomEngine.ts +++ b/src/nitro/room/RoomEngine.ts @@ -216,14 +216,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public onInit(): void { - if (this._ready) return; + if(this._ready) return; this._imageObjectIdBank = new NumberBank(1000); this._thumbnailObjectIdBank = new NumberBank(1000); this._logicFactory.registerEventFunction(this.processRoomObjectEvent); - if (this._roomManager) + if(this._roomManager) { this._roomManager.setContentLoader(this._roomContentLoader); this._roomManager.addUpdateCategory(RoomObjectCategory.FLOOR); @@ -239,7 +239,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato this._roomContentLoader.setSessionDataManager(this._sessionDataManager); this._roomContentLoader.setIconListener(this); - if (this._roomSessionManager) + if(this._roomSessionManager) { this._roomSessionManager.events.addEventListener(RoomSessionEvent.STARTED, this.onRoomSessionEvent); this._roomSessionManager.events.addEventListener(RoomSessionEvent.ENDED, this.onRoomSessionEvent); @@ -254,9 +254,9 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public onDispose(): void { - if (!this._ready) return; + if(!this._ready) return; - for (const [key, value] of this._roomInstanceDatas) + for(const [key, value] of this._roomInstanceDatas) { this.removeRoomInstance(key); } @@ -265,15 +265,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato Nitro.instance.ticker.remove(this.update, this); - if (this._roomObjectEventHandler) this._roomObjectEventHandler.dispose(); + if(this._roomObjectEventHandler) this._roomObjectEventHandler.dispose(); - if (this._roomMessageHandler) this._roomMessageHandler.dispose(); + if(this._roomMessageHandler) this._roomMessageHandler.dispose(); - if (this._roomContentLoader) this._roomContentLoader.dispose(); + if(this._roomContentLoader) this._roomContentLoader.dispose(); this.events.removeEventListener(RoomContentLoader.LOADER_READY, this.onRoomContentLoaderReadyEvent); - if (this._roomSessionManager) + if(this._roomSessionManager) { this._roomSessionManager.events.removeEventListener(RoomSessionEvent.STARTED, this.onRoomSessionEvent); this._roomSessionManager.events.removeEventListener(RoomSessionEvent.ENDED, this.onRoomSessionEvent); @@ -284,15 +284,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private onRoomSessionEvent(event: RoomSessionEvent): void { - if (!(event instanceof RoomSessionEvent)) return; + if(!(event instanceof RoomSessionEvent)) return; - switch (event.type) + switch(event.type) { case RoomSessionEvent.STARTED: - if (this._roomMessageHandler) this._roomMessageHandler.setRoomId(event.session.roomId); + if(this._roomMessageHandler) this._roomMessageHandler.setRoomId(event.session.roomId); return; case RoomSessionEvent.ENDED: - if (this._roomMessageHandler) + if(this._roomMessageHandler) { this._roomMessageHandler.clearRoomId(); this.removeRoomInstance(event.session.roomId); @@ -327,14 +327,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if (instance) + if(instance) { this._roomManager && this._roomManager.removeRoomInstance(this.getRoomId(roomId)); } const existing = this._roomInstanceDatas.get(roomId); - if (existing) + if(existing) { this._roomInstanceDatas.delete(existing.roomId); @@ -350,11 +350,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let wallType = '201'; let landscapeType = '1'; - if (!this._ready) + if(!this._ready) { let data = this._roomDatas.get(roomId); - if (data) + if(data) { this._roomDatas.delete(roomId); @@ -376,7 +376,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato return; } - if (!roomMap) + if(!roomMap) { this.logger.warn('Room property messages received before floor height map, will initialize when floor height map received.'); @@ -385,22 +385,22 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const data = this._roomDatas.get(roomId); - if (data) + if(data) { this._roomDatas.delete(roomId); - if (data.floorType) floorType = data.floorType; + if(data.floorType) floorType = data.floorType; - if (data.wallType) wallType = data.wallType; + if(data.wallType) wallType = data.wallType; - if (data.landscapeType) landscapeType = data.landscapeType; + if(data.landscapeType) landscapeType = data.landscapeType; } const instance = this.setupRoomInstance(roomId, roomMap, floorType, wallType, landscapeType, this.getRoomInstanceModelName(roomId)); - if (!instance) return; + if(!instance) return; - if (roomMap.restrictsDragging) + if(roomMap.restrictsDragging) { this._roomAllowsDragging = false; } @@ -414,11 +414,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private setupRoomInstance(roomId: number, roomMap: RoomMapData, floorType: string, wallType: string, landscapeType: string, worldType: string): IRoomInstance { - if (!this._ready || !this._roomManager) return; + if(!this._ready || !this._roomManager) return; const instance = this._roomManager.createRoomInstance(this.getRoomId(roomId)); - if (!instance) return null; + if(!instance) return null; const category = RoomObjectCategory.ROOM; @@ -427,7 +427,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato instance.model.setValue(RoomVariableEnum.ROOM_IS_PUBLIC, 0); instance.model.setValue(RoomVariableEnum.ROOM_Z_SCALE, 1); - if (roomMap) + if(roomMap) { instance.model.setValue(RoomVariableEnum.RESTRICTS_DRAGGING, roomMap.restrictsDragging); instance.model.setValue(RoomVariableEnum.RESTRICTS_SCALING, roomMap.restrictsScaling); @@ -435,7 +435,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const dimensions = roomMap.dimensions; - if (dimensions) + if(dimensions) { const minX = roomMap.dimensions.minX; const maxX = roomMap.dimensions.maxX; @@ -449,44 +449,44 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const seed = ((((minX * 423) + (maxX * 671)) + (minY * 913)) + (maxY * 7509)); - if (roomObject && roomObject.model) roomObject.model.setValue(RoomObjectVariable.ROOM_RANDOM_SEED, seed); + if(roomObject && roomObject.model) roomObject.model.setValue(RoomObjectVariable.ROOM_RANDOM_SEED, seed); } } const logic = (roomObject && roomObject.logic as RoomLogic) || null; - if (logic) + if(logic) { logic.initialize(roomMap); - if (floorType) + if(floorType) { logic.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_FLOOR_UPDATE, floorType)); instance.model.setValue(RoomObjectVariable.ROOM_FLOOR_TYPE, floorType); } - if (wallType) + if(wallType) { logic.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_WALL_UPDATE, wallType)); instance.model.setValue(RoomObjectVariable.ROOM_WALL_TYPE, wallType); } - if (landscapeType) + if(landscapeType) { logic.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_LANDSCAPE_UPDATE, landscapeType)); instance.model.setValue(RoomObjectVariable.ROOM_LANDSCAPE_TYPE, landscapeType); } } - if (roomMap && roomMap.doors.length) + if(roomMap && roomMap.doors.length) { let doorIndex = 0; - while (doorIndex < roomMap.doors.length) + while(doorIndex < roomMap.doors.length) { const door = roomMap.doors[doorIndex]; - if (door) + if(door) { const doorX = door.x; const doorY = door.y; @@ -498,15 +498,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato logic.processUpdateMessage(new ObjectRoomMaskUpdateMessage(ObjectRoomMaskUpdateMessage.ADD_MASK, maskId, maskType, maskLocation, ObjectRoomMaskUpdateMessage.HOLE)); - if ((doorDir === 90) || (doorDir === 180)) + if((doorDir === 90) || (doorDir === 180)) { - if (doorDir === 90) + if(doorDir === 90) { instance.model.setValue(RoomObjectVariable.ROOM_DOOR_X, (doorX - 0.5)); instance.model.setValue(RoomObjectVariable.ROOM_DOOR_Y, doorY); } - if (doorDir === 180) + if(doorDir === 180) { instance.model.setValue(RoomObjectVariable.ROOM_DOOR_X, doorX); instance.model.setValue(RoomObjectVariable.ROOM_DOOR_Y, (doorY - 0.5)); @@ -522,7 +522,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } instance.createRoomObjectAndInitalize(RoomEngine.CURSOR_OBJECT_ID, RoomEngine.CURSOR_OBJECT_TYPE, RoomObjectCategory.CURSOR); - if (Nitro.instance.getConfiguration('enable.avatar.arrow', false)) instance.createRoomObjectAndInitalize(RoomEngine.ARROW_OBJECT_ID, RoomEngine.ARROW_OBJECT_TYPE, RoomObjectCategory.CURSOR); + if(Nitro.instance.getConfiguration('enable.avatar.arrow', false)) instance.createRoomObjectAndInitalize(RoomEngine.ARROW_OBJECT_ID, RoomEngine.ARROW_OBJECT_TYPE, RoomObjectCategory.CURSOR); return instance; } @@ -531,15 +531,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if (!instance) return null; + if(!instance) return null; let renderer = instance.renderer as IRoomRenderer; - if (!renderer) + if(!renderer) { renderer = this._roomRendererFactory.createRenderer(); - if (!renderer) return null; + if(!renderer) return null; } renderer.roomObjectVariableAccurateZ = RoomObjectVariable.OBJECT_ACCURATE_Z_VALUE; @@ -548,15 +548,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const canvas = renderer.createCanvas(id, width, height, scale); - if (!canvas) return null; + if(!canvas) return null; const restrictedScaling = instance.model.getValue(RoomVariableEnum.RESTRICTS_SCALING); - if (restrictedScaling) + if(restrictedScaling) { let restrictedScale = instance.model.getValue(RoomVariableEnum.RESTRICTED_SCALE); - if (!restrictedScale) restrictedScale = 1; + if(!restrictedScale) restrictedScale = 1; canvas.setScale(restrictedScale); @@ -569,7 +569,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato canvas.setMouseListener(this._roomObjectEventHandler); - if (canvas.geometry) + if(canvas.geometry) { canvas.geometry.z_scale = instance.model.getValue(RoomVariableEnum.ROOM_Z_SCALE); @@ -581,15 +581,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let direction: IVector3D = null; - if (doorDirection === 90) direction = new Vector3d(-2000, 0, 0); + if(doorDirection === 90) direction = new Vector3d(-2000, 0, 0); - if (doorDirection === 180) direction = new Vector3d(0, -2000, 0); + if(doorDirection === 180) direction = new Vector3d(0, -2000, 0); canvas.geometry.setDisplacement(vector, direction); const displayObject = (canvas.master as Container); - if (displayObject) + if(displayObject) { const overlay = new NitroSprite(Texture.EMPTY); @@ -607,16 +607,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if (roomCanvas) roomCanvas.setMask(flag); + if(roomCanvas) roomCanvas.setMask(flag); } public setRoomInstanceRenderingCanvasScale(roomId: number, canvasId: number, scale: number, point: Point = null, offsetPoint: Point = null, override: boolean = false, asDelta: boolean = false): void { const roomCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if (roomCanvas) + if(roomCanvas) { - if (roomCanvas.restrictsScaling && !override) return; + if(roomCanvas.restrictsScaling && !override) return; roomCanvas.setScale(scale, point, offsetPoint, override, asDelta); @@ -628,17 +628,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if (!instance) return null; + if(!instance) return null; const renderer = instance.renderer as IRoomRenderer; - if (!renderer) return null; + if(!renderer) return null; - if (canvasId === -1) canvasId = this._activeRoomActiveCanvas; + if(canvasId === -1) canvasId = this._activeRoomActiveCanvas; const canvas = renderer.getCanvas(canvasId); - if (!canvas) return null; + if(!canvas) return null; return canvas; } @@ -650,11 +650,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getRoomInstanceRenderingCanvasOffset(roomId: number, canvasId: number = -1): Point { - if (canvasId === -1) canvasId = this._activeRoomActiveCanvas; + if(canvasId === -1) canvasId = this._activeRoomActiveCanvas; const renderingCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if (!renderingCanvas) return null; + if(!renderingCanvas) return null; return new Point(renderingCanvas.screenOffsetX, renderingCanvas.screenOffsetY); } @@ -663,12 +663,12 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const renderingCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if (!renderingCanvas || !point) return false; + if(!renderingCanvas || !point) return false; const x = ~~(point.x); const y = ~~(point.y); - if ((renderingCanvas.screenOffsetX === x) && (renderingCanvas.screenOffsetY === y)) return; + if((renderingCanvas.screenOffsetX === x) && (renderingCanvas.screenOffsetY === y)) return; this.events.dispatchEvent(new RoomDragEvent(roomId, -(renderingCanvas.screenOffsetX - x), -(renderingCanvas.screenOffsetY - y))); @@ -680,13 +680,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getRoomInstanceRenderingCanvasScale(roomId: number = -1000, canvasId: number = -1): number { - if (roomId === -1000) roomId = this._activeRoomId; + if(roomId === -1000) roomId = this._activeRoomId; - if (canvasId === -1) canvasId = this._activeRoomActiveCanvas; + if(canvasId === -1) canvasId = this._activeRoomActiveCanvas; const canvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if (!canvas) return 1; + if(!canvas) return 1; return canvas.scale; } @@ -695,7 +695,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const canvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if (!canvas) return; + if(!canvas) return; canvas.initialize(width, height); } @@ -704,17 +704,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if (!instance) return null; + if(!instance) return null; const renderer = instance.renderer as IRoomRenderer; - if (!renderer) return null; + if(!renderer) return null; - if (canvasId === -1) canvasId = this._activeRoomActiveCanvas; + if(canvasId === -1) canvasId = this._activeRoomActiveCanvas; const canvas = renderer.getCanvas(canvasId); - if (!canvas) return null; + if(!canvas) return null; return canvas.geometry; } @@ -723,7 +723,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if (!instance) return null; + if(!instance) return null; return ((instance.model && instance.model.getValue(key)) || null); } @@ -732,7 +732,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomOwnObject(roomId); - if (!object) return false; + if(!object) return false; object.processUpdateMessage(new ObjectRoomPlaneVisibilityUpdateMessage(ObjectRoomPlaneVisibilityUpdateMessage.WALL_VISIBILITY, wallVisible)); object.processUpdateMessage(new ObjectRoomPlaneVisibilityUpdateMessage(ObjectRoomPlaneVisibilityUpdateMessage.FLOOR_VISIBILITY, floorVisible)); @@ -744,7 +744,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomOwnObject(roomId); - if (!object) return false; + if(!object) return false; object.processUpdateMessage(new ObjectRoomPlanePropertyUpdateMessage(ObjectRoomPlanePropertyUpdateMessage.WALL_THICKNESS, wallThickness)); object.processUpdateMessage(new ObjectRoomPlanePropertyUpdateMessage(ObjectRoomPlanePropertyUpdateMessage.FLOOR_THICKNESS, floorThickness)); @@ -757,43 +757,43 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const roomObject = this.getRoomOwnObject(roomId); const roomInstance = this.getRoomInstance(roomId); - if (!roomObject) + if(!roomObject) { let roomData = this._roomDatas.get(roomId); - if (!roomData) + if(!roomData) { roomData = new RoomData(roomId, null); this._roomDatas.set(roomId, roomData); } - if (floorType) roomData.floorType = floorType; + if(floorType) roomData.floorType = floorType; - if (wallType) roomData.wallType = wallType; + if(wallType) roomData.wallType = wallType; - if (landscapeType) roomData.landscapeType = landscapeType; + if(landscapeType) roomData.landscapeType = landscapeType; return true; } - if (floorType) + if(floorType) { - if (roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_FLOOR_TYPE, floorType); + if(roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_FLOOR_TYPE, floorType); roomObject.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_FLOOR_UPDATE, floorType)); } - if (wallType) + if(wallType) { - if (roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_WALL_TYPE, wallType); + if(roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_WALL_TYPE, wallType); roomObject.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_WALL_UPDATE, wallType)); } - if (landscapeType) + if(landscapeType) { - if (roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_LANDSCAPE_TYPE, landscapeType); + if(roomInstance && !_arg_5) roomInstance.model.setValue(RoomObjectVariable.ROOM_LANDSCAPE_TYPE, landscapeType); roomObject.processUpdateMessage(new ObjectRoomUpdateMessage(ObjectRoomUpdateMessage.ROOM_LANDSCAPE_UPDATE, landscapeType)); } @@ -805,7 +805,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomObject = this.getRoomOwnObject(roomId); - if (!roomObject || !roomObject.logic) return false; + if(!roomObject || !roomObject.logic) return false; const event = new ObjectRoomColorUpdateMessage(ObjectRoomColorUpdateMessage.BACKGROUND_COLOR, color, light, backgroundOnly); @@ -818,12 +818,12 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public addRoomInstanceFloorHole(roomId: number, objectId: number): void { - if (objectId < 0) return; + if(objectId < 0) return; const roomOwnObject = this.getRoomOwnObject(roomId); const roomObject = this.getRoomObjectFloor(roomId, objectId); - if (roomOwnObject && roomOwnObject.logic && roomObject && roomObject.model) + if(roomOwnObject && roomOwnObject.logic && roomObject && roomObject.model) { const location = roomObject.getLocation(); const sizeX = roomObject.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); @@ -835,11 +835,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public removeRoomInstanceFloorHole(roomId: number, objectId: number): void { - if (objectId < 0) return; + if(objectId < 0) return; const roomOwnObject = this.getRoomOwnObject(roomId); - if (roomOwnObject) + if(roomOwnObject) { roomOwnObject.processUpdateMessage(new ObjectRoomFloorHoleUpdateMessage(ObjectRoomFloorHoleUpdateMessage.REMOVE, objectId)); } @@ -849,13 +849,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstance = this.getRoomInstance(roomId); - if (!roomInstance) return; + if(!roomInstance) return; const mode = isPlaying ? 1 : 0; roomInstance.model.setValue(RoomVariableEnum.IS_PLAYING_GAME, mode); - if (mode === 0) + if(mode === 0) { this.events.dispatchEvent(new RoomEngineEvent(RoomEngineEvent.NORMAL_MODE, roomId)); } @@ -869,7 +869,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstance = this.getRoomInstance(roomId); - if (!roomInstance) return false; + if(!roomInstance) return false; return (roomInstance.model.getValue(RoomVariableEnum.IS_PLAYING_GAME) > 0); } @@ -881,7 +881,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public disableUpdate(flag: boolean): void { - if (flag) + if(flag) { Nitro.instance.ticker.remove(this.update, this); } @@ -899,12 +899,12 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public runVisibilityUpdate(): void { - if (!document.hidden) this.update(1, true); + if(!document.hidden) this.update(1, true); } public update(time: number, update: boolean = false): void { - if (!this._roomManager) return; + if(!this._roomManager) return; time = Nitro.instance.time; @@ -916,7 +916,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato this.updateRoomCameras(time); - if (this._mouseCursorUpdate) this.setPointer(); + if(this._mouseCursorUpdate) this.setPointer(); RoomEnterEffect.turnVisualizationOff(); } @@ -927,7 +927,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const instanceData = this.getRoomInstanceData(this._activeRoomId); - if (instanceData && instanceData.hasButtonMouseCursorOwners()) + if(instanceData && instanceData.hasButtonMouseCursorOwners()) { document.body.style.cursor = 'pointer'; } @@ -939,7 +939,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private processPendingFurniture(): void { - if (this._skipFurnitureCreationForNextFrame) + if(this._skipFurnitureCreationForNextFrame) { this._skipFurnitureCreationForNextFrame = false; @@ -950,25 +950,25 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const furniturePerTick = 5; const hasTickLimit = true; - for (const instanceData of this._roomInstanceDatas.values()) + for(const instanceData of this._roomInstanceDatas.values()) { - if (!instanceData) continue; + if(!instanceData) continue; let pendingData: RoomFurnitureData = null; let totalFurnitureAdded = 0; let furnitureAdded = false; - while ((pendingData = instanceData.getNextPendingFurnitureFloor())) + while((pendingData = instanceData.getNextPendingFurnitureFloor())) { furnitureAdded = this.processPendingFurnitureFloor(instanceData.roomId, pendingData.id, pendingData); - if (hasTickLimit) + if(hasTickLimit) { - if (!(++totalFurnitureAdded % furniturePerTick)) + if(!(++totalFurnitureAdded % furniturePerTick)) { const time = new Date().valueOf(); - if ((time - startTime) >= 40) + if((time - startTime) >= 40) { this._skipFurnitureCreationForNextFrame = true; @@ -978,17 +978,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - while (!this._skipFurnitureCreationForNextFrame && (pendingData = instanceData.getNextPendingFurnitureWall())) + while(!this._skipFurnitureCreationForNextFrame && (pendingData = instanceData.getNextPendingFurnitureWall())) { furnitureAdded = this.processPendingFurnitureWall(instanceData.roomId, pendingData.id, pendingData); - if (hasTickLimit) + if(hasTickLimit) { - if (!(++totalFurnitureAdded % furniturePerTick)) + if(!(++totalFurnitureAdded % furniturePerTick)) { const time = new Date().valueOf(); - if ((time - startTime) >= 40) + if((time - startTime) >= 40) { this._skipFurnitureCreationForNextFrame = true; @@ -998,28 +998,28 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - if (furnitureAdded && this._roomManager) + if(furnitureAdded && this._roomManager) { const roomInstance = this._roomManager.getRoomInstance(this.getRoomId(instanceData.roomId)) as RoomInstance; - if (!roomInstance.hasUninitializedObjects()) this.objectsInitialized(instanceData.roomId.toString()); + if(!roomInstance.hasUninitializedObjects()) this.objectsInitialized(instanceData.roomId.toString()); } - if (this._skipFurnitureCreationForNextFrame) return; + if(this._skipFurnitureCreationForNextFrame) return; } } public onRoomEngineInitalized(flag: boolean): void { - if (!flag) return; + if(!flag) return; this._ready = true; this.events.dispatchEvent(new RoomEngineEvent(RoomEngineEvent.ENGINE_INITIALIZED, 0)); - for (const roomData of this._roomDatas.values()) + for(const roomData of this._roomDatas.values()) { - if (!roomData) continue; + if(!roomData) continue; this.createRoomInstance(roomData.roomId, roomData.data); } @@ -1027,19 +1027,19 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private processPendingFurnitureFloor(roomId: number, id: number, data: RoomFurnitureData): boolean { - if (!data) + if(!data) { const instanceData = this.getRoomInstanceData(roomId); - if (instanceData) data = instanceData.getPendingFurnitureFloor(id); + if(instanceData) data = instanceData.getPendingFurnitureFloor(id); - if (!data) return false; + if(!data) return false; } let type = data.type; let didLoad = false; - if (!type) + if(!type) { type = this.getFurnitureFloorName(data.typeId); didLoad = true; @@ -1048,11 +1048,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const object = this.createRoomObjectFloor(roomId, id, type); - if (!object) return false; + if(!object) return false; const model = object.model; - if (model) + if(model) { model.setValue(RoomObjectVariable.FURNITURE_COLOR, this.getFurnitureFloorColorIndex(data.typeId)); model.setValue(RoomObjectVariable.FURNITURE_TYPE_ID, data.typeId); @@ -1065,53 +1065,53 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato model.setValue(RoomObjectVariable.FURNITURE_OWNER_NAME, data.ownerName); } - if (!this.updateRoomObjectFloor(roomId, id, data.location, data.direction, data.state, data.data, data.extra)) return false; + if(!this.updateRoomObjectFloor(roomId, id, data.location, data.direction, data.state, data.data, data.extra)) return false; - if (data.sizeZ >= 0) + if(data.sizeZ >= 0) { - if (!this.updateRoomObjectFloorHeight(roomId, id, data.sizeZ)) return false; + if(!this.updateRoomObjectFloorHeight(roomId, id, data.sizeZ)) return false; } - if (this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, id, RoomObjectCategory.FLOOR)); + if(this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, id, RoomObjectCategory.FLOOR)); const selectedRoomObjectData = this.getPlacedRoomObjectData(roomId); - if (selectedRoomObjectData && (selectedRoomObjectData.id === id) && (selectedRoomObjectData.category === RoomObjectCategory.FLOOR)) + if(selectedRoomObjectData && (selectedRoomObjectData.id === id) && (selectedRoomObjectData.category === RoomObjectCategory.FLOOR)) { this.selectRoomObject(roomId, id, RoomObjectCategory.FLOOR); } - if (object.isReady && data.synchronized) this.addObjectToTileMap(roomId, object); + if(object.isReady && data.synchronized) this.addObjectToTileMap(roomId, object); return true; } private processPendingFurnitureWall(roomId: number, id: number, data: RoomFurnitureData): boolean { - if (!data) + if(!data) { const instanceData = this.getRoomInstanceData(roomId); - if (instanceData) data = instanceData.getPendingFurnitureWall(id); + if(instanceData) data = instanceData.getPendingFurnitureWall(id); - if (!data) return false; + if(!data) return false; } let extra = ''; - if (data.data) extra = data.data.getLegacyString(); + if(data.data) extra = data.data.getLegacyString(); let type = this.getFurnitureWallName(data.typeId, extra); - if (!type) type = ''; + if(!type) type = ''; const object = this.createRoomObjectWall(roomId, id, type); - if (!object) return false; + if(!object) return false; const model = object.model; - if (model) + if(model) { model.setValue(RoomObjectVariable.FURNITURE_COLOR, this.getFurnitureWallColorIndex(data.typeId)); model.setValue(RoomObjectVariable.FURNITURE_TYPE_ID, data.typeId); @@ -1125,13 +1125,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato model.setValue(RoomObjectVariable.FURNITURE_OWNER_NAME, data.ownerName); } - if (!this.updateRoomObjectWall(roomId, id, data.location, data.direction, data.state, extra)) return false; + if(!this.updateRoomObjectWall(roomId, id, data.location, data.direction, data.state, extra)) return false; - if (this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, id, RoomObjectCategory.WALL)); + if(this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, id, RoomObjectCategory.WALL)); const selectedRoomObjectData = this.getPlacedRoomObjectData(roomId); - if (selectedRoomObjectData && (Math.abs(selectedRoomObjectData.id) === id) && (selectedRoomObjectData.category === RoomObjectCategory.WALL)) + if(selectedRoomObjectData && (Math.abs(selectedRoomObjectData.id) === id) && (selectedRoomObjectData.category === RoomObjectCategory.WALL)) { this.selectRoomObject(roomId, id, RoomObjectCategory.WALL); } @@ -1141,18 +1141,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public setRoomSessionOwnUser(roomId: number, objectId: number): void { - if (!this._roomSessionManager) return; + if(!this._roomSessionManager) return; const session = this._roomSessionManager.getSession(roomId); - if (session) + if(session) { session.setOwnRoomIndex(objectId); } const camera = this.getRoomCamera(roomId); - if (camera) + if(camera) { camera.targetId = objectId; camera.targetCategory = RoomObjectCategory.UNIT; @@ -1169,33 +1169,33 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private updateRoomCameras(time: number): void { - for (const instanceData of this._roomInstanceDatas.values()) + for(const instanceData of this._roomInstanceDatas.values()) { - if (!instanceData) continue; + if(!instanceData) continue; const camera = instanceData.roomCamera; - if (!camera) continue; + if(!camera) continue; let location: IVector3D = null; const object = this.getRoomObject(instanceData.roomId, camera.targetId, camera.targetCategory); - if (object) location = object.getLocation(); + if(object) location = object.getLocation(); - if (!location) continue; + if(!location) continue; - if ((instanceData.roomId !== this._activeRoomId) || !this._activeRoomIsDragged) + if((instanceData.roomId !== this._activeRoomId) || !this._activeRoomIsDragged) { this.updateRoomCamera(instanceData.roomId, 1, location, time); } } - if (this._activeRoomWasDragged) + if(this._activeRoomWasDragged) { const renderingCanvas = this.getRoomInstanceRenderingCanvas(this._activeRoomId, 1); - if (renderingCanvas) this.setRoomInstanceRenderingCanvasOffset(this._activeRoomId, 1, new Point((renderingCanvas.screenOffsetX + this._activeRoomDragX), (renderingCanvas.screenOffsetY + this._activeRoomDragY))); + if(renderingCanvas) this.setRoomInstanceRenderingCanvasOffset(this._activeRoomId, 1, new Point((renderingCanvas.screenOffsetX + this._activeRoomDragX), (renderingCanvas.screenOffsetY + this._activeRoomDragY))); this._activeRoomDragX = 0; this._activeRoomDragY = 0; @@ -1207,29 +1207,29 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const renderingCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); const instanceData = this.getRoomInstanceData(roomId); - if (!renderingCanvas || !instanceData || (renderingCanvas.scale !== 1)) return; + if(!renderingCanvas || !instanceData || (renderingCanvas.scale !== 1)) return; const roomGeometry = (renderingCanvas.geometry as RoomGeometry); const roomCamera = instanceData.roomCamera; const roomInstance = this.getRoomInstance(roomId); - if (!roomGeometry || !roomCamera || !roomInstance) return; + if(!roomGeometry || !roomCamera || !roomInstance) return; const canvasRectangle = this.getRoomCanvasRectangle(roomId, canvasId); - if (!canvasRectangle) return; + if(!canvasRectangle) return; let _local_10 = (Math.floor(objectLocation.z) + 1); const width = Math.round(canvasRectangle.width); const height = Math.round(canvasRectangle.height); const bounds = this.getCanvasBoundingRectangle(canvasId); - if (bounds && ((bounds.right < 0) || (bounds.bottom < 0) || (bounds.left >= width) || (bounds.top >= height))) + if(bounds && ((bounds.right < 0) || (bounds.bottom < 0) || (bounds.left >= width) || (bounds.top >= height))) { roomCamera.reset(); } - if ((roomCamera.screenWd !== width) || (roomCamera.screenHt !== height) || (roomCamera.scale !== roomGeometry.scale) || (roomCamera.geometryUpdateId !== roomGeometry.updateId) || !Vector3d.isEqual(objectLocation, roomCamera.targetObjectLoc) || roomCamera.isMoving) + if((roomCamera.screenWd !== width) || (roomCamera.screenHt !== height) || (roomCamera.scale !== roomGeometry.scale) || (roomCamera.geometryUpdateId !== roomGeometry.updateId) || !Vector3d.isEqual(objectLocation, roomCamera.targetObjectLoc) || roomCamera.isMoving) { roomCamera.targetObjectLoc = objectLocation; @@ -1263,17 +1263,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let _local_32 = 0; let _local_33 = roomGeometry.getScreenPoint(new Vector3d(_local_20, _local_21, _local_22)); - if (!_local_33) return; + if(!_local_33) return; _local_33.x = (_local_33.x + Math.round((canvasRectangle.width / 2))); _local_33.y = (_local_33.y + Math.round((canvasRectangle.height / 2))); - if (bounds) + if(bounds) { bounds.x += -(renderingCanvas.screenOffsetX); bounds.y += -(renderingCanvas.screenOffsetY); - if (((bounds.width > 1) && (bounds.height > 1))) + if(((bounds.width > 1) && (bounds.height > 1))) { _local_29 = (((bounds.left - _local_33.x) - (roomGeometry.scale * 0.25)) / _local_24); _local_31 = (((bounds.right - _local_33.x) + (roomGeometry.scale * 0.25)) / _local_24); @@ -1300,7 +1300,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let _local_37 = false; const _local_38 = Math.round(((_local_31 - _local_29) * _local_24)); - if (_local_38 < canvasRectangle.width) + if(_local_38 < canvasRectangle.width) { _local_10 = 2; _local_23.x = ((_local_31 + _local_29) / 2); @@ -1308,19 +1308,19 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } else { - if (_local_23.x > (_local_31 - _local_27)) + if(_local_23.x > (_local_31 - _local_27)) { _local_23.x = (_local_31 - _local_27); _local_34 = true; } - if (_local_23.x < (_local_29 + _local_27)) + if(_local_23.x < (_local_29 + _local_27)) { _local_23.x = (_local_29 + _local_27); _local_34 = true; } } const _local_39 = Math.round(((_local_32 - _local_30) * _local_25)); - if (_local_39 < canvasRectangle.height) + if(_local_39 < canvasRectangle.height) { _local_10 = 2; _local_23.y = ((_local_32 + _local_30) / 2); @@ -1328,17 +1328,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } else { - if (_local_23.y > (_local_32 - _local_28)) + if(_local_23.y > (_local_32 - _local_28)) { _local_23.y = (_local_32 - _local_28); _local_35 = true; } - if (_local_23.y < (_local_30 + _local_28)) + if(_local_23.y < (_local_30 + _local_28)) { _local_23.y = (_local_30 + _local_28); _local_35 = true; } - if (_local_35) + if(_local_35) { _local_23.y = (_local_23.y / (_local_25 / _local_24)); } @@ -1352,23 +1352,23 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let _local_42 = 0.2; const _local_43 = 10; const _local_44 = 10; - if ((_local_42 * width) > 100) + if((_local_42 * width) > 100) { _local_42 = (100 / width); } - if ((_local_40 * height) > 150) + if((_local_40 * height) > 150) { _local_40 = (150 / height); } - if ((_local_41 * height) > 150) + if((_local_41 * height) > 150) { _local_41 = (150 / height); } - if ((((roomCamera.limitedLocationX) && (roomCamera.screenWd == width)) && (roomCamera.screenHt == height))) + if((((roomCamera.limitedLocationX) && (roomCamera.screenWd == width)) && (roomCamera.screenHt == height))) { _local_42 = 0; } - if ((((roomCamera.limitedLocationY) && (roomCamera.screenWd == width)) && (roomCamera.screenHt == height))) + if((((roomCamera.limitedLocationY) && (roomCamera.screenWd == width)) && (roomCamera.screenHt == height))) { _local_40 = 0; _local_41 = 0; @@ -1377,17 +1377,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato canvasRectangle.width = (canvasRectangle.width * (1 - (_local_42 * 2))); canvasRectangle.height = (canvasRectangle.height * (1 - (_local_40 + _local_41))); - if (canvasRectangle.width < _local_43) + if(canvasRectangle.width < _local_43) { canvasRectangle.width = _local_43; } - if (canvasRectangle.height < _local_44) + if(canvasRectangle.height < _local_44) { canvasRectangle.height = _local_44; } - if ((_local_40 + _local_41) > 0) + if((_local_40 + _local_41) > 0) { canvasRectangle.x += (-(canvasRectangle.width) / 2); canvasRectangle.y += (-(canvasRectangle.height) * (_local_41 / (_local_40 + _local_41))); @@ -1400,19 +1400,19 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato _local_33 = roomGeometry.getScreenPoint(_local_15); - if (!_local_33) return; + if(!_local_33) return; - if (_local_33) + if(_local_33) { _local_33.x = (_local_33.x + renderingCanvas.screenOffsetX); _local_33.y = (_local_33.y + renderingCanvas.screenOffsetY); _local_15.z = _local_10; _local_15.x = (Math.round((_local_23.x * 2)) / 2); _local_15.y = (Math.round((_local_23.y * 2)) / 2); - if (!roomCamera.location) + if(!roomCamera.location) { roomGeometry.location = _local_15; - if (this.useOffsetScrolling) + if(this.useOffsetScrolling) { roomCamera.initializeLocation(new Vector3d(0, 0, 0)); } @@ -1423,16 +1423,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } const _local_45 = roomGeometry.getScreenPoint(_local_15); const _local_46 = new Vector3d(0, 0, 0); - if (_local_45) + if(_local_45) { _local_46.x = _local_45.x; _local_46.y = _local_45.y; } - if (((((((((_local_33.x < canvasRectangle.left) || (_local_33.x > canvasRectangle.right)) && (!(roomCamera.centeredLocX))) || (((_local_33.y < canvasRectangle.top) || (_local_33.y > canvasRectangle.bottom)) && (!(roomCamera.centeredLocY)))) || (((_local_36) && (!(roomCamera.centeredLocX))) && (!(roomCamera.screenWd == width)))) || (((_local_37) && (!(roomCamera.centeredLocY))) && (!(roomCamera.screenHt == height)))) || ((!(roomCamera.roomWd == bounds.width)) || (!(roomCamera.roomHt == bounds.height)))) || ((!(roomCamera.screenWd == width)) || (!(roomCamera.screenHt == height))))) + if(((((((((_local_33.x < canvasRectangle.left) || (_local_33.x > canvasRectangle.right)) && (!(roomCamera.centeredLocX))) || (((_local_33.y < canvasRectangle.top) || (_local_33.y > canvasRectangle.bottom)) && (!(roomCamera.centeredLocY)))) || (((_local_36) && (!(roomCamera.centeredLocX))) && (!(roomCamera.screenWd == width)))) || (((_local_37) && (!(roomCamera.centeredLocY))) && (!(roomCamera.screenHt == height)))) || ((!(roomCamera.roomWd == bounds.width)) || (!(roomCamera.roomHt == bounds.height)))) || ((!(roomCamera.screenWd == width)) || (!(roomCamera.screenHt == height))))) { roomCamera.limitedLocationX = _local_34; roomCamera.limitedLocationY = _local_35; - if (this.useOffsetScrolling) + if(this.useOffsetScrolling) { roomCamera.target = _local_46; } @@ -1443,9 +1443,9 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } else { - if (!_local_34) roomCamera.limitedLocationX = false; + if(!_local_34) roomCamera.limitedLocationX = false; - if (!_local_35) roomCamera.limitedLocationY = false; + if(!_local_35) roomCamera.limitedLocationY = false; } } @@ -1458,9 +1458,9 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato roomCamera.roomWd = bounds.width; roomCamera.roomHt = bounds.height; - if (!this._sessionDataManager.isCameraFollowDisabled) + if(!this._sessionDataManager.isCameraFollowDisabled) { - if (this.useOffsetScrolling) + if(this.useOffsetScrolling) { roomCamera.update(time, 8); } @@ -1470,7 +1470,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - if (this.useOffsetScrolling) + if(this.useOffsetScrolling) { this.setRoomInstanceRenderingCanvasOffset(this.activeRoomId, 1, new Point(-(roomCamera.location.x), -(roomCamera.location.y))); } @@ -1492,7 +1492,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const canvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if (!canvas) return null; + if(!canvas) return null; return new Rectangle(0, 0, canvas.width, canvas.height); } @@ -1501,22 +1501,22 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const geometry = this.getRoomInstanceGeometry(roomId, canvasId); - if (!geometry) return null; + if(!geometry) return null; const roomObject = this.getRoomObject(roomId, objectId, category); - if (!roomObject) return null; + if(!roomObject) return null; const visualization = roomObject.visualization; - if (!visualization) return null; + if(!visualization) return null; const rectangle = visualization.getBoundingRectangle(); const canvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); const scale = ((canvas) ? canvas.scale : 1); const screenPoint = geometry.getScreenPoint(roomObject.getLocation()); - if (!screenPoint) return null; + if(!screenPoint) return null; screenPoint.x = Math.round(screenPoint.x); screenPoint.y = Math.round(screenPoint.y); @@ -1532,7 +1532,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato rectangle.x += screenPoint.x; rectangle.y += screenPoint.y; - if (!canvas) return null; + if(!canvas) return null; rectangle.x += (Math.round(canvas.width / 2) + canvas.screenOffsetX); rectangle.y += (Math.round(canvas.height / 2) + canvas.screenOffsetY); @@ -1547,28 +1547,28 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getFurnitureFloorName(typeId: number): string { - if (!this._roomContentLoader) return null; + if(!this._roomContentLoader) return null; return this._roomContentLoader.getFurnitureFloorNameForTypeId(typeId); } public getFurnitureWallName(typeId: number, extra: string = null): string { - if (!this._roomContentLoader) return null; + if(!this._roomContentLoader) return null; return this._roomContentLoader.getFurnitureWallNameForTypeId(typeId, extra); } public getFurnitureFloorColorIndex(typeId: number): number { - if (!this._roomContentLoader) return null; + if(!this._roomContentLoader) return null; return this._roomContentLoader.getFurnitureFloorColorIndex(typeId); } public getFurnitureWallColorIndex(typeId: number): number { - if (!this._roomContentLoader) return null; + if(!this._roomContentLoader) return null; return this._roomContentLoader.getFurnitureWallColorIndex(typeId); } @@ -1577,7 +1577,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const existing = this._roomInstanceDatas.get(roomId); - if (existing) return existing; + if(existing) return existing; const data = new RoomInstanceData(roomId); @@ -1590,7 +1590,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return null; + if(!instanceData) return null; return instanceData.modelName; } @@ -1599,7 +1599,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return; + if(!instanceData) return; instanceData.setModelName(name); } @@ -1608,7 +1608,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstance = this.getRoomInstanceData(k); - if (!roomInstance) return null; + if(!roomInstance) return null; return roomInstance.tileObjectMap; } @@ -1622,7 +1622,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return null; + if(!instanceData) return null; return instanceData.roomCamera; } @@ -1631,7 +1631,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return null; + if(!instanceData) return null; return instanceData.selectedObject; } @@ -1640,18 +1640,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return null; + if(!instanceData) return null; instanceData.setSelectedObject(data); - if (data) instanceData.setPlacedObject(null); + if(data) instanceData.setPlacedObject(null); } public getPlacedRoomObjectData(roomId: number): SelectedRoomObjectData { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return null; + if(!instanceData) return null; return instanceData.placedObject; } @@ -1660,14 +1660,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return null; + if(!instanceData) return null; instanceData.setPlacedObject(data); } public cancelRoomObjectPlacement(): void { - if (!this._roomObjectEventHandler) return; + if(!this._roomObjectEventHandler) return; this._roomObjectEventHandler.cancelRoomObjectPlacement(this._activeRoomId); } @@ -1676,7 +1676,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return null; + if(!instanceData) return null; return instanceData.furnitureStackingHeightMap; } @@ -1685,7 +1685,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return null; + if(!instanceData) return null; instanceData.setFurnitureStackingHeightMap(heightMap); } @@ -1694,7 +1694,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return null; + if(!instanceData) return null; return instanceData.legacyGeometry; } @@ -1703,7 +1703,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if (!instance) return null; + if(!instance) return null; return instance.createRoomObjectAndInitalize(objectId, type, category) as IRoomObjectController; } @@ -1712,18 +1712,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if (!instance) return 0; + if(!instance) return 0; return instance.getTotalObjectsForManager(category); } public getRoomObject(roomId: number, objectId: number, category: number): IRoomObjectController { - if (!this._ready) return null; + if(!this._ready) return null; let roomIdString = this.getRoomId(roomId); - if (roomId === 0) roomIdString = RoomEngine.TEMPORARY_ROOM; + if(roomId === 0) roomIdString = RoomEngine.TEMPORARY_ROOM; return this.getObject(roomIdString, objectId, category); } @@ -1732,15 +1732,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { let roomInstance: IRoomInstance = null; - if (this._roomManager) roomInstance = this._roomManager.getRoomInstance(roomId); + if(this._roomManager) roomInstance = this._roomManager.getRoomInstance(roomId); - if (!roomInstance) return null; + if(!roomInstance) return null; let roomObject = (roomInstance.getRoomObject(objectId, category) as IRoomObjectController); - if (!roomObject) + if(!roomObject) { - switch (category) + switch(category) { case RoomObjectCategory.FLOOR: this.processPendingFurnitureFloor(this.getRoomIdFromString(roomId), objectId, null); @@ -1762,14 +1762,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if (!instance) return null; + if(!instance) return null; return instance.getRoomObjectByIndex(index, category) as IRoomObjectController; } public getRoomObjectCategoryForType(type: string): number { - if (!type || !this._roomContentLoader) return RoomObjectCategory.MINIMUM; + if(!type || !this._roomContentLoader) return RoomObjectCategory.MINIMUM; return this._roomContentLoader.getCategoryForType(type); } @@ -1818,21 +1818,21 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstanceData = this.getRoomInstanceData(roomId); - if (roomInstanceData) roomInstanceData.removePendingFunitureFloor(objectId); + if(roomInstanceData) roomInstanceData.removePendingFunitureFloor(objectId); - if (this._sessionDataManager && (userId === this._sessionDataManager.userId) && !FurniId.isBuilderClubId(objectId)) + if(this._sessionDataManager && (userId === this._sessionDataManager.userId) && !FurniId.isBuilderClubId(objectId)) { const roomObject = this.getRoomObject(roomId, objectId, RoomObjectCategory.FLOOR); - if (roomObject) + if(roomObject) { const screenLocation = this.getRoomObjectScreenLocation(roomId, objectId, RoomObjectCategory.FLOOR, this._activeRoomActiveCanvas); - if (screenLocation) + if(screenLocation) { const disabledPickingAnimation = (roomObject.model.getValue(RoomObjectVariable.FURNITURE_DISABLE_PICKING_ANIMATION) === 1); - if (!disabledPickingAnimation) + if(!disabledPickingAnimation) { const typeId = roomObject.model.getValue(RoomObjectVariable.FURNITURE_TYPE_ID); const extras = roomObject.model.getValue(RoomObjectVariable.FURNITURE_EXTRAS); @@ -1840,11 +1840,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const objectData = ObjectDataFactory.getData(dataKey); const icon = this.getFurnitureFloorIcon(typeId, null, extras, objectData).data; - if (icon) + if(icon) { const image = TextureUtils.generateImage(icon); - if (this.events) + if(this.events) { const event = new NitroToolbarAnimateIconEvent(image, screenLocation.x, screenLocation.y); @@ -1861,7 +1861,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato this.removeRoomObject(roomId, objectId, RoomObjectCategory.FLOOR); this.setMouseDefault(roomId, RoomObjectCategory.FLOOR, objectId); - if (_arg_4) this.refreshTileObjectMap(roomId, 'RoomEngine.disposeObjectFurniture()'); + if(_arg_4) this.refreshTileObjectMap(roomId, 'RoomEngine.disposeObjectFurniture()'); } public getRoomObjectWall(roomId: number, objectId: number): IRoomObjectController @@ -1871,25 +1871,25 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public removeRoomObjectWall(roomId: number, objectId: number, userId: number = -1): void { - if (this._sessionDataManager && (userId === this._sessionDataManager.userId) && !FurniId.isBuilderClubId(objectId)) + if(this._sessionDataManager && (userId === this._sessionDataManager.userId) && !FurniId.isBuilderClubId(objectId)) { const roomObject = this.getRoomObject(roomId, objectId, RoomObjectCategory.WALL); - if (roomObject && (roomObject.type.indexOf('post_it') === -1) && (roomObject.type.indexOf('external_image_wallitem') === -1)) + if(roomObject && (roomObject.type.indexOf('post_it') === -1) && (roomObject.type.indexOf('external_image_wallitem') === -1)) { const screenLocation = this.getRoomObjectScreenLocation(roomId, objectId, RoomObjectCategory.WALL, this._activeRoomActiveCanvas); - if (screenLocation) + if(screenLocation) { const typeId = roomObject.model.getValue(RoomObjectVariable.FURNITURE_TYPE_ID); const objectData = roomObject.model.getValue(RoomObjectVariable.FURNITURE_DATA); const icon = this.getFurnitureWallIcon(typeId, null, objectData).data; - if (icon) + if(icon) { const image = TextureUtils.generateImage(icon); - if (this.events) + if(this.events) { const event = new NitroToolbarAnimateIconEvent(image, screenLocation.x, screenLocation.y); @@ -1916,18 +1916,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instance = this.getRoomInstance(roomId); - if (!instance) return null; + if(!instance) return null; instance.removeRoomObject(objectId, category); - if (this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REMOVED, roomId, objectId, category)); + if(this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REMOVED, roomId, objectId, category)); } public addFurnitureFloor(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra: number = NaN, expires: number = -1, usagePolicy: number = 0, ownerId: number = 0, ownerName: string = '', synchronized: boolean = true, realRoomObject: boolean = true, sizeZ: number = -1): boolean { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return false; + if(!instanceData) return false; const furnitureData = new RoomFurnitureData(id, typeId, null, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ); @@ -1940,7 +1940,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return false; + if(!instanceData) return false; const furnitureData = new RoomFurnitureData(id, 0, typeName, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ); @@ -1953,7 +1953,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return false; + if(!instanceData) return false; const objectData = new LegacyDataType(); @@ -1970,7 +1970,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectFloor(roomId, objectId); - if (!object) return false; + if(!object) return false; object.processUpdateMessage(new RoomObjectUpdateMessage(location, direction)); object.processUpdateMessage(new ObjectDataUpdateMessage(state, data, extra)); @@ -1982,7 +1982,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectWall(roomId, objectId); - if (!object || !object.logic) return false; + if(!object || !object.logic) return false; const updateMessage = new RoomObjectUpdateMessage(location, direction); const data = new LegacyDataType(); @@ -2002,7 +2002,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectWall(roomId, objectId); - if (!object || !object.logic) return false; + if(!object || !object.logic) return false; object.logic.processUpdateMessage(new ObjectItemDataUpdateMessage(data)); @@ -2013,7 +2013,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectFloor(roomId, objectId); - if (!object) return false; + if(!object) return false; object.processUpdateMessage(new ObjectHeightUpdateMessage(null, null, height)); @@ -2024,7 +2024,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectFloor(roomId, objectId); - if (!object) return false; + if(!object) return false; object.model.setValue(RoomObjectVariable.FURNITURE_EXPIRY_TIME, expires); object.model.setValue(RoomObjectVariable.FURNITURE_EXPIRTY_TIMESTAMP, Nitro.instance.time); @@ -2036,7 +2036,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectWall(roomId, objectId); - if (!object) return false; + if(!object) return false; object.model.setValue(RoomObjectVariable.FURNITURE_EXPIRY_TIME, expires); object.model.setValue(RoomObjectVariable.FURNITURE_EXPIRTY_TIMESTAMP, Nitro.instance.time); @@ -2051,14 +2051,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let maskUpdate: ObjectRoomMaskUpdateMessage = null; - if (roomObject && roomObject.model) + if(roomObject && roomObject.model) { - if (roomObject.model.getValue(RoomObjectVariable.FURNITURE_USES_PLANE_MASK) > 0) + if(roomObject.model.getValue(RoomObjectVariable.FURNITURE_USES_PLANE_MASK) > 0) { const maskType = roomObject.model.getValue(RoomObjectVariable.FURNITURE_PLANE_MASK_TYPE); const location = roomObject.getLocation(); - if (_arg_3) maskUpdate = new ObjectRoomMaskUpdateMessage(ObjectRoomMaskUpdateMessage.ADD_MASK, maskName, maskType, location); + if(_arg_3) maskUpdate = new ObjectRoomMaskUpdateMessage(ObjectRoomMaskUpdateMessage.ADD_MASK, maskName, maskType, location); else maskUpdate = new ObjectRoomMaskUpdateMessage(ObjectRoomMaskUpdateMessage.REMOVE_MASK, maskName); } } @@ -2069,14 +2069,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const roomOwnObject = this.getRoomOwnObject(roomId); - if (roomOwnObject && roomOwnObject.logic && maskUpdate) roomOwnObject.logic.processUpdateMessage(maskUpdate); + if(roomOwnObject && roomOwnObject.logic && maskUpdate) roomOwnObject.logic.processUpdateMessage(maskUpdate); } public rollRoomObjectFloor(roomId: number, objectId: number, location: IVector3D, targetLocation: IVector3D): void { const object = this.getRoomObjectFloor(roomId, objectId); - if (!object) return; + if(!object) return; object.processUpdateMessage(new ObjectMoveUpdateMessage(location, targetLocation, null, !!targetLocation)); } @@ -2085,9 +2085,9 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomObject = this.getRoomObjectWall(roomId, objectId); - if (!roomObject) return false; + if(!roomObject) return false; - if (roomObject.logic) roomObject.logic.processUpdateMessage(new ObjectMoveUpdateMessage(location, null, null)); + if(roomObject.logic) roomObject.logic.processUpdateMessage(new ObjectMoveUpdateMessage(location, null, null)); this.updateRoomObjectMask(roomId, objectId); @@ -2098,23 +2098,23 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const existing = this.getRoomObjectUser(roomId, objectId); - if (existing) return false; + if(existing) return false; let objectType = RoomObjectUserType.getTypeString(type); - if (objectType === RoomObjectUserType.PET) objectType = this.getPetType(figure); + if(objectType === RoomObjectUserType.PET) objectType = this.getPetType(figure); const object = this.createRoomObjectUser(roomId, objectId, objectType); - if (!object) return false; + if(!object) return false; //object.model.setValue(RoomObjectVariable.FIGURE_HIGHLIGHT_ENABLE, 1); object.processUpdateMessage(new ObjectAvatarUpdateMessage(this.fixedUserLocation(roomId, location), null, direction, headDirection, false, 0)); - if (figure) object.processUpdateMessage(new ObjectAvatarFigureUpdateMessage(figure)); + if(figure) object.processUpdateMessage(new ObjectAvatarFigureUpdateMessage(figure)); - if (this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, objectId, RoomObjectCategory.UNIT)); + if(this.events) this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.ADDED, roomId, objectId, RoomObjectCategory.UNIT)); return true; } @@ -2123,19 +2123,19 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if (!object) return false; + if(!object) return false; - if (!location) location = object.getLocation(); + if(!location) location = object.getLocation(); - if (!direction) direction = object.getDirection(); + if(!direction) direction = object.getDirection(); - if (isNaN(headDirection)) headDirection = object.model.getValue(RoomObjectVariable.HEAD_DIRECTION); + if(isNaN(headDirection)) headDirection = object.model.getValue(RoomObjectVariable.HEAD_DIRECTION); object.processUpdateMessage(new ObjectAvatarUpdateMessage(this.fixedUserLocation(roomId, location), this.fixedUserLocation(roomId, targetLocation), direction, headDirection, canStandUp, baseY)); const roomSession = ((this._roomSessionManager && this._roomSessionManager.getSession(roomId)) || null); - if (roomSession && (roomSession.ownRoomIndex === objectId)) + if(roomSession && (roomSession.ownRoomIndex === objectId)) { this._logicFactory.events.dispatchEvent(new RoomToObjectOwnAvatarMoveEvent(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, targetLocation)); } @@ -2145,18 +2145,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private fixedUserLocation(roomId: number, location: IVector3D): IVector3D { - if (!location) return null; + if(!location) return null; const heightMap = this.getFurnitureStackingHeightMap(roomId); const wallGeometry = this.getLegacyWallGeometry(roomId); - if (!heightMap || !wallGeometry) return location; + if(!heightMap || !wallGeometry) return location; let _local_5 = location.z; const _local_6 = heightMap.getTileHeight(location.x, location.y); const _local_7 = wallGeometry.getHeight(location.x, location.y); - if ((Math.abs((_local_5 - _local_6)) < 0.1) && (Math.abs((_local_6 - _local_7)) < 0.1)) + if((Math.abs((_local_5 - _local_6)) < 0.1) && (Math.abs((_local_6 - _local_7)) < 0.1)) { _local_5 = wallGeometry.getFloorAltitude(location.x, location.y); } @@ -2168,11 +2168,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if (!object) return false; + if(!object) return false; let message: ObjectStateUpdateMessage = null; - switch (action) + switch(action) { case RoomObjectVariable.FIGURE_TALK: message = new ObjectAvatarChatUpdateMessage(value); @@ -2215,7 +2215,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato break; } - if (!message) return false; + if(!message) return false; object.processUpdateMessage(message); @@ -2226,7 +2226,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if (!object) return false; + if(!object) return false; object.processUpdateMessage(new ObjectAvatarFigureUpdateMessage(figure, gender, subType, isRiding)); @@ -2237,7 +2237,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if (!object) return false; + if(!object) return false; object.processUpdateMessage(new ObjectAvatarFlatControlUpdateMessage(parseInt(level))); @@ -2248,7 +2248,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if (!object) return false; + if(!object) return false; object.processUpdateMessage(new ObjectAvatarEffectUpdateMessage(effectId, delay)); @@ -2259,7 +2259,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if (!object) return false; + if(!object) return false; object.processUpdateMessage(new ObjectAvatarGestureUpdateMessage(gestureId)); @@ -2270,7 +2270,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if (!object) return false; + if(!object) return false; object.processUpdateMessage(new ObjectAvatarPetGestureUpdateMessage(gesture)); @@ -2281,7 +2281,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if (!object) return false; + if(!object) return false; object.processUpdateMessage(new ObjectAvatarPostureUpdateMessage(type, parameter)); @@ -2292,7 +2292,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const object = this.getRoomObjectUser(roomId, objectId); - if (!object) return; + if(!object) return; object.processUpdateMessage(new ObjectAvatarOwnMessage()); } @@ -2301,11 +2301,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomObject = this.getRoomObject(this._activeRoomId, objectId, category); - if (roomObject) + if(roomObject) { const eventHandler = roomObject.logic; - if (eventHandler) + if(eventHandler) { eventHandler.useObject(); @@ -2320,18 +2320,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const id = this.getRoomIdFromString(roomId); - if (category === RoomObjectCategory.WALL) + if(category === RoomObjectCategory.WALL) { this.updateRoomObjectMask(id, objectId); } const object = this.getRoomObject(id, objectId, category); - if (object && object.model && object.logic) + if(object && object.model && object.logic) { const dataFormat = object.model.getValue(RoomObjectVariable.FURNITURE_DATA_FORMAT); - if (!isNaN(dataFormat)) + if(!isNaN(dataFormat)) { const data = ObjectDataFactory.getData(dataFormat); @@ -2343,14 +2343,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.CONTENT_UPDATED, id, objectId, category)); } - if (roomId !== RoomEngine.TEMPORARY_ROOM) this.addObjectToTileMap(id, object); + if(roomId !== RoomEngine.TEMPORARY_ROOM) this.addObjectToTileMap(id, object); } public changeObjectModelData(roomId: number, objectId: number, category: number, numberKey: string, numberValue: number): boolean { const roomObject = this.getObject(this.getRoomId(roomId), objectId, category); - if (!roomObject || !roomObject.logic) return false; + if(!roomObject || !roomObject.logic) return false; const message = new ObjectModelDataUpdateMessage(numberKey, numberValue); @@ -2363,11 +2363,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomObject = this.getObject(this.getRoomId(roomId), objectId, category); - if (!roomObject || !roomObject.model) return; + if(!roomObject || !roomObject.model) return; let stateIndex = roomObject.model.getValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX); - if (isNaN(stateIndex)) stateIndex = 1; + if(isNaN(stateIndex)) stateIndex = 1; else stateIndex = (stateIndex + 1); roomObject.model.setValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX, stateIndex); @@ -2377,44 +2377,44 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato objectData.initializeFromRoomObjectModel(roomObject.model); - if (roomObject.logic) roomObject.logic.processUpdateMessage(new ObjectDataUpdateMessage(stateIndex, objectData)); + if(roomObject.logic) roomObject.logic.processUpdateMessage(new ObjectDataUpdateMessage(stateIndex, objectData)); } public loadRoomObjectBadgeImage(roomId: number, objectId: number, objectCategory: number, badgeId: string, groupBadge: boolean = true): void { - if (!this._sessionDataManager) return; + if(!this._sessionDataManager) return; let roomObject: IRoomObjectController = null; - if (roomId === 0) + if(roomId === 0) { const room = this._roomManager.getRoomInstance(RoomEngine.TEMPORARY_ROOM); - if (room) roomObject = (room.getRoomObject(objectId, objectCategory) as IRoomObjectController); + if(room) roomObject = (room.getRoomObject(objectId, objectCategory) as IRoomObjectController); } else { roomObject = this.getRoomObjectFloor(roomId, objectId); } - if (!roomObject || !roomObject.logic) return; + if(!roomObject || !roomObject.logic) return; let badgeName = (groupBadge) ? this._sessionDataManager.loadGroupBadgeImage(badgeId) : this._sessionDataManager.loadBadgeImage(badgeId); - if (!badgeName) + if(!badgeName) { badgeName = 'loading_icon'; - if (!this._badgeListenerObjects) this._badgeListenerObjects = new Map(); + if(!this._badgeListenerObjects) this._badgeListenerObjects = new Map(); - if (!this._badgeListenerObjects.size) + if(!this._badgeListenerObjects.size) { this._sessionDataManager.events.addEventListener(BadgeImageReadyEvent.IMAGE_READY, this.onBadgeImageReadyEvent); } let listeners = this._badgeListenerObjects.get(badgeId); - if (!listeners) listeners = []; + if(!listeners) listeners = []; listeners.push(new RoomObjectBadgeImageAssetListener(roomObject, groupBadge)); @@ -2430,26 +2430,26 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private onBadgeImageReadyEvent(k: BadgeImageReadyEvent): void { - if (!this._sessionDataManager) return; + if(!this._sessionDataManager) return; const listeners = this._badgeListenerObjects && this._badgeListenerObjects.get(k.badgeId); - if (!listeners) return; + if(!listeners) return; - for (const listener of listeners) + for(const listener of listeners) { - if (!listener) continue; + if(!listener) continue; this.putBadgeInObjectAssets(listener.object, k.badgeId, listener.groupBadge); const badgeName = (listener.groupBadge) ? this._sessionDataManager.loadGroupBadgeImage(k.badgeId) : this._sessionDataManager.loadBadgeImage(k.badgeId); - if (listener.object && listener.object.logic) listener.object.logic.processUpdateMessage(new ObjectGroupBadgeUpdateMessage(k.badgeId, badgeName)); + if(listener.object && listener.object.logic) listener.object.logic.processUpdateMessage(new ObjectGroupBadgeUpdateMessage(k.badgeId, badgeName)); } this._badgeListenerObjects.delete(k.badgeId); - if (!this._badgeListenerObjects.size) + if(!this._badgeListenerObjects.size) { this._sessionDataManager.events.removeEventListener(BadgeImageReadyEvent.IMAGE_READY, this.onBadgeImageReadyEvent); } @@ -2457,24 +2457,24 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private putBadgeInObjectAssets(object: IRoomObjectController, badgeId: string, groupBadge: boolean = false): void { - if (!this._roomContentLoader || !this._sessionDataManager) return; + if(!this._roomContentLoader || !this._sessionDataManager) return; const badgeName = (groupBadge) ? this._sessionDataManager.loadGroupBadgeImage(badgeId) : this._sessionDataManager.loadBadgeImage(badgeId); const badgeImage = (groupBadge) ? this._sessionDataManager.getGroupBadgeImage(badgeId) : this._sessionDataManager.getBadgeImage(badgeId); - if (badgeImage) this._roomContentLoader.addAssetToCollection(object.type, badgeName, badgeImage, false); + if(badgeImage) this._roomContentLoader.addAssetToCollection(object.type, badgeName, badgeImage, false); } public dispatchMouseEvent(canvasId: number, x: number, y: number, type: string, altKey: boolean, ctrlKey: boolean, shiftKey: boolean, buttonDown: boolean): void { const canvas = this.getRoomInstanceRenderingCanvas(this._activeRoomId, canvasId); - if (!canvas) return; + if(!canvas) return; const overlay = this.getRenderingCanvasOverlay(canvas); const sprite = this.getOverlayIconSprite(overlay, RoomEngine.OBJECT_ICON_SPRITE); - if (sprite) + if(sprite) { const rectangle = sprite.getLocalBounds(); @@ -2482,15 +2482,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato sprite.y = (y - (rectangle.height / 2)); } - if (!this.handleRoomDragging(canvas, x, y, type, altKey, ctrlKey, shiftKey)) + if(!this.handleRoomDragging(canvas, x, y, type, altKey, ctrlKey, shiftKey)) { - if (!canvas.handleMouseEvent(x, y, type, altKey, ctrlKey, shiftKey, buttonDown)) + if(!canvas.handleMouseEvent(x, y, type, altKey, ctrlKey, shiftKey, buttonDown)) { let eventType: string = null; - if (type === MouseEventType.MOUSE_CLICK) + if(type === MouseEventType.MOUSE_CLICK) { - if (this.events) + if(this.events) { this.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.DESELECTED, this._activeRoomId, -1, RoomObjectCategory.MINIMUM)); } @@ -2499,13 +2499,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } else { - if (type === MouseEventType.MOUSE_MOVE) eventType = RoomObjectMouseEvent.MOUSE_MOVE; + if(type === MouseEventType.MOUSE_MOVE) eventType = RoomObjectMouseEvent.MOUSE_MOVE; - else if (type === MouseEventType.MOUSE_DOWN) eventType = RoomObjectMouseEvent.MOUSE_DOWN; + else if(type === MouseEventType.MOUSE_DOWN) eventType = RoomObjectMouseEvent.MOUSE_DOWN; - else if (type === MouseEventType.MOUSE_DOWN_LONG) eventType = RoomObjectMouseEvent.MOUSE_DOWN_LONG; + else if(type === MouseEventType.MOUSE_DOWN_LONG) eventType = RoomObjectMouseEvent.MOUSE_DOWN_LONG; - else if (type === MouseEventType.MOUSE_UP) eventType = RoomObjectMouseEvent.MOUSE_UP; + else if(type === MouseEventType.MOUSE_UP) eventType = RoomObjectMouseEvent.MOUSE_UP; } this._roomObjectEventHandler.handleRoomObjectEvent(new RoomObjectMouseEvent(eventType, this.getRoomObject(this._activeRoomId, RoomEngine.ROOM_OBJECT_ID, RoomObjectCategory.ROOM), null, altKey), this._activeRoomId); @@ -2522,11 +2522,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let offsetX = (x - this._activeRoomActiveCanvasMouseX); let offsetY = (y - this._activeRoomActiveCanvasMouseY); - if (type === MouseEventType.MOUSE_DOWN) + if(type === MouseEventType.MOUSE_DOWN) { - if (!altKey && !ctrlKey && !shiftKey && !this.isDecorating) + if(!altKey && !ctrlKey && !shiftKey && !this.isDecorating) { - if (this._roomAllowsDragging) + if(this._roomAllowsDragging) { this._activeRoomIsDragged = true; this._activeRoomWasDragged = false; @@ -2536,25 +2536,25 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - else if (type === MouseEventType.MOUSE_UP) + else if(type === MouseEventType.MOUSE_UP) { - if (this._activeRoomIsDragged) + if(this._activeRoomIsDragged) { this._activeRoomIsDragged = false; - if (this._activeRoomWasDragged) + if(this._activeRoomWasDragged) { const instanceData = this.getRoomInstanceData(this._activeRoomId); - if (instanceData) + if(instanceData) { const camera = instanceData.roomCamera; - if (camera) + if(camera) { - if (this.useOffsetScrolling) + if(this.useOffsetScrolling) { - if (!camera.isMoving) + if(!camera.isMoving) { camera.centeredLocX = false; camera.centeredLocY = false; @@ -2563,23 +2563,23 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato camera.resetLocation(new Vector3d(-(canvas.screenOffsetX), -(canvas.screenOffsetY))); } - if (this._roomDraggingAlwaysCenters) camera.reset(); + if(this._roomDraggingAlwaysCenters) camera.reset(); } } } } } - else if (type === MouseEventType.MOUSE_MOVE) + else if(type === MouseEventType.MOUSE_MOVE) { - if (this._activeRoomIsDragged) + if(this._activeRoomIsDragged) { - if (!this._activeRoomWasDragged) + if(!this._activeRoomWasDragged) { offsetX = (x - this._activeRoomDragStartX); offsetY = (y - this._activeRoomDragStartY); - if (((((offsetX <= -(RoomEngine.DRAG_THRESHOLD)) || (offsetX >= RoomEngine.DRAG_THRESHOLD)) || (offsetY <= -(RoomEngine.DRAG_THRESHOLD))) || (offsetY >= RoomEngine.DRAG_THRESHOLD))) + if(((((offsetX <= -(RoomEngine.DRAG_THRESHOLD)) || (offsetX >= RoomEngine.DRAG_THRESHOLD)) || (offsetY <= -(RoomEngine.DRAG_THRESHOLD))) || (offsetY >= RoomEngine.DRAG_THRESHOLD))) { this._activeRoomWasDragged = true; } @@ -2588,7 +2588,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato offsetY = 0; } - if (((!(offsetX == 0)) || (!(offsetY == 0)))) + if(((!(offsetX == 0)) || (!(offsetY == 0)))) { this._activeRoomDragX += offsetX; this._activeRoomDragY += offsetY; @@ -2598,11 +2598,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - else if ((type === MouseEventType.MOUSE_CLICK) || (type === MouseEventType.DOUBLE_CLICK)) + else if((type === MouseEventType.MOUSE_CLICK) || (type === MouseEventType.DOUBLE_CLICK)) { this._activeRoomIsDragged = false; - if (this._activeRoomWasDragged) + if(this._activeRoomWasDragged) { this._activeRoomWasDragged = false; @@ -2617,7 +2617,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const category = this.getRoomObjectCategoryForType(objectType); - switch (type) + switch(type) { case RoomObjectFurnitureActionEvent.MOUSE_BUTTON: this.setMouseButton(this._activeRoomId, category, objectId); @@ -2630,67 +2630,67 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private setMouseButton(roomId: number, category: number, objectId: number): void { - if (!this._roomSessionManager) return; + if(!this._roomSessionManager) return; const session = this._roomSessionManager.getSession(roomId); - if (!session) return; + if(!session) return; - if (((category !== RoomObjectCategory.FLOOR) && (category !== RoomObjectCategory.WALL)) || ((session.controllerLevel >= RoomControllerLevel.GUEST))) + if(((category !== RoomObjectCategory.FLOOR) && (category !== RoomObjectCategory.WALL)) || ((session.controllerLevel >= RoomControllerLevel.GUEST))) { const instanceData = this.getRoomInstanceData(roomId); - if (instanceData) + if(instanceData) { - if (instanceData.addButtonMouseCursorOwner((category + '_' + objectId))) this._mouseCursorUpdate = true; + if(instanceData.addButtonMouseCursorOwner((category + '_' + objectId))) this._mouseCursorUpdate = true; } } } private setMouseDefault(roomId: number, category: number, objectId: number): void { - if (!this._roomSessionManager) return; + if(!this._roomSessionManager) return; const instanceData = this.getRoomInstanceData(roomId); - if (instanceData) + if(instanceData) { - if (instanceData.removeButtonMouseCursorOwner((category + '_' + objectId))) this._mouseCursorUpdate = true; + if(instanceData.removeButtonMouseCursorOwner((category + '_' + objectId))) this._mouseCursorUpdate = true; } } public processRoomObjectOperation(objectId: number, category: number, operation: string): boolean { - if (!this._roomObjectEventHandler) return false; + if(!this._roomObjectEventHandler) return false; this._roomObjectEventHandler.modifyRoomObject(this._activeRoomId, objectId, category, operation); } public modifyRoomObjectDataWithMap(objectId: number, category: number, operation: string, data: Map): boolean { - if (!this._roomObjectEventHandler) return false; + if(!this._roomObjectEventHandler) return false; - if (category !== RoomObjectCategory.FLOOR) return; + if(category !== RoomObjectCategory.FLOOR) return; this._roomObjectEventHandler.modifyRoomObjectDataWithMap(this._activeRoomId, objectId, category, operation, data); } public modifyRoomObjectData(objectId: number, category: number, colorHex: string, data: string): boolean { - if (!this._roomObjectEventHandler) return false; + if(!this._roomObjectEventHandler) return false; - if (category !== RoomObjectCategory.WALL) return; + if(category !== RoomObjectCategory.WALL) return; this._roomObjectEventHandler.modifyWallItemData(this._activeRoomId, objectId, colorHex, data); } private processRoomObjectEvent(event: RoomObjectEvent): void { - if (!this._roomObjectEventHandler) return; + if(!this._roomObjectEventHandler) return; const roomIdString = this.getRoomObjectRoomId(event.object); - if (!roomIdString) return; + if(!roomIdString) return; const roomId = this.getRoomIdFromString(roomIdString); @@ -2701,32 +2701,32 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstance = this.getRoomInstance(this._activeRoomId); - if (!roomInstance || (roomInstance.model.getValue(RoomVariableEnum.ROOM_IS_PUBLIC) !== 0)) return false; + if(!roomInstance || (roomInstance.model.getValue(RoomVariableEnum.ROOM_IS_PUBLIC) !== 0)) return false; - if (!this._roomObjectEventHandler) return false; + if(!this._roomObjectEventHandler) return false; return this._roomObjectEventHandler.processRoomObjectPlacement(placementSource, this._activeRoomId, id, category, typeId, extra, stuffData, state, frameNumber, posture); } public getRoomObjectScreenLocation(roomId: number, objectId: number, objectType: number, canvasId: number = -1): Point { - if (canvasId == -1) canvasId = this._activeRoomActiveCanvas; + if(canvasId == -1) canvasId = this._activeRoomActiveCanvas; const geometry = this.getRoomInstanceGeometry(roomId, canvasId); - if (!geometry) return null; + if(!geometry) return null; const roomObject = this.getRoomObject(roomId, objectId, objectType); - if (!roomObject) return null; + if(!roomObject) return null; const screenPoint = geometry.getScreenPoint(roomObject.getLocation()); - if (!screenPoint) return null; + if(!screenPoint) return null; const renderingCanvas = this.getRoomInstanceRenderingCanvas(roomId, canvasId); - if (!renderingCanvas) return null; + if(!renderingCanvas) return null; screenPoint.x = (screenPoint.x * renderingCanvas.scale); screenPoint.y = (screenPoint.y * renderingCanvas.scale); @@ -2742,32 +2742,32 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public selectRoomObject(roomId: number, objectId: number, objectCategory: number): void { - if (!this._roomObjectEventHandler) return; + if(!this._roomObjectEventHandler) return; this._roomObjectEventHandler.setSelectedObject(roomId, objectId, objectCategory); } public setSelectedAvatar(roomId: number, objectId: number): void { - if (this._roomObjectEventHandler) return; + if(this._roomObjectEventHandler) return; this._roomObjectEventHandler.setSelectedAvatar(roomId, objectId, true); } public cancelRoomObjectInsert(): void { - if (!this._roomObjectEventHandler) return; + if(!this._roomObjectEventHandler) return; this._roomObjectEventHandler.cancelRoomObjectInsert(this._activeRoomId); } private addOverlayIconSprite(k: NitroSprite, _arg_2: string, _arg_3: Texture, scale: number = 1): NitroSprite { - if (!k || !_arg_3) return; + if(!k || !_arg_3) return; let sprite = this.getOverlayIconSprite(k, _arg_2); - if (sprite) return null; + if(sprite) return null; sprite = new NitroSprite(_arg_3); @@ -2782,23 +2782,23 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public onRoomContentLoaded(id: number, assetName: string, success: boolean): void { - if (!this._roomContentLoader || (id === -1)) return; + if(!this._roomContentLoader || (id === -1)) return; this._thumbnailObjectIdBank.freeNumber((id - 1)); const listeners = this._thumbnailCallbacks.get(assetName); - if (listeners) + if(listeners) { this._thumbnailCallbacks.delete(assetName); const image = this._roomContentLoader.getImage(assetName); - if (image) + if(image) { - for (const listener of listeners) + for(const listener of listeners) { - if (!listener) continue; + if(!listener) continue; listener.imageReady(id, null, image); } @@ -2813,31 +2813,31 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let imageResult: ImageResult = null; const scale = 1; - if (_arg_3) + if(_arg_3) { imageResult = this.getRoomObjectImage(this._activeRoomId, objectId, category, new Vector3d(), 1, null); } else { - if (this._roomContentLoader) + if(this._roomContentLoader) { - if (category === RoomObjectCategory.FLOOR) + if(category === RoomObjectCategory.FLOOR) { type = this._roomContentLoader.getFurnitureFloorNameForTypeId(objectId); colorIndex = this._roomContentLoader.getFurnitureFloorColorIndex(objectId); } - else if (category === RoomObjectCategory.WALL) + else if(category === RoomObjectCategory.WALL) { type = this._roomContentLoader.getFurnitureWallNameForTypeId(objectId, instanceData); colorIndex = this._roomContentLoader.getFurnitureWallColorIndex(objectId); } - if (category === RoomObjectCategory.UNIT) + if(category === RoomObjectCategory.UNIT) { type = RoomObjectUserType.getTypeString(objectId); - if (type === 'pet') + if(type === 'pet') { type = this.getPetType(instanceData); @@ -2857,11 +2857,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - if (!imageResult || !imageResult.data) return; + if(!imageResult || !imageResult.data) return; const canvas = this.getActiveRoomInstanceRenderingCanvas(); - if (!canvas) return; + if(!canvas) return; const overlay = this.getRenderingCanvasOverlay(canvas); @@ -2869,7 +2869,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const _local_15 = this.addOverlayIconSprite(overlay, RoomEngine.OBJECT_ICON_SPRITE, imageResult.data, scale); - if (_local_15) + if(_local_15) { _local_15.x = (this._activeRoomActiveCanvasMouseX - (imageResult.data.width / 2)); _local_15.y = (this._activeRoomActiveCanvasMouseY - (imageResult.data.height / 2)); @@ -2878,7 +2878,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getRoomObjectImage(roomId: number, objectId: number, category: number, direction: IVector3D, scale: number, listener: IGetImageListener, bgColor: number = 0): ImageResult { - if (!this._roomManager) return null; + if(!this._roomManager) return null; let id = -1; let type: string = null; @@ -2889,16 +2889,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const roomIdString = this.getRoomId(roomId); const roomInstance = this._roomManager.getRoomInstance(roomIdString); - if (roomInstance) + if(roomInstance) { const roomObject = roomInstance.getRoomObject(objectId, category); - if (roomObject && roomObject.model) + if(roomObject && roomObject.model) { id = roomObject.id; type = roomObject.type; - switch (category) + switch(category) { case RoomObjectCategory.FLOOR: case RoomObjectCategory.WALL: { @@ -2907,7 +2907,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const dataFormat = roomObject.model.getValue(RoomObjectVariable.FURNITURE_DATA_FORMAT); - if (dataFormat !== LegacyDataType.FORMAT_KEY) + if(dataFormat !== LegacyDataType.FORMAT_KEY) { data = ObjectDataFactory.getData(dataFormat); @@ -2931,7 +2931,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let type: string = null; let color = ''; - if (this._roomContentLoader) + if(this._roomContentLoader) { type = this._roomContentLoader.getFurnitureFloorNameForTypeId(typeId); color = (this._roomContentLoader.getFurnitureFloorColorIndex(typeId).toString()); @@ -2952,7 +2952,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let type: string = null; let color = ''; - if (this._roomContentLoader) + if(this._roomContentLoader) { type = this._roomContentLoader.getFurnitureWallNameForTypeId(typeId, extra); color = (this._roomContentLoader.getFurnitureWallColorIndex(typeId).toString()); @@ -2973,13 +2973,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let type: string = null; let color = ''; - if (this._roomContentLoader) + if(this._roomContentLoader) { type = this._roomContentLoader.getFurnitureFloorNameForTypeId(typeId); color = (this._roomContentLoader.getFurnitureFloorColorIndex(typeId).toString()); } - if ((scale === 1) && listener) + if((scale === 1) && listener) { return this.getGenericRoomObjectThumbnail(type, color, listener, extras, objectData); } @@ -2992,13 +2992,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let type: string = null; let color = ''; - if (this._roomContentLoader) + if(this._roomContentLoader) { type = this._roomContentLoader.getFurnitureWallNameForTypeId(typeId); color = this._roomContentLoader.getFurnitureWallColorIndex(typeId).toString(); } - if ((scale === 1) && listener) + if((scale === 1) && listener) { return this.getGenericRoomObjectThumbnail(type, color, listener, extras, null); } @@ -3011,56 +3011,56 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let type: string = null; let value = ((((typeId + ' ') + paletteId) + ' ') + color.toString(16)); - if (headOnly) value = (value + (' ' + 'head')); + if(headOnly) value = (value + (' ' + 'head')); - if (customParts) + if(customParts) { value = (value + (' ' + customParts.length)); - for (const _local_13 of customParts) + for(const _local_13 of customParts) { value = (value + (((((' ' + _local_13.layerId) + ' ') + _local_13.partId) + ' ') + _local_13.paletteId)); } } - if (this._roomContentLoader) type = this._roomContentLoader.getPetNameForType(typeId); + if(this._roomContentLoader) type = this._roomContentLoader.getPetNameForType(typeId); return this.getGenericRoomObjectImage(type, value, direction, scale, listener, bgColor, null, null, -1, -1, posture); } public getGenericRoomObjectImage(type: string, value: string, direction: IVector3D, scale: number, listener: IGetImageListener, bgColor: number = 0, extras: string = null, objectData: IObjectData = null, state: number = -1, frameCount: number = -1, posture: string = null, originalId: number = -1): ImageResult { - if (!this._roomManager) return null; + if(!this._roomManager) return null; const imageResult = new ImageResult(); imageResult.id = -1; - if (!this._ready || !type) return imageResult; + if(!this._ready || !type) return imageResult; let roomInstance = this._roomManager.getRoomInstance(RoomEngine.TEMPORARY_ROOM); - if (!roomInstance) + if(!roomInstance) { roomInstance = this._roomManager.createRoomInstance(RoomEngine.TEMPORARY_ROOM); - if (!roomInstance) return imageResult; + if(!roomInstance) return imageResult; } let objectId = this._imageObjectIdBank.reserveNumber(); const objectCategory = this.getRoomObjectCategoryForType(type); - if (objectId < 0) return imageResult; + if(objectId < 0) return imageResult; objectId++; const roomObject = (roomInstance.createRoomObjectAndInitalize(objectId, type, objectCategory) as IRoomObjectController); - if (!roomObject || !roomObject.model || !roomObject.logic) return imageResult; + if(!roomObject || !roomObject.model || !roomObject.logic) return imageResult; const model = roomObject.model; - switch (objectCategory) + switch(objectCategory) { case RoomObjectCategory.FLOOR: case RoomObjectCategory.WALL: @@ -3068,7 +3068,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, extras); break; case RoomObjectCategory.UNIT: - if ((type === RoomObjectUserType.USER) || (type === RoomObjectUserType.BOT) || (type === RoomObjectUserType.RENTABLE_BOT) || (type === RoomObjectUserType.PET)) + if((type === RoomObjectUserType.USER) || (type === RoomObjectUserType.BOT) || (type === RoomObjectUserType.RENTABLE_BOT) || (type === RoomObjectUserType.PET)) { model.setValue(RoomObjectVariable.FIGURE, value); } @@ -3079,16 +3079,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato model.setValue(RoomObjectVariable.PET_PALETTE_INDEX, figureData.paletteId); model.setValue(RoomObjectVariable.PET_COLOR, figureData.color); - if (figureData.headOnly) model.setValue(RoomObjectVariable.PET_HEAD_ONLY, 1); + if(figureData.headOnly) model.setValue(RoomObjectVariable.PET_HEAD_ONLY, 1); - if (figureData.hasCustomParts) + if(figureData.hasCustomParts) { model.setValue(RoomObjectVariable.PET_CUSTOM_LAYER_IDS, figureData.customLayerIds); model.setValue(RoomObjectVariable.PET_CUSTOM_PARTS_IDS, figureData.customPartIds); model.setValue(RoomObjectVariable.PET_CUSTOM_PALETTE_IDS, figureData.customPaletteIds); } - if (posture) model.setValue(RoomObjectVariable.FIGURE_POSTURE, posture); + if(posture) model.setValue(RoomObjectVariable.FIGURE_POSTURE, posture); } break; case RoomObjectCategory.ROOM: @@ -3099,16 +3099,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const visualization = roomObject.visualization; - if (!visualization) + if(!visualization) { roomInstance.removeRoomObject(objectId, objectCategory); return imageResult; } - if ((state > -1) || objectData) + if((state > -1) || objectData) { - if (objectData && (objectData.getLegacyString() !== '')) + if(objectData && (objectData.getLegacyString() !== '')) { roomObject.logic.processUpdateMessage(new ObjectDataUpdateMessage(parseInt(objectData.getLegacyString()), objectData)); } @@ -3122,11 +3122,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato visualization.update(geometry, 0, true, false); - if (frameCount > 0) + if(frameCount > 0) { let i = 0; - while (i < frameCount) + while(i < frameCount) { visualization.update(geometry, 0, true, false); @@ -3139,11 +3139,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato imageResult.data = texture; imageResult.id = objectId; - if (!this.isRoomContentTypeLoaded(type) && listener) + if(!this.isRoomContentTypeLoaded(type) && listener) { let imageListeners = this._imageCallbacks.get(objectId.toString()); - if (!imageListeners) + if(!imageListeners) { imageListeners = []; @@ -3170,27 +3170,27 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getGenericRoomObjectThumbnail(type: string, param: string, listener: IGetImageListener, extraData: string = null, stuffData: IObjectData = null): ImageResult { - if (!this._roomManager) return null; + if(!this._roomManager) return null; const imageResult = new ImageResult(); imageResult.id = -1; - if (!this._ready || !type) return imageResult; + if(!this._ready || !type) return imageResult; let roomInstance = this._roomManager.getRoomInstance(RoomEngine.TEMPORARY_ROOM); - if (!roomInstance) + if(!roomInstance) { roomInstance = this._roomManager.createRoomInstance(RoomEngine.TEMPORARY_ROOM); - if (!roomInstance) return imageResult; + if(!roomInstance) return imageResult; } let objectId = this._thumbnailObjectIdBank.reserveNumber(); const objectCategory = this.getRoomObjectCategoryForType(type); - if (objectId < 0) return imageResult; + if(objectId < 0) return imageResult; objectId++; @@ -3202,11 +3202,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const asset = this._roomContentLoader.getImage(assetName); - if (!asset && listener) + if(!asset && listener) { let contentListeners = this._thumbnailCallbacks.get(assetName); - if (!contentListeners) + if(!contentListeners) { contentListeners = []; @@ -3219,7 +3219,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } else { - if (asset) + if(asset) { imageResult.image = asset; } @@ -3236,7 +3236,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const roomInstance = this._roomManager.getRoomInstance(RoomEngine.TEMPORARY_ROOM); - if (!roomInstance || !this._roomContentLoader) return; + if(!roomInstance || !this._roomContentLoader) return; const objectCategory = this._roomContentLoader.getCategoryForType(type); const objectManager = roomInstance.getManager(objectCategory); @@ -3244,29 +3244,29 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let geometry: RoomGeometry = null; let scale = 0; - if (objectManager && objectManager.objects.length) + if(objectManager && objectManager.objects.length) { - for (const roomObject of objectManager.objects.getValues()) + for(const roomObject of objectManager.objects.getValues()) { - if (roomObject && roomObject.model && (roomObject.type === type)) + if(roomObject && roomObject.model && (roomObject.type === type)) { const objectId = roomObject.id; const visualization = roomObject.visualization; let texture: RenderTexture = null; - if (visualization) + if(visualization) { const imageScale = roomObject.model.getValue(RoomObjectVariable.IMAGE_QUERY_SCALE); - if (geometry && (scale !== imageScale)) + if(geometry && (scale !== imageScale)) { geometry.dispose(); geometry = null; } - if (!geometry) + if(!geometry) { scale = imageScale; @@ -3284,15 +3284,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const imageListeners = this._imageCallbacks.get(objectId.toString()); - if (imageListeners) + if(imageListeners) { this._imageCallbacks.delete(objectId.toString()); - for (const imageListener of imageListeners) + for(const imageListener of imageListeners) { - if (!imageListener) continue; + if(!imageListener) continue; - if (texture) imageListener.imageReady(objectId, texture); + if(texture) imageListener.imageReady(objectId, texture); else imageListener.imageFailed(objectId); } } @@ -3300,19 +3300,19 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } } - if (geometry) geometry.dispose(); + if(geometry) geometry.dispose(); } public setObjectMoverIconSpriteVisible(k: boolean): void { const canvas = this.getActiveRoomInstanceRenderingCanvas(); - if (!canvas) return; + if(!canvas) return; const overlay = this.getRenderingCanvasOverlay(canvas); const sprite = this.getOverlayIconSprite(overlay, RoomEngine.OBJECT_ICON_SPRITE); - if (sprite) + if(sprite) { sprite.visible = k; } @@ -3322,7 +3322,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const canvas = this.getActiveRoomInstanceRenderingCanvas(); - if (!canvas) return; + if(!canvas) return; const sprite = this.getRenderingCanvasOverlay(canvas); @@ -3331,32 +3331,32 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private getRenderingCanvasOverlay(k: IRoomRenderingCanvas): NitroSprite { - if (!k) return null; + if(!k) return null; const displayObject = (k.master as Container); - if (!displayObject) return null; + if(!displayObject) return null; return ((displayObject.getChildByName(RoomEngine.OVERLAY) as NitroSprite) || null); } private removeOverlayIconSprite(k: NitroSprite, _arg_2: string): boolean { - if (!k) return false; + if(!k) return false; let index = (k.children.length - 1); - while (index >= 0) + while(index >= 0) { const child = (k.getChildAt(index) as NitroSprite); - if (child) + if(child) { - if (child.name === _arg_2) + if(child.name === _arg_2) { k.removeChildAt(index); - if (child.children.length) + if(child.children.length) { const firstChild = (child.getChildAt(0) as NitroSprite); @@ -3377,17 +3377,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private getOverlayIconSprite(k: NitroSprite, _arg_2: string): NitroSprite { - if (!k) return null; + if(!k) return null; let index = (k.children.length - 1); - while (index >= 0) + while(index >= 0) { const child = (k.getChildAt(index) as NitroSprite); - if (child) + if(child) { - if (child.name === _arg_2) return child; + if(child.name === _arg_2) return child; } index--; @@ -3398,13 +3398,13 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getRoomObjects(roomId: number, category: number): IRoomObject[] { - if (this._ready) + if(this._ready) { const _local_3 = this.getRoomId(roomId); const _local_4 = this._roomManager.getRoomInstance(_local_3); - if (_local_4) return _local_4.getRoomObjectsForCategory(category); + if(_local_4) return _local_4.getRoomObjectsForCategory(category); } return []; @@ -3414,21 +3414,21 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const tileObjectMap = this.getRoomInstanceData(k).tileObjectMap; - if (tileObjectMap) tileObjectMap.addRoomObject(_arg_2); + if(tileObjectMap) tileObjectMap.addRoomObject(_arg_2); } public refreshTileObjectMap(k: number, _arg_2: string): void { const tileObjectMap = this.getRoomInstanceData(k).tileObjectMap; - if (tileObjectMap) tileObjectMap.populate(this.getRoomObjects(k, RoomObjectCategory.FLOOR)); + if(tileObjectMap) tileObjectMap.populate(this.getRoomObjects(k, RoomObjectCategory.FLOOR)); } public getRenderRoomMessage(k: Rectangle, _arg_2: number, _arg_3: boolean = false, _arg_4: boolean = true, _arg_5: boolean = false, canvasId: number = -1): IMessageComposer { let canvas: IRoomRenderingCanvas = null; - if (canvasId > -1) + if(canvasId > -1) { canvas = this.getRoomInstanceRenderingCanvas(this._activeRoomId, canvasId); } @@ -3437,16 +3437,16 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato canvas = this.getActiveRoomInstanceRenderingCanvas(); } - if (!canvas) return null; + if(!canvas) return null; - if (_arg_5) + if(_arg_5) { canvas.skipSpriteVisibilityChecking(); } let _local_8 = -1; - if (((!(_arg_4)) && (!(this._roomSessionManager.getSession(this._activeRoomId) == null)))) + if(((!(_arg_4)) && (!(this._roomSessionManager.getSession(this._activeRoomId) == null)))) { _local_8 = this._roomSessionManager.getSession(this._activeRoomId).ownRoomIndex; } @@ -3456,9 +3456,9 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato const _local_11 = _local_9.getRoomRenderingModifiers(this); const _local_12 = _local_9.getRoomPlanes(k, canvas, this, _arg_2); - if (_arg_5) canvas.resumeSpriteVisibilityChecking(); + if(_arg_5) canvas.resumeSpriteVisibilityChecking(); - if (_arg_3) + if(_arg_3) { //return new RenderRoomThumbnailMessageComposer(_local_12, _local_10, _local_11, this._activeRoomId, this._sessionDataManager._Str_8500); } @@ -3474,7 +3474,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { let canvas: IRoomRenderingCanvas = null; - if (canvasId > -1) + if(canvasId > -1) { canvas = this.getRoomInstanceRenderingCanvas(this._activeRoomId, canvasId); } @@ -3485,7 +3485,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let texture: RenderTexture = null; - if (bounds) + if(bounds) { texture = TextureUtils.generateTexture(canvas.master, bounds); } @@ -3501,7 +3501,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { let composer: RenderRoomMessageComposer = null; - if (saveAsThumbnail) composer = new RenderRoomThumbnailMessageComposer(); + if(saveAsThumbnail) composer = new RenderRoomThumbnailMessageComposer(); else composer = new RenderRoomMessageComposer(); composer.assignBitmap(texture); @@ -3513,7 +3513,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { let composer: RenderRoomMessageComposer = null; - if (saveAsThumbnail) composer = new RenderRoomThumbnailMessageComposer(); + if(saveAsThumbnail) composer = new RenderRoomThumbnailMessageComposer(); else composer = new RenderRoomMessageComposer(); composer.assignBase64(base64); @@ -3535,18 +3535,18 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private getRoomIdFromString(roomId: string): number { - if (!roomId) return -1; + if(!roomId) return -1; const split = roomId.split('_'); - if (split.length <= 0) return -1; + if(split.length <= 0) return -1; return (parseInt(split[0]) || 0); } private getRoomObjectRoomId(object: IRoomObject): string { - if (!object || !object.model) return null; + if(!object || !object.model) return null; return (object.model.getValue(RoomObjectVariable.OBJECT_ROOM_ID)); } @@ -3560,11 +3560,11 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { let type = -1; - if (figure) + if(figure) { const parts = figure.split(' '); - if (parts.length > 1) type = parseInt(parts[0]); + if(parts.length > 1) type = parseInt(parts[0]); } return type; @@ -3572,15 +3572,15 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private getPetType(type: string): string { - if (!type) return null; + if(!type) return null; const parts = type.split(' '); - if (parts.length > 1) + if(parts.length > 1) { const typeId = parseInt(parts[0]); - if (this._roomContentLoader) return this._roomContentLoader.getPetNameForType(typeId); + if(this._roomContentLoader) return this._roomContentLoader.getPetNameForType(typeId); return 'pet'; } @@ -3590,28 +3590,28 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public isRoomContentTypeLoaded(name: string): boolean { - if (!this._roomContentLoader) return false; + if(!this._roomContentLoader) return false; return (this._roomContentLoader.getCollection(name) !== null); } public getPetColorResult(petIndex: number, paletteIndex: number): PetColorResult { - if (!this._roomContentLoader) return null; + if(!this._roomContentLoader) return null; return this._roomContentLoader.getPetColorResult(petIndex, paletteIndex); } public getPetColorResultsForTag(petIndex: number, tagName: string): PetColorResult[] { - if (!this._roomContentLoader) return null; + if(!this._roomContentLoader) return null; return this._roomContentLoader.getPetColorResultsForTag(petIndex, tagName); } public deleteRoomObject(objectId: number, objectCategory: number): boolean { - if (!this._roomObjectEventHandler || (objectCategory !== RoomObjectCategory.WALL)) return false; + if(!this._roomObjectEventHandler || (objectCategory !== RoomObjectCategory.WALL)) return false; return this._roomObjectEventHandler.deleteWallItem(this._activeRoomId, objectId); } @@ -3688,7 +3688,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public get isDecorating(): boolean { - if (!this._roomSessionManager) return false; + if(!this._roomSessionManager) return false; const session = this._roomSessionManager.getSession(this._activeRoomId); @@ -3702,14 +3702,14 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public get selectedAvatarId(): number { - if (!this._roomObjectEventHandler) return -1; + if(!this._roomObjectEventHandler) return -1; return this._roomObjectEventHandler.selectedAvatarId; } public getRoomObjectCount(roomId: number, categoryId: number): number { - if (this._roomManager == null) return 0; + if(this._roomManager == null) return 0; return this._roomManager.getRoomInstance(roomId.toString()).getRoomObjectsForCategory(categoryId).length; } diff --git a/src/nitro/room/RoomObjectEventHandler.ts b/src/nitro/room/RoomObjectEventHandler.ts index 63e0695c..b86b6dc7 100644 --- a/src/nitro/room/RoomObjectEventHandler.ts +++ b/src/nitro/room/RoomObjectEventHandler.ts @@ -106,7 +106,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public dispose(): void { - if (this._eventIds) + if(this._eventIds) { this._eventIds = null; } @@ -120,19 +120,19 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { let selectedData = this.getSelectedRoomObjectData(event.roomId); - if (!selectedData) return; + if(!selectedData) return; - if ((selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) && (selectedData.id === event.objectId)) + if((selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) && (selectedData.id === event.objectId)) { const roomObject = this._roomEngine.getRoomObject(event.roomId, selectedData.id, selectedData.category); - if (roomObject && roomObject.model) + if(roomObject && roomObject.model) { - if (selectedData.category === RoomObjectCategory.FLOOR) + if(selectedData.category === RoomObjectCategory.FLOOR) { const allowedDirections = roomObject.model.getValue(RoomObjectVariable.FURNITURE_ALLOWED_DIRECTIONS); - if (allowedDirections && allowedDirections.length) + if(allowedDirections && allowedDirections.length) { const direction = new Vector3d(allowedDirections[0]); @@ -142,7 +142,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou selectedData = this.getSelectedRoomObjectData(event.roomId); - if (!selectedData) return; + if(!selectedData) return; } } } @@ -153,31 +153,31 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public processRoomCanvasMouseEvent(event: RoomSpriteMouseEvent, object: IRoomObject, geometry: IRoomGeometry): void { - if (!event || !object) return; + if(!event || !object) return; - if (RoomEnterEffect.isRunning()) return; + if(RoomEnterEffect.isRunning()) return; const type = object.type; let category = this._roomEngine.getRoomObjectCategoryForType(type); - if ((category !== RoomObjectCategory.ROOM) && (!this._roomEngine.isPlayingGame() || category !== RoomObjectCategory.UNIT)) category = RoomObjectCategory.MINIMUM; + if((category !== RoomObjectCategory.ROOM) && (!this._roomEngine.isPlayingGame() || category !== RoomObjectCategory.UNIT)) category = RoomObjectCategory.MINIMUM; const _local_7 = this.getMouseEventId(category, event.type); - if (_local_7 === event.eventId) + if(_local_7 === event.eventId) { - if ((event.type === MouseEventType.MOUSE_CLICK) || (event.type === MouseEventType.DOUBLE_CLICK) || (event.type === MouseEventType.MOUSE_DOWN) || (event.type === MouseEventType.MOUSE_UP) || (event.type === MouseEventType.MOUSE_MOVE)) return; + if((event.type === MouseEventType.MOUSE_CLICK) || (event.type === MouseEventType.DOUBLE_CLICK) || (event.type === MouseEventType.MOUSE_DOWN) || (event.type === MouseEventType.MOUSE_UP) || (event.type === MouseEventType.MOUSE_MOVE)) return; } else { - if (event.eventId) + if(event.eventId) { this.setMouseEventId(category, event.type, event.eventId); } } - if (object.mouseHandler) object.mouseHandler.mouseEvent(event, geometry); + if(object.mouseHandler) object.mouseHandler.mouseEvent(event, geometry); } public processRoomObjectPlacement(placementSource: string, roomId: number, id: number, category: number, typeId: number, extra: string = null, stuffData: IObjectData = null, state: number = -1, frameNumber: number = -1, posture: string = null): boolean @@ -189,7 +189,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this.setSelectedRoomObjectData(roomId, id, category, location, direction, RoomObjectOperationType.OBJECT_PLACE, typeId, extra, stuffData, state, frameNumber, posture); - if (this._roomEngine) + if(this._roomEngine) { this._roomEngine.setObjectMoverIconSprite(typeId, category, false, extra, stuffData, state, frameNumber, posture); this._roomEngine.setObjectMoverIconSpriteVisible(false); @@ -209,7 +209,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { const existing = this._eventIds.get(k); - if (!existing) return null; + if(!existing) return null; return (existing.get(_arg_2) || null); } @@ -218,7 +218,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { let existing = this._eventIds.get(k); - if (!existing) + if(!existing) { existing = new Map(); @@ -232,16 +232,16 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public handleRoomObjectEvent(event: RoomObjectEvent, roomId: number): void { - if (!event) return; + if(!event) return; - if (event instanceof RoomObjectMouseEvent) + if(event instanceof RoomObjectMouseEvent) { this.handleRoomObjectMouseEvent(event, roomId); return; } - switch (event.type) + switch(event.type) { case RoomObjectStateChangedEvent.STATE_CHANGE: case RoomObjectStateChangedEvent.STATE_RANDOM: @@ -355,9 +355,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectMouseEvent(event: RoomObjectMouseEvent, roomId: number): void { - if (!event || !event.type) return; + if(!event || !event.type) return; - switch (event.type) + switch(event.type) { case RoomObjectMouseEvent.CLICK: this.handleRoomObjectMouseClickEvent(event, roomId); @@ -382,20 +382,20 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectMouseClickEvent(event: RoomObjectMouseEvent, roomId: number): void { - if (!event) return; + if(!event) return; let operation = RoomObjectOperationType.OBJECT_UNDEFINED; const selectedData = this.getSelectedRoomObjectData(roomId); - if (selectedData) operation = selectedData.operation; + if(selectedData) operation = selectedData.operation; let didWalk = false; let didMove = false; - if (this._whereYouClickIsWhereYouGo) + if(this._whereYouClickIsWhereYouGo) { - if (!operation || (operation === RoomObjectOperationType.OBJECT_UNDEFINED)) + if(!operation || (operation === RoomObjectOperationType.OBJECT_UNDEFINED)) { didWalk = this.handleMoveTargetFurni(roomId, event); } @@ -403,50 +403,50 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const category = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - switch (operation) + switch(operation) { case RoomObjectOperationType.OBJECT_MOVE: - if (category === RoomObjectCategory.ROOM) + if(category === RoomObjectCategory.ROOM) { - if (selectedData) + if(selectedData) { this.modifyRoomObject(roomId, selectedData.id, selectedData.category, RoomObjectOperationType.OBJECT_MOVE_TO); } } - else if (category === RoomObjectCategory.UNIT) + else if(category === RoomObjectCategory.UNIT) { - if (selectedData && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) + if(selectedData && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) { this.modifyRoomObject(roomId, selectedData.id, selectedData.category, RoomObjectOperationType.OBJECT_MOVE_TO); } - if (event.eventId) this.setMouseEventId(RoomObjectCategory.ROOM, MouseEventType.MOUSE_CLICK, event.eventId); + if(event.eventId) this.setMouseEventId(RoomObjectCategory.ROOM, MouseEventType.MOUSE_CLICK, event.eventId); this.placeObjectOnUser(roomId, event.objectId, category); } didMove = true; - if (event.objectId !== -1) this.setSelectedObject(roomId, event.objectId, category); + if(event.objectId !== -1) this.setSelectedObject(roomId, event.objectId, category); break; case RoomObjectOperationType.OBJECT_PLACE: - if (category === RoomObjectCategory.ROOM) + if(category === RoomObjectCategory.ROOM) { this.placeObject(roomId, (event instanceof RoomObjectTileMouseEvent), (event instanceof RoomObjectWallMouseEvent)); } - else if (category === RoomObjectCategory.UNIT) + else if(category === RoomObjectCategory.UNIT) { - switch (event.objectType) + switch(event.objectType) { case RoomObjectUserType.MONSTER_PLANT: case RoomObjectUserType.RENTABLE_BOT: this.placeObject(roomId, (event instanceof RoomObjectTileMouseEvent), (event instanceof RoomObjectWallMouseEvent)); break; default: - if (event.eventId) + if(event.eventId) { this.setMouseEventId(RoomObjectCategory.ROOM, MouseEventType.MOUSE_CLICK, event.eventId); } @@ -457,9 +457,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } break; case RoomObjectOperationType.OBJECT_UNDEFINED: - if (category === RoomObjectCategory.ROOM) + if(category === RoomObjectCategory.ROOM) { - if (!didWalk && (event instanceof RoomObjectTileMouseEvent)) this.onRoomObjectTileMouseEvent(roomId, event); + if(!didWalk && (event instanceof RoomObjectTileMouseEvent)) this.onRoomObjectTileMouseEvent(roomId, event); } else { @@ -467,24 +467,24 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou didMove = false; - if (category === RoomObjectCategory.UNIT) + if(category === RoomObjectCategory.UNIT) { - if (event.ctrlKey && !event.altKey && !event.shiftKey && (event.objectType === RoomObjectUserType.RENTABLE_BOT)) + if(event.ctrlKey && !event.altKey && !event.shiftKey && (event.objectType === RoomObjectUserType.RENTABLE_BOT)) { this.modifyRoomObject(roomId, event.objectId, category, RoomObjectOperationType.OBJECT_PICKUP_BOT); } - else if (event.ctrlKey && !event.altKey && !event.shiftKey && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) + else if(event.ctrlKey && !event.altKey && !event.shiftKey && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) { this.modifyRoomObject(roomId, event.objectId, category, RoomObjectOperationType.OBJECT_PICKUP_PET); } - else if (!event.ctrlKey && !event.altKey && event.shiftKey && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) + else if(!event.ctrlKey && !event.altKey && event.shiftKey && (event.objectType === RoomObjectUserType.MONSTER_PLANT)) { this.modifyRoomObject(roomId, event.objectId, category, RoomObjectOperationType.OBJECT_ROTATE_POSITIVE); } - if (!this._roomEngine.isPlayingGame()) + if(!this._roomEngine.isPlayingGame()) { didWalk = true; } @@ -494,27 +494,27 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - else if ((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL)) + else if((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL)) { - if (event.altKey || event.ctrlKey || event.shiftKey) + if(event.altKey || event.ctrlKey || event.shiftKey) { - if (!event.ctrlKey && !event.altKey && event.shiftKey) + if(!event.ctrlKey && !event.altKey && event.shiftKey) { - if (category === RoomObjectCategory.FLOOR) + if(category === RoomObjectCategory.FLOOR) { - if (this._roomEngine.events) + if(this._roomEngine.events) { this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REQUEST_ROTATE, roomId, event.objectId, category)); } } } - else if (event.ctrlKey && !event.altKey && !event.shiftKey) + else if(event.ctrlKey && !event.altKey && !event.shiftKey) { this.modifyRoomObject(roomId, event.objectId, category, RoomObjectOperationType.OBJECT_PICKUP); } - if (!this._roomEngine.isPlayingGame()) + if(!this._roomEngine.isPlayingGame()) { didWalk = true; } @@ -525,14 +525,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - if (event.eventId) + if(event.eventId) { - if (didWalk) + if(didWalk) { this.setMouseEventId(RoomObjectCategory.ROOM, MouseEventType.MOUSE_CLICK, event.eventId); } - if (didMove) + if(didMove) { this.setMouseEventId(RoomObjectCategory.MINIMUM, MouseEventType.MOUSE_CLICK, event.eventId); } @@ -541,16 +541,16 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou break; } - if (category === RoomObjectCategory.ROOM) + if(category === RoomObjectCategory.ROOM) { const _local_15 = this.getMouseEventId(RoomObjectCategory.MINIMUM, MouseEventType.MOUSE_CLICK); const _local_16 = this.getMouseEventId(RoomObjectCategory.UNIT, MouseEventType.MOUSE_CLICK); - if ((_local_15 !== event.eventId) && (_local_16 !== event.eventId) && !didMove) + if((_local_15 !== event.eventId) && (_local_16 !== event.eventId) && !didMove) { this.deselectObject(roomId); - if (this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.DESELECTED, roomId, -1, RoomObjectCategory.MINIMUM)); + if(this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.DESELECTED, roomId, -1, RoomObjectCategory.MINIMUM)); this.setSelectedAvatar(roomId, 0, false); } @@ -559,32 +559,32 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectMouseMoveEvent(event: RoomObjectMouseEvent, roomId: number): void { - if (!event) return; + if(!event) return; let operation = RoomObjectOperationType.OBJECT_UNDEFINED; const selectedData = this.getSelectedRoomObjectData(roomId); - if (selectedData) operation = selectedData.operation; + if(selectedData) operation = selectedData.operation; const category = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - if (this._roomEngine) + if(this._roomEngine) { const roomCursor = this._roomEngine.getRoomObjectCursor(roomId); - if (roomCursor && roomCursor.logic) + if(roomCursor && roomCursor.logic) { let newEvent: ObjectTileCursorUpdateMessage = null; - if (event instanceof RoomObjectTileMouseEvent) + if(event instanceof RoomObjectTileMouseEvent) { newEvent = this.handleMouseOverTile(event, roomId); } - else if (event.object && (event.object.id !== -1)) + else if(event.object && (event.object.id !== -1)) { - if (this._whereYouClickIsWhereYouGo) + if(this._whereYouClickIsWhereYouGo) { newEvent = this.handleMouseOverObject(category, roomId, event); } @@ -599,14 +599,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - switch (operation) + switch(operation) { case RoomObjectOperationType.OBJECT_MOVE: - if (category === RoomObjectCategory.ROOM) this.handleObjectMove(event, roomId); + if(category === RoomObjectCategory.ROOM) this.handleObjectMove(event, roomId); return; case RoomObjectOperationType.OBJECT_PLACE: - if (category === RoomObjectCategory.ROOM) this.handleObjectPlace(event, roomId); + if(category === RoomObjectCategory.ROOM) this.handleObjectPlace(event, roomId); return; } @@ -614,24 +614,24 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectMouseDownEvent(event: RoomObjectMouseEvent, roomId: number): void { - if (!event) return; + if(!event) return; let operation = RoomObjectOperationType.OBJECT_UNDEFINED; const selectedData = this.getSelectedRoomObjectData(roomId); - if (selectedData) operation = selectedData.operation; + if(selectedData) operation = selectedData.operation; const category = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - switch (operation) + switch(operation) { case RoomObjectOperationType.OBJECT_UNDEFINED: - if ((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL) || (event.objectType === RoomObjectUserType.MONSTER_PLANT)) + if((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL) || (event.objectType === RoomObjectUserType.MONSTER_PLANT)) { - if ((event.altKey && !event.ctrlKey && !event.shiftKey) || this.decorateModeMove(event)) + if((event.altKey && !event.ctrlKey && !event.shiftKey) || this.decorateModeMove(event)) { - if (this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REQUEST_MOVE, roomId, event.objectId, category)); + if(this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REQUEST_MOVE, roomId, event.objectId, category)); } } return; @@ -640,24 +640,24 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectMouseDownLongEvent(event: RoomObjectMouseEvent, roomId: number): void { - if (!event) return; + if(!event) return; let operation = RoomObjectOperationType.OBJECT_UNDEFINED; const selectedData = this.getSelectedRoomObjectData(roomId); - if (selectedData) operation = selectedData.operation; + if(selectedData) operation = selectedData.operation; const category = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - switch (operation) + switch(operation) { case RoomObjectOperationType.OBJECT_UNDEFINED: - if ((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL) || (event.objectType === RoomObjectUserType.MONSTER_PLANT)) + if((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.WALL) || (event.objectType === RoomObjectUserType.MONSTER_PLANT)) { - if ((!event.ctrlKey && !event.shiftKey) || this.decorateModeMove(event)) + if((!event.ctrlKey && !event.shiftKey) || this.decorateModeMove(event)) { - if (this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REQUEST_MANIPULATION, roomId, event.objectId, category)); + if(this._roomEngine.events) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.REQUEST_MANIPULATION, roomId, event.objectId, category)); } } return; @@ -670,7 +670,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const type = event.objectType; const category = this._roomEngine.getRoomObjectCategoryForType(type); - if (this._roomEngine.events) + if(this._roomEngine.events) { this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.MOUSE_ENTER, roomId, id, category)); } @@ -682,17 +682,17 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const type = event.objectType; const category = this._roomEngine.getRoomObjectCategoryForType(type); - if (category !== RoomObjectCategory.ROOM) + if(category !== RoomObjectCategory.ROOM) { - if (category === RoomObjectCategory.UNIT) + if(category === RoomObjectCategory.UNIT) { const cursor = this._roomEngine.getRoomObjectCursor(roomId); - if (cursor) cursor.processUpdateMessage(new ObjectDataUpdateMessage(0, null)); + if(cursor) cursor.processUpdateMessage(new ObjectDataUpdateMessage(0, null)); } } - if (this._roomEngine.events) + if(this._roomEngine.events) { this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(RoomEngineObjectEvent.MOUSE_LEAVE, roomId, id, category)); } @@ -702,9 +702,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectStateChangedEvent(event: RoomObjectStateChangedEvent, roomId: number): void { - if (!event) return; + if(!event) return; - switch (event.type) + switch(event.type) { case RoomObjectStateChangedEvent.STATE_CHANGE: this.changeObjectState(roomId, event.object.id, event.object.type, event.state, false); @@ -717,9 +717,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectDimmerStateUpdateEvent(event: RoomObjectDimmerStateUpdateEvent, roomId: number): void { - if (!event) return; + if(!event) return; - switch (event.type) + switch(event.type) { case RoomObjectDimmerStateUpdateEvent.DIMMER_STATE: this._roomEngine.events.dispatchEvent(new RoomEngineDimmerStateEvent(roomId, event.state, event.presetId, event.effectId, event.color, event.brightness)); @@ -729,9 +729,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleSelectedObjectRemove(event: RoomObjectMoveEvent, roomId: number): void { - if (!event || !this._roomEngine) return; + if(!event || !this._roomEngine) return; - switch (event.type) + switch(event.type) { case RoomObjectMoveEvent.POSITION_CHANGED: { const objectId = event.objectId; @@ -740,7 +740,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const object = this._roomEngine.getRoomObject(roomId, objectId, objectCategory); const selectionArrow = this._roomEngine.getRoomObjectSelectionArrow(roomId); - if (object && selectionArrow && selectionArrow.logic) + if(object && selectionArrow && selectionArrow.logic) { const location = object.getLocation(); @@ -756,18 +756,18 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectWidgetRequestEvent(event: RoomObjectWidgetRequestEvent, roomId: number): void { - if (!event || !this._roomEngine) return; + if(!event || !this._roomEngine) return; const objectId = event.objectId; const objectType = event.objectType; const objectCategory = this._roomEngine.getRoomObjectCategoryForType(objectType); const eventDispatcher = this._roomEngine.events; - if (!eventDispatcher) return; + if(!eventDispatcher) return; - if (RoomId.isRoomPreviewerId(roomId)) return; + if(RoomId.isRoomPreviewerId(roomId)) return; - switch (event.type) + switch(event.type) { case RoomObjectWidgetRequestEvent.OPEN_WIDGET: eventDispatcher.dispatchEvent(new RoomEngineTriggerWidgetEvent(RoomEngineTriggerWidgetEvent.OPEN_WIDGET, roomId, objectId, objectCategory, ((event.object as IRoomObjectController).logic.widget))); @@ -885,27 +885,27 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectFurnitureActionEvent(event: RoomObjectFurnitureActionEvent, roomId: number): void { - if (!event) return; + if(!event) return; this.useObject(roomId, event.object.id, event.object.type, event.type); } private handleObjectSoundMachineEvent(event: RoomObjectEvent, roomId: number): void { - if (!event) return; + if(!event) return; const objectCategory = this._roomEngine.getRoomObjectCategoryForType(event.objectType); const selectedData = this.getSelectedRoomObjectData(roomId); - if (selectedData) + if(selectedData) { - if ((selectedData.category === objectCategory) && (selectedData.id === event.objectId)) + if((selectedData.category === objectCategory) && (selectedData.id === event.objectId)) { - if (selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) return; + if(selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) return; } } - switch (event.type) + switch(event.type) { case RoomObjectFurnitureActionEvent.SOUND_MACHINE_INIT: this._roomEngine.events.dispatchEvent(new RoomObjectSoundMachineEvent(RoomObjectSoundMachineEvent.SOUND_MACHINE_INIT, roomId, event.objectId, objectCategory)); @@ -924,20 +924,20 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleObjectJukeboxEvent(event: RoomObjectEvent, roomId: number): void { - if (!event) return; + if(!event) return; const objectCategory = this._roomEngine.getRoomObjectCategoryForType(event.objectType); const selectedData = this.getSelectedRoomObjectData(roomId); - if (selectedData) + if(selectedData) { - if ((selectedData.category === objectCategory) && (selectedData.id === event.objectId)) + if((selectedData.category === objectCategory) && (selectedData.id === event.objectId)) { - if (selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) return; + if(selectedData.operation === RoomObjectOperationType.OBJECT_PLACE) return; } } - switch (event.type) + switch(event.type) { case RoomObjectFurnitureActionEvent.JUKEBOX_INIT: this._roomEngine.events.dispatchEvent(new RoomObjectSoundMachineEvent(RoomObjectSoundMachineEvent.JUKEBOX_INIT, roomId, event.objectId, objectCategory)); @@ -956,9 +956,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectFloorHoleEvent(event: RoomObjectFloorHoleEvent, roomId: number): void { - if (!event) return; + if(!event) return; - switch (event.type) + switch(event.type) { case RoomObjectFloorHoleEvent.ADD_HOLE: this._roomEngine.addRoomInstanceFloorHole(roomId, event.objectId); @@ -971,16 +971,16 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectRoomAdEvent(event: RoomObjectRoomAdEvent, roomId: number): void { - if (!event) return; + if(!event) return; let eventType: string = null; - switch (event.type) + switch(event.type) { case RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK: this._roomEngine.events.dispatchEvent(event); - if (event.clickUrl && (event.clickUrl.length > 0)) + if(event.clickUrl && (event.clickUrl.length > 0)) { Nitro.instance.createLinkEvent(event.clickUrl); } @@ -988,11 +988,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou eventType = RoomEngineRoomAdEvent.FURNI_CLICK; break; case RoomObjectRoomAdEvent.ROOM_AD_FURNI_DOUBLE_CLICK: - if (event.clickUrl && (event.clickUrl.length > 0)) + if(event.clickUrl && (event.clickUrl.length > 0)) { const catalogPage = 'CATALOG_PAGE'; - if (event.clickUrl.indexOf(catalogPage) === 0) + if(event.clickUrl.indexOf(catalogPage) === 0) { Nitro.instance.createLinkEvent(event.clickUrl.substr(catalogPage.length)); } @@ -1008,14 +1008,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou break; } - if (eventType) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(eventType, roomId, event.objectId, this._roomEngine.getRoomObjectCategoryForType(event.objectType))); + if(eventType) this._roomEngine.events.dispatchEvent(new RoomEngineObjectEvent(eventType, roomId, event.objectId, this._roomEngine.getRoomObjectCategoryForType(event.objectType))); } private onRoomObjectBadgeAssetEvent(event: RoomObjectBadgeAssetEvent, roomId: number): void { - if (!event || !this._roomEngine) return; + if(!event || !this._roomEngine) return; - switch (event.type) + switch(event.type) { case RoomObjectBadgeAssetEvent.LOAD_BADGE: { const objectId = event.objectId; @@ -1030,7 +1030,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleMousePointer(event: RoomObjectFurnitureActionEvent, roomId: number): void { - if (!event) return; + if(!event) return; this._roomEngine.updateMousePointer(event.type, event.objectId, event.objectType); } @@ -1039,7 +1039,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { const objectCategory = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - switch (event.type) + switch(event.type) { case RoomObjectPlaySoundIdEvent.PLAY_SOUND: this._roomEngine.events.dispatchEvent(new RoomEngineObjectPlaySoundEvent(RoomEngineObjectPlaySoundEvent.PLAY_SOUND, roomId, event.objectId, objectCategory, event.soundId, event.pitch)); @@ -1052,11 +1052,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleRoomObjectSamplePlaybackEvent(event: RoomObjectSamplePlaybackEvent, roomId: number): void { - if (!event) return; + if(!event) return; const objectCategory = this._roomEngine.getRoomObjectCategoryForType(event.objectType); - switch (event.type) + switch(event.type) { case RoomObjectSamplePlaybackEvent.ROOM_OBJECT_INITIALIZED: this._roomEngine.events.dispatchEvent(new RoomEngineSamplePlaybackEvent(RoomEngineSamplePlaybackEvent.ROOM_OBJECT_INITIALIZED, roomId, event.objectId, objectCategory, event.sampleId, event.pitch)); @@ -1075,9 +1075,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onHSLColorEnableEvent(event: RoomObjectHSLColorEnableEvent, roomId: number): void { - if (!event || !this._roomEngine) return; + if(!event || !this._roomEngine) return; - switch (event.type) + switch(event.type) { case RoomObjectHSLColorEnableEvent.ROOM_BACKGROUND_COLOR: this._roomEngine.events.dispatchEvent(new RoomObjectHSLColorEnabledEvent(RoomObjectHSLColorEnabledEvent.ROOM_BACKGROUND_COLOR, roomId, event.enable, event.hue, event.saturation, event.lightness)); @@ -1087,9 +1087,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectDataRequestEvent(event: RoomObjectDataRequestEvent, roomId: number): void { - if (!event || !this._roomEngine || !event.object) return; + if(!event || !this._roomEngine || !event.object) return; - switch (event.type) + switch(event.type) { case RoomObjectDataRequestEvent.RODRE_CURRENT_USER_ID: event.object.model.setValue(RoomObjectVariable.SESSION_CURRENT_USER_ID, this._roomEngine.sessionDataManager.userId); @@ -1102,38 +1102,38 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private onRoomObjectTileMouseEvent(roomId: number, event: RoomObjectTileMouseEvent): void { - if (!this._roomEngine || this._roomEngine.isDecorating || !this._roomEngine.roomSessionManager) return; + if(!this._roomEngine || this._roomEngine.isDecorating || !this._roomEngine.roomSessionManager) return; const session = this._roomEngine.roomSessionManager.getSession(roomId); - if (!session || session.isSpectator) return; + if(!session || session.isSpectator) return; this.sendWalkUpdate(event.tileXAsInt, event.tileYAsInt); } private handleObjectMove(event: RoomObjectMouseEvent, roomId: number): void { - if (!event || !this._roomEngine) return; + if(!event || !this._roomEngine) return; const eventDispatcher = this._roomEngine.events; - if (!eventDispatcher) return; + if(!eventDispatcher) return; const selectedData = this.getSelectedRoomObjectData(roomId); - if (!selectedData) return; + if(!selectedData) return; const roomObject = this._roomEngine.getRoomObject(roomId, selectedData.id, selectedData.category); - if (!roomObject) return; + if(!roomObject) return; let _local_6 = true; - if ((selectedData.category === RoomObjectCategory.FLOOR) || (selectedData.category === RoomObjectCategory.UNIT)) + if((selectedData.category === RoomObjectCategory.FLOOR) || (selectedData.category === RoomObjectCategory.UNIT)) { const stackingHeightMap = this._roomEngine.getFurnitureStackingHeightMap(roomId); - if (!(((event instanceof RoomObjectTileMouseEvent)) && (this.handleFurnitureMove(roomObject, selectedData, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), stackingHeightMap)))) + if(!(((event instanceof RoomObjectTileMouseEvent)) && (this.handleFurnitureMove(roomObject, selectedData, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), stackingHeightMap)))) { this.handleFurnitureMove(roomObject, selectedData, selectedData.loc.x, selectedData.loc.y, stackingHeightMap); @@ -1141,11 +1141,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - else if ((selectedData.category === RoomObjectCategory.WALL)) + else if((selectedData.category === RoomObjectCategory.WALL)) { _local_6 = false; - if (event instanceof RoomObjectWallMouseEvent) + if(event instanceof RoomObjectWallMouseEvent) { const _local_10 = event.wallLocation; const _local_11 = event.wallWidth; @@ -1154,13 +1154,13 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const _local_14 = event.y; const _local_15 = event.direction; - if (this.handleWallItemMove(roomObject, selectedData, _local_10, _local_11, _local_12, _local_13, _local_14, _local_15)) + if(this.handleWallItemMove(roomObject, selectedData, _local_10, _local_11, _local_12, _local_13, _local_14, _local_15)) { _local_6 = true; } } - if (!_local_6) + if(!_local_6) { roomObject.setLocation(selectedData.loc); roomObject.setDirection(selectedData.dir); @@ -1169,7 +1169,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this._roomEngine.updateRoomObjectMask(roomId, selectedData.id, _local_6); } - if (_local_6) + if(_local_6) { this.setFurnitureAlphaMultiplier(roomObject, 0.5); @@ -1185,28 +1185,28 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleObjectPlace(event: RoomObjectMouseEvent, roomId: number): void { - if (!event || !this._roomEngine) return; + if(!event || !this._roomEngine) return; const eventDispatcher = this._roomEngine.events; - if (!eventDispatcher) return; + if(!eventDispatcher) return; let selectedData = this.getSelectedRoomObjectData(roomId); - if (!selectedData) return; + if(!selectedData) return; let roomObject = this._roomEngine.getRoomObject(roomId, selectedData.id, selectedData.category); - if (!roomObject) + if(!roomObject) { - if (event instanceof RoomObjectTileMouseEvent) + if(event instanceof RoomObjectTileMouseEvent) { - if (selectedData.category === RoomObjectCategory.FLOOR) + if(selectedData.category === RoomObjectCategory.FLOOR) { this._roomEngine.addFurnitureFloor(roomId, selectedData.id, selectedData.typeId, selectedData.loc, selectedData.dir, 0, selectedData.stuffData, parseFloat(selectedData.instanceData), -1, 0, 0, '', false); } - else if (selectedData.category === RoomObjectCategory.UNIT) + else if(selectedData.category === RoomObjectCategory.UNIT) { this._roomEngine.addRoomObjectUser(roomId, selectedData.id, new Vector3d(), new Vector3d(180), 180, selectedData.typeId, selectedData.instanceData); @@ -1216,9 +1216,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - else if (event instanceof RoomObjectWallMouseEvent) + else if(event instanceof RoomObjectWallMouseEvent) { - if (selectedData.category === RoomObjectCategory.WALL) + if(selectedData.category === RoomObjectCategory.WALL) { this._roomEngine.addFurnitureWall(roomId, selectedData.id, selectedData.typeId, selectedData.loc, selectedData.dir, 0, selectedData.instanceData, 0); } @@ -1226,13 +1226,13 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou roomObject = this._roomEngine.getRoomObject(roomId, selectedData.id, selectedData.category); - if (roomObject) + if(roomObject) { - if (selectedData.category === RoomObjectCategory.FLOOR) + if(selectedData.category === RoomObjectCategory.FLOOR) { const allowedDirections = roomObject.model.getValue(RoomObjectVariable.FURNITURE_ALLOWED_DIRECTIONS); - if (allowedDirections && allowedDirections.length) + if(allowedDirections && allowedDirections.length) { const direction = new Vector3d(allowedDirections[0]); @@ -1242,7 +1242,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou selectedData = this.getSelectedRoomObjectData(roomId); - if (!selectedData) return; + if(!selectedData) return; } } } @@ -1251,15 +1251,15 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this._roomEngine.setObjectMoverIconSpriteVisible(true); } - if (roomObject) + if(roomObject) { let _local_12 = true; const stackingHeightMap = this._roomEngine.getFurnitureStackingHeightMap(roomId); - if (selectedData.category === RoomObjectCategory.FLOOR) + if(selectedData.category === RoomObjectCategory.FLOOR) { - if (!((event instanceof RoomObjectTileMouseEvent) && this.handleFurnitureMove(roomObject, selectedData, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), stackingHeightMap))) + if(!((event instanceof RoomObjectTileMouseEvent) && this.handleFurnitureMove(roomObject, selectedData, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), stackingHeightMap))) { this._roomEngine.removeRoomObjectFloor(roomId, selectedData.id); @@ -1267,11 +1267,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - else if (selectedData.category === RoomObjectCategory.WALL) + else if(selectedData.category === RoomObjectCategory.WALL) { _local_12 = false; - if (event instanceof RoomObjectWallMouseEvent) + if(event instanceof RoomObjectWallMouseEvent) { const _local_14 = event.wallLocation; const _local_15 = event.wallWidth; @@ -1280,13 +1280,13 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const _local_18 = event.y; const _local_19 = event.direction; - if (this.handleWallItemMove(roomObject, selectedData, _local_14, _local_15, _local_16, _local_17, _local_18, _local_19)) + if(this.handleWallItemMove(roomObject, selectedData, _local_14, _local_15, _local_16, _local_17, _local_18, _local_19)) { _local_12 = true; } } - if (!_local_12) + if(!_local_12) { this._roomEngine.removeRoomObjectWall(roomId, selectedData.id); } @@ -1294,9 +1294,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this._roomEngine.updateRoomObjectMask(roomId, selectedData.id, _local_12); } - else if (selectedData.category === RoomObjectCategory.UNIT) + else if(selectedData.category === RoomObjectCategory.UNIT) { - if (!((event instanceof RoomObjectTileMouseEvent) && this.handleUserPlace(roomObject, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), this._roomEngine.getLegacyWallGeometry(roomId)))) + if(!((event instanceof RoomObjectTileMouseEvent) && this.handleUserPlace(roomObject, Math.trunc(event.tileX + 0.5), Math.trunc(event.tileY + 0.5), this._roomEngine.getLegacyWallGeometry(roomId)))) { this._roomEngine.removeRoomObjectUser(roomId, selectedData.id); @@ -1310,7 +1310,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleFurnitureMove(roomObject: IRoomObjectController, selectedObjectData: SelectedRoomObjectData, x: number, y: number, stackingHeightMap: FurnitureStackingHeightMap): boolean { - if (!roomObject || !selectedObjectData) return false; + if(!roomObject || !selectedObjectData) return false; const _local_6 = new Vector3d(); _local_6.assign(roomObject.getDirection()); @@ -1324,7 +1324,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let _local_9 = this.validateFurnitureLocation(roomObject, _local_7, selectedObjectData.loc, selectedObjectData.dir, stackingHeightMap); - if (!_local_9) + if(!_local_9) { _local_8.x = this.getValidRoomObjectDirection(roomObject, true); @@ -1333,7 +1333,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou _local_9 = this.validateFurnitureLocation(roomObject, _local_7, selectedObjectData.loc, selectedObjectData.dir, stackingHeightMap); } - if (!_local_9) + if(!_local_9) { roomObject.setDirection(_local_6); @@ -1342,19 +1342,19 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou roomObject.setLocation(_local_9); - if (_local_8) roomObject.setDirection(_local_8); + if(_local_8) roomObject.setDirection(_local_8); return true; } private handleWallItemMove(k: IRoomObjectController, _arg_2: SelectedRoomObjectData, _arg_3: IVector3D, _arg_4: IVector3D, _arg_5: IVector3D, _arg_6: number, _arg_7: number, _arg_8: number): boolean { - if (!k || !_arg_2) return false; + if(!k || !_arg_2) return false; const _local_9 = new Vector3d(_arg_8); const _local_10 = this.validateWallItemLocation(k, _arg_3, _arg_4, _arg_5, _arg_6, _arg_7, _arg_2); - if (!_local_10) return false; + if(!_local_10) return false; k.setLocation(_local_10); k.setDirection(_local_9); @@ -1364,19 +1364,19 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private validateFurnitureLocation(k: IRoomObject, _arg_2: IVector3D, _arg_3: IVector3D, _arg_4: IVector3D, _arg_5: FurnitureStackingHeightMap): Vector3d { - if (!k || !k.model || !_arg_2) return null; + if(!k || !k.model || !_arg_2) return null; let _local_15: Vector3d = null; const _local_6 = k.getDirection(); - if (!_local_6) return null; + if(!_local_6) return null; - if (!_arg_3 || !_arg_4) return null; + if(!_arg_3 || !_arg_4) return null; - if ((_arg_2.x === _arg_3.x) && (_arg_2.y === _arg_3.y)) + if((_arg_2.x === _arg_3.x) && (_arg_2.y === _arg_3.y)) { - if (_local_6.x === _arg_4.x) + if(_local_6.x === _arg_4.x) { _local_15 = new Vector3d(); @@ -1389,9 +1389,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let sizeX = k.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); let sizeY = k.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Y); - if (sizeX < 1) sizeX = 1; + if(sizeX < 1) sizeX = 1; - if (sizeY < 1) sizeY = 1; + if(sizeY < 1) sizeY = 1; const _local_9 = _arg_3.x; const _local_10 = _arg_3.y; @@ -1400,7 +1400,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let _local_13 = 0; let _local_14 = (Math.trunc((Math.trunc(_local_6.x + 45) % 360) / 90)); - if ((_local_14 === 1) || (_local_14 === 3)) + if((_local_14 === 1) || (_local_14 === 3)) { _local_13 = sizeX; @@ -1410,18 +1410,18 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou _local_14 = Math.trunc((Math.trunc(_arg_4.x + 45) % 360) / 90); - if ((_local_14 === 1) || (_local_14 === 3)) + if((_local_14 === 1) || (_local_14 === 3)) { _local_13 = _local_11; _local_11 = _local_12; _local_12 = _local_13; } - if (_arg_5 && _arg_2) + if(_arg_5 && _arg_2) { const stackable = (k.model.getValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE) === 1); - if (_arg_5.validateLocation(_arg_2.x, _arg_2.y, sizeX, sizeY, _local_9, _local_10, _local_11, _local_12, stackable)) + if(_arg_5.validateLocation(_arg_2.x, _arg_2.y, sizeX, sizeY, _local_9, _local_10, _local_11, _local_12, stackable)) { return new Vector3d(_arg_2.x, _arg_2.y, _arg_5.getTileHeight(_arg_2.x, _arg_2.y)); } @@ -1434,40 +1434,40 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private validateWallItemLocation(k: IRoomObject, _arg_2: IVector3D, _arg_3: IVector3D, _arg_4: IVector3D, _arg_5: number, _arg_6: number, _arg_7: SelectedRoomObjectData): Vector3d { - if ((((((k == null) || (k.model == null)) || (_arg_2 == null)) || (_arg_3 == null)) || (_arg_4 == null)) || (_arg_7 == null)) return null; + if((((((k == null) || (k.model == null)) || (_arg_2 == null)) || (_arg_3 == null)) || (_arg_4 == null)) || (_arg_7 == null)) return null; const _local_8 = k.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); const _local_9 = k.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Z); const _local_10 = k.model.getValue(RoomObjectVariable.FURNITURE_CENTER_Z); - if ((((_arg_5 < (_local_8 / 2)) || (_arg_5 > (_arg_3.length - (_local_8 / 2)))) || (_arg_6 < _local_10)) || (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) + if((((_arg_5 < (_local_8 / 2)) || (_arg_5 > (_arg_3.length - (_local_8 / 2)))) || (_arg_6 < _local_10)) || (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) { - if ((_arg_5 < (_local_8 / 2)) && (_arg_5 <= (_arg_3.length - (_local_8 / 2)))) + if((_arg_5 < (_local_8 / 2)) && (_arg_5 <= (_arg_3.length - (_local_8 / 2)))) { _arg_5 = (_local_8 / 2); } else { - if ((_arg_5 >= (_local_8 / 2)) && (_arg_5 > (_arg_3.length - (_local_8 / 2)))) + if((_arg_5 >= (_local_8 / 2)) && (_arg_5 > (_arg_3.length - (_local_8 / 2)))) { _arg_5 = (_arg_3.length - (_local_8 / 2)); } } - if ((_arg_6 < _local_10) && (_arg_6 <= (_arg_4.length - (_local_9 - _local_10)))) + if((_arg_6 < _local_10) && (_arg_6 <= (_arg_4.length - (_local_9 - _local_10)))) { _arg_6 = _local_10; } else { - if ((_arg_6 >= _local_10) && (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) + if((_arg_6 >= _local_10) && (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) { _arg_6 = (_arg_4.length - (_local_9 - _local_10)); } } } - if ((((_arg_5 < (_local_8 / 2)) || (_arg_5 > (_arg_3.length - (_local_8 / 2)))) || (_arg_6 < _local_10)) || (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) + if((((_arg_5 < (_local_8 / 2)) || (_arg_5 > (_arg_3.length - (_local_8 / 2)))) || (_arg_6 < _local_10)) || (_arg_6 > (_arg_4.length - (_local_9 - _local_10)))) { return null; } @@ -1488,8 +1488,8 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private useObject(roomId: number, objectId: number, type: string, action: string): void { - if (!this._roomEngine || !this._roomEngine.connection) return; - switch (action) + if(!this._roomEngine || !this._roomEngine.connection) return; + switch(action) { case RoomObjectFurnitureActionEvent.DICE_ACTIVATE: this._roomEngine.connection.send(new FurnitureDiceActivateComposer(objectId)); @@ -1511,11 +1511,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private changeRoomObjectState(roomId: number, objectId: number, category: number, state: number, isRandom: boolean): boolean { - if (!this._roomEngine || !this._roomEngine.connection) return true; + if(!this._roomEngine || !this._roomEngine.connection) return true; - if (category === RoomObjectCategory.FLOOR) + if(category === RoomObjectCategory.FLOOR) { - if (!isRandom) + if(!isRandom) { this._roomEngine.connection.send(new FurnitureMultiStateComposer(objectId, state)); } @@ -1525,7 +1525,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - else if (category === RoomObjectCategory.WALL) + else if(category === RoomObjectCategory.WALL) { this._roomEngine.connection.send(new FurnitureWallMultiStateComposer(objectId, state)); } @@ -1535,26 +1535,26 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private sendWalkUpdate(x: number, y: number): void { - if (!this._roomEngine || !this._roomEngine.connection) return; + if(!this._roomEngine || !this._roomEngine.connection) return; this._roomEngine.connection.send(new RoomUnitWalkComposer(x, y)); } private handleMouseOverObject(category: number, roomId: number, event: RoomObjectMouseEvent): ObjectTileCursorUpdateMessage { - if (category !== RoomObjectCategory.FLOOR) return null; + if(category !== RoomObjectCategory.FLOOR) return null; const roomObject = this._roomEngine.getRoomObject(roomId, event.objectId, RoomObjectCategory.FLOOR); - if (!roomObject) return null; + if(!roomObject) return null; const location = this.getActiveSurfaceLocation(roomObject, event); - if (!location) return null; + if(!location) return null; const furnitureHeightMap = this._roomEngine.getFurnitureStackingHeightMap(roomId); - if (!furnitureHeightMap) return null; + if(!furnitureHeightMap) return null; const x = location.x; const y = location.y; @@ -1565,12 +1565,12 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleMoveTargetFurni(k: number, _arg_2: RoomObjectMouseEvent): boolean { - if ((_arg_2.objectType === RoomObjectUserType.USER) || (_arg_2.objectType === RoomObjectUserType.PET) || (_arg_2.objectType === RoomObjectUserType.BOT) || (_arg_2.objectType === RoomObjectUserType.RENTABLE_BOT) || (_arg_2.objectType === RoomObjectUserType.MONSTER_PLANT)) return; + if((_arg_2.objectType === RoomObjectUserType.USER) || (_arg_2.objectType === RoomObjectUserType.PET) || (_arg_2.objectType === RoomObjectUserType.BOT) || (_arg_2.objectType === RoomObjectUserType.RENTABLE_BOT) || (_arg_2.objectType === RoomObjectUserType.MONSTER_PLANT)) return; const _local_3 = this._roomEngine.getRoomObject(k, _arg_2.objectId, RoomObjectCategory.FLOOR); const _local_4 = this.getActiveSurfaceLocation(_local_3, _arg_2); - if (_local_4) + if(_local_4) { this.sendWalkUpdate(_local_4.x, _local_4.y); @@ -1582,17 +1582,17 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private getActiveSurfaceLocation(k: IRoomObject, _arg_2: RoomObjectMouseEvent): Vector3d { - if (!k || !_arg_2) return null; + if(!k || !_arg_2) return null; const furniData = this._roomEngine.sessionDataManager.getFloorItemDataByName(k.type); - if (!furniData) return null; + if(!furniData) return null; - if (!furniData.canStandOn && !furniData.canSitOn && !furniData.canLayOn) return null; + if(!furniData.canStandOn && !furniData.canSitOn && !furniData.canLayOn) return null; const model = k.model; - if (!model) return null; + if(!model) return null; const location = k.getLocation(); const direction = k.getDirection(); @@ -1601,14 +1601,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let sizeY = model.getValue(RoomObjectVariable.FURNITURE_SIZE_Y); const sizeZ = model.getValue(RoomObjectVariable.FURNITURE_SIZE_Z); - if ((direction.x === 90) || (direction.x === 270)) [sizeX, sizeY] = [sizeY, sizeX]; + if((direction.x === 90) || (direction.x === 270)) [sizeX, sizeY] = [sizeY, sizeX]; - if (sizeX < 1) sizeX = 1; - if (sizeY < 1) sizeY = 1; + if(sizeX < 1) sizeX = 1; + if(sizeY < 1) sizeY = 1; const renderingCanvas = this._roomEngine.getActiveRoomInstanceRenderingCanvas(); - if (!renderingCanvas) return null; + if(!renderingCanvas) return null; const scale = renderingCanvas.geometry.scale; const _local_13 = furniData.canSitOn ? 0.5 : 0; @@ -1621,44 +1621,44 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let _local_20 = false; - if ((_local_18 < location.x) || (_local_18 >= (location.x + sizeX))) _local_20 = true; - else if ((_local_19 < location.y) || (_local_19 >= (location.y + sizeY))) _local_20 = true; + if((_local_18 < location.x) || (_local_18 >= (location.x + sizeX))) _local_20 = true; + else if((_local_19 < location.y) || (_local_19 >= (location.y + sizeY))) _local_20 = true; const _local_21 = furniData.canSitOn ? (sizeZ - 0.5) : sizeZ; - if (!_local_20) return new Vector3d(_local_18, _local_19, _local_21); + if(!_local_20) return new Vector3d(_local_18, _local_19, _local_21); return null; } private handleMouseOverTile(k: RoomObjectTileMouseEvent, roomId: number): ObjectTileCursorUpdateMessage { - if (this._whereYouClickIsWhereYouGo) + if(this._whereYouClickIsWhereYouGo) { return new ObjectTileCursorUpdateMessage(new Vector3d(k.tileXAsInt, k.tileYAsInt, k.tileZAsInt), 0, true, k.eventId); } const roomObject = this._roomEngine.getRoomObjectCursor(roomId); - if (roomObject && roomObject.visualization) + if(roomObject && roomObject.visualization) { const _local_4 = k.tileXAsInt; const _local_5 = k.tileYAsInt; const _local_6 = k.tileZAsInt; const _local_7 = this._roomEngine.getRoomInstance(roomId); - if (_local_7) + if(_local_7) { const _local_8 = this._roomEngine.getRoomTileObjectMap(roomId); - if (_local_8) + if(_local_8) { const _local_9 = _local_8.getObjectIntTile(_local_4, _local_5); const _local_10 = this._roomEngine.getFurnitureStackingHeightMap(roomId); - if (_local_10) + if(_local_10) { - if (_local_9 && _local_9.model && (_local_9.model.getValue(RoomObjectVariable.FURNITURE_IS_VARIABLE_HEIGHT) > 0)) + if(_local_9 && _local_9.model && (_local_9.model.getValue(RoomObjectVariable.FURNITURE_IS_VARIABLE_HEIGHT) > 0)) { const _local_11 = _local_10.getTileHeight(_local_4, _local_5); const _local_12 = this._roomEngine.getLegacyWallGeometry(roomId).getHeight(_local_4, _local_5); @@ -1679,7 +1679,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { const selectedData = this.getSelectedRoomObjectData(roomId); - if (!selectedData) return; + if(!selectedData) return; let roomObject: IRoomObjectController = null; let objectId = selectedData.id; @@ -1691,24 +1691,24 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let direction = 0; let wallLocation = ''; - if (this._roomEngine && this._roomEngine.connection) + if(this._roomEngine && this._roomEngine.connection) { roomObject = this._roomEngine.getRoomObject(roomId, objectId, category); - if (roomObject) + if(roomObject) { const location = roomObject.getLocation(); direction = roomObject.getDirection().x; - if ((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.UNIT)) + if((category === RoomObjectCategory.FLOOR) || (category === RoomObjectCategory.UNIT)) { x = location.x; y = location.y; z = location.z; } - else if (category === RoomObjectCategory.WALL) + else if(category === RoomObjectCategory.WALL) { x = location.x; y = location.y; @@ -1716,29 +1716,29 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const wallGeometry = this._roomEngine.getLegacyWallGeometry(roomId); - if (wallGeometry) wallLocation = wallGeometry.getOldLocationString(location, direction); + if(wallGeometry) wallLocation = wallGeometry.getOldLocationString(location, direction); } direction = ((((direction / 45) % 8) + 8) % 8); - if ((objectId < 0) && (category === RoomObjectCategory.UNIT)) objectId = (objectId * -1); + if((objectId < 0) && (category === RoomObjectCategory.UNIT)) objectId = (objectId * -1); - if (this._objectPlacementSource !== RoomObjectPlacementSource.CATALOG) + if(this._objectPlacementSource !== RoomObjectPlacementSource.CATALOG) { - if (category === RoomObjectCategory.UNIT) + if(category === RoomObjectCategory.UNIT) { - if (selectedData.typeId === RoomObjectType.PET) + if(selectedData.typeId === RoomObjectType.PET) { this._roomEngine.connection.send(new PetPlaceComposer(objectId, Math.trunc(x), Math.trunc(y))); } - else if (selectedData.typeId === RoomObjectType.RENTABLE_BOT) + else if(selectedData.typeId === RoomObjectType.RENTABLE_BOT) { this._roomEngine.connection.send(new BotPlaceComposer(objectId, Math.trunc(x), Math.trunc(y))); } } - else if (roomObject.model.getValue(RoomObjectVariable.FURNITURE_IS_STICKIE) !== undefined) + else if(roomObject.model.getValue(RoomObjectVariable.FURNITURE_IS_STICKIE) !== undefined) { this._roomEngine.connection.send(new FurniturePostItPlaceComposer(objectId, wallLocation)); } @@ -1755,7 +1755,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this.resetSelectedObjectData(roomId); - if (this._roomEngine && this._roomEngine.events) + if(this._roomEngine && this._roomEngine.events) { const placedInRoom = (roomObject && (roomObject.id === selectedData.id)); @@ -1765,23 +1765,23 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public modifyRoomObject(roomId: number, objectId: number, category: number, operation: string): boolean { - if (!this._roomEngine) return false; + if(!this._roomEngine) return false; const roomObject = this._roomEngine.getRoomObject(roomId, objectId, category); - if (!roomObject) return false; + if(!roomObject) return false; let _local_9 = true; - switch (operation) + switch(operation) { case RoomObjectOperationType.OBJECT_ROTATE_POSITIVE: case RoomObjectOperationType.OBJECT_ROTATE_NEGATIVE: - if (this._roomEngine.connection) + if(this._roomEngine.connection) { let direction = 0; - if (operation == RoomObjectOperationType.OBJECT_ROTATE_NEGATIVE) + if(operation == RoomObjectOperationType.OBJECT_ROTATE_NEGATIVE) { direction = this.getValidRoomObjectDirection(roomObject, false); } @@ -1793,19 +1793,19 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const x = roomObject.getLocation().x; const y = roomObject.getLocation().y; - if (this.isValidLocation(roomObject, new Vector3d(direction), this._roomEngine.getFurnitureStackingHeightMap(roomId))) + if(this.isValidLocation(roomObject, new Vector3d(direction), this._roomEngine.getFurnitureStackingHeightMap(roomId))) { direction = Math.trunc((direction / 45)); - if (roomObject.type === RoomObjectUserType.MONSTER_PLANT) + if(roomObject.type === RoomObjectUserType.MONSTER_PLANT) { const roomSession = this._roomEngine.roomSessionManager.getSession(roomId); - if (roomSession) + if(roomSession) { const userData = roomSession.userDataManager.getUserDataByIndex(objectId); - if (userData) + if(userData) { this._roomEngine.connection.send(new PetMoveComposer(userData.webID, Math.trunc(x), Math.trunc(y), direction)); } @@ -1820,14 +1820,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou break; case RoomObjectOperationType.OBJECT_EJECT: case RoomObjectOperationType.OBJECT_PICKUP: - if (this._roomEngine.connection) this._roomEngine.connection.send(new FurniturePickupComposer(category, objectId)); + if(this._roomEngine.connection) this._roomEngine.connection.send(new FurniturePickupComposer(category, objectId)); break; case RoomObjectOperationType.OBJECT_PICKUP_PET: - if (this._roomEngine.connection) + if(this._roomEngine.connection) { const session = this._roomEngine.roomSessionManager.getSession(roomId); - if (session) + if(session) { const userData = session.userDataManager.getUserDataByIndex(objectId); @@ -1836,11 +1836,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } break; case RoomObjectOperationType.OBJECT_PICKUP_BOT: - if (this._roomEngine.connection) + if(this._roomEngine.connection) { const session = this._roomEngine.roomSessionManager.getSession(roomId); - if (session) + if(session) { const userData = session.userDataManager.getUserDataByIndex(objectId); @@ -1862,9 +1862,9 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this.setFurnitureAlphaMultiplier(roomObject, 1); this._roomEngine.removeObjectMoverIconSprite(); - if (this._roomEngine.connection) + if(this._roomEngine.connection) { - if (category === RoomObjectCategory.FLOOR) + if(category === RoomObjectCategory.FLOOR) { const angle = ((roomObject.getDirection().x) % 360); const location = roomObject.getLocation(); @@ -1873,20 +1873,20 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this._roomEngine.connection.send(new FurnitureFloorUpdateComposer(objectId, location.x, location.y, direction)); } - else if (category === RoomObjectCategory.WALL) + else if(category === RoomObjectCategory.WALL) { const angle = ((roomObject.getDirection().x) % 360); const wallGeometry = this._roomEngine.getLegacyWallGeometry(roomId); - if (wallGeometry) + if(wallGeometry) { const location = wallGeometry.getOldLocationString(roomObject.getLocation(), angle); - if (location) this._roomEngine.connection.send(new FurnitureWallUpdateComposer(objectId, location)); + if(location) this._roomEngine.connection.send(new FurnitureWallUpdateComposer(objectId, location)); } } - else if (category === RoomObjectCategory.UNIT) + else if(category === RoomObjectCategory.UNIT) { const angle = ((roomObject.getDirection().x) % 360); const location = roomObject.getLocation(); @@ -1894,11 +1894,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const race = parseInt(roomObject.model.getValue(RoomObjectVariable.RACE)); const roomSession = this._roomEngine.roomSessionManager.getSession(roomId); - if (roomSession) + if(roomSession) { const userData = roomSession.userDataManager.getUserDataByIndex(objectId); - if (userData) this._roomEngine.connection.send(new PetMoveComposer(userData.webID, location.x, location.y, direction)); + if(userData) this._roomEngine.connection.send(new PetMoveComposer(userData.webID, location.x, location.y, direction)); } } } @@ -1907,23 +1907,23 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou } } - if (_local_9) this.resetSelectedObjectData(roomId); + if(_local_9) this.resetSelectedObjectData(roomId); return true; } public modifyRoomObjectDataWithMap(roomId: number, objectId: number, category: number, operation: string, data: Map): boolean { - if (!this._roomEngine) return false; + if(!this._roomEngine) return false; const roomObject = this._roomEngine.getRoomObject(roomId, objectId, category); - if (!roomObject) return false; + if(!roomObject) return false; - switch (operation) + switch(operation) { case RoomObjectOperationType.OBJECT_SAVE_STUFF_DATA: - if (this._roomEngine.connection) + if(this._roomEngine.connection) { this._roomEngine.connection.send(new SetObjectDataMessageComposer(objectId, data)); } @@ -1935,7 +1935,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public modifyWallItemData(roomId: number, objectId: number, colorHex: string, text: string): boolean { - if (!this._roomEngine || !this._roomEngine.connection) return false; + if(!this._roomEngine || !this._roomEngine.connection) return false; this._roomEngine.connection.send(new SetItemDataMessageComposer(objectId, colorHex, text)); @@ -1944,7 +1944,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public deleteWallItem(roomId: number, itemId: number): boolean { - if (!this._roomEngine || !this._roomEngine.connection) return false; + if(!this._roomEngine || !this._roomEngine.connection) return false; this._roomEngine.connection.send(new RemoveWallItemComposer(itemId)); @@ -1953,13 +1953,13 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public getValidRoomObjectDirection(k: IRoomObjectController, _arg_2: boolean): number { - if (!k || !k.model) return 0; + if(!k || !k.model) return 0; let _local_6 = 0; let _local_7 = 0; let allowedDirections: number[] = []; - if (k.type === RoomObjectUserType.MONSTER_PLANT) + if(k.type === RoomObjectUserType.MONSTER_PLANT) { allowedDirections = k.model.getValue(RoomObjectVariable.PET_ALLOWED_DIRECTIONS); } @@ -1970,18 +1970,18 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let direction = k.getDirection().x; - if (allowedDirections && allowedDirections.length) + if(allowedDirections && allowedDirections.length) { _local_6 = allowedDirections.indexOf(direction); - if (_local_6 < 0) + if(_local_6 < 0) { _local_6 = 0; _local_7 = 0; - while (_local_7 < allowedDirections.length) + while(_local_7 < allowedDirections.length) { - if (direction <= allowedDirections[_local_7]) break; + if(direction <= allowedDirections[_local_7]) break; _local_6++; _local_7++; @@ -1990,7 +1990,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou _local_6 = (_local_6 % allowedDirections.length); } - if (_arg_2) _local_6 = ((_local_6 + 1) % allowedDirections.length); + if(_arg_2) _local_6 = ((_local_6 + 1) % allowedDirections.length); else _local_6 = (((_local_6 - 1) + allowedDirections.length) % allowedDirections.length); direction = allowedDirections[_local_6]; @@ -2001,38 +2001,38 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private isValidLocation(object: IRoomObject, goalDirection: IVector3D, stackingHeightMap: FurnitureStackingHeightMap): boolean { - if (!object || !object.model || !goalDirection) return false; + if(!object || !object.model || !goalDirection) return false; const direction = object.getDirection(); const location = object.getLocation(); - if (!direction || !location) return false; + if(!direction || !location) return false; - if ((direction.x % 180) === (goalDirection.x % 180)) return true; + if((direction.x % 180) === (goalDirection.x % 180)) return true; let sizeX = object.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); let sizeY = object.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Y); - if (sizeX < 1) sizeX = 1; + if(sizeX < 1) sizeX = 1; - if (sizeY < 1) sizeY = 1; + if(sizeY < 1) sizeY = 1; let _local_8 = sizeX; let _local_9 = sizeY; let _local_11 = (Math.trunc((Math.trunc((goalDirection.x + 45)) % 360) / 90)); - if ((_local_11 === 1) || (_local_11 === 3)) [sizeX, sizeY] = [sizeY, sizeX]; + if((_local_11 === 1) || (_local_11 === 3)) [sizeX, sizeY] = [sizeY, sizeX]; _local_11 = (Math.trunc((Math.trunc((direction.x + 45)) % 360) / 90)); - if (((_local_11 === 1) || (_local_11 === 3))) [_local_8, _local_9] = [_local_9, _local_8]; + if(((_local_11 === 1) || (_local_11 === 3))) [_local_8, _local_9] = [_local_9, _local_8]; - if (stackingHeightMap && location) + if(stackingHeightMap && location) { const alwaysStackable = (object.model.getValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE) === 1); - if (stackingHeightMap.validateLocation(location.x, location.y, sizeX, sizeY, location.x, location.y, _local_8, _local_9, alwaysStackable, location.z)) return true; + if(stackingHeightMap.validateLocation(location.x, location.y, sizeX, sizeY, location.x, location.y, _local_8, _local_9, alwaysStackable, location.z)) return true; } return false; @@ -2042,31 +2042,31 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { const _local_4 = this.getSelectedRoomObjectData(roomId); - if (!_local_4) return; + if(!_local_4) return; const _local_5 = (this._roomEngine.getRoomObject(roomId, objectId, category) as IRoomObjectController); - if (!_local_5) return; + if(!_local_5) return; - if (!this._roomEngine || !this._roomEngine.events) return; + if(!this._roomEngine || !this._roomEngine.events) return; this._roomEngine.events.dispatchEvent(new RoomEngineObjectPlacedOnUserEvent(RoomEngineObjectEvent.PLACED_ON_USER, roomId, objectId, category, _local_4.id, _local_4.category)); } public setSelectedObject(roomId: number, objectId: number, category: number): void { - if (!this._roomEngine) return; + if(!this._roomEngine) return; const eventDispatcher = this._roomEngine.events; - if (!eventDispatcher) return; + if(!eventDispatcher) return; - switch (category) + switch(category) { case RoomObjectCategory.UNIT: case RoomObjectCategory.FLOOR: case RoomObjectCategory.WALL: - if (category === RoomObjectCategory.UNIT) + if(category === RoomObjectCategory.UNIT) { this.deselectObject(roomId); this.setSelectedAvatar(roomId, objectId, true); @@ -2075,13 +2075,13 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { this.setSelectedAvatar(roomId, 0, false); - if (objectId !== this._selectedObjectId) + if(objectId !== this._selectedObjectId) { this.deselectObject(roomId); const roomObject = this._roomEngine.getRoomObject(roomId, objectId, category); - if (roomObject && roomObject.logic) + if(roomObject && roomObject.logic) { roomObject.logic.processUpdateMessage(new ObjectSelectedMessage(true)); @@ -2099,11 +2099,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private deselectObject(roomId: number): void { - if (this._selectedObjectId === -1) return; + if(this._selectedObjectId === -1) return; const object = this._roomEngine.getRoomObject(roomId, this._selectedObjectId, this._selectedObjectCategory); - if (object && object.logic) + if(object && object.logic) { object.logic.processUpdateMessage(new ObjectSelectedMessage(false)); @@ -2114,12 +2114,12 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public setSelectedAvatar(k: number, _arg_2: number, _arg_3: boolean): void { - if (!this._roomEngine) return; + if(!this._roomEngine) return; const _local_4 = RoomObjectCategory.UNIT; const _local_5 = this._roomEngine.getRoomObject(k, this._selectedAvatarId, _local_4); - if (_local_5 && _local_5.logic) + if(_local_5 && _local_5.logic) { _local_5.logic.processUpdateMessage(new ObjectAvatarSelectedMessage(false)); @@ -2128,11 +2128,11 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou let _local_6 = false; - if (_arg_3) + if(_arg_3) { const _local_5 = this._roomEngine.getRoomObject(k, _arg_2, _local_4); - if (_local_5 && _local_5.logic) + if(_local_5 && _local_5.logic) { _local_5.logic.processUpdateMessage(new ObjectAvatarSelectedMessage(true)); @@ -2142,34 +2142,34 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou const location = _local_5.getLocation(); - if (location) this._roomEngine.connection.send(new RoomUnitLookComposer(~~(location.x), ~~(location.y))); + if(location) this._roomEngine.connection.send(new RoomUnitLookComposer(~~(location.x), ~~(location.y))); } } const selectionArrow = this._roomEngine.getRoomObjectSelectionArrow(k); - if (selectionArrow && selectionArrow.logic) + if(selectionArrow && selectionArrow.logic) { - if (_local_6 && !this._roomEngine.isPlayingGame()) selectionArrow.logic.processUpdateMessage(new ObjectVisibilityUpdateMessage(ObjectVisibilityUpdateMessage.ENABLED)); + if(_local_6 && !this._roomEngine.isPlayingGame()) selectionArrow.logic.processUpdateMessage(new ObjectVisibilityUpdateMessage(ObjectVisibilityUpdateMessage.ENABLED)); else selectionArrow.logic.processUpdateMessage(new ObjectVisibilityUpdateMessage(ObjectVisibilityUpdateMessage.DISABLED)); } } private resetSelectedObjectData(roomId: number): void { - if (!this._roomEngine) return; + if(!this._roomEngine) return; this._roomEngine.removeObjectMoverIconSprite(); const selectedData = this.getSelectedRoomObjectData(roomId); - if (selectedData) + if(selectedData) { - if ((selectedData.operation === RoomObjectOperationType.OBJECT_MOVE) || (selectedData.operation === RoomObjectOperationType.OBJECT_MOVE_TO)) + if((selectedData.operation === RoomObjectOperationType.OBJECT_MOVE) || (selectedData.operation === RoomObjectOperationType.OBJECT_MOVE_TO)) { const roomObject = this._roomEngine.getRoomObject(roomId, selectedData.id, selectedData.category); - if (roomObject && (selectedData.operation !== RoomObjectOperationType.OBJECT_MOVE_TO)) + if(roomObject && (selectedData.operation !== RoomObjectOperationType.OBJECT_MOVE_TO)) { roomObject.setLocation(selectedData.loc); roomObject.setDirection(selectedData.dir); @@ -2177,7 +2177,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this.setFurnitureAlphaMultiplier(roomObject, 1); - if (selectedData.category === RoomObjectCategory.WALL) + if(selectedData.category === RoomObjectCategory.WALL) { this._roomEngine.updateRoomObjectMask(roomId, selectedData.id, true); } @@ -2185,12 +2185,12 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou this.updateSelectedObjectData(roomId, selectedData.id, selectedData.category, selectedData.loc, selectedData.dir, RoomObjectOperationType.OBJECT_MOVE, selectedData.typeId, selectedData.instanceData, selectedData.stuffData, selectedData.state, selectedData.animFrame, selectedData.posture); } - else if ((selectedData.operation === RoomObjectOperationType.OBJECT_PLACE)) + else if((selectedData.operation === RoomObjectOperationType.OBJECT_PLACE)) { const objectId = selectedData.id; const category = selectedData.category; - switch (category) + switch(category) { case RoomObjectCategory.FLOOR: this._roomEngine.removeRoomObjectFloor(roomId, objectId); @@ -2210,14 +2210,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private getSelectedRoomObjectData(roomId: number): SelectedRoomObjectData { - if (!this._roomEngine) return null; + if(!this._roomEngine) return null; return this._roomEngine.getSelectedRoomObjectData(roomId); } private setFurnitureAlphaMultiplier(object: IRoomObjectController, multiplier: number): void { - if (!object || !object.model) return; + if(!object || !object.model) return; object.model.setValue(RoomObjectVariable.FURNITURE_ALPHA_MULTIPLIER, multiplier); } @@ -2238,7 +2238,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { this.resetSelectedObjectData(roomId); - if (!this._roomEngine) return; + if(!this._roomEngine) return; const selectedData = new SelectedRoomObjectData(id, category, operation, location, direction, typeId, instanceData, stuffData, state, frameNumber, posture); @@ -2247,7 +2247,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private updateSelectedObjectData(roomId: number, id: number, category: number, location: IVector3D, direction: IVector3D, operation: string, typeId: number = 0, instanceData: string = null, stuffData: IObjectData = null, state: number = -1, frameNumber: number = -1, posture: string = null): void { - if (!this._roomEngine) return null; + if(!this._roomEngine) return null; const selectedData = new SelectedRoomObjectData(id, category, operation, location, direction, typeId, instanceData, stuffData, state, frameNumber, posture); @@ -2256,7 +2256,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleUserPlace(roomObject: IRoomObjectController, x: number, y: number, wallGeometry: LegacyWallGeometry): boolean { - if (!wallGeometry.isRoomTile(x, y)) return false; + if(!wallGeometry.isRoomTile(x, y)) return false; roomObject.setLocation(new Vector3d(x, y, wallGeometry.getHeight(x, y))); diff --git a/src/nitro/room/RoomObjectLogicFactory.ts b/src/nitro/room/RoomObjectLogicFactory.ts index 6301d27a..342689ab 100644 --- a/src/nitro/room/RoomObjectLogicFactory.ts +++ b/src/nitro/room/RoomObjectLogicFactory.ts @@ -74,23 +74,23 @@ export class RoomObjectLogicFactory implements IRoomObjectLogicFactory { const logic = this.getLogicType(type); - if (!logic) return null; + if(!logic) return null; const instance = (new logic() as IRoomObjectEventHandler); - if (!instance) return null; + if(!instance) return null; instance.eventDispatcher = this._events; - if (!this._cachedEvents.get(type)) + if(!this._cachedEvents.get(type)) { this._cachedEvents.set(type, true); const eventTypes = instance.getEventTypes(); - for (const eventType of eventTypes) + for(const eventType of eventTypes) { - if (!eventType) continue; + if(!eventType) continue; this.registerEventType(eventType); } @@ -101,13 +101,13 @@ export class RoomObjectLogicFactory implements IRoomObjectLogicFactory private registerEventType(type: string): void { - if (this._registeredEvents.get(type)) return; + if(this._registeredEvents.get(type)) return; this._registeredEvents.set(type, true); - for (const func of this._functions) + for(const func of this._functions) { - if (!func) continue; + if(!func) continue; this._events.addEventListener(type, func); } @@ -115,15 +115,15 @@ export class RoomObjectLogicFactory implements IRoomObjectLogicFactory public registerEventFunction(func: Function): void { - if (!func) return; + if(!func) return; - if (this._functions.indexOf(func) >= 0) return; + if(this._functions.indexOf(func) >= 0) return; this._functions.push(func); - for (const eventType of this._registeredEvents.keys()) + for(const eventType of this._registeredEvents.keys()) { - if (!eventType) continue; + if(!eventType) continue; this._events.addEventListener(eventType, func); } @@ -131,17 +131,17 @@ export class RoomObjectLogicFactory implements IRoomObjectLogicFactory public removeEventFunction(func: Function): void { - if (!func) return; + if(!func) return; const index = this._functions.indexOf(func); - if (index === -1) return; + if(index === -1) return; this._functions.splice(index, 1); - for (const event of this._registeredEvents.keys()) + for(const event of this._registeredEvents.keys()) { - if (!event) continue; + if(!event) continue; this._events.removeEventListener(event, func); } @@ -149,11 +149,11 @@ export class RoomObjectLogicFactory implements IRoomObjectLogicFactory public getLogicType(type: string): typeof RoomObjectLogicBase { - if (!type) return null; + if(!type) return null; let logic: typeof RoomObjectLogicBase = null; - switch (type) + switch(type) { case RoomObjectLogicType.ROOM: logic = RoomLogic; @@ -354,7 +354,7 @@ export class RoomObjectLogicFactory implements IRoomObjectLogicFactory break; } - if (!logic) + if(!logic) { NitroLogger.warn('Unknown Logic', type); diff --git a/src/nitro/room/object/RoomObjectVisualizationFactory.ts b/src/nitro/room/object/RoomObjectVisualizationFactory.ts index 72a8e5a3..f6f33839 100644 --- a/src/nitro/room/object/RoomObjectVisualizationFactory.ts +++ b/src/nitro/room/object/RoomObjectVisualizationFactory.ts @@ -63,18 +63,18 @@ export class RoomObjectVisualizationFactory implements IRoomObjectVisualizationF { const visualization = this.getVisualizationType(type); - if (!visualization) return null; + if(!visualization) return null; return new visualization(); } public getVisualizationType(type: string): typeof RoomObjectSpriteVisualization { - if (!type) return null; + if(!type) return null; let visualization: typeof RoomObjectSpriteVisualization = null; - switch (type) + switch(type) { case RoomObjectVisualizationType.ROOM: visualization = RoomVisualization; @@ -185,7 +185,7 @@ export class RoomObjectVisualizationFactory implements IRoomObjectVisualizationF break; } - if (!visualization) + if(!visualization) { NitroLogger.log('Unknown Visualization', type); @@ -199,11 +199,11 @@ export class RoomObjectVisualizationFactory implements IRoomObjectVisualizationF { const existing = this._visualizationDatas.get(type); - if (existing) return existing; + if(existing) return existing; let visualizationData: IObjectVisualizationData = null; - switch (visualization) + switch(visualization) { case RoomObjectVisualizationType.FURNITURE_STATIC: case RoomObjectVisualizationType.FURNITURE_GIFT_WRAPPED: @@ -255,21 +255,21 @@ export class RoomObjectVisualizationFactory implements IRoomObjectVisualizationF break; } - if (!visualizationData) return null; + if(!visualizationData) return null; - if (!visualizationData.initialize(asset)) + if(!visualizationData.initialize(asset)) { visualizationData.dispose(); return null; } - if ((visualizationData instanceof AvatarVisualizationData) || (visualizationData instanceof FurnitureMannequinVisualizationData)) + if((visualizationData instanceof AvatarVisualizationData) || (visualizationData instanceof FurnitureMannequinVisualizationData)) { visualizationData.avatarManager = Nitro.instance.avatar; } - if (RoomObjectVisualizationFactory.CACHING_ENABLED) this._visualizationDatas.set(type, visualizationData); + if(RoomObjectVisualizationFactory.CACHING_ENABLED) this._visualizationDatas.set(type, visualizationData); return visualizationData; } diff --git a/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts index b0d530b1..accabc6a 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts @@ -19,7 +19,7 @@ export class FurnitureYoutubeLogic extends FurnitureLogic { super.update(time); - if (!this.object.model.getValue(RoomObjectVariable.SESSION_URL_PREFIX)) + if(!this.object.model.getValue(RoomObjectVariable.SESSION_URL_PREFIX)) { this.eventDispatcher.dispatchEvent(new RoomObjectDataRequestEvent(RoomObjectDataRequestEvent.RODRE_URL_PREFIX, this.object)); } @@ -27,7 +27,7 @@ export class FurnitureYoutubeLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.YOUTUBE, this.object)); } diff --git a/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts index b1339ea6..59e61533 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts @@ -14,9 +14,9 @@ export class FurnitureFireworksVisualization extends FurnitureAnimatedVisualizat this._currentParticleSystem = null; - if (this._particleSystems) + if(this._particleSystems) { - for (const particleSystem of this._particleSystems.getValues()) particleSystem.dispose(); + for(const particleSystem of this._particleSystems.getValues()) particleSystem.dispose(); this._particleSystems = null; } @@ -24,25 +24,25 @@ export class FurnitureFireworksVisualization extends FurnitureAnimatedVisualizat protected updateObject(scale: number, direction: number): boolean { - if (super.updateObject(scale, direction)) + if(super.updateObject(scale, direction)) { - if (!this._particleSystems) + if(!this._particleSystems) { this._Str_18684(); - if (this._particleSystems) this._currentParticleSystem = this._particleSystems.getValue(scale); + if(this._particleSystems) this._currentParticleSystem = this._particleSystems.getValue(scale); else NitroLogger.log('ERROR Particle systems could not be read!', this.object.type); } else { - if ((scale !== this._scale) || (this._particleSystems.getValue(scale) !== this._currentParticleSystem)) + if((scale !== this._scale) || (this._particleSystems.getValue(scale) !== this._currentParticleSystem)) { const particleSystem = this._particleSystems.getValue(scale); particleSystem._Str_17988(this._currentParticleSystem); - if (this._currentParticleSystem) this._currentParticleSystem.reset(); + if(this._currentParticleSystem) this._currentParticleSystem.reset(); this._currentParticleSystem = particleSystem; } @@ -58,26 +58,26 @@ export class FurnitureFireworksVisualization extends FurnitureAnimatedVisualizat { super.updateSprites(scale, update, animation); - if (this._currentParticleSystem) this._currentParticleSystem.updateSprites(); + if(this._currentParticleSystem) this._currentParticleSystem.updateSprites(); } protected updateAnimation(scale: number): number { - if (this._currentParticleSystem) this._currentParticleSystem.updateAnimation(); + if(this._currentParticleSystem) this._currentParticleSystem.updateAnimation(); return super.updateAnimation(scale); } protected setAnimation(id: number): void { - if (this._currentParticleSystem) this._currentParticleSystem.setAnimation(id); + if(this._currentParticleSystem) this._currentParticleSystem.setAnimation(id); super.setAnimation(id); } protected getLayerYOffset(scale: number, direction: number, layerId: number): number { - if (this._currentParticleSystem && this._currentParticleSystem.controlsSprite(layerId)) + if(this._currentParticleSystem && this._currentParticleSystem.controlsSprite(layerId)) { return this._currentParticleSystem.getLayerYOffset(scale, direction, layerId); } @@ -87,15 +87,15 @@ export class FurnitureFireworksVisualization extends FurnitureAnimatedVisualizat private _Str_18684(): boolean { - if (!this.object || !this.object.model) return false; + if(!this.object || !this.object.model) return false; const fireworksData = this.object.model.getValue(RoomObjectVariable.FURNITURE_FIREWORKS_DATA); - if (!fireworksData || !fireworksData.length) return false; + if(!fireworksData || !fireworksData.length) return false; this._particleSystems = new AdvancedMap(); - for (const particleData of fireworksData) + for(const particleData of fireworksData) { const size = particleData.size; const particleSystem = new FurnitureParticleSystem(this); diff --git a/src/nitro/room/utils/TileObjectMap.ts b/src/nitro/room/utils/TileObjectMap.ts index eef29915..989e77b2 100644 --- a/src/nitro/room/utils/TileObjectMap.ts +++ b/src/nitro/room/utils/TileObjectMap.ts @@ -14,7 +14,7 @@ export class TileObjectMap let index = 0; - while (index < _arg_2) + while(index < _arg_2) { this._tileObjectMap.set(index, new Map()); @@ -27,9 +27,9 @@ export class TileObjectMap public clear(): void { - for (const k of this._tileObjectMap.values()) + for(const k of this._tileObjectMap.values()) { - if (!k) continue; + if(!k) continue; k.clear(); } @@ -41,7 +41,7 @@ export class TileObjectMap { this.clear(); - for (const _local_2 of k) this.addRoomObject(_local_2); + for(const _local_2 of k) this.addRoomObject(_local_2); } public dispose(): void @@ -53,11 +53,11 @@ export class TileObjectMap public getObjectIntTile(k: number, _arg_2: number): IRoomObject { - if ((((k >= 0) && (k < this._width)) && (_arg_2 >= 0)) && (_arg_2 < this._height)) + if((((k >= 0) && (k < this._width)) && (_arg_2 >= 0)) && (_arg_2 < this._height)) { const existing = this._tileObjectMap.get(_arg_2); - if (existing) return existing.get(k); + if(existing) return existing.get(k); } return null; @@ -65,51 +65,51 @@ export class TileObjectMap public setObjectInTile(k: number, _arg_2: number, _arg_3: IRoomObject): void { - if (!_arg_3.isReady) + if(!_arg_3.isReady) { NitroLogger.log('Assigning non initialized object to tile object map!'); return; } - if ((((k >= 0) && (k < this._width)) && (_arg_2 >= 0)) && (_arg_2 < this._height)) + if((((k >= 0) && (k < this._width)) && (_arg_2 >= 0)) && (_arg_2 < this._height)) { const existing = this._tileObjectMap.get(_arg_2); - if (existing) existing.set(k, _arg_3); + if(existing) existing.set(k, _arg_3); } } public addRoomObject(k: IRoomObject): void { - if (!k || !k.model || !k.isReady) return; + if(!k || !k.model || !k.isReady) return; const location = k.getLocation(); const direction = k.getDirection(); - if (!location || !direction) return; + if(!location || !direction) return; let sizeX = k.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); let sizeY = k.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Y); - if (sizeX < 1) sizeX = 1; - if (sizeY < 1) sizeY = 1; + if(sizeX < 1) sizeX = 1; + if(sizeY < 1) sizeY = 1; const directionNumber = ((Math.trunc((direction.x + 45)) % 360) / 90); - if ((directionNumber === 1) || (directionNumber === 3)) [sizeX, sizeY] = [sizeY, sizeX]; + if((directionNumber === 1) || (directionNumber === 3)) [sizeX, sizeY] = [sizeY, sizeX]; let y = location.y; - while (y < (location.y + sizeY)) + while(y < (location.y + sizeY)) { let x = location.x; - while (x < (location.x + sizeX)) + while(x < (location.x + sizeX)) { const roomObject = this.getObjectIntTile(x, y); - if ((!(roomObject)) || ((!(roomObject === k)) && (roomObject.getLocation().z <= location.z))) + if((!(roomObject)) || ((!(roomObject === k)) && (roomObject.getLocation().z <= location.z))) { this.setObjectInTile(x, y, k); } diff --git a/src/nitro/session/RoomSession.ts b/src/nitro/session/RoomSession.ts index 6a4e571e..71c13bce 100644 --- a/src/nitro/session/RoomSession.ts +++ b/src/nitro/session/RoomSession.ts @@ -76,7 +76,7 @@ export class RoomSession extends Disposable implements IRoomSession protected onDispose(): void { - if (this._userData) + if(this._userData) { this._userData.dispose(); @@ -88,16 +88,16 @@ export class RoomSession extends Disposable implements IRoomSession public setConnection(connection: IConnection): void { - if (this._connection || !connection) return; + if(this._connection || !connection) return; this._connection = connection; - if (this._userData) this._userData.setConnection(connection); + if(this._userData) this._userData.setConnection(connection); } public setControllerLevel(level: number): void { - if ((level >= RoomControllerLevel.NONE) && (level <= RoomControllerLevel.MODERATOR)) + if((level >= RoomControllerLevel.NONE) && (level <= RoomControllerLevel.MODERATOR)) { this._controllerLevel = level; @@ -119,7 +119,7 @@ export class RoomSession extends Disposable implements IRoomSession public start(): boolean { - if (this._state !== RoomSessionEvent.CREATED || !this._connection) return false; + if(this._state !== RoomSessionEvent.CREATED || !this._connection) return false; this._state = RoomSessionEvent.STARTED; @@ -128,7 +128,7 @@ export class RoomSession extends Disposable implements IRoomSession private enterRoom(): boolean { - if (!this._connection) return false; + if(!this._connection) return false; this._connection.send(new RoomEnterComposer(this._roomId, this._password)); @@ -137,7 +137,7 @@ export class RoomSession extends Disposable implements IRoomSession public reset(roomId: number): void { - if (roomId === this._roomId) return; + if(roomId === this._roomId) return; this._roomId = roomId; } @@ -159,7 +159,7 @@ export class RoomSession extends Disposable implements IRoomSession public sendChatTypingMessage(isTyping: boolean): void { - if (isTyping) this._connection.send(new RoomUnitTypingStartComposer()); + if(isTyping) this._connection.send(new RoomUnitTypingStartComposer()); else this._connection.send(new RoomUnitTypingStopComposer()); } @@ -180,7 +180,7 @@ export class RoomSession extends Disposable implements IRoomSession public sendSignMessage(sign: number): void { - if ((sign < 0) || (sign > 17)) return; + if((sign < 0) || (sign > 17)) return; this._connection.send(new RoomUnitSignComposer(sign)); } @@ -255,21 +255,21 @@ export class RoomSession extends Disposable implements IRoomSession public pickupPet(id: number): void { - if (!this._connection) return; + if(!this._connection) return; this._connection.send(new PetRemoveComposer(id)); } public pickupBot(id: number): void { - if (!this._connection) return; + if(!this._connection) return; this._connection.send(new BotRemoveComposer(id)); } public requestMoodlightSettings(): void { - if (!this._connection) return; + if(!this._connection) return; this._connection.send(new MoodlightSettingsComposer()); } diff --git a/src/nitro/session/SessionDataManager.ts b/src/nitro/session/SessionDataManager.ts index bbd8889b..2c764940 100644 --- a/src/nitro/session/SessionDataManager.ts +++ b/src/nitro/session/SessionDataManager.ts @@ -143,14 +143,14 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana { this.destroyFurnitureData(); - if (this._ignoredUsersManager) + if(this._ignoredUsersManager) { this._ignoredUsersManager.dispose(); this._ignoredUsersManager = null; } - if (this._groupInformationManager) + if(this._groupInformationManager) { this._groupInformationManager.dispose(); @@ -196,7 +196,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private loadBadgeImageManager(): void { - if (this._badgeImageManager) return; + if(this._badgeImageManager) return; this._badgeImageManager = new BadgeImageManager(Nitro.instance.core.asset, this); this._badgeImageManager.init(); @@ -204,34 +204,34 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana public hasProductData(listener: IProductDataListener): boolean { - if (this._productsReady) return true; + if(this._productsReady) return true; - if (listener && (this._pendingProductListeners.indexOf(listener) === -1)) this._pendingProductListeners.push(listener); + if(listener && (this._pendingProductListeners.indexOf(listener) === -1)) this._pendingProductListeners.push(listener); return false; } public getAllFurnitureData(listener: IFurnitureDataListener): IFurnitureData[] { - if (!this._furnitureReady) + if(!this._furnitureReady) { - if (this._pendingFurnitureListeners.indexOf(listener) === -1) this._pendingFurnitureListeners.push(listener); + if(this._pendingFurnitureListeners.indexOf(listener) === -1) this._pendingFurnitureListeners.push(listener); return null; } const furnitureData: IFurnitureData[] = []; - for (const data of this._floorItems.values()) + for(const data of this._floorItems.values()) { - if (!data) continue; + if(!data) continue; furnitureData.push(data); } - for (const data of this._wallItems.values()) + for(const data of this._wallItems.values()) { - if (!data) continue; + if(!data) continue; furnitureData.push(data); } @@ -241,18 +241,18 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana public removePendingFurniDataListener(listener: IFurnitureDataListener): void { - if (!this._pendingFurnitureListeners) return; + if(!this._pendingFurnitureListeners) return; const index = this._pendingFurnitureListeners.indexOf(listener); - if (index === -1) return; + if(index === -1) return; this._pendingFurnitureListeners.splice(index, 1); } private onUserFigureEvent(event: FigureUpdateEvent): void { - if (!event || !event.connection) return; + if(!event || !event.connection) return; this._figure = event.getParser().figure; this._gender = event.getParser().gender; @@ -262,13 +262,13 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onUserInfoEvent(event: UserInfoEvent): void { - if (!event || !event.connection) return; + if(!event || !event.connection) return; this.resetUserInfo(); const userInfo = event.getParser().userInfo; - if (!userInfo) return; + if(!userInfo) return; this._userId = userInfo.userId; this._name = userInfo.username; @@ -285,7 +285,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onUserPermissionsEvent(event: UserPermissionsEvent): void { - if (!event || !event.connection) return; + if(!event || !event.connection) return; this._clubLevel = event.getParser().clubLevel; this._securityLevel = event.getParser().securityLevel; @@ -294,11 +294,11 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onAvailabilityStatusMessageEvent(event: AvailabilityStatusMessageEvent): void { - if (!event || !event.connection) return; + if(!event || !event.connection) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; this._systemOpen = parser.isOpen; this._systemShutdown = parser.onShutdown; @@ -307,13 +307,13 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onChangeNameUpdateEvent(event: ChangeUserNameResultMessageEvent): void { - if (!event || !event.connection) return; + if(!event || !event.connection) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; - if (parser.resultCode !== ChangeUserNameResultMessageEvent.NAME_OK) return; + if(parser.resultCode !== ChangeUserNameResultMessageEvent.NAME_OK) return; this._canChangeName = false; @@ -322,13 +322,13 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onUserNameChangeMessageEvent(event: UserNameChangeMessageEvent): void { - if (!event || !event.connection) return; + if(!event || !event.connection) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; - if (parser.webId !== this.userId) return; + if(parser.webId !== this.userId) return; this._name = parser.newName; this._canChangeName = false; @@ -338,11 +338,11 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private onRoomModelNameEvent(event: RoomReadyMessageEvent): void { - if (!event) return; + if(!event) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; HabboWebTools.roomVisited(parser.roomId); } @@ -353,13 +353,13 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana this._furnitureReady = true; - if (!this._furnitureListenersNotified) + if(!this._furnitureListenersNotified) { this._furnitureListenersNotified = true; - if (this._pendingFurnitureListeners && this._pendingFurnitureListeners.length) + if(this._pendingFurnitureListeners && this._pendingFurnitureListeners.length) { - for (const listener of this._pendingFurnitureListeners) listener && listener.loadFurnitureData(); + for(const listener of this._pendingFurnitureListeners) listener && listener.loadFurnitureData(); } } @@ -372,29 +372,29 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana this._productsReady = true; - for (const listener of this._pendingProductListeners) listener && listener.loadProductData(); + for(const listener of this._pendingProductListeners) listener && listener.loadProductData(); this._pendingProductListeners = []; } private onInClientLinkEvent(event: InClientLinkEvent): void { - if (!event) return; + if(!event) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; Nitro.instance.createLinkEvent(parser.link); } private onMysteryBoxKeysEvent(event: MysteryBoxKeysEvent): void { - if (!event) return; + if(!event) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; this.events.dispatchEvent(new MysteryBoxKeysUpdateEvent(parser.boxColor, parser.keyColor)); } @@ -403,7 +403,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana { this._noobnessLevel = event.getParser().noobnessLevel; - if (this._noobnessLevel !== NoobnessLevelEnum.OLD_IDENTITY) + if(this._noobnessLevel !== NoobnessLevelEnum.OLD_IDENTITY) { Nitro.instance.core.configuration.setValue('new.identity', 1); } @@ -419,7 +419,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private destroyFurnitureData(): void { - if (!this._furnitureData) return; + if(!this._furnitureData) return; this._furnitureData.dispose(); @@ -428,7 +428,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private destroyProductData(): void { - if (!this._productData) return; + if(!this._productData) return; this._productData.dispose(); @@ -439,18 +439,18 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana { const existing = this._floorItems.get(id); - if (!existing) return null; + if(!existing) return null; return existing; } public getFloorItemDataByName(name: string): IFurnitureData { - if (!name || !this._floorItems || !this._floorItems.size) return null; + if(!name || !this._floorItems || !this._floorItems.size) return null; - for (const item of this._floorItems.values()) + for(const item of this._floorItems.values()) { - if (!item || (item.className !== name)) continue; + if(!item || (item.className !== name)) continue; return item; } @@ -460,18 +460,18 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana { const existing = this._wallItems.get(id); - if (!existing) return null; + if(!existing) return null; return existing; } public getWallItemDataByName(name: string): IFurnitureData { - if (!name || !this._wallItems || !this._wallItems.size) return null; + if(!name || !this._wallItems || !this._wallItems.size) return null; - for (const item of this._wallItems.values()) + for(const item of this._wallItems.values()) { - if (!item || (item.className !== name)) continue; + if(!item || (item.className !== name)) continue; return item; } @@ -479,7 +479,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana public getProductData(type: string): IProductData { - if (!this._productsReady) this.loadProductData(); + if(!this._productsReady) this.loadProductData(); return this._products.get(type); } @@ -521,7 +521,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana public giveRespect(userId: number): void { - if ((userId < 0) || (this._respectsLeft <= 0)) return; + if((userId < 0) || (this._respectsLeft <= 0)) return; this.send(new UserRespectComposer(userId)); @@ -530,7 +530,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana public givePetRespect(petId: number): void { - if ((petId < 0) || (this._respectsPetLeft <= 0)) return; + if((petId < 0) || (this._respectsPetLeft <= 0)) return; this.send(new PetRespectComposer(petId)); diff --git a/src/nitro/session/badge/BadgeImageManager.ts b/src/nitro/session/badge/BadgeImageManager.ts index 757c7a97..67cb32c8 100644 --- a/src/nitro/session/badge/BadgeImageManager.ts +++ b/src/nitro/session/badge/BadgeImageManager.ts @@ -4,6 +4,7 @@ import { IAssetManager } from '../../../core/asset/IAssetManager'; import { IMessageEvent } from '../../../core/communication/messages/IMessageEvent'; import { NitroSprite } from '../../../core/utils/proxy/NitroSprite'; import { GroupBadgePartsEvent } from '../../communication/messages/incoming/group/GroupBadgePartsEvent'; +import { GroupBadgePartsComposer } from '../../communication/messages/outgoing/group/GroupBadgePartsComposer'; import { Nitro } from '../../Nitro'; import { BadgeImageReadyEvent } from '../events/BadgeImageReadyEvent'; import { IDisposable } from './../../../core/common/disposable/IDisposable'; @@ -56,7 +57,7 @@ export class BadgeImageManager implements IDisposable for(const message of this._messages) this._sessionDataManager.communication.registerMessageEvent(message); - //this._sessionDataManager.send(new GroupBadgePartsComposer()); + this._sessionDataManager.send(new GroupBadgePartsComposer()); } } @@ -208,7 +209,7 @@ export class BadgeImageManager implements IDisposable { if(!partName || !partName.length) continue; - const texture = this._assets.getTexture(`badgepart_${ partName }`); + const texture = this._assets.getTexture(`badgepart_${partName}`); if(!texture) continue; @@ -243,9 +244,9 @@ export class BadgeImageManager implements IDisposable if(!data) return; - data.bases.forEach((names, id) => this._groupBases.set(id, names.map( val => val.replace('.png', '').replace('.gif', '')))); + data.bases.forEach((names, id) => this._groupBases.set(id, names.map(val => val.replace('.png', '').replace('.gif', '')))); - data.symbols.forEach( (names, id) => this._groupSymbols.set(id, names.map( val => val.replace('.png', '').replace('.gif', '')))); + data.symbols.forEach((names, id) => this._groupSymbols.set(id, names.map(val => val.replace('.png', '').replace('.gif', '')))); this._groupPartColors = data.partColors; this._readyToGenerateGroupBadges = true; diff --git a/src/nitro/session/handler/RoomUsersHandler.ts b/src/nitro/session/handler/RoomUsersHandler.ts index 9fabf9c3..db1a6647 100644 --- a/src/nitro/session/handler/RoomUsersHandler.ts +++ b/src/nitro/session/handler/RoomUsersHandler.ts @@ -51,21 +51,21 @@ export class RoomUsersHandler extends BaseHandler private onRoomUnitEvent(event: RoomUnitEvent): void { - if (!this.listener) return; + if(!this.listener) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; const users = event.getParser().users; const usersToAdd: RoomUserData[] = []; - if (users && users.length) + if(users && users.length) { - for (const user of users) + for(const user of users) { - if (!user) continue; + if(!user) continue; const userData = new RoomUserData(user.roomIndex); @@ -92,7 +92,7 @@ export class RoomUsersHandler extends BaseHandler userData.botSkills = user.botSkills; userData.isModerator = user.isModerator; - if (!session.userDataManager.getUserData(user.roomIndex)) usersToAdd.push(userData); + if(!session.userDataManager.getUserData(user.roomIndex)) usersToAdd.push(userData); session.userDataManager.updateUserData(userData); } @@ -103,15 +103,15 @@ export class RoomUsersHandler extends BaseHandler private onRoomUnitInfoEvent(event: RoomUnitInfoEvent): void { - if (!this.listener) return; + if(!this.listener) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; session.userDataManager.updateFigure(parser.unitId, parser.figure, parser.gender, false, false); session.userDataManager.updateMotto(parser.unitId, parser.motto); @@ -123,41 +123,41 @@ export class RoomUsersHandler extends BaseHandler private onRoomUnitRemoveEvent(event: RoomUnitRemoveEvent): void { - if (!this.listener) return; + if(!this.listener) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; session.userDataManager.removeUserData(event.getParser().unitId); } private onRoomUnitDanceEvent(event: RoomUnitDanceEvent): void { - if (!this.listener) return; + if(!this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; this.listener.events.dispatchEvent(new RoomSessionDanceEvent(session, parser.unitId, parser.danceId)); } private onUserCurrentBadgesEvent(event: UserCurrentBadgesEvent): void { - if (!this.listener) return; + if(!this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; session.userDataManager.setUserBadges(parser.userId, parser.badges); @@ -166,49 +166,49 @@ export class RoomUsersHandler extends BaseHandler private onRoomDoorbellEvent(event: DoorbellMessageEvent): void { - if (!this.listener) return; + if(!this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const username = parser.userName; - if (!username || !username.length) return; + if(!username || !username.length) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; this.listener.events.dispatchEvent(new RoomSessionDoorbellEvent(RoomSessionDoorbellEvent.DOORBELL, session, username)); } private onUserNameChangeMessageEvent(event: UserNameChangeMessageEvent): void { - if (!this.listener) return; + if(!this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; session.userDataManager.updateName(parser.id, parser.newName); } private onNewFriendRequestEvent(event: NewFriendRequestEvent): void { - if (!this.listener) return; + if(!this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; const request = parser.request; @@ -217,15 +217,15 @@ export class RoomUsersHandler extends BaseHandler private onPetInfoEvent(event: PetInfoEvent): void { - if (!this.listener) return; + if(!this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; const petData = new RoomPetData(); @@ -261,15 +261,15 @@ export class RoomUsersHandler extends BaseHandler private onPetStatusUpdateEvent(event: PetStatusUpdateEvent): void { - if (!this.listener) return; + if(!this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; session.userDataManager.updatePetBreedingStatus(parser.roomIndex, parser.canBreed, parser.canHarvest, parser.canRevive, parser.hasBreedingPermission); @@ -278,15 +278,15 @@ export class RoomUsersHandler extends BaseHandler private onPetFigureUpdateEvent(event: PetFigureUpdateEvent): void { - if (!this.listener) return; + if(!this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; const figure = parser.figureData.figuredata; @@ -297,21 +297,21 @@ export class RoomUsersHandler extends BaseHandler private onPetPlacingError(event: PetPlacingErrorEvent): void { - if (!event) return; + if(!event) return; - if (!this.listener) return; + if(!this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; let type: string = null; - switch (parser.errorCode) + switch(parser.errorCode) { case 0: type = RoomSessionErrorMessageEvent.RSEME_PETS_FORBIDDEN_IN_HOTEL; @@ -333,28 +333,28 @@ export class RoomUsersHandler extends BaseHandler break; } - if (!type || type.length == 0) return; + if(!type || type.length == 0) return; this.listener.events.dispatchEvent(new RoomSessionErrorMessageEvent(type, session)); } private onBotError(event: BotErrorEvent): void { - if (!event) return; + if(!event) return; - if (!this.listener) return; + if(!this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; let type: string = null; - switch (parser.errorCode) + switch(parser.errorCode) { case 0: type = RoomSessionErrorMessageEvent.RSEME_BOTS_FORBIDDEN_IN_HOTEL; @@ -373,23 +373,23 @@ export class RoomUsersHandler extends BaseHandler break; } - if (!type || type.length == 0) return; + if(!type || type.length == 0) return; this.listener.events.dispatchEvent(new RoomSessionErrorMessageEvent(type, session)); } private onFavoriteMembershipUpdateMessageEvent(event: FavoriteMembershipUpdateMessageEvent): void { - if (!this.listener) return; + if(!this.listener) return; const parser = event.getParser(); const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; const userData = session.userDataManager.getUserDataByIndex(parser.roomIndex); - if (!userData) return; + if(!userData) return; userData.groupId = parser.groupId; userData.groupName = parser.groupName;