From b3abc727cda5248855d040f9531a739279c9b73a Mon Sep 17 00:00:00 2001 From: Bill Date: Tue, 8 Nov 2022 16:50:16 -0500 Subject: [PATCH] Eslint --- src/api/common/NitroLogger.ts | 2 +- .../configuration/IConfigurationManager.ts | 4 +- src/api/configuration/NitroConfiguration.ts | 28 +- src/core/asset/AssetManager.ts | 48 +- src/core/asset/GraphicAssetCollection.ts | 96 +- src/core/common/EventDispatcher.ts | 26 +- src/core/common/NitroManager.ts | 4 +- src/core/communication/SocketConnection.ts | 78 +- .../messages/MessageClassManager.ts | 40 +- .../configuration/ConfigurationManager.ts | 10 +- src/core/utils/AdvancedMap.ts | 22 +- .../session/RoomSessionDimmerPresetsEvent.ts | 2 +- src/events/session/RoomSessionVoteEvent.ts | 2 +- src/nitro/Nitro.ts | 66 +- .../avatar/AvatarAssetDownloadLibrary.ts | 8 +- .../avatar/AvatarAssetDownloadManager.ts | 94 +- src/nitro/avatar/AvatarFigureContainer.ts | 18 +- src/nitro/avatar/AvatarImage.ts | 252 ++--- src/nitro/avatar/AvatarImagePartContainer.ts | 14 +- src/nitro/avatar/AvatarRenderManager.ts | 94 +- src/nitro/avatar/AvatarStructure.ts | 138 +-- .../avatar/EffectAssetDownloadLibrary.ts | 10 +- .../avatar/EffectAssetDownloadManager.ts | 76 +- src/nitro/avatar/actions/ActionDefinition.ts | 42 +- src/nitro/avatar/actions/ActiveActionData.ts | 2 +- .../avatar/actions/AvatarActionManager.ts | 66 +- src/nitro/avatar/animation/Animation.ts | 88 +- .../avatar/animation/AnimationManager.ts | 4 +- .../animation/AvatarAnimationLayerData.ts | 8 +- .../avatar/animation/AvatarDataContainer.ts | 6 +- .../avatar/animation/SpriteDataContainer.ts | 12 +- .../avatar/cache/AvatarImageActionCache.ts | 8 +- .../avatar/cache/AvatarImageBodyPartCache.ts | 24 +- src/nitro/avatar/cache/AvatarImageCache.ts | 152 +-- .../avatar/geometry/AvatarModelGeometry.ts | 90 +- src/nitro/avatar/geometry/GeometryBodyPart.ts | 48 +- .../avatar/structure/AvatarAnimationData.ts | 12 +- src/nitro/avatar/structure/AvatarCanvas.ts | 2 +- .../structure/AvatarStructureDownload.ts | 4 +- src/nitro/avatar/structure/FigureSetData.ts | 34 +- src/nitro/avatar/structure/PartSetsData.ts | 32 +- .../avatar/structure/figure/FigurePart.ts | 2 +- .../avatar/structure/figure/FigurePartSet.ts | 24 +- src/nitro/avatar/structure/figure/Palette.ts | 6 +- .../avatar/structure/figure/PartColor.ts | 2 +- src/nitro/avatar/structure/figure/SetType.ts | 18 +- src/nitro/camera/RoomCameraWidgetManager.ts | 18 +- .../communication/NitroCommunicationDemo.ts | 26 +- .../NitroCommunicationManager.ts | 14 +- .../messages/parser/catalog/FrontPageItem.ts | 6 +- .../parser/catalog/TargetedOfferData.ts | 4 +- .../parser/inventory/badges/BadgesParser.ts | 6 +- .../furniture/FurnitureListItemParser.ts | 8 +- .../inventory/pets/PetFigureDataParser.ts | 4 +- .../parser/moderation/IssueMessageData.ts | 4 +- .../parser/notifications/UnseenItemsParser.ts | 6 +- .../messages/parser/poll/QuestionParser.ts | 4 +- .../UserSongDisksInventoryMessageParser.ts | 6 +- .../RelationshipStatusInfoMessageParser.ts | 4 +- .../localization/NitroLocalizationManager.ts | 70 +- src/nitro/room/RoomContentLoader.ts | 158 +-- src/nitro/room/RoomEngine.ts | 922 +++++++++--------- src/nitro/room/RoomMessageHandler.ts | 250 ++--- src/nitro/room/RoomObjectEventHandler.ts | 602 ++++++------ src/nitro/room/RoomObjectLogicFactory.ts | 38 +- .../object/RoomObjectVisualizationFactory.ts | 20 +- .../room/object/logic/avatar/AvatarLogic.ts | 120 +-- .../FurnitureAchievementResolutionLogic.ts | 16 +- .../furniture/FurnitureBadgeDisplayLogic.ts | 16 +- .../FurnitureChangeStateWhenStepOnLogic.ts | 12 +- .../furniture/FurnitureClothingChangeLogic.ts | 10 +- .../furniture/FurnitureCounterClockLogic.ts | 10 +- .../furniture/FurnitureCrackableLogic.ts | 4 +- .../logic/furniture/FurnitureCreditLogic.ts | 6 +- .../furniture/FurnitureCuckooClockLogic.ts | 4 +- .../FurnitureCustomStackHeightLogic.ts | 4 +- .../logic/furniture/FurnitureDiceLogic.ts | 14 +- .../furniture/FurnitureEcotronBoxLogic.ts | 2 +- .../FurnitureEditableInternalLinkLogic.ts | 20 +- .../FurnitureEditableRoomLinkLogic.ts | 16 +- .../furniture/FurnitureEffectBoxLogic.ts | 2 +- .../furniture/FurnitureExternalImageLogic.ts | 10 +- .../furniture/FurnitureFireworksLogic.ts | 14 +- .../furniture/FurnitureFloorHoleLogic.ts | 28 +- .../furniture/FurnitureFriendFurniLogic.ts | 10 +- .../FurnitureGroupForumTerminalLogic.ts | 2 +- .../FurnitureGuildCustomizedLogic.ts | 16 +- .../furniture/FurnitureHabboWheelLogic.ts | 2 +- .../furniture/FurnitureHighScoreLogic.ts | 8 +- .../furniture/FurnitureHockeyScoreLogic.ts | 12 +- .../furniture/FurnitureInternalLinkLogic.ts | 20 +- .../logic/furniture/FurnitureJukeboxLogic.ts | 22 +- .../object/logic/furniture/FurnitureLogic.ts | 108 +- .../furniture/FurnitureMannequinLogic.ts | 6 +- .../FurnitureMonsterplantSeedLogic.ts | 2 +- .../furniture/FurnitureMultiStateLogic.ts | 4 +- .../furniture/FurnitureMysteryBoxLogic.ts | 2 +- .../furniture/FurnitureMysteryTrophyLogic.ts | 2 +- .../furniture/FurnitureOneWayDoorLogic.ts | 2 +- .../FurniturePetCustomizationLogic.ts | 6 +- .../furniture/FurniturePlaceholderLogic.ts | 2 +- .../logic/furniture/FurniturePresentLogic.ts | 22 +- .../FurniturePurchaseableClothingLogic.ts | 2 +- .../furniture/FurnitureRandomStateLogic.ts | 2 +- .../furniture/FurnitureRentableSpaceLogic.ts | 8 +- .../FurnitureRoomBackgroundColorLogic.ts | 20 +- .../furniture/FurnitureRoomBillboardLogic.ts | 4 +- .../furniture/FurnitureRoomBrandingLogic.ts | 56 +- .../furniture/FurnitureRoomDimmerLogic.ts | 26 +- .../logic/furniture/FurnitureScoreLogic.ts | 14 +- .../logic/furniture/FurnitureSongDiskLogic.ts | 2 +- .../furniture/FurnitureSoundBlockLogic.ts | 26 +- .../furniture/FurnitureSoundMachineLogic.ts | 20 +- .../logic/furniture/FurnitureStickieLogic.ts | 10 +- .../logic/furniture/FurnitureTrophyLogic.ts | 2 +- .../furniture/FurnitureVoteCounterLogic.ts | 18 +- .../furniture/FurnitureWelcomeGiftLogic.ts | 6 +- .../logic/furniture/FurnitureYoutubeLogic.ts | 4 +- src/nitro/room/object/logic/pet/PetLogic.ts | 62 +- src/nitro/room/object/logic/room/RoomLogic.ts | 94 +- .../avatar/AvatarVisualization.ts | 290 +++--- .../avatar/AvatarVisualizationData.ts | 4 +- .../avatar/additions/FloatingHeartAddition.ts | 34 +- .../avatar/additions/FloatingIdleZAddition.ts | 32 +- .../additions/GuideStatusBubbleAddition.ts | 12 +- .../avatar/additions/MutedBubbleAddition.ts | 12 +- .../avatar/additions/NumberBubbleAddition.ts | 42 +- .../avatar/additions/TypingBubbleAddition.ts | 12 +- .../FurnitureFireworksVisualization.ts | 28 +- .../FurnitureMannequinVisualization.ts | 28 +- .../FurnitureMannequinVisualizationData.ts | 2 +- .../furniture/FurnitureParticleSystem.ts | 66 +- .../animated/LandscapeRasterizer.ts | 80 +- src/nitro/room/preview/RoomPreviewer.ts | 194 ++-- src/nitro/room/utils/TileObjectMap.ts | 34 +- src/nitro/session/RoomSession.ts | 24 +- src/nitro/session/RoomSessionManager.ts | 28 +- src/nitro/session/SessionDataManager.ts | 98 +- src/nitro/session/badge/BadgeImageManager.ts | 56 +- .../session/furniture/FurnitureDataLoader.ts | 34 +- .../session/handler/GenericErrorHandler.ts | 10 +- src/nitro/session/handler/PollHandler.ts | 18 +- src/nitro/session/handler/RoomChatHandler.ts | 58 +- src/nitro/session/handler/RoomDataHandler.ts | 8 +- .../handler/RoomDimmerPresetsHandler.ts | 10 +- .../session/handler/RoomPresentHandler.ts | 10 +- .../session/handler/RoomSessionHandler.ts | 36 +- src/nitro/session/handler/RoomUsersHandler.ts | 102 +- src/nitro/session/handler/WordQuizHandler.ts | 18 +- .../session/product/ProductDataLoader.ts | 10 +- src/nitro/sound/SoundManager.ts | 18 +- .../sound/common/SongStartRequestData.ts | 2 +- src/nitro/sound/music/MusicManager.ts | 20 +- src/nitro/utils/FigureDataContainer.ts | 42 +- src/nitro/utils/HabboWebTools.ts | 36 +- src/nitro/window/motion/Interval.ts | 2 +- src/nitro/window/motion/Motions.ts | 62 +- src/nitro/window/motion/Wait.ts | 2 +- src/room/RoomManager.ts | 116 +-- src/room/RoomObjectManager.ts | 22 +- src/room/events/RoomObjectEvent.ts | 4 +- src/room/renderer/RoomSpriteCanvas.ts | 288 +++--- src/room/utils/RoomEnterEffect.ts | 8 +- src/room/utils/RoomGeometry.ts | 52 +- src/room/utils/RoomRotatingEffect.ts | 10 +- src/room/utils/RoomShakingEffect.ts | 10 +- 166 files changed, 3501 insertions(+), 3503 deletions(-) diff --git a/src/api/common/NitroLogger.ts b/src/api/common/NitroLogger.ts index faad90b3..af770af9 100644 --- a/src/api/common/NitroLogger.ts +++ b/src/api/common/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); } diff --git a/src/api/configuration/IConfigurationManager.ts b/src/api/configuration/IConfigurationManager.ts index 182ad5e3..6aee7846 100644 --- a/src/api/configuration/IConfigurationManager.ts +++ b/src/api/configuration/IConfigurationManager.ts @@ -1,5 +1,3 @@ import { INitroManager } from '../common'; -export interface IConfigurationManager extends INitroManager -{ -} +export type IConfigurationManager = INitroManager diff --git a/src/api/configuration/NitroConfiguration.ts b/src/api/configuration/NitroConfiguration.ts index 6d35e5eb..d3e01584 100644 --- a/src/api/configuration/NitroConfiguration.ts +++ b/src/api/configuration/NitroConfiguration.ts @@ -8,21 +8,21 @@ export class NitroConfiguration public static parseConfiguration(data: { [index: string]: any }, overrides: boolean = false): boolean { - if (!data) return false; + if(!data) return false; try { const regex = new RegExp(/\${(.*?)}/g); - for (const key in data) + for(const key in data) { let value = data[key]; - if (typeof value === 'string') value = this.interpolate((value as string), regex); + if(typeof value === 'string') value = this.interpolate((value as string), regex); - if (this._definitions.has(key)) + if(this._definitions.has(key)) { - if (overrides) this.setValue(key, value); + if(overrides) this.setValue(key, value); } else { @@ -43,17 +43,17 @@ export class NitroConfiguration public static interpolate(value: string, regex: RegExp = null): string { - if (!regex) regex = new RegExp(/\${(.*?)}/g); + if(!regex) regex = new RegExp(/\${(.*?)}/g); const pieces = value.match(regex); - if (pieces && pieces.length) + if(pieces && pieces.length) { - for (const piece of pieces) + for(const piece of pieces) { const existing = (this._definitions.get(this.removeInterpolateKey(piece)) as string); - if (existing) (value = value.replace(piece, existing)); + if(existing) (value = value.replace(piece, existing)); } } @@ -69,9 +69,9 @@ export class NitroConfiguration { let existing = this._definitions.get(key); - if (existing === undefined) + if(existing === undefined) { - if (this._missingKeys.indexOf(key) >= 0) return value; + if(this._missingKeys.indexOf(key) >= 0) return value; this._missingKeys.push(key); NitroLogger.warn(`Missing configuration key: ${key}`); @@ -88,13 +88,13 @@ export class NitroConfiguration let last = this._config; - for (let i = 0; i < parts.length; i++) + for(let i = 0; i < parts.length; i++) { const part = parts[i].toString(); - if (i !== (parts.length - 1)) + if(i !== (parts.length - 1)) { - if (!last[part]) last[part] = {}; + if(!last[part]) last[part] = {}; last = last[part]; diff --git a/src/core/asset/AssetManager.ts b/src/core/asset/AssetManager.ts index 50fca969..7fcb8072 100644 --- a/src/core/asset/AssetManager.ts +++ b/src/core/asset/AssetManager.ts @@ -22,33 +22,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; } @@ -58,24 +58,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); } @@ -90,7 +90,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); @@ -99,9 +99,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({ @@ -116,7 +116,7 @@ export class AssetManager extends Disposable implements IAssetManager const onDownloaded = (status: boolean, url: string) => { - if (!status) + if(!status) { NitroLogger.error('Failed to download asset', url); @@ -129,7 +129,7 @@ export class AssetManager extends Disposable implements IAssetManager remaining--; - if (!remaining) + if(!remaining) { loader.destroy(); @@ -141,11 +141,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); @@ -154,7 +154,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); @@ -166,12 +166,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); @@ -203,7 +203,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); @@ -224,7 +224,7 @@ export class AssetManager extends Disposable implements IAssetManager }); }; - if (baseTexture.valid) + if(baseTexture.valid) { createAsset(); } diff --git a/src/core/asset/GraphicAssetCollection.ts b/src/core/asset/GraphicAssetCollection.ts index a772482d..ccb35e51 100644 --- a/src/core/asset/GraphicAssetCollection.ts +++ b/src/core/asset/GraphicAssetCollection.ts @@ -23,7 +23,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection constructor(data: IAssetData, spritesheet: Spritesheet) { - if (!data) throw new Error('invalid_collection'); + if(!data) throw new Error('invalid_collection'); this._name = data.name; this._baseTexture = ((spritesheet && spritesheet.baseTexture) || null); @@ -33,7 +33,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection this._palettes = new Map(); this._paletteAssetNames = []; - if (spritesheet) this.addLibraryAsset(spritesheet.textures); + if(spritesheet) this.addLibraryAsset(spritesheet.textures); this.define(data); } @@ -45,23 +45,23 @@ export class GraphicAssetCollection implements IGraphicAssetCollection public dispose(): void { - if (this._palettes) + if(this._palettes) { - for (const palette of this._palettes.values()) palette.dispose(); + for(const palette of this._palettes.values()) palette.dispose(); this._palettes.clear(); } - if (this._paletteAssetNames) + if(this._paletteAssetNames) { this.disposePaletteAssets(); this._paletteAssetNames = null; } - if (this._assets) + if(this._assets) { - for (const asset of this._assets.values()) asset.recycle(); + for(const asset of this._assets.values()) asset.recycle(); this._assets.clear(); } @@ -77,7 +77,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection { this._referenceCount--; - if (this._referenceCount <= 0) + if(this._referenceCount <= 0) { this._referenceCount = 0; this._referenceTimestamp = GetTickerTime(); @@ -91,20 +91,20 @@ export class GraphicAssetCollection implements IGraphicAssetCollection const assets = data.assets; const palettes = data.palettes; - if (assets) this.defineAssets(assets); + if(assets) this.defineAssets(assets); - if (palettes) this.definePalettes(palettes); + if(palettes) this.definePalettes(palettes); } private defineAssets(assets: { [index: string]: IAsset }): void { - if (!assets) return; + if(!assets) return; - for (const name in assets) + for(const name in assets) { const asset = assets[name]; - if (!asset) continue; + if(!asset) continue; const x = (-(asset.x) || 0); const y = (-(asset.y) || 0); @@ -113,23 +113,23 @@ export class GraphicAssetCollection implements IGraphicAssetCollection const usesPalette = (asset.usesPalette || false); let source = (asset.source || ''); - if (asset.flipH && source.length) flipH = true; + if(asset.flipH && source.length) flipH = true; // if(asset.flipV && source.length) flipV = true; - if (!source.length) source = name; + if(!source.length) source = name; const texture = this.getLibraryAsset(source); - if (!texture) continue; + if(!texture) continue; let didAddAsset = this.createAsset(name, source, texture, flipH, flipV, x, y, usesPalette); - if (!didAddAsset) + if(!didAddAsset) { const existingAsset = this.getAsset(name); - if (existingAsset && (existingAsset.name !== existingAsset.source)) + if(existingAsset && (existingAsset.name !== existingAsset.source)) { didAddAsset = this.replaceAsset(name, source, texture, flipH, flipV, x, y, usesPalette); } @@ -139,28 +139,28 @@ export class GraphicAssetCollection implements IGraphicAssetCollection private definePalettes(palettes: { [index: string]: IAssetPalette }): void { - if (!palettes) return; + if(!palettes) return; - for (const name in palettes) + for(const name in palettes) { const palette = palettes[name]; - if (!palette) continue; + if(!palette) continue; const id = palette.id.toString(); - if (this._palettes.get(id)) continue; + if(this._palettes.get(id)) continue; let colorOne = 0xFFFFFF; let colorTwo = 0xFFFFFF; let color = palette.color1; - if (color && color.length > 0) colorOne = parseInt(color, 16); + if(color && color.length > 0) colorOne = parseInt(color, 16); color = palette.color2; - if (color && color.length > 0) colorTwo = parseInt(color, 16); + if(color && color.length > 0) colorTwo = parseInt(color, 16); this._palettes.set(id, new GraphicAssetPalette(palette.rgb, colorOne, colorTwo)); } @@ -168,7 +168,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection private createAsset(name: string, source: string, texture: Texture, flipH: boolean, flipV: boolean, x: number, y: number, usesPalette: boolean): boolean { - if (this._assets.get(name)) return false; + if(this._assets.get(name)) return false; const graphicAsset = GraphicAsset.createAsset(name, source, texture, x, y, flipH, flipV, usesPalette); @@ -181,7 +181,7 @@ export class GraphicAssetCollection implements IGraphicAssetCollection { const existing = this._assets.get(name); - if (existing) + if(existing) { this._assets.delete(name); @@ -193,11 +193,11 @@ export class GraphicAssetCollection implements IGraphicAssetCollection public getAsset(name: string): IGraphicAsset { - if (!name) return null; + if(!name) return null; const existing = this._assets.get(name); - if (!existing) return null; + if(!existing) return null; return existing; } @@ -208,19 +208,19 @@ export class GraphicAssetCollection implements IGraphicAssetCollection let asset = this.getAsset(saveName); - if (!asset) + if(!asset) { asset = this.getAsset(name); - if (!asset || !asset.usesPalette) return asset; + if(!asset || !asset.usesPalette) return asset; const palette = this.getPalette(paletteName); - if (palette) + if(palette) { const texture = palette.applyPalette(asset.texture); - if (texture) + if(texture) { this._paletteAssetNames.push(saveName); @@ -248,36 +248,36 @@ export class GraphicAssetCollection implements IGraphicAssetCollection { const palette = this.getPalette(paletteName); - if (palette) return [palette.primaryColor, palette.secondaryColor]; + if(palette) return [palette.primaryColor, palette.secondaryColor]; return null; } public getPalette(name: string): GraphicAssetPalette { - if (!name) return null; + if(!name) return null; const existing = this._palettes.get(name); - if (!existing) return null; + if(!existing) return null; return existing; } public addAsset(name: string, texture: Texture, override: boolean, x: number = 0, y: number = 0, flipH: boolean = false, flipV: boolean = false): boolean { - if (!name || !texture) return false; + if(!name || !texture) return false; const existingTexture = this.getLibraryAsset(name); - if (!existingTexture) + if(!existingTexture) { this._textures.set(name, texture); return this.createAsset(name, name, texture, flipH, flipV, x, y, false); } - if (override) + if(override) { existingTexture.baseTexture = texture.baseTexture; existingTexture.frame = texture.frame; @@ -295,13 +295,13 @@ export class GraphicAssetCollection implements IGraphicAssetCollection { const existing = this._assets.get(name); - if (!existing) return; + if(!existing) return; this._assets.delete(name); const texture = this.getLibraryAsset(existing.source); - if (texture) + if(texture) { this._textures.delete(existing.source); @@ -313,26 +313,26 @@ export class GraphicAssetCollection implements IGraphicAssetCollection public getLibraryAsset(name: string): Texture { - if (!name) return null; + if(!name) return null; name = this._name + '_' + name; const texture = this._textures.get(name); - if (!texture) return null; + if(!texture) return null; return texture; } private addLibraryAsset(textures: Dict>): void { - if (!textures) return; + if(!textures) return; - for (const name in textures) + for(const name in textures) { const texture = textures[name]; - if (!texture) continue; + if(!texture) continue; this._textures.set(GraphicAssetCollection.removeFileExtension(name), texture); } @@ -340,11 +340,11 @@ export class GraphicAssetCollection implements IGraphicAssetCollection private disposePaletteAssets(disposeAll: boolean = true): void { - if (this._paletteAssetNames) + if(this._paletteAssetNames) { - if (disposeAll || (this._paletteAssetNames.length > GraphicAssetCollection.PALETTE_ASSET_DISPOSE_THRESHOLD)) + if(disposeAll || (this._paletteAssetNames.length > GraphicAssetCollection.PALETTE_ASSET_DISPOSE_THRESHOLD)) { - for (const name of this._paletteAssetNames) this.disposeAsset(name); + for(const name of this._paletteAssetNames) this.disposeAsset(name); this._paletteAssetNames = []; } diff --git a/src/core/common/EventDispatcher.ts b/src/core/common/EventDispatcher.ts index 7d831e0a..7cd30923 100644 --- a/src/core/common/EventDispatcher.ts +++ b/src/core/common/EventDispatcher.ts @@ -23,11 +23,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]); @@ -39,19 +39,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; } @@ -59,9 +59,9 @@ export class EventDispatcher extends Disposable implements IEventDispatcher, IDi public dispatchEvent(event: INitroEvent): boolean { - if (!event) return false; + if(!event) return false; - if (NitroConfiguration.getValue('system.dispatcher.log')) this._logger.log('Dispatched Event', event.type); + if(NitroConfiguration.getValue('system.dispatcher.log')) this._logger.log('Dispatched Event', event.type); this.processEvent(event); @@ -72,18 +72,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/core/common/NitroManager.ts b/src/core/common/NitroManager.ts index e2c0bfec..20cdaddc 100644 --- a/src/core/common/NitroManager.ts +++ b/src/core/common/NitroManager.ts @@ -25,7 +25,7 @@ export class NitroManager extends Disposable implements INitroManager public init(): void { - if (this._isLoaded || this._isLoading || this.isDisposing) return; + if(this._isLoaded || this._isLoading || this.isDisposing) return; this._isLoading = true; @@ -42,7 +42,7 @@ export class NitroManager extends Disposable implements INitroManager protected onDispose(): void { - if (this._events) this._events.dispose(); + if(this._events) this._events.dispose(); super.onDispose(); } diff --git a/src/core/communication/SocketConnection.ts b/src/core/communication/SocketConnection.ts index c0068b7c..c5390d16 100644 --- a/src/core/communication/SocketConnection.ts +++ b/src/core/communication/SocketConnection.ts @@ -44,7 +44,7 @@ export class SocketConnection extends EventDispatcher implements IConnection public init(socketUrl: string): void { - if (this._stateListener) + if(this._stateListener) { this._stateListener.connectionInit(socketUrl); } @@ -67,13 +67,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 = []; @@ -81,7 +81,7 @@ export class SocketConnection extends EventDispatcher implements IConnection private createSocket(socketUrl: string): void { - if (!socketUrl) return; + if(!socketUrl) return; this.destroySocket(); @@ -96,14 +96,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; } @@ -125,7 +125,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); @@ -153,28 +153,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 (NitroConfiguration.getValue('system.packet.log')) NitroLogger.log('Unknown Composer', composer.constructor.name); + if(NitroConfiguration.getValue('system.packet.log')) NitroLogger.log('Unknown Composer', composer.constructor.name); continue; } @@ -182,14 +182,14 @@ export class SocketConnection extends EventDispatcher implements IConnection const message = composer.getMessageArray(); const encoded = this._codec.encode(header, message); - if (!encoded) + if(!encoded) { - if (NitroConfiguration.getValue('system.packet.log')) NitroLogger.log('Encoding Failed', composer.constructor.name); + if(NitroConfiguration.getValue('system.packet.log')) NitroLogger.log('Encoding Failed', composer.constructor.name); continue; } - if (NitroConfiguration.getValue('system.packet.log')) NitroLogger.log('OutgoingComposer', header, composer.constructor.name, message); + if(NitroConfiguration.getValue('system.packet.log')) NitroLogger.log('OutgoingComposer', header, composer.constructor.name, message); this.write(encoded.getBuffer()); } @@ -199,7 +199,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); } @@ -221,11 +221,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); @@ -237,17 +237,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 (NitroConfiguration.getValue('system.packet.log')) NitroLogger.log('IncomingMessage', wrapper.header, messages[0].constructor.name, messages[0].parser); + if(NitroConfiguration.getValue('system.packet.log')) NitroLogger.log('IncomingMessage', wrapper.header, messages[0].constructor.name, messages[0].parser); this.handleMessages(...messages); } @@ -255,7 +255,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); } @@ -272,13 +272,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 (NitroConfiguration.getValue('system.packet.log')) NitroLogger.log('IncomingMessage', wrapper.header, 'UNREGISTERED', wrapper); + if(NitroConfiguration.getValue('system.packet.log')) NitroLogger.log('IncomingMessage', wrapper.header, 'UNREGISTERED', wrapper); return; } @@ -288,9 +288,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) @@ -307,33 +307,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/communication/messages/MessageClassManager.ts b/src/core/communication/messages/MessageClassManager.ts index b191b04c..f4f7e002 100644 --- a/src/core/communication/messages/MessageClassManager.ts +++ b/src/core/communication/messages/MessageClassManager.ts @@ -23,36 +23,36 @@ export class MessageClassManager public registerMessages(configuration: IMessageConfiguration): void { - for (const [header, handler] of configuration.events) this.registerMessageEventClass(header, handler); + for(const [header, handler] of configuration.events) this.registerMessageEventClass(header, handler); - for (const [header, handler] of configuration.composers) this.registerMessageComposerClass(header, handler); + for(const [header, handler] of configuration.composers) this.registerMessageComposerClass(header, handler); } private registerMessageEventClass(header: number, handler: Function): void { - if (!header || !handler) return; + if(!header || !handler) return; this._messageIdByEvent.set(handler, header); } private registerMessageComposerClass(header: number, handler: Function): void { - if (!header || !handler) return; + if(!header || !handler) return; this._messageIdByComposer.set(handler, header); } public registerMessageEvent(event: IMessageEvent): void { - if (!event) return; + if(!event) return; const header = this.getEventId(event); - if (!header) return; + if(!header) return; let existing = this._messageInstancesById.get(header); - if (!existing || !existing.length) + if(!existing || !existing.length) { existing = []; @@ -64,25 +64,25 @@ export class MessageClassManager public removeMessageEvent(event: IMessageEvent): void { - if (!event) return; + if(!event) return; const header = this.getEventId(event); - if (!header) return; + if(!header) return; const existing = this._messageInstancesById.get(header); - if (!existing) return; + if(!existing) return; - for (const [index, message] of existing.entries()) + for(const [index, message] of existing.entries()) { - if (!message) continue; + if(!message) continue; - if (message !== event) continue; + if(message !== event) continue; existing.splice(index, 1); - if (existing.length === 0) this._messageInstancesById.delete(header); + if(existing.length === 0) this._messageInstancesById.delete(header); message.dispose(); @@ -92,36 +92,36 @@ export class MessageClassManager public getEvents(header: number): IMessageEvent[] { - if (!header) return; + if(!header) return; const existing = this._messageInstancesById.get(header); - if (!existing) return; + if(!existing) return; return existing; } public getEventId(event: IMessageEvent): number { - if (!event) return -1; + if(!event) return -1; //@ts-ignore const name = (event instanceof MessageEvent ? event.constructor : event) as Function; const existing = this._messageIdByEvent.get(name); - if (!existing) return -1; + if(!existing) return -1; return existing; } public getComposerId(composer: IMessageComposer): number { - if (!composer) return -1; + if(!composer) return -1; const existing = this._messageIdByComposer.get(composer.constructor); - if (!existing) return -1; + if(!existing) return -1; return existing; } diff --git a/src/core/configuration/ConfigurationManager.ts b/src/core/configuration/ConfigurationManager.ts index b308c8e6..bedf4b12 100644 --- a/src/core/configuration/ConfigurationManager.ts +++ b/src/core/configuration/ConfigurationManager.ts @@ -32,7 +32,7 @@ export class ConfigurationManager extends NitroManager implements IConfiguration private loadNextConfiguration(): void { - if (!this._pendingUrls.length) + if(!this._pendingUrls.length) { this.dispatchConfigurationEvent(ConfigurationEvent.LOADED); @@ -44,7 +44,7 @@ export class ConfigurationManager extends NitroManager implements IConfiguration public loadConfigurationFromUrl(url: string): void { - if (!url || (url === '')) + if(!url || (url === '')) { this.dispatchConfigurationEvent(ConfigurationEvent.FAILED); @@ -59,13 +59,13 @@ export class ConfigurationManager extends NitroManager implements IConfiguration private onConfigurationLoaded(data: { [index: string]: any }, url: string): void { - if (!data) return; + if(!data) return; - if (NitroConfiguration.parseConfiguration(data)) + if(NitroConfiguration.parseConfiguration(data)) { const index = this._pendingUrls.indexOf(url); - if (index >= 0) this._pendingUrls.splice(index, 1); + if(index >= 0) this._pendingUrls.splice(index, 1); this.loadNextConfiguration(); diff --git a/src/core/utils/AdvancedMap.ts b/src/core/utils/AdvancedMap.ts index 3be0f412..e231a1f4 100644 --- a/src/core/utils/AdvancedMap.ts +++ b/src/core/utils/AdvancedMap.ts @@ -14,7 +14,7 @@ export class AdvancedMap implements IAdvancedMap this._array = []; this._keys = []; - if (map) for (const [key, value] of map.entries()) this.add(key, value); + if(map) for(const [key, value] of map.entries()) this.add(key, value); } public get length(): number @@ -29,9 +29,9 @@ export class AdvancedMap implements IAdvancedMap public dispose(): void { - if (!this._dictionary) + if(!this._dictionary) { - for (const key of this._dictionary.keys()) this._dictionary.delete(key); + for(const key of this._dictionary.keys()) this._dictionary.delete(key); this._dictionary = null; } @@ -43,7 +43,7 @@ export class AdvancedMap implements IAdvancedMap public reset(): void { - for (const key of this._dictionary.keys()) this._dictionary.delete(key); + for(const key of this._dictionary.keys()) this._dictionary.delete(key); this._length = 0; this._array = []; @@ -52,7 +52,7 @@ export class AdvancedMap implements IAdvancedMap public unshift(key: T, value: U): boolean { - if (this._dictionary.get(key) !== null) return false; + if(this._dictionary.get(key) !== null) return false; this._dictionary.set(key, value); @@ -66,7 +66,7 @@ export class AdvancedMap implements IAdvancedMap public add(key: T, value: U): boolean { - if (this._dictionary.get(key) !== undefined) return false; + if(this._dictionary.get(key) !== undefined) return false; this._dictionary.set(key, value); @@ -82,11 +82,11 @@ export class AdvancedMap implements IAdvancedMap { const value = this._dictionary.get(key); - if (!value) return null; + if(!value) return null; const index = this._array.indexOf(value); - if (index >= 0) + if(index >= 0) { this._array.splice(index, 1); this._keys.splice(index, 1); @@ -101,14 +101,14 @@ export class AdvancedMap implements IAdvancedMap public getWithIndex(index: number): U { - if ((index < 0) || (index >= this._length)) return null; + if((index < 0) || (index >= this._length)) return null; return this._array[index]; } public getKey(index: number): T { - if ((index < 0) || (index >= this._length)) return null; + if((index < 0) || (index >= this._length)) return null; return this._keys[index]; } @@ -145,7 +145,7 @@ export class AdvancedMap implements IAdvancedMap public concatenate(newValues: IAdvancedMap): void { - for (const k of (newValues as AdvancedMap)._keys) this.add(k, newValues.getValue(k)); + for(const k of (newValues as AdvancedMap)._keys) this.add(k, newValues.getValue(k)); } public clone(): IAdvancedMap diff --git a/src/events/session/RoomSessionDimmerPresetsEvent.ts b/src/events/session/RoomSessionDimmerPresetsEvent.ts index ddd40705..6ae9d5c5 100644 --- a/src/events/session/RoomSessionDimmerPresetsEvent.ts +++ b/src/events/session/RoomSessionDimmerPresetsEvent.ts @@ -23,7 +23,7 @@ export class RoomSessionDimmerPresetsEvent extends RoomSessionEvent public getPreset(id: number): RoomSessionDimmerPresetsEventPresetItem { - if ((id < 0) || (id >= this._presets.length)) return null; + if((id < 0) || (id >= this._presets.length)) return null; return this._presets[id]; } diff --git a/src/events/session/RoomSessionVoteEvent.ts b/src/events/session/RoomSessionVoteEvent.ts index ae29ad54..d8d778be 100644 --- a/src/events/session/RoomSessionVoteEvent.ts +++ b/src/events/session/RoomSessionVoteEvent.ts @@ -21,7 +21,7 @@ export class RoomSessionVoteEvent extends RoomSessionEvent this._question = _arg_3; this._choices = _arg_4; this._SafeStr_7651 = _arg_5; - if (this._SafeStr_7651 == null) + if(this._SafeStr_7651 == null) { this._SafeStr_7651 = []; } diff --git a/src/nitro/Nitro.ts b/src/nitro/Nitro.ts index 34cf8fae..18de6f0a 100644 --- a/src/nitro/Nitro.ts +++ b/src/nitro/Nitro.ts @@ -54,7 +54,7 @@ export class Nitro implements INitro constructor(core: INitroCore, options?: IApplicationOptions) { - if (!Nitro.INSTANCE) Nitro.INSTANCE = this; + if(!Nitro.INSTANCE) Nitro.INSTANCE = this; this._worker = null; this._application = new PixiApplicationProxy(options); @@ -78,12 +78,12 @@ export class Nitro implements INitro this._core.configuration.events.addEventListener(ConfigurationEvent.LOADED, this.onConfigurationLoadedEvent.bind(this)); this._roomEngine.events.addEventListener(RoomEngineEvent.ENGINE_INITIALIZED, this.onRoomEngineReady.bind(this)); - if (this._worker) this._worker.onmessage = this.createWorkerEvent.bind(this); + if(this._worker) this._worker.onmessage = this.createWorkerEvent.bind(this); } public static bootstrap(): void { - if (Nitro.INSTANCE) + if(Nitro.INSTANCE) { Nitro.INSTANCE.dispose(); @@ -105,25 +105,25 @@ export class Nitro implements INitro public init(): void { - if (this._isReady || this._isDisposed) return; + if(this._isReady || this._isDisposed) return; - if (this._avatar) this._avatar.init(); + if(this._avatar) this._avatar.init(); - if (this._soundManager) this._soundManager.init(); + if(this._soundManager) this._soundManager.init(); - if (this._roomEngine) + if(this._roomEngine) { this._roomEngine.sessionDataManager = this._sessionDataManager; this._roomEngine.roomSessionManager = this._roomSessionManager; this._roomEngine.roomManager = this._roomManager; - if (this._sessionDataManager) this._sessionDataManager.init(); - if (this._roomSessionManager) this._roomSessionManager.init(); + if(this._sessionDataManager) this._sessionDataManager.init(); + if(this._roomSessionManager) this._roomSessionManager.init(); this._roomEngine.init(); } - if (!this._communication.connection) + if(!this._communication.connection) { throw new Error('No connection found'); } @@ -135,58 +135,58 @@ export class Nitro implements INitro public dispose(): void { - if (this._isDisposed) return; + if(this._isDisposed) return; - if (this._roomManager) + if(this._roomManager) { this._roomManager.dispose(); this._roomManager = null; } - if (this._roomSessionManager) + if(this._roomSessionManager) { this._roomSessionManager.dispose(); this._roomSessionManager = null; } - if (this._sessionDataManager) + if(this._sessionDataManager) { this._sessionDataManager.dispose(); this._sessionDataManager = null; } - if (this._roomEngine) + if(this._roomEngine) { this._roomEngine.dispose(); this._roomEngine = null; } - if (this._avatar) + if(this._avatar) { this._avatar.dispose(); this._avatar = null; } - if (this._soundManager) + if(this._soundManager) { this._soundManager.dispose(); this._soundManager = null; } - if (this._communication) + if(this._communication) { this._communication.dispose(); this._communication = null; } - if (this._application) + if(this._application) { this._application.destroy(); @@ -202,7 +202,7 @@ export class Nitro implements INitro const animationFPS = NitroConfiguration.getValue('system.animation.fps', 24); const limitsFPS = NitroConfiguration.getValue('system.limits.fps', true); - if (limitsFPS) Nitro.instance.ticker.maxFPS = animationFPS; + if(limitsFPS) Nitro.instance.ticker.maxFPS = animationFPS; } private onRoomEngineReady(event: RoomEngineEvent): void @@ -232,7 +232,7 @@ export class Nitro implements INitro public addWorkerEventTracker(tracker: IWorkerEventTracker): void { - if (this._workerTrackers.indexOf(tracker) >= 0) return; + if(this._workerTrackers.indexOf(tracker) >= 0) return; this._workerTrackers.push(tracker); } @@ -241,20 +241,20 @@ export class Nitro implements INitro { const index = this._workerTrackers.indexOf(tracker); - if (index === -1) return; + if(index === -1) return; this._workerTrackers.splice(index, 1); } public createWorkerEvent(message: MessageEvent): void { - if (!message) return; + if(!message) return; const data: { [index: string]: any } = message.data; - for (const tracker of this._workerTrackers) + for(const tracker of this._workerTrackers) { - if (!tracker) continue; + if(!tracker) continue; tracker.workerMessageReceived(data); } @@ -262,14 +262,14 @@ export class Nitro implements INitro public sendWorkerEvent(message: { [index: string]: any }): void { - if (!message || !this._worker) return; + if(!message || !this._worker) return; this._worker.postMessage(message); } public addLinkEventTracker(tracker: ILinkEventTracker): void { - if (this._linkTrackers.indexOf(tracker) >= 0) return; + if(this._linkTrackers.indexOf(tracker) >= 0) return; this._linkTrackers.push(tracker); } @@ -278,24 +278,24 @@ export class Nitro implements INitro { const index = this._linkTrackers.indexOf(tracker); - if (index === -1) return; + if(index === -1) return; this._linkTrackers.splice(index, 1); } public createLinkEvent(link: string): void { - if (!link || (link === '')) return; + if(!link || (link === '')) return; - for (const tracker of this._linkTrackers) + for(const tracker of this._linkTrackers) { - if (!tracker) continue; + if(!tracker) continue; const prefix = tracker.eventUrlPrefix; - if (prefix.length > 0) + if(prefix.length > 0) { - if (link.substr(0, prefix.length) === prefix) tracker.linkReceived(link); + if(link.substr(0, prefix.length) === prefix) tracker.linkReceived(link); } else { diff --git a/src/nitro/avatar/AvatarAssetDownloadLibrary.ts b/src/nitro/avatar/AvatarAssetDownloadLibrary.ts index 4d3437b9..654730eb 100644 --- a/src/nitro/avatar/AvatarAssetDownloadLibrary.ts +++ b/src/nitro/avatar/AvatarAssetDownloadLibrary.ts @@ -31,16 +31,16 @@ export class AvatarAssetDownloadLibrary extends EventDispatcher implements IAvat const asset = this._assets.getCollection(this._libraryName); - if (asset) this._state = AvatarAssetDownloadLibrary.LOADED; + if(asset) this._state = AvatarAssetDownloadLibrary.LOADED; } public downloadAsset(): void { - if (!this._assets || (this._state === AvatarAssetDownloadLibrary.LOADING) || (this._state === AvatarAssetDownloadLibrary.LOADED)) return; + if(!this._assets || (this._state === AvatarAssetDownloadLibrary.LOADING) || (this._state === AvatarAssetDownloadLibrary.LOADED)) return; const asset = this._assets.getCollection(this._libraryName); - if (asset) + if(asset) { this._state = AvatarAssetDownloadLibrary.LOADED; @@ -53,7 +53,7 @@ export class AvatarAssetDownloadLibrary extends EventDispatcher implements IAvat this._assets.downloadAsset(this._downloadUrl, (flag: boolean) => { - if (flag) + if(flag) { this._state = AvatarAssetDownloadLibrary.LOADED; diff --git a/src/nitro/avatar/AvatarAssetDownloadManager.ts b/src/nitro/avatar/AvatarAssetDownloadManager.ts index 54a5cc33..25802506 100644 --- a/src/nitro/avatar/AvatarAssetDownloadManager.ts +++ b/src/nitro/avatar/AvatarAssetDownloadManager.ts @@ -61,7 +61,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher request.onloadend = e => { - if (request.responseText) + if(request.responseText) { const data = JSON.parse(request.responseText); @@ -89,16 +89,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); @@ -106,7 +106,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); @@ -114,7 +114,7 @@ export class AvatarAssetDownloadManager extends EventDispatcher let existing = this._figureMap.get(partString); - if (!existing) existing = []; + if(!existing) existing = []; existing.push(downloadLibrary); @@ -125,9 +125,9 @@ export class AvatarAssetDownloadManager extends EventDispatcher private onAvatarRenderReady(event: INitroEvent): 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); } @@ -137,34 +137,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); } @@ -176,22 +176,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++; @@ -202,19 +202,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; } @@ -228,38 +228,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); } @@ -271,7 +271,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]); @@ -281,13 +281,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 = []; @@ -299,24 +299,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); @@ -325,7 +325,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/AvatarFigureContainer.ts b/src/nitro/avatar/AvatarFigureContainer.ts index 58ec0aeb..abef07b0 100644 --- a/src/nitro/avatar/AvatarFigureContainer.ts +++ b/src/nitro/avatar/AvatarFigureContainer.ts @@ -25,7 +25,7 @@ export class AvatarFigureContainer implements IAvatarFigureContainer { const existing = this.partSets().get(k); - if (!existing) return 0; + if(!existing) return 0; return existing.get('setid'); } @@ -34,7 +34,7 @@ export class AvatarFigureContainer implements IAvatarFigureContainer { const existing = this.partSets().get(k); - if (!existing) return null; + if(!existing) return null; return existing.get('colorids'); } @@ -62,9 +62,9 @@ export class AvatarFigureContainer implements IAvatarFigureContainer { const parts: string[] = []; - for (const key of this.partSets().keys()) + for(const key of this.partSets().keys()) { - if (!key) continue; + if(!key) continue; let setParts = []; @@ -81,20 +81,20 @@ export class AvatarFigureContainer implements IAvatarFigureContainer private partSets(): Map> { - if (!this._parts) this._parts = new Map(); + if(!this._parts) this._parts = new Map(); return this._parts; } private parseFigure(figure: string): void { - if (!figure) figure = ''; + if(!figure) figure = ''; - for (const part of figure.split('.')) + for(const part of figure.split('.')) { const pieces = part.split('-'); - if (pieces.length >= 2) + if(pieces.length >= 2) { const type = pieces[0]; const setId = parseInt(pieces[1]); @@ -102,7 +102,7 @@ export class AvatarFigureContainer implements IAvatarFigureContainer let index = 2; - while (index < pieces.length) + while(index < pieces.length) { colors.push(parseInt(pieces[index])); diff --git a/src/nitro/avatar/AvatarImage.ts b/src/nitro/avatar/AvatarImage.ts index bf4ecefe..95ef1fdb 100644 --- a/src/nitro/avatar/AvatarImage.ts +++ b/src/nitro/avatar/AvatarImage.ts @@ -76,11 +76,11 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._assets = _arg_2; this._scale = _arg_4; this._effectListener = _arg_6; - if (this._scale == null) + if(this._scale == null) { this._scale = AvatarScaleType.LARGE; } - if (_arg_3 == null) + if(_arg_3 == null) { _arg_3 = new AvatarFigureContainer('hr-893-45.hd-180-2.ch-210-66.lg-270-82.sh-300-91.wa-2007-.ri-1-'); } @@ -104,7 +104,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public dispose(): void { - if (this._disposed) return; + if(this._disposed) return; this._structure = null; this._assets = null; @@ -113,22 +113,22 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._avatarSpriteData = null; this._actions = null; - if (this._image) + if(this._image) { this._image.destroy(); this._image = null; } - if (this._cache) + if(this._cache) { this._cache.dispose(); this._cache = null; } - if (this._fullImageCache) + if(this._fullImageCache) { - for (const k of this._fullImageCache.getValues()) (k && k.destroy()); + for(const k of this._fullImageCache.getValues()) (k && k.destroy()); this._fullImageCache = null; } @@ -162,24 +162,24 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { _arg_2 = (_arg_2 + this._directionOffset); - if (_arg_2 < AvatarDirectionAngle.MIN_DIRECTION) + if(_arg_2 < AvatarDirectionAngle.MIN_DIRECTION) { _arg_2 = (AvatarDirectionAngle.MAX_DIRECTION + (_arg_2 + 1)); } - if (_arg_2 > AvatarDirectionAngle.MAX_DIRECTION) + if(_arg_2 > AvatarDirectionAngle.MAX_DIRECTION) { _arg_2 = (_arg_2 - (AvatarDirectionAngle.MAX_DIRECTION + 1)); } - if (this._structure.isMainAvatarSet(k)) + if(this._structure.isMainAvatarSet(k)) { this._mainDirection = _arg_2; } - if ((k === AvatarSetType.HEAD) || (k === AvatarSetType.FULL)) + if((k === AvatarSetType.HEAD) || (k === AvatarSetType.FULL)) { - if ((k === AvatarSetType.HEAD) && (this.isHeadTurnPreventedByAction())) + if((k === AvatarSetType.HEAD) && (this.isHeadTurnPreventedByAction())) { _arg_2 = this._mainDirection; } @@ -225,34 +225,34 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener private getFullImageCacheKey(): string { - if (!this._useFullImageCache) return null; + if(!this._useFullImageCache) return null; - if (((this._sortedActions.length == 1) && (this._mainDirection == this._headDirection))) + if(((this._sortedActions.length == 1) && (this._mainDirection == this._headDirection))) { return (this._mainDirection + this._currentActionsString) + (this._frameCounter % 4); } - if (this._sortedActions.length == 2) + if(this._sortedActions.length == 2) { - for (const k of this._sortedActions) + for(const k of this._sortedActions) { - if (((k.actionType == 'fx') && ((((k.actionParameter == '33') || (k.actionParameter == '34')) || (k.actionParameter == '35')) || (k.actionParameter == '36')))) + if(((k.actionType == 'fx') && ((((k.actionParameter == '33') || (k.actionParameter == '34')) || (k.actionParameter == '35')) || (k.actionParameter == '36')))) { return (this._mainDirection + this._currentActionsString) + 0; } - if (((k.actionType == 'fx') && ((k.actionParameter == '38') || (k.actionParameter == '39')))) + if(((k.actionType == 'fx') && ((k.actionParameter == '38') || (k.actionParameter == '39')))) { return (((this._mainDirection + '_') + this._headDirection) + this._currentActionsString) + (this._frameCounter % 11); } - if ((k.actionType === 'dance') && ((k.actionParameter === '1') || (k.actionParameter === '2') || (k.actionParameter === '3') || (k.actionParameter === '4'))) + if((k.actionType === 'dance') && ((k.actionParameter === '1') || (k.actionParameter === '2') || (k.actionParameter === '3') || (k.actionParameter === '4'))) { let frame = (this._frameCounter % 8); - if ((k.actionParameter === '3')) frame = (this._frameCounter % 10); + if((k.actionParameter === '3')) frame = (this._frameCounter % 10); - if ((k.actionParameter === '4')) frame = (this._frameCounter % 16); + if((k.actionParameter === '4')) frame = (this._frameCounter % 16); return (((this._mainDirection + k.actionType) + k.actionParameter) + frame); } @@ -264,7 +264,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener private getBodyParts(k: string, _arg_2: string, _arg_3: number): string[] { - if ((((!(_arg_3 == this._cachedBodyPartsDirection)) || (!(_arg_2 == this._cachedBodyPartsGeometryType))) || (!(k == this._cachedBodyPartsAvatarSet)))) + if((((!(_arg_3 == this._cachedBodyPartsDirection)) || (!(_arg_2 == this._cachedBodyPartsGeometryType))) || (!(k == this._cachedBodyPartsAvatarSet)))) { this._cachedBodyPartsDirection = _arg_3; this._cachedBodyPartsGeometryType = _arg_2; @@ -277,18 +277,18 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public getAvatarPartsForCamera(k: string): void { let _local_4: string; - if (this._mainAction == null) + if(this._mainAction == null) { return; } const _local_2 = this._structure.getCanvas(this._scale, this._mainAction.definition.geometryType); - if (_local_2 == null) + if(_local_2 == null) { return; } const _local_3 = this.getBodyParts(k, this._mainAction.definition.geometryType, this._mainDirection); let _local_6 = (_local_3.length - 1); - while (_local_6 >= 0) + while(_local_6 >= 0) { _local_4 = _local_3[_local_6]; const _local_5 = this._cache.getImageContainer(_local_4, this._frameCounter, true); @@ -298,19 +298,19 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public getImage(setType: string, hightlight: boolean, scale: number = 1, cache: boolean = true): RenderTexture { - if (!this._changes) return this._image; + if(!this._changes) return this._image; - if (!this._mainAction) return null; + if(!this._mainAction) return null; - if (!this._actionsSorted) this.endActionAppends(); + if(!this._actionsSorted) this.endActionAppends(); const avatarCanvas = this._structure.getCanvas(this._scale, this._mainAction.definition.geometryType); - if (!avatarCanvas) return null; + if(!avatarCanvas) return null; - if (this._image && ((this._image.width !== avatarCanvas.width) || (this._image.height !== avatarCanvas.height))) + if(this._image && ((this._image.width !== avatarCanvas.width) || (this._image.height !== avatarCanvas.height))) { - if (this._reusableTexture) + if(this._reusableTexture) { this._reusableTexture.destroy(true); @@ -330,16 +330,16 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener let isCachable = true; let partCount = (_local_6.length - 1); - while (partCount >= 0) + while(partCount >= 0) { const set = _local_6[partCount]; const part = this._cache.getImageContainer(set, this._frameCounter); - if (part) + if(part) { const partCacheContainer = part.image; - if (!partCacheContainer) + if(!partCacheContainer) { container.destroy({ children: true @@ -352,7 +352,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const point = part.regPoint.clone(); - if (point) + if(point) { point.x += avatarCanvas.offset.x; point.y += avatarCanvas.offset.y; @@ -364,7 +364,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener partContainer.addChild(partCacheContainer); - if (partContainer) + if(partContainer) { partContainer.position.set(point.x, point.y); @@ -376,13 +376,13 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener partCount--; } - if (this._avatarSpriteData) + if(this._avatarSpriteData) { - if (!container.filters) container.filters = []; + if(!container.filters) container.filters = []; - if (this._avatarSpriteData.colorTransform) container.filters.push(this._avatarSpriteData.colorTransform); + if(this._avatarSpriteData.colorTransform) container.filters.push(this._avatarSpriteData.colorTransform); - if (this._avatarSpriteData.paletteIsGrayscale) + if(this._avatarSpriteData.paletteIsGrayscale) { this.convertToGrayscale(container); @@ -390,12 +390,12 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener } } - if (!cache) + if(!cache) { return TextureUtils.generateTexture(container, new Rectangle(0, 0, avatarCanvas.width, avatarCanvas.height)); } - if (this._reusableTexture) + if(this._reusableTexture) { PixiApplicationProxy.instance.renderer.render(container, { renderTexture: this._reusableTexture, @@ -407,7 +407,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._reusableTexture = TextureUtils.generateTexture(container, new Rectangle(0, 0, avatarCanvas.width, avatarCanvas.height)); } - if (!this._reusableTexture) return null; + if(!this._reusableTexture) return null; /* if(this._avatarSpriteData) @@ -432,31 +432,31 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const textureImageData = textureCtx.getImageData(0, 0, textureCanvas.width, textureCanvas.height); const data = textureImageData.data; - for (let i = 0; i < data.length; i += 4) + for(let i = 0; i < data.length; i += 4) { - if (reds.length == 256) + if(reds.length == 256) { let paletteColor = reds[data[i]]; - if (paletteColor === undefined) paletteColor = 0; + if(paletteColor === undefined) paletteColor = 0; data[i] = ((paletteColor >> 16) & 0xFF); data[i + 1] = ((paletteColor >> 8) & 0xFF); data[i + 2] = (paletteColor & 0xFF); } - if (greens.length == 256) + if(greens.length == 256) { let paletteColor = greens[data[i + 1]]; - if (paletteColor === undefined) paletteColor = 0; + if(paletteColor === undefined) paletteColor = 0; data[i] = ((paletteColor >> 16) & 0xFF); data[i + 1] = ((paletteColor >> 8) & 0xFF); data[i + 2] = (paletteColor & 0xFF); } - if (blues.length == 256) + if(blues.length == 256) { let paletteColor = greens[data[i + 2]]; - if (paletteColor === undefined) paletteColor = 0; + if(paletteColor === undefined) paletteColor = 0; data[i] = ((paletteColor >> 16) & 0xFF); data[i + 1] = ((paletteColor >> 8) & 0xFF); @@ -478,13 +478,13 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public getImageAsSprite(setType: string, scale: number = 1): Sprite { - if (!this._mainAction) return null; + if(!this._mainAction) return null; - if (!this._actionsSorted) this.endActionAppends(); + if(!this._actionsSorted) this.endActionAppends(); const avatarCanvas = this._structure.getCanvas(this._scale, this._mainAction.definition.geometryType); - if (!avatarCanvas) return null; + if(!avatarCanvas) return null; const setTypes = this.getBodyParts(setType, this._mainAction.definition.geometryType, this._mainDirection); const container = new NitroSprite(); @@ -497,16 +497,16 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener let partCount = (setTypes.length - 1); - while (partCount >= 0) + while(partCount >= 0) { const set = setTypes[partCount]; const part = this._cache.getImageContainer(set, this._frameCounter); - if (part) + if(part) { const partCacheContainer = part.image; - if (!partCacheContainer) + if(!partCacheContainer) { container.destroy({ children: true @@ -517,7 +517,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const point = part.regPoint.clone(); - if (point) + if(point) { point.x += avatarCanvas.offset.x; point.y += avatarCanvas.offset.y; @@ -543,29 +543,29 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public getCroppedImage(setType: string, scale: number = 1): HTMLImageElement { - if (!this._mainAction) return null; + if(!this._mainAction) return null; - if (!this._actionsSorted) this.endActionAppends(); + if(!this._actionsSorted) this.endActionAppends(); const avatarCanvas = this._structure.getCanvas(this._scale, this._mainAction.definition.geometryType); - if (!avatarCanvas) return null; + if(!avatarCanvas) return null; const setTypes = this.getBodyParts(setType, this._mainAction.definition.geometryType, this._mainDirection); const container = new NitroContainer(); let partCount = (setTypes.length - 1); - while (partCount >= 0) + while(partCount >= 0) { const set = setTypes[partCount]; const part = this._cache.getImageContainer(set, this._frameCounter); - if (part) + if(part) { const partCacheContainer = part.image; - if (!partCacheContainer) + if(!partCacheContainer) { container.destroy({ children: true @@ -576,7 +576,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const point = part.regPoint.clone(); - if (point) + if(point) { point.x += avatarCanvas.offset.x; point.y += avatarCanvas.offset.y; @@ -588,7 +588,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener partContainer.addChild(partCacheContainer); - if (partContainer) + if(partContainer) { partContainer.position.set(point.x, point.y); @@ -604,7 +604,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener const image = TextureUtils.generateImage(texture); - if (!image) return null; + if(!image) return null; return image; } @@ -613,9 +613,9 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { const existing = this._fullImageCache.getValue(k); - if (existing) + if(existing) { - if (!existing.valid) + if(!existing.valid) { this._fullImageCache.remove(k); @@ -632,18 +632,18 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { const existing = this._fullImageCache.getValue(k); - if (existing) + if(existing) { this._fullImageCache.remove(k); existing.destroy(true); } - if (this._fullImageCache.length === this._fullImageCacheSize) + if(this._fullImageCache.length === this._fullImageCacheSize) { const oldestKey = this._fullImageCache.getKey(0); - if (oldestKey) + if(oldestKey) { const removed = this._fullImageCache.remove(oldestKey); @@ -676,13 +676,13 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { let k: ActiveActionData; - if (!this.sortActions()) return; + if(!this.sortActions()) return; - for (const k of this._sortedActions) + for(const k of this._sortedActions) { - if (k.actionType === AvatarAction.EFFECT) + if(k.actionType === AvatarAction.EFFECT) { - if (!this._effectManager.isAvatarEffectReady(parseInt(k.actionParameter))) this._effectManager.downloadAvatarEffect(parseInt(k.actionParameter), this); + if(!this._effectManager.isAvatarEffectReady(parseInt(k.actionParameter))) this._effectManager.downloadAvatarEffect(parseInt(k.actionParameter), this); } } @@ -696,14 +696,14 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._actionsSorted = false; - if (_args && (_args.length > 0)) _local_3 = _args[0]; + if(_args && (_args.length > 0)) _local_3 = _args[0]; - if ((_local_3 !== undefined) && (_local_3 !== null)) _local_3 = _local_3.toString(); + if((_local_3 !== undefined) && (_local_3 !== null)) _local_3 = _local_3.toString(); - switch (k) + switch(k) { case AvatarAction.POSTURE: - switch (_local_3) + switch(_local_3) { case AvatarAction.POSTURE_LAY: case AvatarAction.POSTURE_WALK: @@ -716,11 +716,11 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener case AvatarAction.SNOWWAR_DIE_BACK: case AvatarAction.SNOWWAR_PICK: case AvatarAction.SNOWWAR_THROW: - if ((_local_3 === AvatarAction.POSTURE_LAY) || (_local_3 === AvatarAction.POSTURE_LAY) || (_local_3 === AvatarAction.POSTURE_LAY)) + if((_local_3 === AvatarAction.POSTURE_LAY) || (_local_3 === AvatarAction.POSTURE_LAY) || (_local_3 === AvatarAction.POSTURE_LAY)) { - if (_local_3 === AvatarAction.POSTURE_LAY) + if(_local_3 === AvatarAction.POSTURE_LAY) { - if (this._mainDirection == 0) + if(this._mainDirection == 0) { this.setDirection(AvatarSetType.FULL, 4); } @@ -739,7 +739,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener } break; case AvatarAction.GESTURE: - switch (_local_3) + switch(_local_3) { case AvatarAction.GESTURE_AGGRAVATED: case AvatarAction.GESTURE_SAD: @@ -763,9 +763,9 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener case AvatarAction.EXPRESSION_SNOWBOARD_OLLIE: case AvatarAction.EXPRESSION_SNOWBORD_360: case AvatarAction.EXPRESSION_RIDE_JUMP: - if (_local_3 === AvatarAction.EFFECT) + if(_local_3 === AvatarAction.EFFECT) { - if ((((((_local_3 === '33') || (_local_3 === '34')) || (_local_3 === '35')) || (_local_3 === '36')) || (_local_3 === '38')) || (_local_3 === '39')) + if((((((_local_3 === '33') || (_local_3 === '34')) || (_local_3 === '35')) || (_local_3 === '36')) || (_local_3 === '38')) || (_local_3 === '39')) { this._useFullImageCache = true; } @@ -776,7 +776,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener case AvatarAction.CARRY_OBJECT: case AvatarAction.USE_OBJECT: { const _local_4 = this._structure.getActionDefinitionWithState(k); - if (_local_4) _local_3 = _local_4.getParameterValue(_local_3); + if(_local_4) _local_3 = _local_4.getParameterValue(_local_3); this.addActionData(k, _local_3); break; } @@ -788,13 +788,13 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener protected addActionData(k: string, _arg_2: string = ''): void { let _local_3: ActiveActionData; - if (!this._actions) this._actions = []; + if(!this._actions) this._actions = []; let _local_4 = 0; - while (_local_4 < this._actions.length) + while(_local_4 < this._actions.length) { _local_3 = this._actions[_local_4]; - if (((_local_3.actionType == k) && (_local_3.actionParameter == _arg_2))) + if(((_local_3.actionType == k) && (_local_3.actionParameter == _arg_2))) { return; } @@ -827,14 +827,14 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener let _local_2: IActionDefinition; let _local_3: ActiveActionData; let k: boolean; - if (this._sortedActions == null) + if(this._sortedActions == null) { return false; } - for (const _local_3 of this._sortedActions) + for(const _local_3 of this._sortedActions) { _local_2 = this._structure.getActionDefinitionWithState(_local_3.actionType); - if (((!(_local_2 == null)) && (_local_2.getPreventHeadTurn(_local_3.actionParameter)))) + if(((!(_local_2 == null)) && (_local_2.getPreventHeadTurn(_local_3.actionParameter)))) { k = true; } @@ -854,11 +854,11 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._sortedActions = this._structure.sortActions(this._actions); this._animationFrameCount = this._structure.maxFrames(this._sortedActions); - if (!this._sortedActions) + if(!this._sortedActions) { this._canvasOffsets = [0, 0, 0]; - if (this._lastActionsString !== '') + if(this._lastActionsString !== '') { k = true; @@ -869,15 +869,15 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener { this._canvasOffsets = this._structure.getCanvasOffsets(this._sortedActions, this._scale, this._mainDirection); - for (const _local_4 of this._sortedActions) + for(const _local_4 of this._sortedActions) { this._currentActionsString = (this._currentActionsString + (_local_4.actionType + _local_4.actionParameter)); - if (_local_4.actionType === AvatarAction.EFFECT) + if(_local_4.actionType === AvatarAction.EFFECT) { const _local_5 = parseInt(_local_4.actionParameter); - if (this._effectIdInUse !== _local_5) _local_2 = true; + if(this._effectIdInUse !== _local_5) _local_2 = true; this._effectIdInUse = _local_5; @@ -885,16 +885,16 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener } } - if (!_local_3) + if(!_local_3) { - if (this._effectIdInUse > -1) _local_2 = true; + if(this._effectIdInUse > -1) _local_2 = true; this._effectIdInUse = -1; } - if (_local_2) this._cache.disposeInactiveActions(0); + if(_local_2) this._cache.disposeInactiveActions(0); - if (this._lastActionsString != this._currentActionsString) + if(this._lastActionsString != this._currentActionsString) { k = true; @@ -909,60 +909,60 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener private setActionsToParts(): void { - if (!this._sortedActions == null) return; + if(!this._sortedActions == null) return; const _local_3: number = GetTickerTime(); const _local_4: string[] = []; - for (const k of this._sortedActions) _local_4.push(k.actionType); + for(const k of this._sortedActions) _local_4.push(k.actionType); - for (const k of this._sortedActions) + for(const k of this._sortedActions) { - if ((k && k.definition) && k.definition.isAnimation) + if((k && k.definition) && k.definition.isAnimation) { const _local_2 = this._structure.getAnimation(((k.definition.state + '.') + k.actionParameter)); - if (_local_2 && _local_2.hasOverriddenActions()) + if(_local_2 && _local_2.hasOverriddenActions()) { const _local_5 = _local_2.overriddenActionNames(); - if (_local_5) + if(_local_5) { - for (const _local_6 of _local_5) + for(const _local_6 of _local_5) { - if (_local_4.indexOf(_local_6) >= 0) k.overridingAction = _local_2.overridingAction(_local_6); + if(_local_4.indexOf(_local_6) >= 0) k.overridingAction = _local_2.overridingAction(_local_6); } } } - if (_local_2 && _local_2.resetOnToggle) + if(_local_2 && _local_2.resetOnToggle) { this._animationHasResetOnToggle = true; } } } - for (const k of this._sortedActions) + for(const k of this._sortedActions) { - if (!((!(k)) || (!(k.definition)))) + if(!((!(k)) || (!(k.definition)))) { - if (k.definition.isAnimation && (k.actionParameter === '')) k.actionParameter = '1'; + if(k.definition.isAnimation && (k.actionParameter === '')) k.actionParameter = '1'; this.setActionToParts(k, _local_3); - if (k.definition.isAnimation) + if(k.definition.isAnimation) { this._isAnimating = k.definition.isAnimated(k.actionParameter); const _local_2 = this._structure.getAnimation(((k.definition.state + '.') + k.actionParameter)); - if (_local_2) + if(_local_2) { this._sprites = this._sprites.concat(_local_2.spriteData); - if (_local_2.hasDirectionData()) this._directionOffset = _local_2.directionData.offset; + if(_local_2.hasDirectionData()) this._directionOffset = _local_2.directionData.offset; - if (_local_2.hasAvatarData()) this._avatarSpriteData = _local_2.avatarData; + if(_local_2.hasAvatarData()) this._avatarSpriteData = _local_2.avatarData; } } } @@ -971,15 +971,15 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener private setActionToParts(k: IActiveActionData, _arg_2: number): void { - if (((k == null) || (k.definition == null))) + if(((k == null) || (k.definition == null))) { return; } - if (k.definition.assetPartDefinition == '') + if(k.definition.assetPartDefinition == '') { return; } - if (k.definition.isMain) + if(k.definition.isMain) { this._mainAction = k; this._cache.setGeometryType(k.definition.geometryType); @@ -990,11 +990,11 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener private resetBodyPartCache(k: IActiveActionData): void { - if (!k) return; + if(!k) return; - if (k.definition.assetPartDefinition === '') return; + if(k.definition.assetPartDefinition === '') return; - if (k.definition.isMain) + if(k.definition.isMain) { this._mainAction = k; this._cache.setGeometryType(k.definition.geometryType); @@ -1016,7 +1016,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener let _local_5 = 0.33; const _local_6 = 1; - switch (channel) + switch(channel) { case AvatarImage.CHANNELS_UNIQUE: _local_3 = 0.3; @@ -1084,7 +1084,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener public resetEffect(effect: number): void { - if (effect === this._effectIdInUse) + if(effect === this._effectIdInUse) { this.resetActions(); this.setActionsToParts(); @@ -1092,7 +1092,7 @@ export class AvatarImage implements IAvatarImage, IAvatarEffectListener this._animationHasResetOnToggle = true; this._changes = true; - if (this._effectListener) this._effectListener.resetEffect(effect); + if(this._effectListener) this._effectListener.resetEffect(effect); } } } diff --git a/src/nitro/avatar/AvatarImagePartContainer.ts b/src/nitro/avatar/AvatarImagePartContainer.ts index a2a5dec5..a64d3b09 100644 --- a/src/nitro/avatar/AvatarImagePartContainer.ts +++ b/src/nitro/avatar/AvatarImagePartContainer.ts @@ -30,16 +30,16 @@ export class AvatarImagePartContainer this._isBlendable = isBlendable; this._blendTransform = null; - if (this._partType === 'ey') this._isColorable = false; + if(this._partType === 'ey') this._isColorable = false; } public getFrameIndex(k: number): number { - if (!this._frames || !this._frames.length) return 0; + if(!this._frames || !this._frames.length) return 0; const frameNumber = (k % this._frames.length); - if (this._frames[frameNumber] instanceof AvatarAnimationFrame) + if(this._frames[frameNumber] instanceof AvatarAnimationFrame) { return this._frames[frameNumber].number; } @@ -51,9 +51,9 @@ export class AvatarImagePartContainer { const frameNumber = (k % this._frames.length); - if (this._frames && (this._frames.length > frameNumber)) + if(this._frames && (this._frames.length > frameNumber)) { - if (this._frames[frameNumber] instanceof AvatarAnimationFrame) + if(this._frames[frameNumber] instanceof AvatarAnimationFrame) { return this._frames[frameNumber]; } @@ -66,9 +66,9 @@ export class AvatarImagePartContainer { const frameNumber = (k % this._frames.length); - if (this._frames && (this._frames.length > frameNumber)) + if(this._frames && (this._frames.length > frameNumber)) { - if (this._frames[frameNumber] instanceof AvatarAnimationFrame) + if(this._frames[frameNumber] instanceof AvatarAnimationFrame) { const frame = this._frames[frameNumber]; diff --git a/src/nitro/avatar/AvatarRenderManager.ts b/src/nitro/avatar/AvatarRenderManager.ts index c2474965..536f1d6f 100644 --- a/src/nitro/avatar/AvatarRenderManager.ts +++ b/src/nitro/avatar/AvatarRenderManager.ts @@ -8,7 +8,7 @@ import { AvatarAssetDownloadManager } from './AvatarAssetDownloadManager'; import { AvatarFigureContainer } from './AvatarFigureContainer'; import { AvatarImage } from './AvatarImage'; import { AvatarStructure } from './AvatarStructure'; -import { HabboAvatarAnimations } from "./data/HabboAvatarAnimations"; +import { HabboAvatarAnimations } from './data/HabboAvatarAnimations'; import { HabboAvatarGeometry } from './data/HabboAvatarGeometry'; import { HabboAvatarPartSets } from './data/HabboAvatarPartSets'; import { EffectAssetDownloadManager } from './EffectAssetDownloadManager'; @@ -74,7 +74,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); @@ -82,7 +82,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); @@ -95,14 +95,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); @@ -112,7 +112,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadGeometry(): void { - if (!this._structure) return; + if(!this._structure) return; this._structure.initGeometry(HabboAvatarGeometry.geometry); @@ -123,7 +123,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadPartSets(): void { - if (!this._structure) return; + if(!this._structure) return; this._structure.initPartSets(HabboAvatarPartSets.partSets); @@ -136,7 +136,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa { const defaultActions = NitroConfiguration.getValue('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(); @@ -148,7 +148,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)); @@ -171,7 +171,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private loadAnimations(): void { - if (!this._structure) return; + if(!this._structure) return; this._structure.initAnimation(HabboAvatarAnimations.animations); @@ -184,14 +184,14 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa { const defaultFigureData = NitroConfiguration.getValue('avatar.default.figuredata'); - if (!defaultFigureData || (typeof defaultFigureData === 'string')) + if(!defaultFigureData || (typeof defaultFigureData === 'string')) { NitroLogger.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(NitroConfiguration.getValue('avatar.figuredata.url'), (this._structure.figureData as IFigureSetData)); @@ -209,7 +209,7 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private onAvatarAssetDownloaderReady(event: INitroEvent): void { - if (!event) return; + if(!event) return; this._figureMapReady = true; @@ -218,14 +218,14 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private onAvatarAssetDownloaded(event: INitroEvent): void { - if (!event) return; + if(!event) return; this._aliasCollection.reset(); } private onEffectAssetDownloaderReady(event: INitroEvent): void { - if (!event) return; + if(!event) return; this._effectMapReady = true; @@ -234,20 +234,20 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa private onEffectAssetDownloaded(event: INitroEvent): 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 @@ -257,25 +257,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); @@ -284,7 +284,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); } @@ -295,17 +295,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]); @@ -316,15 +316,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]); @@ -341,49 +341,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; @@ -405,7 +405,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)); } @@ -418,11 +418,11 @@ export class AvatarRenderManager extends NitroManager implements IAvatarRenderMa const structure = this.structureData; const partSets: IFigurePartSet[] = []; - for (const setId of setIds) + for(const setId of setIds) { const partSet = structure.getFigurePartSet(setId); - if (partSet) partSets.push(partSet); + if(partSet) partSets.push(partSet); } return partSets; @@ -430,7 +430,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); } @@ -457,7 +457,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/AvatarStructure.ts b/src/nitro/avatar/AvatarStructure.ts index 24377c1c..4d8d0ebe 100644 --- a/src/nitro/avatar/AvatarStructure.ts +++ b/src/nitro/avatar/AvatarStructure.ts @@ -42,7 +42,7 @@ export class AvatarStructure extends EventDispatcher public dispose(): void { - if (this.disposed) return; + if(this.disposed) return; super.dispose(); @@ -55,14 +55,14 @@ export class AvatarStructure extends EventDispatcher public initGeometry(k: any): void { - if (!k) return; + if(!k) return; this._geometry = new AvatarModelGeometry(k); } public initActions(k: IAssetManager, _arg_2: any): void { - if (!_arg_2) return; + if(!_arg_2) return; this._actionManager = new AvatarActionManager(k, _arg_2); this._defaultAction = this._actionManager.getDefaultAction(); @@ -77,9 +77,9 @@ export class AvatarStructure extends EventDispatcher public initPartSets(k: any): boolean { - if (!k) return false; + if(!k) return false; - if (this._partSetsData.parse(k)) + if(this._partSetsData.parse(k)) { this._partSetsData.getPartDefinition('ri').appendToFigure = true; this._partSetsData.getPartDefinition('li').appendToFigure = true; @@ -92,14 +92,14 @@ export class AvatarStructure extends EventDispatcher public initAnimation(k: any): boolean { - if (!k) return false; + if(!k) return false; return this._animationData.parse(k); } public initFigureData(k: IFigureData): boolean { - if (!k) return false; + if(!k) return false; return this._figureData.parse(k); } @@ -113,11 +113,11 @@ export class AvatarStructure extends EventDispatcher { let index = 0; - while (index < _arg_3) + while(index < _arg_3) { const collection = k.getCollection((_arg_2 + index)); - if (collection) + if(collection) { const animationData = collection.data; @@ -137,15 +137,15 @@ export class AvatarStructure extends EventDispatcher { const _local_4 = k.getPartColorIds(_arg_2); - if ((!(_local_4)) || (_local_4.length < _arg_3)) return null; + if((!(_local_4)) || (_local_4.length < _arg_3)) return null; const _local_5 = this._figureData.getSetType(_arg_2); - if (_local_5 == null) return null; + if(_local_5 == null) return null; const _local_6 = this._figureData.getPalette(_local_5.paletteID); - if (!_local_6) return null; + if(!_local_6) return null; return _local_6.getColor(_local_4[_arg_3]); } @@ -184,7 +184,7 @@ export class AvatarStructure extends EventDispatcher { let _local_2 = 0; - for (const _local_3 of k) + for(const _local_3 of k) { _local_2 = Math.max(_local_2, this._animationData.getFrameCount(_local_3.definition)); } @@ -193,12 +193,12 @@ export class AvatarStructure extends EventDispatcher public getMandatorySetTypeIds(k: string, _arg_2: number): string[] { - if (!this._mandatorySetTypeIds[k]) + if(!this._mandatorySetTypeIds[k]) { this._mandatorySetTypeIds[k] = []; } - if (this._mandatorySetTypeIds[k][_arg_2]) + if(this._mandatorySetTypeIds[k][_arg_2]) { return this._mandatorySetTypeIds[k][_arg_2]; } @@ -235,16 +235,16 @@ export class AvatarStructure extends EventDispatcher const _local_4: string[] = []; const _local_5 = k.definition.geometryType; - if (k.definition.isAnimation) + if(k.definition.isAnimation) { const _local_7 = ((k.definition.state + '.') + k.actionParameter); const _local_8 = this._animationManager.getAnimation(_local_7); - if (_local_8) + if(_local_8) { _local_3 = _local_8.getAnimatedBodyPartIds(0, k.overridingAction); - if (_local_8.hasAddData()) + if(_local_8.hasAddData()) { const _local_11 = { id: '', @@ -262,11 +262,11 @@ export class AvatarStructure extends EventDispatcher setType: '' }; - for (const _local_13 of _local_8.addData) + for(const _local_13 of _local_8.addData) { const _local_6 = this._geometry.getBodyPart(_local_5, _local_13.align); - if (_local_6) + if(_local_6) { _local_11.id = _local_13.id; _local_6.addPart(_local_11, _arg_2); @@ -276,30 +276,30 @@ export class AvatarStructure extends EventDispatcher const _local_10 = this._partSetsData.addPartDefinition(_local_12); _local_10.appendToFigure = true; - if (_local_13.base === '') _local_10.staticId = 1; + if(_local_13.base === '') _local_10.staticId = 1; - if (_local_4.indexOf(_local_6.id) === -1) _local_4.push(_local_6.id); + if(_local_4.indexOf(_local_6.id) === -1) _local_4.push(_local_6.id); } } } } - for (const _local_9 of _local_3) + for(const _local_9 of _local_3) { const _local_6 = this._geometry.getBodyPart(_local_5, _local_9); - if (_local_6 && (_local_4.indexOf(_local_6.id) === -1)) _local_4.push(_local_6.id); + if(_local_6 && (_local_4.indexOf(_local_6.id) === -1)) _local_4.push(_local_6.id); } } else { _local_3 = this._partSetsData.getActiveParts(k.definition); - for (const _local_14 of _local_3) + for(const _local_14 of _local_3) { const _local_6 = this._geometry.getBodyPartOfItem(_local_5, _local_14, _arg_2); - if (_local_6 && (_local_4.indexOf(_local_6.id) === -1)) _local_4.push(_local_6.id); + if(_local_6 && (_local_4.indexOf(_local_6.id) === -1)) _local_4.push(_local_6.id); } } @@ -322,7 +322,7 @@ export class AvatarStructure extends EventDispatcher { const _local_5 = this._animationData.getAction(k.definition); - if (_local_5) return _local_5.getFrameBodyPartOffset(_arg_2, _arg_3, _arg_4); + if(_local_5) return _local_5.getFrameBodyPartOffset(_arg_2, _arg_3, _arg_4); return AnimationAction.DEFAULT_OFFSET; } @@ -335,31 +335,31 @@ export class AvatarStructure extends EventDispatcher let _local_20: AvatarAnimationFrame[] = []; let _local_36: IPartColor = null; - if (!_arg_3 == null) return []; + if(!_arg_3 == null) return []; const _local_9 = this._partSetsData.getActiveParts(_arg_3.definition); const _local_11: AvatarImagePartContainer[] = []; let _local_14: any[] = [0]; const _local_15 = this._animationData.getAction(_arg_3.definition); - if (_arg_3.definition.isAnimation) + if(_arg_3.definition.isAnimation) { const _local_24 = ((_arg_3.definition.state + '.') + _arg_3.actionParameter); const _local_10 = this._animationManager.getAnimation(_local_24); - if (_local_10) + if(_local_10) { _local_14 = this.getPopulatedArray(_local_10.frameCount(_arg_3.overridingAction)); - for (const _local_25 of _local_10.getAnimatedBodyPartIds(0, _arg_3.overridingAction)) + for(const _local_25 of _local_10.getAnimatedBodyPartIds(0, _arg_3.overridingAction)) { - if (_local_25 === k) + if(_local_25 === k) { const _local_26 = this._geometry.getBodyPart(_arg_4, _local_25); - if (_local_26) + if(_local_26) { - for (const _local_27 of _local_26.getDynamicParts(_arg_7)) + for(const _local_27 of _local_26.getDynamicParts(_arg_7)) { _local_9.push(_local_27.id); } @@ -372,11 +372,11 @@ export class AvatarStructure extends EventDispatcher const _local_16 = this._geometry.getParts(_arg_4, k, _arg_5, _local_9, _arg_7); const _local_21 = _arg_2.getPartTypeIds(); - for (const _local_17 of _local_21) + for(const _local_17 of _local_21) { - if (_arg_8) + if(_arg_8) { - if (_arg_8.get(_local_17)) continue; + if(_arg_8.get(_local_17)) continue; } const _local_28 = _arg_2.getPartSetId(_local_17); @@ -385,27 +385,27 @@ export class AvatarStructure extends EventDispatcher - if (_local_30) + if(_local_30) { const _local_31 = this._figureData.getPalette(_local_30.paletteID); - if (_local_31) + if(_local_31) { const _local_32 = _local_30.getPartSet(_local_28); - if (_local_32) + if(_local_32) { removes = removes.concat(_local_32.hiddenLayers); - for (const _local_33 of _local_32.parts) + for(const _local_33 of _local_32.parts) { - if (_local_16.indexOf(_local_33.type) > -1) + if(_local_16.indexOf(_local_33.type) > -1) { - if (_local_15) + if(_local_15) { const _local_19 = _local_15.getPart(_local_33.type); - if (_local_19) + if(_local_19) { _local_20 = _local_19.frames; } @@ -421,15 +421,15 @@ export class AvatarStructure extends EventDispatcher _local_34 = _arg_3.definition; - if (_local_9.indexOf(_local_33.type) === -1) _local_34 = this._defaultAction; + if(_local_9.indexOf(_local_33.type) === -1) _local_34 = this._defaultAction; const _local_13 = this._partSetsData.getPartDefinition(_local_33.type); let _local_35 = (!_local_13) ? _local_33.type : _local_13.flippedSetType; - if (!_local_35 || (_local_35 === '')) _local_35 = _local_33.type; + if(!_local_35 || (_local_35 === '')) _local_35 = _local_33.type; - if (_local_29 && (_local_29.length > (_local_33.colorLayerIndex - 1))) + if(_local_29 && (_local_29.length > (_local_33.colorLayerIndex - 1))) { _local_36 = _local_31.getColor(_local_29[(_local_33.colorLayerIndex - 1)]); } @@ -447,18 +447,18 @@ export class AvatarStructure extends EventDispatcher const _local_22: AvatarImagePartContainer[] = []; - for (const _local_12 of _local_16) + for(const _local_12 of _local_16) { let _local_39: IPartColor = null; let _local_38 = false; const _local_40 = ((_arg_8) && (_arg_8.get(_local_12))); - for (const _local_23 of _local_11) + for(const _local_23 of _local_11) { - if (_local_23.partType === _local_12) + if(_local_23.partType === _local_12) { - if (_local_40) + if(_local_40) { _local_39 = _local_23.color; } @@ -466,31 +466,31 @@ export class AvatarStructure extends EventDispatcher { _local_38 = true; - if (removes.indexOf(_local_12) === -1) _local_22.push(_local_23); + if(removes.indexOf(_local_12) === -1) _local_22.push(_local_23); } } } - if (!_local_38) + if(!_local_38) { - if (_local_40) + if(_local_40) { const _local_41 = _arg_8.get(_local_12); let _local_42 = 0; let _local_43 = 0; - while (_local_43 < _local_41.length) + while(_local_43 < _local_41.length) { _local_42 = (_local_42 + _local_41.charCodeAt(_local_43)); _local_43++; } - if (_local_15) + if(_local_15) { const _local_19 = _local_15.getPart(_local_12); - if (_local_19) + if(_local_19) { _local_20 = _local_19.frames; } @@ -510,11 +510,11 @@ export class AvatarStructure extends EventDispatcher } else { - if (_local_9.indexOf(_local_12) > -1) + if(_local_9.indexOf(_local_12) > -1) { const _local_44 = this._geometry.getBodyPartOfItem(_arg_4, _local_12, _arg_7); - if (k !== _local_44.id) + if(k !== _local_44.id) { // } @@ -525,36 +525,36 @@ export class AvatarStructure extends EventDispatcher let _local_45 = false; let _local_46 = 1; - if (_local_13.appendToFigure) + if(_local_13.appendToFigure) { let _local_47 = '1'; - if (_arg_3.actionParameter !== '') + if(_arg_3.actionParameter !== '') { _local_47 = _arg_3.actionParameter; } - if (_local_13.hasStaticId()) + if(_local_13.hasStaticId()) { _local_47 = _local_13.staticId.toString(); } - if (_local_10 != null) + if(_local_10 != null) { const _local_48 = _local_10.getAddData(_local_12); - if (_local_48) + if(_local_48) { _local_45 = _local_48.isBlended; _local_46 = _local_48.blend; } } - if (_local_15) + if(_local_15) { const _local_19 = _local_15.getPart(_local_12); - if (_local_19) + if(_local_19) { _local_20 = _local_19.frames; } @@ -587,7 +587,7 @@ export class AvatarStructure extends EventDispatcher let index = 0; - while (index < k) + while(index < k) { _local_2.push(index); @@ -599,13 +599,13 @@ export class AvatarStructure extends EventDispatcher public getItemIds(): string[] { - if (this._actionManager) + if(this._actionManager) { const k = this._actionManager.getActionDefinition('CarryItem').params; const _local_2 = []; - for (const _local_3 of k.values()) _local_2.push(_local_3); + for(const _local_3 of k.values()) _local_2.push(_local_3); return _local_2; } diff --git a/src/nitro/avatar/EffectAssetDownloadLibrary.ts b/src/nitro/avatar/EffectAssetDownloadLibrary.ts index 9a7db8df..8d91fd820 100644 --- a/src/nitro/avatar/EffectAssetDownloadLibrary.ts +++ b/src/nitro/avatar/EffectAssetDownloadLibrary.ts @@ -33,16 +33,16 @@ export class EffectAssetDownloadLibrary extends EventDispatcher implements IEffe const asset = this._assets.getCollection(this._libraryName); - if (asset) this._state = EffectAssetDownloadLibrary.LOADED; + if(asset) this._state = EffectAssetDownloadLibrary.LOADED; } public downloadAsset(): void { - if (!this._assets || (this._state === EffectAssetDownloadLibrary.LOADING) || (this._state === EffectAssetDownloadLibrary.LOADED)) return; + if(!this._assets || (this._state === EffectAssetDownloadLibrary.LOADING) || (this._state === EffectAssetDownloadLibrary.LOADED)) return; const asset = this._assets.getCollection(this._libraryName); - if (asset) + if(asset) { this._state = EffectAssetDownloadLibrary.LOADED; @@ -55,13 +55,13 @@ export class EffectAssetDownloadLibrary extends EventDispatcher implements IEffe this._assets.downloadAsset(this._downloadUrl, (flag: boolean) => { - if (flag) + if(flag) { this._state = EffectAssetDownloadLibrary.LOADED; const collection = this._assets.getCollection(this._libraryName); - if (collection) this._animation = collection.data.animations; + if(collection) this._animation = collection.data.animations; this.dispatchEvent(new AvatarRenderEffectLibraryEvent(AvatarRenderEffectLibraryEvent.DOWNLOAD_COMPLETE, this)); } diff --git a/src/nitro/avatar/EffectAssetDownloadManager.ts b/src/nitro/avatar/EffectAssetDownloadManager.ts index 4627c2fe..4d46c1df 100644 --- a/src/nitro/avatar/EffectAssetDownloadManager.ts +++ b/src/nitro/avatar/EffectAssetDownloadManager.ts @@ -61,7 +61,7 @@ export class EffectAssetDownloadManager extends EventDispatcher request.onloadend = e => { - if (request.responseText) + if(request.responseText) { const data = JSON.parse(request.responseText); @@ -89,17 +89,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); @@ -109,7 +109,7 @@ export class EffectAssetDownloadManager extends EventDispatcher let existing = this._effectMap.get(id); - if (!existing) existing = []; + if(!existing) existing = []; existing.push(downloadLibrary); @@ -119,7 +119,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]); @@ -128,13 +128,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); @@ -143,24 +143,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: INitroEvent): 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); } @@ -170,34 +170,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)); } @@ -208,17 +208,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++; @@ -229,19 +229,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; } @@ -255,17 +255,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); } } @@ -274,9 +274,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); @@ -285,7 +285,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/actions/ActionDefinition.ts b/src/nitro/avatar/actions/ActionDefinition.ts index 5729dc41..cf4163ba 100644 --- a/src/nitro/avatar/actions/ActionDefinition.ts +++ b/src/nitro/avatar/actions/ActionDefinition.ts @@ -41,22 +41,22 @@ export class ActionDefinition implements IActionDefinition this._defaultParameterValue = ''; this._canvasOffsets = null; - if (data.params && (data.params.length > 0)) + if(data.params && (data.params.length > 0)) { - for (const param of data.params) + for(const param of data.params) { - if (!param) continue; + if(!param) continue; - if (param.id === 'default') this._defaultParameterValue = param.value; + if(param.id === 'default') this._defaultParameterValue = param.value; else this._params.set(param.id, param.value); } } - if (data.types && (data.types.length > 0)) + if(data.types && (data.types.length > 0)) { - for (const type of data.types) + for(const type of data.types) { - if (!type) continue; + if(!type) continue; const action = new ActionType(type); @@ -67,11 +67,11 @@ export class ActionDefinition implements IActionDefinition public setOffsets(k: string, _arg_2: number, _arg_3: number[]): void { - if (!this._canvasOffsets) this._canvasOffsets = new Map(); + if(!this._canvasOffsets) this._canvasOffsets = new Map(); let existing = this._canvasOffsets.get(k); - if (!existing) + if(!existing) { existing = new Map(); @@ -83,33 +83,33 @@ export class ActionDefinition implements IActionDefinition public getOffsets(k: string, _arg_2: number): number[] { - if (!this._canvasOffsets) return null; + if(!this._canvasOffsets) return null; const existing = this._canvasOffsets.get(k); - if (!existing) return null; + if(!existing) return null; return existing.get(_arg_2); } public getType(id: string): ActionType { - if (!id) return null; + if(!id) return null; const existing = this._types.get(parseInt(id)); - if (!existing) return null; + if(!existing) return null; return existing; } public getParameterValue(id: string): string { - if (!id) return ''; + if(!id) return ''; const existing = this._params.get(id); - if (!existing) return this._defaultParameterValue; + if(!existing) return this._defaultParameterValue; return existing; } @@ -121,33 +121,33 @@ export class ActionDefinition implements IActionDefinition private getTypePrevents(type: string): string[] { - if (!type) return []; + if(!type) return []; const existing = this._types.get(parseInt(type)); - if (!existing) return []; + if(!existing) return []; return existing.prevents; } public getPreventHeadTurn(k: string): boolean { - if (!k) return this._preventHeadTurn; + if(!k) return this._preventHeadTurn; const type = this.getType(k); - if (!type) return this._preventHeadTurn; + if(!type) return this._preventHeadTurn; return type.preventHeadTurn; } public isAnimated(k: string): boolean { - if (!k) return true; + if(!k) return true; const type = this.getType(k); - if (!type) return true; + if(!type) return true; return type.isAnimated; } diff --git a/src/nitro/avatar/actions/ActiveActionData.ts b/src/nitro/avatar/actions/ActiveActionData.ts index 0664c591..44883543 100644 --- a/src/nitro/avatar/actions/ActiveActionData.ts +++ b/src/nitro/avatar/actions/ActiveActionData.ts @@ -26,7 +26,7 @@ export class ActiveActionData implements IActiveActionData public get id(): string { - if (!this._definition) return ''; + if(!this._definition) return ''; return this._definition.id + '_' + this._actionParameter; } diff --git a/src/nitro/avatar/actions/AvatarActionManager.ts b/src/nitro/avatar/actions/AvatarActionManager.ts index d267d8ac..a50cabd5 100644 --- a/src/nitro/avatar/actions/AvatarActionManager.ts +++ b/src/nitro/avatar/actions/AvatarActionManager.ts @@ -18,36 +18,36 @@ export class AvatarActionManager public updateActions(data: any): void { - if (!data) return; + if(!data) return; - for (const action of data.actions) + for(const action of data.actions) { - if (!action || !action.state) continue; + if(!action || !action.state) continue; const definition = new ActionDefinition(action); this._actions.set(definition.state, definition); } - if (data.actionOffsets) this.parseActionOffsets(data.actionOffsets); + if(data.actionOffsets) this.parseActionOffsets(data.actionOffsets); } private parseActionOffsets(offsets: any): void { - if (!offsets || !offsets.length) return; + if(!offsets || !offsets.length) return; - for (const offset of offsets) + for(const offset of offsets) { const action = this._actions.get(offset.action); - if (!action) continue; + if(!action) continue; - for (const canvasOffset of offset.offsets) + for(const canvasOffset of offset.offsets) { const size = (canvasOffset.size || ''); const direction = canvasOffset.direction; - if ((size === '') || (direction === undefined)) continue; + if((size === '') || (direction === undefined)) continue; const x = (canvasOffset.x || 0); const y = (canvasOffset.y || 0); @@ -60,11 +60,11 @@ export class AvatarActionManager public getActionDefinition(id: string): ActionDefinition { - if (!id) return null; + if(!id) return null; - for (const action of this._actions.values()) + for(const action of this._actions.values()) { - if (!action || (action.id !== id)) continue; + if(!action || (action.id !== id)) continue; return action; } @@ -76,18 +76,18 @@ export class AvatarActionManager { const existing = this._actions.get(state); - if (!existing) return null; + if(!existing) return null; return existing; } public getDefaultAction(): ActionDefinition { - if (this._defaultAction) return this._defaultAction; + if(this._defaultAction) return this._defaultAction; - for (const action of this._actions.values()) + for(const action of this._actions.values()) { - if (!action || !action.isDefault) continue; + if(!action || !action.isDefault) continue; this._defaultAction = action; @@ -101,14 +101,14 @@ export class AvatarActionManager { let canvasOffsets: number[] = []; - for (const activeAction of k) + for(const activeAction of k) { - if (!activeAction) continue; + if(!activeAction) continue; const action = this._actions.get(activeAction.actionType); const offsets = action && action.getOffsets(_arg_2, _arg_3); - if (offsets) canvasOffsets = offsets; + if(offsets) canvasOffsets = offsets; } return canvasOffsets; @@ -116,19 +116,19 @@ export class AvatarActionManager public sortActions(actions: IActiveActionData[]): IActiveActionData[] { - if (!actions) return null; + if(!actions) return null; actions = this.filterActions(actions); const validatedActions: IActiveActionData[] = []; - for (const action of actions) + for(const action of actions) { - if (!action) continue; + if(!action) continue; const definition = this._actions.get(action.actionType); - if (!definition) continue; + if(!definition) continue; action.definition = definition; @@ -145,24 +145,24 @@ export class AvatarActionManager let preventions: string[] = []; const activeActions: IActiveActionData[] = []; - for (const action of actions) + for(const action of actions) { - if (!action) continue; + if(!action) continue; const localAction = this._actions.get(action.actionType); - if (localAction) preventions = preventions.concat(localAction.getPrevents(action.actionParameter)); + if(localAction) preventions = preventions.concat(localAction.getPrevents(action.actionParameter)); } - for (const action of actions) + for(const action of actions) { - if (!action) continue; + if(!action) continue; let actionType = action.actionType; - if (action.actionType === 'fx') actionType = (actionType + ('.' + action.actionParameter)); + if(action.actionType === 'fx') actionType = (actionType + ('.' + action.actionParameter)); - if (preventions.indexOf(actionType) >= 0) continue; + if(preventions.indexOf(actionType) >= 0) continue; activeActions.push(action); } @@ -172,14 +172,14 @@ export class AvatarActionManager private sortByPrecedence(actionOne: IActiveActionData, actionTwo: IActiveActionData): number { - if (!actionOne || !actionTwo) return 0; + if(!actionOne || !actionTwo) return 0; const precedenceOne = actionOne.definition.precedence; const precedenceTwo = actionTwo.definition.precedence; - if (precedenceOne < precedenceTwo) return 1; + if(precedenceOne < precedenceTwo) return 1; - if (precedenceOne > precedenceTwo) return -1; + if(precedenceOne > precedenceTwo) return -1; return 0; } diff --git a/src/nitro/avatar/animation/Animation.ts b/src/nitro/avatar/animation/Animation.ts index 54c204ea..74c5b8e0 100644 --- a/src/nitro/avatar/animation/Animation.ts +++ b/src/nitro/avatar/animation/Animation.ts @@ -36,37 +36,37 @@ export class Animation implements IAnimation this._overrideFrames = null; this._resetOnToggle = (_arg_2.resetOnToggle || false); - if (_arg_2.sprites && _arg_2.sprites.length) + if(_arg_2.sprites && _arg_2.sprites.length) { this._spriteData = []; - for (const sprite of _arg_2.sprites) this._spriteData.push(new SpriteDataContainer(this, sprite)); + for(const sprite of _arg_2.sprites) this._spriteData.push(new SpriteDataContainer(this, sprite)); } - if (_arg_2.avatars && _arg_2.avatars.length) this._avatarData = new AvatarDataContainer(_arg_2.avatars[0]); + if(_arg_2.avatars && _arg_2.avatars.length) this._avatarData = new AvatarDataContainer(_arg_2.avatars[0]); - if (_arg_2.directions && _arg_2.directions.length) this._directionData = new DirectionDataContainer(_arg_2.directions[0]); + if(_arg_2.directions && _arg_2.directions.length) this._directionData = new DirectionDataContainer(_arg_2.directions[0]); - if (_arg_2.removes && _arg_2.removes.length) + if(_arg_2.removes && _arg_2.removes.length) { this._removeData = []; - for (const remove of _arg_2.removes) this._removeData.push(remove.id); + for(const remove of _arg_2.removes) this._removeData.push(remove.id); } - if (_arg_2.adds && _arg_2.adds.length) + if(_arg_2.adds && _arg_2.adds.length) { this._addData = []; - for (const add of _arg_2.adds) this._addData.push(new AddDataContainer(add)); + for(const add of _arg_2.adds) this._addData.push(new AddDataContainer(add)); } - if (_arg_2.overrides && _arg_2.overrides.length) + if(_arg_2.overrides && _arg_2.overrides.length) { this._overrideFrames = new Map(); this._overriddenActions = new Map(); - for (const override of _arg_2.overrides) + for(const override of _arg_2.overrides) { const name = override.name; const value = override.override; @@ -86,23 +86,23 @@ export class Animation implements IAnimation private parseFrames(frames: AvatarAnimationLayerData[][], _arg_2: IAssetAnimationFrame[], _arg_3: AvatarStructure): void { - if (!_arg_2 || !_arg_2.length) return; + if(!_arg_2 || !_arg_2.length) return; - for (const frame of _arg_2) + for(const frame of _arg_2) { let repeats = 1; - if (frame.repeats && (frame.repeats > 1)) repeats = frame.repeats; + if(frame.repeats && (frame.repeats > 1)) repeats = frame.repeats; let index = 0; - while (index < repeats) + while(index < repeats) { const layers: AvatarAnimationLayerData[] = []; - if (frame.bodyparts && frame.bodyparts.length) + if(frame.bodyparts && frame.bodyparts.length) { - for (const bodyPart of frame.bodyparts) + for(const bodyPart of frame.bodyparts) { const definition = _arg_3.getActionDefinition(bodyPart.action); const layer = new AvatarAnimationLayerData(bodyPart, AvatarAnimationLayerData.BODYPART, definition); @@ -111,9 +111,9 @@ export class Animation implements IAnimation } } - if (frame.fxs && frame.fxs.length) + if(frame.fxs && frame.fxs.length) { - for (const fx of frame.fxs) + for(const fx of frame.fxs) { const definition = _arg_3.getActionDefinition(fx.action); const layer = new AvatarAnimationLayerData(fx, AvatarAnimationLayerData.FX, definition); @@ -131,13 +131,13 @@ export class Animation implements IAnimation public frameCount(k: string = null): number { - if (!k) return this._frames.length; + if(!k) return this._frames.length; - if (this._overrideFrames) + if(this._overrideFrames) { const _local_2 = this._overrideFrames.get(k); - if (_local_2) return _local_2.length; + if(_local_2) return _local_2.length; } return 0; @@ -145,38 +145,38 @@ export class Animation implements IAnimation public hasOverriddenActions(): boolean { - if (!this._overriddenActions) return false; + if(!this._overriddenActions) return false; return (this._overriddenActions.size > 0); } public overriddenActionNames(): string[] { - if (!this._overriddenActions) return null; + if(!this._overriddenActions) return null; const keys: string[] = []; - for (const key of this._overriddenActions.keys()) keys.push(key); + for(const key of this._overriddenActions.keys()) keys.push(key); return keys; } public overridingAction(k: string): string { - if (!this._overriddenActions) return null; + if(!this._overriddenActions) return null; return this._overriddenActions.get(k); } private getFrame(frameCount: number, _arg_2: string = null): AvatarAnimationLayerData[] { - if (frameCount < 0) frameCount = 0; + if(frameCount < 0) frameCount = 0; let layers: AvatarAnimationLayerData[] = []; - if (!_arg_2) + if(!_arg_2) { - if (this._frames.length > 0) + if(this._frames.length > 0) { layers = this._frames[(frameCount % this._frames.length)]; } @@ -185,7 +185,7 @@ export class Animation implements IAnimation { const overrideLayers = this._overrideFrames.get(_arg_2); - if (overrideLayers && (overrideLayers.length > 0)) + if(overrideLayers && (overrideLayers.length > 0)) { layers = overrideLayers[(frameCount % overrideLayers.length)]; } @@ -198,20 +198,20 @@ export class Animation implements IAnimation { const _local_3: string[] = []; - for (const layer of this.getFrame(k, _arg_2)) + for(const layer of this.getFrame(k, _arg_2)) { - if (layer.type === AvatarAnimationLayerData.BODYPART) + if(layer.type === AvatarAnimationLayerData.BODYPART) { _local_3.push(layer.id); } - else if (layer.type === AvatarAnimationLayerData.FX) + else if(layer.type === AvatarAnimationLayerData.FX) { - if (this._addData && this._addData.length) + if(this._addData && this._addData.length) { - for (const _local_5 of this._addData) + for(const _local_5 of this._addData) { - if (_local_5.id === layer.id) _local_3.push(_local_5.align); + if(_local_5.id === layer.id) _local_3.push(_local_5.align); } } } @@ -222,17 +222,17 @@ export class Animation implements IAnimation public getLayerData(frameCount: number, spriteId: string, _arg_3: string = null): AvatarAnimationLayerData { - for (const layer of this.getFrame(frameCount, _arg_3)) + for(const layer of this.getFrame(frameCount, _arg_3)) { - if (layer.id === spriteId) return layer; + if(layer.id === spriteId) return layer; - if (layer.type === AvatarAnimationLayerData.FX) + if(layer.type === AvatarAnimationLayerData.FX) { - if (this._addData && this._addData.length) + if(this._addData && this._addData.length) { - for (const addData of this._addData) + for(const addData of this._addData) { - if (((addData.align === spriteId) && (addData.id === layer.id))) return layer; + if(((addData.align === spriteId) && (addData.id === layer.id))) return layer; } } } @@ -258,11 +258,11 @@ export class Animation implements IAnimation public getAddData(k: string): AddDataContainer { - if (this._addData) + if(this._addData) { - for (const _local_2 of this._addData) + for(const _local_2 of this._addData) { - if (_local_2.id === k) return _local_2; + if(_local_2.id === k) return _local_2; } } diff --git a/src/nitro/avatar/animation/AnimationManager.ts b/src/nitro/avatar/animation/AnimationManager.ts index 86ae66d1..528abac6 100644 --- a/src/nitro/avatar/animation/AnimationManager.ts +++ b/src/nitro/avatar/animation/AnimationManager.ts @@ -26,7 +26,7 @@ export class AnimationManager implements IAnimationManager { const existing = this._animations.get(animation); - if (!existing) return null; + if(!existing) return null; return existing; } @@ -35,7 +35,7 @@ export class AnimationManager implements IAnimationManager { const existing = this.getAnimation(animation); - if (!existing) return null; + if(!existing) return null; return existing.getLayerData(frameCount, spriteId); } diff --git a/src/nitro/avatar/animation/AvatarAnimationLayerData.ts b/src/nitro/avatar/animation/AvatarAnimationLayerData.ts index 18d055b2..d4124309 100644 --- a/src/nitro/avatar/animation/AvatarAnimationLayerData.ts +++ b/src/nitro/avatar/animation/AvatarAnimationLayerData.ts @@ -29,13 +29,13 @@ export class AvatarAnimationLayerData implements IAnimationLayerData this._base = (k.base || ''); this._items = new Map(); - if (k.items) for (const _local_4 of k.items) this._items.set(_local_4.id, _local_4.base); + if(k.items) for(const _local_4 of k.items) this._items.set(_local_4.id, _local_4.base); let _local_5 = ''; - if (this._base !== '') _local_5 = this.baseAsInt().toString(); + if(this._base !== '') _local_5 = this.baseAsInt().toString(); - if (_arg_3) + if(_arg_3) { this._action = new ActiveActionData(_arg_3.state, this.base); this._action.definition = _arg_3; @@ -52,7 +52,7 @@ export class AvatarAnimationLayerData implements IAnimationLayerData let k = 0; let index = 0; - while (index < this._base.length) + while(index < this._base.length) { k = (k + this._base.charCodeAt(index)); diff --git a/src/nitro/avatar/animation/AvatarDataContainer.ts b/src/nitro/avatar/animation/AvatarDataContainer.ts index dd52d993..258cbb84 100644 --- a/src/nitro/avatar/animation/AvatarDataContainer.ts +++ b/src/nitro/avatar/animation/AvatarDataContainer.ts @@ -41,7 +41,7 @@ export class AvatarDataContainer implements IAvatarDataContainer this._alphaMultiplier = 1; this._paletteIsGrayscale = true; - if (this._ink === 37) + if(this._ink === 37) { this._alphaMultiplier = 0.5; this._paletteIsGrayscale = false; @@ -110,9 +110,9 @@ export class AvatarDataContainer implements IAvatarDataContainer let _local_22 = greenBackground; let _local_23 = blueBackground; - for (let i = 0; i < 256; i++) + for(let i = 0; i < 256; i++) { - if ((((_local_21 == redBackground) && (_local_22 == greenBackground)) && (_local_23 == blueBackground))) + if((((_local_21 == redBackground) && (_local_22 == greenBackground)) && (_local_23 == blueBackground))) { _local_20 = 0; } diff --git a/src/nitro/avatar/animation/SpriteDataContainer.ts b/src/nitro/avatar/animation/SpriteDataContainer.ts index 4c49b5f2..e3c818ea 100644 --- a/src/nitro/avatar/animation/SpriteDataContainer.ts +++ b/src/nitro/avatar/animation/SpriteDataContainer.ts @@ -26,13 +26,13 @@ export class SpriteDataContainer implements ISpriteDataContainer const directions = _arg_2.directionList; - if (directions && directions.length) + if(directions && directions.length) { - for (const direction of directions) + for(const direction of directions) { const id = direction.id; - if (id === undefined) continue; + if(id === undefined) continue; this._dx[id] = (direction.dx || 0); this._dy[id] = (direction.dy || 0); @@ -43,21 +43,21 @@ export class SpriteDataContainer implements ISpriteDataContainer public getDirectionOffsetX(k: number): number { - if (k < this._dx.length) return this._dx[k]; + if(k < this._dx.length) return this._dx[k]; return 0; } public getDirectionOffsetY(k: number): number { - if (k < this._dy.length) return this._dy[k]; + if(k < this._dy.length) return this._dy[k]; return 0; } public getDirectionOffsetZ(k: number): number { - if (k < this._dz.length) return this._dz[k]; + if(k < this._dz.length) return this._dz[k]; return 0; } diff --git a/src/nitro/avatar/cache/AvatarImageActionCache.ts b/src/nitro/avatar/cache/AvatarImageActionCache.ts index e38bec8f..5cc57fef 100644 --- a/src/nitro/avatar/cache/AvatarImageActionCache.ts +++ b/src/nitro/avatar/cache/AvatarImageActionCache.ts @@ -17,11 +17,11 @@ export class AvatarImageActionCache { this.debugInfo('[dispose]'); - if (!this._cache) return; + if(!this._cache) return; - for (const direction of this._cache.values()) + for(const direction of this._cache.values()) { - if (direction) direction.dispose(); + if(direction) direction.dispose(); } this._cache.clear(); @@ -31,7 +31,7 @@ export class AvatarImageActionCache { const existing = this._cache.get(k.toString()); - if (!existing) return null; + if(!existing) return null; return existing; } diff --git a/src/nitro/avatar/cache/AvatarImageBodyPartCache.ts b/src/nitro/avatar/cache/AvatarImageBodyPartCache.ts index fed0968c..660355aa 100644 --- a/src/nitro/avatar/cache/AvatarImageBodyPartCache.ts +++ b/src/nitro/avatar/cache/AvatarImageBodyPartCache.ts @@ -15,20 +15,20 @@ export class AvatarImageBodyPartCache public setAction(k: IActiveActionData, _arg_2: number): void { - if (!this._currentAction) this._currentAction = k; + if(!this._currentAction) this._currentAction = k; const _local_3 = this.getActionCache(this._currentAction); - if (_local_3) _local_3.setLastAccessTime(_arg_2); + if(_local_3) _local_3.setLastAccessTime(_arg_2); this._currentAction = k; } public dispose(): void { - if (!this._disposed) + if(!this._disposed) { - if (!this._cache) return; + if(!this._cache) return; this.disposeActions(0, 2147483647); @@ -41,15 +41,15 @@ export class AvatarImageBodyPartCache public disposeActions(k: number, _arg_2: number): void { - if (!this._cache || this._disposed) return; + if(!this._cache || this._disposed) return; - for (const [key, cache] of this._cache.entries()) + for(const [key, cache] of this._cache.entries()) { - if (!cache) continue; + if(!cache) continue; const _local_3 = cache.getLastAccessTime(); - if ((_arg_2 - _local_3) >= k) + if((_arg_2 - _local_3) >= k) { cache.dispose(); @@ -75,18 +75,18 @@ export class AvatarImageBodyPartCache public getActionCache(k: IActiveActionData = null): AvatarImageActionCache { - if (!this._currentAction) return null; + if(!this._currentAction) return null; - if (!k) k = this._currentAction; + if(!k) k = this._currentAction; - if (k.overridingAction) return this._cache.get(k.overridingAction); + if(k.overridingAction) return this._cache.get(k.overridingAction); return this._cache.get(k.id); } public updateActionCache(k: IActiveActionData, _arg_2: AvatarImageActionCache): void { - if (k.overridingAction) this._cache.set(k.overridingAction, _arg_2); + if(k.overridingAction) this._cache.set(k.overridingAction, _arg_2); else this._cache.set(k.id, _arg_2); } diff --git a/src/nitro/avatar/cache/AvatarImageCache.ts b/src/nitro/avatar/cache/AvatarImageCache.ts index 60718e51..beb4a061 100644 --- a/src/nitro/avatar/cache/AvatarImageCache.ts +++ b/src/nitro/avatar/cache/AvatarImageCache.ts @@ -45,7 +45,7 @@ export class AvatarImageCache public dispose(): void { - if (this._disposed) return; + if(this._disposed) return; this._structure = null; this._avatar = null; @@ -53,11 +53,11 @@ export class AvatarImageCache this._canvas = null; this._disposed = true; - if (this._cache) + if(this._cache) { - for (const cache of this._cache.values()) + for(const cache of this._cache.values()) { - if (!cache) continue; + if(!cache) continue; cache.dispose(); } @@ -65,11 +65,11 @@ export class AvatarImageCache this._cache = null; } - if (this._unionImages) + if(this._unionImages) { - for (const image of this._unionImages) + for(const image of this._unionImages) { - if (!image) continue; + if(!image) continue; image.dispose(); } @@ -82,11 +82,11 @@ export class AvatarImageCache { const time = GetTickerTime(); - if (this._cache) + if(this._cache) { - for (const cache of this._cache.values()) + for(const cache of this._cache.values()) { - if (!cache) continue; + if(!cache) continue; cache.disposeActions(k, time); } @@ -95,11 +95,11 @@ export class AvatarImageCache public resetBodyPartCache(k: IActiveActionData): void { - if (this._cache) + if(this._cache) { - for (const cache of this._cache.values()) + for(const cache of this._cache.values()) { - if (!cache) continue; + if(!cache) continue; cache.setAction(k, 0); } @@ -110,13 +110,13 @@ export class AvatarImageCache { const parts = this._structure.getBodyPartsUnordered(k); - if (parts) + if(parts) { - for (const part of parts) + for(const part of parts) { const actionCache = this.getBodyPartCache(part); - if (!actionCache) continue; + if(!actionCache) continue; actionCache.setDirection(_arg_2); } @@ -127,19 +127,19 @@ export class AvatarImageCache { const _local_3 = this._structure.getActiveBodyPartIds(k, this._avatar); - for (const _local_4 of _local_3) + for(const _local_4 of _local_3) { const _local_5 = this.getBodyPartCache(_local_4); - if (_local_5) _local_5.setAction(k, _arg_2); + if(_local_5) _local_5.setAction(k, _arg_2); } } public setGeometryType(k: string): void { - if (this._geometryType === k) return; + if(this._geometryType === k) return; - if ((((this._geometryType === GeometryType.SITTING) && (k === GeometryType.VERTICAL)) || ((this._geometryType === GeometryType.VERTICAL) && (k === GeometryType.SITTING)) || ((this._geometryType === GeometryType.SNOWWARS_HORIZONTAL) && (k = GeometryType.SNOWWARS_HORIZONTAL)))) + if((((this._geometryType === GeometryType.SITTING) && (k === GeometryType.VERTICAL)) || ((this._geometryType === GeometryType.VERTICAL) && (k === GeometryType.SITTING)) || ((this._geometryType === GeometryType.SNOWWARS_HORIZONTAL) && (k = GeometryType.SNOWWARS_HORIZONTAL)))) { this._geometryType = k; this._canvas = null; @@ -157,7 +157,7 @@ export class AvatarImageCache { let _local_4 = this.getBodyPartCache(k); - if (!_local_4) + if(!_local_4) { _local_4 = new AvatarImageBodyPartCache(); @@ -168,48 +168,48 @@ export class AvatarImageCache let _local_7 = _local_4.getAction(); let frameCount = frameNumber; - if (_local_7.definition.startFromFrameZero) frameCount -= _local_7.startFrame; + if(_local_7.definition.startFromFrameZero) frameCount -= _local_7.startFrame; let _local_8 = _local_7; let _local_9: string[] = []; let _local_10: Map = new Map(); const _local_11 = new Point(); - if (!((!(_local_7)) || (!(_local_7.definition)))) + if(!((!(_local_7)) || (!(_local_7.definition)))) { - if (_local_7.definition.isAnimation) + if(_local_7.definition.isAnimation) { let _local_15 = _local_5; const _local_16 = this._structure.getAnimation(((_local_7.definition.state + '.') + _local_7.actionParameter)); const _local_17 = (frameNumber - _local_7.startFrame); - if (_local_16) + if(_local_16) { const _local_18 = _local_16.getLayerData(_local_17, k, _local_7.overridingAction); - if (_local_18) + if(_local_18) { _local_15 = (_local_5 + _local_18.dd); - if (_local_18.dd < 0) + if(_local_18.dd < 0) { - if (_local_15 < 0) + if(_local_15 < 0) { _local_15 = (8 + _local_15); } - else if (_local_15 > 7) _local_15 = (8 - _local_15); + else if(_local_15 > 7) _local_15 = (8 - _local_15); } else { - if (_local_15 < 0) + if(_local_15 < 0) { _local_15 = (_local_15 + 8); } - else if (_local_15 > 7) _local_15 = (_local_15 - 8); + else if(_local_15 > 7) _local_15 = (_local_15 - 8); } - if (this._scale === AvatarScaleType.LARGE) + if(this._scale === AvatarScaleType.LARGE) { _local_11.x = _local_18.dx; _local_11.y = _local_18.dy; @@ -222,21 +222,21 @@ export class AvatarImageCache frameCount = _local_18.animationFrame; - if (_local_18.action) + if(_local_18.action) { _local_7 = _local_18.action; } - if (_local_18.type === AvatarAnimationLayerData.BODYPART) + if(_local_18.type === AvatarAnimationLayerData.BODYPART) { - if (_local_18.action != null) + if(_local_18.action != null) { _local_8 = _local_18.action; } _local_5 = _local_15; } - else if (_local_18.type === AvatarAnimationLayerData.FX) _local_5 = _local_15; + else if(_local_18.type === AvatarAnimationLayerData.FX) _local_5 = _local_15; _local_10 = _local_18.items; } @@ -248,7 +248,7 @@ export class AvatarImageCache let _local_12 = _local_4.getActionCache(_local_8); - if (!_local_12 || _arg_3) + if(!_local_12 || _arg_3) { _local_12 = new AvatarImageActionCache(); _local_4.updateActionCache(_local_8, _local_12); @@ -256,7 +256,7 @@ export class AvatarImageCache let _local_13 = _local_12.getDirectionCache(_local_5); - if (!_local_13 || _arg_3) + if(!_local_13 || _arg_3) { const _local_19 = this._structure.getParts(k, this._avatar.getFigure(), _local_8, this._geometryType, _local_5, _local_9, this._avatar, _local_10); @@ -267,15 +267,15 @@ export class AvatarImageCache let _local_14 = _local_13.getImageContainer(frameCount); - if (!_local_14 || _arg_3) + if(!_local_14 || _arg_3) { const _local_20 = _local_13.getPartList(); _local_14 = this.renderBodyPart(_local_5, _local_20, frameCount, _local_7, _arg_3); - if (_local_14 && !_arg_3) + if(_local_14 && !_arg_3) { - if (_local_14.isCacheable) _local_13.updateImageContainer(_local_14, frameCount); + if(_local_14.isCacheable) _local_13.updateImageContainer(_local_14, frameCount); } else { @@ -304,7 +304,7 @@ export class AvatarImageCache { let existing = this._cache.get(k); - if (!existing) + if(!existing) { existing = new AvatarImageBodyPartCache(); @@ -316,13 +316,13 @@ export class AvatarImageCache private renderBodyPart(direction: number, containers: AvatarImagePartContainer[], frameCount: number, _arg_4: IActiveActionData, renderServerData: boolean = false): AvatarImageBodyPartContainer { - if (!containers || !containers.length) return null; + if(!containers || !containers.length) return null; - if (!this._canvas) + if(!this._canvas) { this._canvas = this._structure.getCanvas(this._scale, this._geometryType); - if (!this._canvas) return null; + if(!this._canvas) return null; } const isFlipped = AvatarDirectionAngle.DIRECTION_IS_FLIPPED[direction] || false; @@ -330,15 +330,15 @@ export class AvatarImageCache let isCacheable = true; let containerIndex = (containers.length - 1); - while (containerIndex >= 0) + while(containerIndex >= 0) { const container = containers[containerIndex]; let color = 16777215; - if (!((direction == 7) && ((container.partType === 'fc') || (container.partType === 'ey')))) + if(!((direction == 7) && ((container.partType === 'fc') || (container.partType === 'ey')))) { - if (!((container.partType === 'ri') && !container.partId)) + if(!((container.partType === 'ri') && !container.partId)) { const partId = container.partId; const animationFrame = container.getFrameDefinition(frameCount); @@ -346,59 +346,59 @@ export class AvatarImageCache let partType = container.partType; let frameNumber = 0; - if (animationFrame) + if(animationFrame) { frameNumber = animationFrame.number; - if ((animationFrame.assetPartDefinition) && (animationFrame.assetPartDefinition !== '')) assetPartDefinition = animationFrame.assetPartDefinition; + if((animationFrame.assetPartDefinition) && (animationFrame.assetPartDefinition !== '')) assetPartDefinition = animationFrame.assetPartDefinition; } else frameNumber = container.getFrameIndex(frameCount); let assetDirection = direction; let flipH = false; - if (isFlipped) + if(isFlipped) { - if (((assetPartDefinition === 'wav') && (((partType === AvatarFigurePartType.LEFT_HAND) || (partType === AvatarFigurePartType.LEFT_SLEEVE)) || (partType === AvatarFigurePartType.LEFT_COAT_SLEEVE))) || ((assetPartDefinition === 'drk') && (((partType === AvatarFigurePartType.RIGHT_HAND) || (partType === AvatarFigurePartType.RIGHT_SLEEVE)) || (partType === AvatarFigurePartType.RIGHT_COAT_SLEEVE))) || ((assetPartDefinition === 'blw') && (partType === AvatarFigurePartType.RIGHT_HAND)) || ((assetPartDefinition === 'sig') && (partType === AvatarFigurePartType.LEFT_HAND)) || ((assetPartDefinition === 'respect') && (partType === AvatarFigurePartType.LEFT_HAND)) || (partType === AvatarFigurePartType.RIGHT_HAND_ITEM) || (partType === AvatarFigurePartType.LEFT_HAND_ITEM) || (partType === AvatarFigurePartType.CHEST_PRINT)) + if(((assetPartDefinition === 'wav') && (((partType === AvatarFigurePartType.LEFT_HAND) || (partType === AvatarFigurePartType.LEFT_SLEEVE)) || (partType === AvatarFigurePartType.LEFT_COAT_SLEEVE))) || ((assetPartDefinition === 'drk') && (((partType === AvatarFigurePartType.RIGHT_HAND) || (partType === AvatarFigurePartType.RIGHT_SLEEVE)) || (partType === AvatarFigurePartType.RIGHT_COAT_SLEEVE))) || ((assetPartDefinition === 'blw') && (partType === AvatarFigurePartType.RIGHT_HAND)) || ((assetPartDefinition === 'sig') && (partType === AvatarFigurePartType.LEFT_HAND)) || ((assetPartDefinition === 'respect') && (partType === AvatarFigurePartType.LEFT_HAND)) || (partType === AvatarFigurePartType.RIGHT_HAND_ITEM) || (partType === AvatarFigurePartType.LEFT_HAND_ITEM) || (partType === AvatarFigurePartType.CHEST_PRINT)) { flipH = true; } else { - if (direction === 4) assetDirection = 2; - else if (direction === 5) assetDirection = 1; - else if (direction === 6) assetDirection = 0; + if(direction === 4) assetDirection = 2; + else if(direction === 5) assetDirection = 1; + else if(direction === 6) assetDirection = 0; - if (container.flippedPartType !== partType) partType = container.flippedPartType; + if(container.flippedPartType !== partType) partType = container.flippedPartType; } } let assetName = (this._scale + '_' + assetPartDefinition + '_' + partType + '_' + partId + '_' + assetDirection + '_' + frameNumber); let asset = this._assets.getAsset(assetName); - if (!asset) + if(!asset) { assetName = (this._scale + '_std_' + partType + '_' + partId + '_' + assetDirection + '_0'); asset = this._assets.getAsset(assetName); } - if (asset) + if(asset) { const texture = asset.texture; - if (!texture || !texture.valid || !texture.baseTexture) + if(!texture || !texture.valid || !texture.baseTexture) { isCacheable = false; } else { - if (container.isColorable && container.color) color = container.color.rgb; + if(container.isColorable && container.color) color = container.color.rgb; const offset = new Point(-(asset.x), -(asset.y)); - if (flipH) offset.x = (offset.x + ((this._scale === AvatarScaleType.LARGE) ? 65 : 31)); + if(flipH) offset.x = (offset.x + ((this._scale === AvatarScaleType.LARGE) ? 65 : 31)); - if (renderServerData) + if(renderServerData) { const spriteData = new RoomObjectSpriteData(); @@ -410,17 +410,17 @@ export class AvatarImageCache spriteData.height = asset.rectangle.height; spriteData.flipH = flipH; - if (assetPartDefinition === 'lay') spriteData.x = (spriteData.x + 53); + if(assetPartDefinition === 'lay') spriteData.x = (spriteData.x + 53); - if (isFlipped) + if(isFlipped) { spriteData.flipH = (!(spriteData.flipH)); - if (spriteData.flipH) spriteData.x = (-(spriteData.x) - texture.width); + if(spriteData.flipH) spriteData.x = (-(spriteData.x) - texture.width); else spriteData.x = (spriteData.x + 65); } - if (container.isColorable) spriteData.color = `${color}`; + if(container.isColorable) spriteData.color = `${color}`; this._serverRenderData.push(spriteData); } @@ -434,21 +434,21 @@ export class AvatarImageCache containerIndex--; } - if (!this._unionImages.length) return null; + if(!this._unionImages.length) return null; const imageData = this.createUnionImage(this._unionImages, isFlipped); const canvasOffset = ((this._scale === AvatarScaleType.LARGE) ? (this._canvas.height - 16) : (this._canvas.height - 8)); const offset = new Point(-(imageData.regPoint.x), (canvasOffset - imageData.regPoint.y)); - if (isFlipped && (assetPartDefinition !== 'lay')) offset.x = (offset.x + ((this._scale === AvatarScaleType.LARGE) ? 67 : 31)); + if(isFlipped && (assetPartDefinition !== 'lay')) offset.x = (offset.x + ((this._scale === AvatarScaleType.LARGE) ? 67 : 31)); let imageIndex = (this._unionImages.length - 1); - while (imageIndex >= 0) + while(imageIndex >= 0) { const _local_17 = this._unionImages.pop(); - if (_local_17) _local_17.dispose(); + if(_local_17) _local_17.dispose(); imageIndex--; } @@ -459,7 +459,7 @@ export class AvatarImageCache private convertColorToHex(k: number): string { let _local_2: string = (k * 0xFF).toString(16); - if (_local_2.length < 2) + if(_local_2.length < 2) { _local_2 = ('0' + _local_2); } @@ -470,7 +470,7 @@ export class AvatarImageCache { const bounds = new Rectangle(); - for (const data of k) data && bounds.enlarge(data.offsetRect); + for(const data of k) data && bounds.enlarge(data.offsetRect); const point = new Point(-(bounds.x), -(bounds.y)); const container = new NitroContainer(); @@ -482,9 +482,9 @@ export class AvatarImageCache container.addChild(sprite); - for (const data of k) + for(const data of k) { - if (!data) continue; + if(!data) continue; const texture = data.texture; const color = data.colorTransform; @@ -494,9 +494,9 @@ export class AvatarImageCache regPoint.x -= data.regPoint.x; regPoint.y -= data.regPoint.y; - if (isFlipped) regPoint.x = (container.width - (regPoint.x + data.rect.width)); + if(isFlipped) regPoint.x = (container.width - (regPoint.x + data.rect.width)); - if (flipH) + if(flipH) { this._matrix.a = -1; this._matrix.tx = ((data.rect.x + data.rect.width) + regPoint.x); diff --git a/src/nitro/avatar/geometry/AvatarModelGeometry.ts b/src/nitro/avatar/geometry/AvatarModelGeometry.ts index b447f31f..0ad6fcab 100644 --- a/src/nitro/avatar/geometry/AvatarModelGeometry.ts +++ b/src/nitro/avatar/geometry/AvatarModelGeometry.ts @@ -25,27 +25,27 @@ export class AvatarModelGeometry const camera = k.camera; - if (camera) + if(camera) { this._camera.x = parseFloat(camera.x); this._camera.y = parseFloat(camera.y); this._camera.z = parseFloat(camera.z); } - if (k.canvases && (k.canvases.length > 0)) + if(k.canvases && (k.canvases.length > 0)) { - for (const canvas of k.canvases) + for(const canvas of k.canvases) { - if (!canvas) continue; + if(!canvas) continue; const scale = canvas.scale; const geometries = new Map(); - if (canvas.geometries && (canvas.geometries.length > 0)) + if(canvas.geometries && (canvas.geometries.length > 0)) { - for (const geometry of canvas.geometries) + for(const geometry of canvas.geometries) { - if (!geometry) continue; + if(!geometry) continue; const avatarCanvas = new AvatarCanvas(geometry, scale); @@ -57,26 +57,26 @@ export class AvatarModelGeometry } } - if (k.types && (k.types.length > 0)) + if(k.types && (k.types.length > 0)) { - for (const type of k.types) + for(const type of k.types) { - if (!type) continue; + if(!type) continue; const bodyParts: Map = new Map(); const itemIds: Map = new Map(); - if (type.bodyParts && (type.bodyParts.length > 0)) + if(type.bodyParts && (type.bodyParts.length > 0)) { - for (const bodyPart of type.bodyParts) + for(const bodyPart of type.bodyParts) { - if (!bodyPart) continue; + if(!bodyPart) continue; const geometryBodyPart = new GeometryBodyPart(bodyPart); bodyParts.set(geometryBodyPart.id, geometryBodyPart); - for (const part of geometryBodyPart.getPartIds(null)) + for(const part of geometryBodyPart.getPartIds(null)) { itemIds.set(part, geometryBodyPart); } @@ -91,13 +91,13 @@ export class AvatarModelGeometry public removeDynamicItems(k: IAvatarImage): void { - for (const geometry of this._geometryTypes.values()) + for(const geometry of this._geometryTypes.values()) { - if (!geometry) continue; + if(!geometry) continue; - for (const part of geometry.values()) + for(const part of geometry.values()) { - if (!part) continue; + if(!part) continue; part.removeDynamicParts(k); } @@ -108,7 +108,7 @@ export class AvatarModelGeometry { const avatarSet = this._avatarSet.findAvatarSet(k); - if (!avatarSet) return []; + if(!avatarSet) return []; return avatarSet.getBodyParts(); } @@ -117,7 +117,7 @@ export class AvatarModelGeometry { const avatarSet = this._avatarSet.findAvatarSet(k); - if (!avatarSet) return false; + if(!avatarSet) return false; return avatarSet.isMain; } @@ -126,7 +126,7 @@ export class AvatarModelGeometry { const canvas = this._canvases.get(k); - if (!canvas) return null; + if(!canvas) return null; return (canvas.get(_arg_2) || null); } @@ -135,18 +135,18 @@ export class AvatarModelGeometry { const existing = this._geometryTypes.get(k); - if (existing) return true; + if(existing) return true; return false; } private hasBodyPart(k: string, _arg_2: string): boolean { - if (this.typeExists(k)) + if(this.typeExists(k)) { const existing = this._geometryTypes.get(k); - if (existing && existing.get(_arg_2)) return true; + if(existing && existing.get(_arg_2)) return true; } return false; @@ -158,11 +158,11 @@ export class AvatarModelGeometry const types = []; - if (parts) + if(parts) { - for (const part of parts.values()) + for(const part of parts.values()) { - if (!part) continue; + if(!part) continue; types.push(part.id); } @@ -173,7 +173,7 @@ export class AvatarModelGeometry private getBodyPartsOfType(k: string): Map { - if (this.typeExists(k)) return this._geometryTypes.get(k); + if(this.typeExists(k)) return this._geometryTypes.get(k); return new Map(); } @@ -187,21 +187,21 @@ export class AvatarModelGeometry { const itemIds = this._itemIdToBodyPartMap.get(k); - if (itemIds) + if(itemIds) { const part = itemIds.get(_arg_2); - if (part) return part; + if(part) return part; const parts = this.getBodyPartsOfType(k); - if (parts) + if(parts) { - for (const part of parts.values()) + for(const part of parts.values()) { - if (!part) continue; + if(!part) continue; - if (part.hasPart(_arg_2, _arg_3)) return part; + if(part.hasPart(_arg_2, _arg_3)) return part; } } } @@ -214,13 +214,13 @@ export class AvatarModelGeometry const parts = this.getBodyPartIdsInAvatarSet(_arg_2); const geometryParts = []; - for (const part of parts) + for(const part of parts) { - if (!part) continue; + if(!part) continue; const bodyPart = k.get(part); - if (bodyPart) + if(bodyPart) { geometryParts.push(bodyPart); } @@ -231,7 +231,7 @@ export class AvatarModelGeometry public getBodyPartsAtAngle(k: string, _arg_2: number, _arg_3: string): string[] { - if (!_arg_3) return []; + if(!_arg_3) return []; const geometryParts = this.getBodyPartsOfType(_arg_3); const parts = this.getBodyPartsInAvatarSet(geometryParts, k); @@ -240,9 +240,9 @@ export class AvatarModelGeometry this._transformation = Matrix4x4.getYRotationMatrix(_arg_2); - for (const part of parts.values()) + for(const part of parts.values()) { - if (!part) continue; + if(!part) continue; part.applyTransform(this._transformation); @@ -254,16 +254,16 @@ export class AvatarModelGeometry const partA = a[0]; const partB = b[0]; - if (partA < partB) return -1; + if(partA < partB) return -1; - if (partA > partB) return 1; + if(partA > partB) return 1; return 0; }); - for (const set of sets) + for(const set of sets) { - if (!set) continue; + if(!set) continue; ids.push(set[1].id); } @@ -273,7 +273,7 @@ export class AvatarModelGeometry public getParts(k: string, _arg_2: string, _arg_3: number, _arg_4: any[], _arg_5: IAvatarImage): string[] { - if (this.hasBodyPart(k, _arg_2)) + if(this.hasBodyPart(k, _arg_2)) { const part = this.getBodyPartsOfType(k).get(_arg_2); diff --git a/src/nitro/avatar/geometry/GeometryBodyPart.ts b/src/nitro/avatar/geometry/GeometryBodyPart.ts index 1ad78eeb..1c23eb4c 100644 --- a/src/nitro/avatar/geometry/GeometryBodyPart.ts +++ b/src/nitro/avatar/geometry/GeometryBodyPart.ts @@ -20,11 +20,11 @@ export class GeometryBodyPart extends Node3D this._parts = new Map(); this._dynamicParts = new Map(); - if (k.items && (k.items.length > 0)) + if(k.items && (k.items.length > 0)) { - for (const item of k.items) + for(const item of k.items) { - if (!item) continue; + if(!item) continue; const geometryItem = new GeometryItem(item); @@ -38,13 +38,13 @@ export class GeometryBodyPart extends Node3D const existing = this._dynamicParts.get(k); const parts: GeometryItem[] = []; - if (existing) + if(existing) { - for (const index in existing) + for(const index in existing) { const item = existing[index]; - if (!item) continue; + if(!item) continue; parts.push(item); } @@ -57,24 +57,24 @@ export class GeometryBodyPart extends Node3D { const ids: string[] = []; - for (const part of this._parts.values()) + for(const part of this._parts.values()) { - if (!part) continue; + if(!part) continue; ids.push(part.id); } - if (k) + if(k) { const existing = this._dynamicParts.get(k); - if (existing) + if(existing) { - for (const index in existing) + for(const index in existing) { const part = existing[index]; - if (!part) continue; + if(!part) continue; ids.push(part.id); } @@ -93,11 +93,11 @@ export class GeometryBodyPart extends Node3D public addPart(k: any, _arg_2: IAvatarImage): boolean { - if (this.hasPart(k.id, _arg_2)) return false; + if(this.hasPart(k.id, _arg_2)) return false; let existing = this._dynamicParts.get(_arg_2); - if (!existing) + if(!existing) { existing = {}; @@ -113,7 +113,7 @@ export class GeometryBodyPart extends Node3D { let existingPart = (this._parts.get(k) || null); - if (!existingPart && (this._dynamicParts.get(_arg_2) !== undefined)) + if(!existingPart && (this._dynamicParts.get(_arg_2) !== undefined)) { existingPart = (this._dynamicParts.get(_arg_2)[k] || null); } @@ -125,9 +125,9 @@ export class GeometryBodyPart extends Node3D { const parts: [number, GeometryItem][] = []; - for (const part of this._parts.values()) + for(const part of this._parts.values()) { - if (!part) continue; + if(!part) continue; part.applyTransform(k); @@ -136,13 +136,13 @@ export class GeometryBodyPart extends Node3D const existingDynamic = this._dynamicParts.get(_arg_4); - if (existingDynamic) + if(existingDynamic) { - for (const index in existingDynamic) + for(const index in existingDynamic) { const part = existingDynamic[index]; - if (!part) continue; + if(!part) continue; part.applyTransform(k); @@ -155,18 +155,18 @@ export class GeometryBodyPart extends Node3D const partA = a[0]; const partB = b[0]; - if (partA < partB) return -1; + if(partA < partB) return -1; - if (partA > partB) return 1; + if(partA > partB) return 1; return 0; }); const partIds: string[] = []; - for (const part of parts) + for(const part of parts) { - if (!part) continue; + if(!part) continue; partIds.push(part[1].id); } diff --git a/src/nitro/avatar/structure/AvatarAnimationData.ts b/src/nitro/avatar/structure/AvatarAnimationData.ts index 186e9fef..f8b2618e 100644 --- a/src/nitro/avatar/structure/AvatarAnimationData.ts +++ b/src/nitro/avatar/structure/AvatarAnimationData.ts @@ -12,11 +12,11 @@ export class AvatarAnimationData implements IFigureSetData public parse(data: any): boolean { - if (data && (data.length > 0)) + if(data && (data.length > 0)) { - for (const animation of data) + for(const animation of data) { - if (!animation) continue; + if(!animation) continue; const newAnimation = new AnimationAction(animation); @@ -29,7 +29,7 @@ export class AvatarAnimationData implements IFigureSetData public appendJSON(k: any): boolean { - for (const _local_2 of k.action) + for(const _local_2 of k.action) { this._actions.set(_local_2.id, new AnimationAction(_local_2)); } @@ -41,7 +41,7 @@ export class AvatarAnimationData implements IFigureSetData { const existing = this._actions.get(action.id); - if (!existing) return null; + if(!existing) return null; return existing; } @@ -50,7 +50,7 @@ export class AvatarAnimationData implements IFigureSetData { const animationAction = this.getAction(k); - if (!animationAction) return 0; + if(!animationAction) return 0; return animationAction.frameCount; } diff --git a/src/nitro/avatar/structure/AvatarCanvas.ts b/src/nitro/avatar/structure/AvatarCanvas.ts index aef33a0b..9916e682 100644 --- a/src/nitro/avatar/structure/AvatarCanvas.ts +++ b/src/nitro/avatar/structure/AvatarCanvas.ts @@ -16,7 +16,7 @@ export class AvatarCanvas this._height = k.height; this._offset = new Point(k.dx, k.dy); - if (_arg_2 == AvatarScaleType.LARGE) this._regPoint = new Point(((this._width - 64) / 2), 0); + if(_arg_2 == AvatarScaleType.LARGE) this._regPoint = new Point(((this._width - 64) / 2), 0); else this._regPoint = new Point(((this._width - 32) / 2), 0); } diff --git a/src/nitro/avatar/structure/AvatarStructureDownload.ts b/src/nitro/avatar/structure/AvatarStructureDownload.ts index b3eb9688..365925c6 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/avatar/structure/FigureSetData.ts b/src/nitro/avatar/structure/FigureSetData.ts index 9957a6e3..b8554575 100644 --- a/src/nitro/avatar/structure/FigureSetData.ts +++ b/src/nitro/avatar/structure/FigureSetData.ts @@ -19,22 +19,22 @@ export class FigureSetData implements IFigureSetData, IStructureData public parse(data: IFigureData): boolean { - if (!data) return false; + if(!data) return false; - for (const palette of data.palettes) + for(const palette of data.palettes) { const newPalette = new Palette(palette); - if (!newPalette) continue; + if(!newPalette) continue; this._palettes.set(newPalette.id.toString(), newPalette); } - for (const set of data.setTypes) + for(const set of data.setTypes) { const newSet = new SetType(set); - if (!newSet) continue; + if(!newSet) continue; this._setTypes.set(newSet.type, newSet); } @@ -44,11 +44,11 @@ export class FigureSetData implements IFigureSetData, IStructureData public injectJSON(data: IFigureData): void { - for (const setType of data.setTypes) + for(const setType of data.setTypes) { const existingSetType = this._setTypes.get(setType.type); - if (existingSetType) existingSetType.cleanUp(setType); + if(existingSetType) existingSetType.cleanUp(setType); else this._setTypes.set(setType.type, new SetType(setType)); } @@ -57,23 +57,23 @@ export class FigureSetData implements IFigureSetData, IStructureData public appendJSON(data: IFigureData): boolean { - if (!data) return false; + if(!data) return false; - for (const palette of data.palettes) + for(const palette of data.palettes) { const id = palette.id.toString(); const existingPalette = this._palettes.get(id); - if (!existingPalette) this._palettes.set(id, new Palette(palette)); + if(!existingPalette) this._palettes.set(id, new Palette(palette)); else existingPalette.append(palette); } - for (const setType of data.setTypes) + for(const setType of data.setTypes) { const type = setType.type; const existingSetType = this._setTypes.get(type); - if (!existingSetType) this._setTypes.set(type, new SetType(setType)); + if(!existingSetType) this._setTypes.set(type, new SetType(setType)); else existingSetType.append(setType); } @@ -84,9 +84,9 @@ export class FigureSetData implements IFigureSetData, IStructureData { const types: string[] = []; - for (const set of this._setTypes.values()) + for(const set of this._setTypes.values()) { - if (!set || !set.isMandatory(k, _arg_2)) continue; + if(!set || !set.isMandatory(k, _arg_2)) continue; types.push(set.type); } @@ -98,7 +98,7 @@ export class FigureSetData implements IFigureSetData, IStructureData { const setType = this._setTypes.get(type); - if (!setType) return null; + if(!setType) return null; return setType.getDefaultPartSet(gender); } @@ -115,11 +115,11 @@ export class FigureSetData implements IFigureSetData, IStructureData public getFigurePartSet(k: number): IFigurePartSet { - for (const set of this._setTypes.values()) + for(const set of this._setTypes.values()) { const partSet = set.getPartSet(k); - if (!partSet) continue; + if(!partSet) continue; return partSet; } diff --git a/src/nitro/avatar/structure/PartSetsData.ts b/src/nitro/avatar/structure/PartSetsData.ts index 184b2c52..36548ee5 100644 --- a/src/nitro/avatar/structure/PartSetsData.ts +++ b/src/nitro/avatar/structure/PartSetsData.ts @@ -15,21 +15,21 @@ export class PartSetsData implements IFigureSetData public parse(data: any): boolean { - if (data.partSet && (data.partSet.length > 0)) + if(data.partSet && (data.partSet.length > 0)) { - for (const part of data.partSet) + for(const part of data.partSet) { - if (!part) continue; + if(!part) continue; this._parts.set(part.setType, new PartDefinition(part)); } } - if (data.activePartSets && (data.activePartSets.length > 0)) + if(data.activePartSets && (data.activePartSets.length > 0)) { - for (const activePart of data.activePartSets) + for(const activePart of data.activePartSets) { - if (!activePart) continue; + if(!activePart) continue; this._activePartSets.set(activePart.id, new ActivePartSet(activePart)); } @@ -40,21 +40,21 @@ export class PartSetsData implements IFigureSetData public appendJSON(data: any): boolean { - if (data.partSet && (data.partSet.length > 0)) + if(data.partSet && (data.partSet.length > 0)) { - for (const part of data.partSet) + for(const part of data.partSet) { - if (!part) continue; + if(!part) continue; this._parts.set(part.setType, new PartDefinition(part)); } } - if (data.activePartSets && (data.activePartSets.length > 0)) + if(data.activePartSets && (data.activePartSets.length > 0)) { - for (const activePart of data.activePartSets) + for(const activePart of data.activePartSets) { - if (!activePart) continue; + if(!activePart) continue; this._activePartSets.set(activePart.id, new ActivePartSet(activePart)); } @@ -67,7 +67,7 @@ export class PartSetsData implements IFigureSetData { const activePartSet = this._activePartSets.get(k.activePartSet); - if (!activePartSet) return []; + if(!activePartSet) return []; return activePartSet.parts; } @@ -76,7 +76,7 @@ export class PartSetsData implements IFigureSetData { const existing = this._parts.get(part); - if (!existing) return null; + if(!existing) return null; return existing; } @@ -87,7 +87,7 @@ export class PartSetsData implements IFigureSetData let existing = this._parts.get(_local_2); - if (!existing) + if(!existing) { existing = new PartDefinition(k); @@ -101,7 +101,7 @@ export class PartSetsData implements IFigureSetData { const existing = this._activePartSets.get(k.activePartSet); - if (!existing) return null; + if(!existing) return null; return existing; } diff --git a/src/nitro/avatar/structure/figure/FigurePart.ts b/src/nitro/avatar/structure/figure/FigurePart.ts index 87147481..f870dc03 100644 --- a/src/nitro/avatar/structure/figure/FigurePart.ts +++ b/src/nitro/avatar/structure/figure/FigurePart.ts @@ -11,7 +11,7 @@ export class FigurePart implements IFigurePart constructor(data: IFigureDataPart) { - if (!data) throw new Error('invalid_data'); + if(!data) throw new Error('invalid_data'); this._id = data.id; this._type = data.type; diff --git a/src/nitro/avatar/structure/figure/FigurePartSet.ts b/src/nitro/avatar/structure/figure/FigurePartSet.ts index 834e72dd..f5683863 100644 --- a/src/nitro/avatar/structure/figure/FigurePartSet.ts +++ b/src/nitro/avatar/structure/figure/FigurePartSet.ts @@ -16,7 +16,7 @@ export class FigurePartSet implements IFigurePartSet constructor(type: string, data: IFigureDataSet) { - if (!type || !data) throw new Error('invalid_data'); + if(!type || !data) throw new Error('invalid_data'); this._id = data.id; this._type = type; @@ -29,24 +29,24 @@ export class FigurePartSet implements IFigurePartSet this._isPreSelectable = data.preselectable; this._isSellable = data.sellable; - for (const part of data.parts) + for(const part of data.parts) { const newPart = new FigurePart(part); const partIndex = this.getPartIndex(newPart); - if (partIndex !== -1) this._parts.splice(partIndex, 0, newPart); + if(partIndex !== -1) this._parts.splice(partIndex, 0, newPart); else this._parts.push(newPart); } - if (data.hiddenLayers) + if(data.hiddenLayers) { - for (const hiddenLayer of data.hiddenLayers) this._hiddenLayers.push(hiddenLayer.partType); + for(const hiddenLayer of data.hiddenLayers) this._hiddenLayers.push(hiddenLayer.partType); } } public dispose(): void { - for (const part of this._parts) + for(const part of this._parts) { const figurePart = part as FigurePart; @@ -61,15 +61,15 @@ export class FigurePartSet implements IFigurePartSet { const totalParts = this._parts.length; - if (!totalParts) return -1; + if(!totalParts) return -1; - for (let i = 0; i < totalParts; i++) + for(let i = 0; i < totalParts; i++) { const existingPart = this._parts[i]; - if (!existingPart) continue; + if(!existingPart) continue; - if (existingPart.type !== part.type || existingPart.index > part.index) continue; + if(existingPart.type !== part.type || existingPart.index > part.index) continue; return i; } @@ -79,9 +79,9 @@ export class FigurePartSet implements IFigurePartSet public getPart(k: string, _arg_2: number): IFigurePart { - for (const part of this._parts) + for(const part of this._parts) { - if ((part.type !== k) || (part.id !== _arg_2)) continue; + if((part.type !== k) || (part.id !== _arg_2)) continue; return part; } diff --git a/src/nitro/avatar/structure/figure/Palette.ts b/src/nitro/avatar/structure/figure/Palette.ts index 8e0613be..e83ec225 100644 --- a/src/nitro/avatar/structure/figure/Palette.ts +++ b/src/nitro/avatar/structure/figure/Palette.ts @@ -9,7 +9,7 @@ export class Palette implements IPalette constructor(data: IFigureDataPalette) { - if (!data) throw new Error('invalid_data'); + if(!data) throw new Error('invalid_data'); this._id = data.id; this._colors = new AdvancedMap(); @@ -19,7 +19,7 @@ export class Palette implements IPalette public append(data: IFigureDataPalette): void { - for (const color of data.colors) + for(const color of data.colors) { const newColor = new PartColor(color); @@ -29,7 +29,7 @@ export class Palette implements IPalette public getColor(id: number): IPartColor { - if ((id === undefined) || id < 0) return null; + if((id === undefined) || id < 0) return null; return (this._colors.getValue(id.toString()) || null); } diff --git a/src/nitro/avatar/structure/figure/PartColor.ts b/src/nitro/avatar/structure/figure/PartColor.ts index cfa311c9..42d08382 100644 --- a/src/nitro/avatar/structure/figure/PartColor.ts +++ b/src/nitro/avatar/structure/figure/PartColor.ts @@ -10,7 +10,7 @@ export class PartColor implements IPartColor constructor(data: IFigureDataColor) { - if (!data) throw new Error('invalid_data'); + if(!data) throw new Error('invalid_data'); this._id = data.id; this._index = data.index; diff --git a/src/nitro/avatar/structure/figure/SetType.ts b/src/nitro/avatar/structure/figure/SetType.ts index d1da89a8..a7a809f5 100644 --- a/src/nitro/avatar/structure/figure/SetType.ts +++ b/src/nitro/avatar/structure/figure/SetType.ts @@ -11,7 +11,7 @@ export class SetType implements ISetType constructor(data: IFigureDataSetType) { - if (!data) throw new Error('invalid_data'); + if(!data) throw new Error('invalid_data'); this._type = data.type; this._paletteId = data.paletteId; @@ -25,7 +25,7 @@ export class SetType implements ISetType public dispose(): void { - for (const set of this._partSets.getValues()) + for(const set of this._partSets.getValues()) { const partSet = set as FigurePartSet; @@ -37,12 +37,12 @@ export class SetType implements ISetType public cleanUp(data: IFigureDataSetType): void { - for (const set of data.sets) + for(const set of data.sets) { const setId = set.id.toString(); const partSet = (this._partSets.getValue(setId) as FigurePartSet); - if (partSet) + if(partSet) { partSet.dispose(); @@ -53,18 +53,18 @@ export class SetType implements ISetType public append(setType: IFigureDataSetType): void { - if (!setType || !setType.sets) return; + if(!setType || !setType.sets) return; - for (const set of setType.sets) this._partSets.add(set.id.toString(), new FigurePartSet(this._type, set)); + for(const set of setType.sets) this._partSets.add(set.id.toString(), new FigurePartSet(this._type, set)); } public getDefaultPartSet(gender: string): IFigurePartSet { - for (const set of this._partSets.getValues()) + for(const set of this._partSets.getValues()) { - if (!set) continue; + if(!set) continue; - if ((set.clubLevel === 0) && ((set.gender === gender) || (set.gender === 'U'))) return set; + if((set.clubLevel === 0) && ((set.gender === gender) || (set.gender === 'U'))) return set; } return null; diff --git a/src/nitro/camera/RoomCameraWidgetManager.ts b/src/nitro/camera/RoomCameraWidgetManager.ts index b5b43064..1270463d 100644 --- a/src/nitro/camera/RoomCameraWidgetManager.ts +++ b/src/nitro/camera/RoomCameraWidgetManager.ts @@ -21,20 +21,20 @@ export class RoomCameraWidgetManager implements IRoomCameraWidgetManager public init(): void { - if (this._isLoaded) return; + if(this._isLoaded) return; this._isLoaded = true; const imagesUrl = NitroConfiguration.getValue('image.library.url') + 'Habbo-Stories/'; const effects = NitroConfiguration.getValue<{ name: string, colorMatrix?: ColorMatrix, minLevel: number, blendMode?: number, enabled: boolean }[]>('camera.available.effects'); - for (const effect of effects) + for(const effect of effects) { - if (!effect.enabled) continue; + if(!effect.enabled) continue; const cameraEffect = new RoomCameraWidgetEffect(effect.name, effect.minLevel); - if (effect.colorMatrix.length) + if(effect.colorMatrix.length) { cameraEffect.colorMatrix = effect.colorMatrix; } @@ -57,22 +57,22 @@ export class RoomCameraWidgetManager implements IRoomCameraWidgetManager container.addChild(sprite); - if (isZoomed) sprite.scale.set(2); + if(isZoomed) sprite.scale.set(2); - for (const selectedEffect of selectedEffects) + for(const selectedEffect of selectedEffects) { const effect = selectedEffect.effect; - if (!effect) continue; + if(!effect) continue; - if (effect.colorMatrix) + if(effect.colorMatrix) { const filter = new ColorMatrixFilter(); filter.matrix = effect.colorMatrix; filter.alpha = selectedEffect.alpha; - if (!sprite.filters) sprite.filters = []; + if(!sprite.filters) sprite.filters = []; sprite.filters.push(filter); } diff --git a/src/nitro/communication/NitroCommunicationDemo.ts b/src/nitro/communication/NitroCommunicationDemo.ts index 81ffa276..ebfbacc2 100644 --- a/src/nitro/communication/NitroCommunicationDemo.ts +++ b/src/nitro/communication/NitroCommunicationDemo.ts @@ -35,7 +35,7 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun { const connection = this._communication.connection; - if (connection) + if(connection) { connection.addEventListener(SocketConnectionEvent.CONNECTION_OPENED, this.onConnectionOpenedEvent); connection.addEventListener(SocketConnectionEvent.CONNECTION_CLOSED, this.onConnectionClosedEvent); @@ -50,7 +50,7 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun { const connection = this._communication.connection; - if (connection) + if(connection) { connection.removeEventListener(SocketConnectionEvent.CONNECTION_OPENED, this.onConnectionOpenedEvent); connection.removeEventListener(SocketConnectionEvent.CONNECTION_CLOSED, this.onConnectionClosedEvent); @@ -68,13 +68,13 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun { const connection = this._communication.connection; - if (!connection) return; + if(!connection) return; this._didConnect = true; this.dispatchCommunicationDemoEvent(NitroCommunicationDemoEvent.CONNECTION_ESTABLISHED, connection); - if (NitroConfiguration.getValue('system.pong.manually', false)) this.startPonging(); + if(NitroConfiguration.getValue('system.pong.manually', false)) this.startPonging(); this.startHandshake(connection); @@ -87,18 +87,18 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun { 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(); @@ -107,9 +107,9 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun private tryAuthentication(connection: IConnection): void { - if (!connection || !this.getSSO()) + if(!connection || !this.getSSO()) { - if (!this.getSSO()) + if(!this.getSSO()) { NitroLogger.error('Login without an SSO ticket is not supported'); } @@ -124,14 +124,14 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun 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); @@ -163,7 +163,7 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun private stopPonging(): void { - if (!this._pongInterval) return; + if(!this._pongInterval) return; clearInterval(this._pongInterval); @@ -174,7 +174,7 @@ export class NitroCommunicationDemo extends NitroManager implements INitroCommun { connection = ((connection || this._communication.connection) || null); - if (!connection) return; + if(!connection) return; connection.send(new PongMessageComposer()); } diff --git a/src/nitro/communication/NitroCommunicationManager.ts b/src/nitro/communication/NitroCommunicationManager.ts index ce7ca0e9..dc12ec1f 100644 --- a/src/nitro/communication/NitroCommunicationManager.ts +++ b/src/nitro/communication/NitroCommunicationManager.ts @@ -31,7 +31,7 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom protected onInit(): void { - if (this._connection) return; + if(this._connection) return; Nitro.instance.events.addEventListener(NitroCommunicationDemoEvent.CONNECTION_AUTHENTICATED, this.onConnectionAuthenticatedEvent); @@ -43,16 +43,16 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom this._connection.addEventListener(SocketConnectionEvent.CONNECTION_CLOSED, this.onConnectionClosedEvent); this._connection.addEventListener(SocketConnectionEvent.CONNECTION_ERROR, this.onConnectionErrorEvent); - if (this._demo) this._demo.init(); + if(this._demo) this._demo.init(); this._connection.init(NitroConfiguration.getValue('socket.url')); } protected onDispose(): void { - if (this._demo) this._demo.dispose(); + if(this._demo) this._demo.dispose(); - if (this._connection) + if(this._connection) { this._connection.removeEventListener(SocketConnectionEvent.CONNECTION_OPENED, this.onConnectionOpenedEvent); this._connection.removeEventListener(SocketConnectionEvent.CONNECTION_CLOSED, this.onConnectionClosedEvent); @@ -83,7 +83,7 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom { NitroLogger.log('Connection Authenticated'); - if (this._connection) this._connection.authenticated(); + if(this._connection) this._connection.authenticated(); } public connectionInit(socketUrl: string): void @@ -93,14 +93,14 @@ export class NitroCommunicationManager extends NitroManager implements INitroCom public registerMessageEvent(event: IMessageEvent): IMessageEvent { - if (this._connection) this._connection.addMessageEvent(event); + if(this._connection) this._connection.addMessageEvent(event); return event; } public removeMessageEvent(event: IMessageEvent): void { - if (!this._connection) return; + if(!this._connection) return; this._connection.removeMessageEvent(event); } diff --git a/src/nitro/communication/messages/parser/catalog/FrontPageItem.ts b/src/nitro/communication/messages/parser/catalog/FrontPageItem.ts index 243d9279..6b471e08 100644 --- a/src/nitro/communication/messages/parser/catalog/FrontPageItem.ts +++ b/src/nitro/communication/messages/parser/catalog/FrontPageItem.ts @@ -18,7 +18,7 @@ export class FrontPageItem constructor(wrapper: IMessageDataWrapper) { - if (!wrapper) throw new Error('invalid_wrapper'); + if(!wrapper) throw new Error('invalid_wrapper'); this.flush(); this.parse(wrapper); @@ -40,14 +40,14 @@ export class FrontPageItem public parse(wrapper: IMessageDataWrapper): boolean { - if (!wrapper) return false; + if(!wrapper) return false; this._position = wrapper.readInt(); this._itemName = wrapper.readString(); this._itemPromoImage = wrapper.readString(); this._type = wrapper.readInt(); - switch (this._type) + switch(this._type) { case FrontPageItem.ITEM_CATALOGUE_PAGE: this._catalogPageLocation = wrapper.readString(); diff --git a/src/nitro/communication/messages/parser/catalog/TargetedOfferData.ts b/src/nitro/communication/messages/parser/catalog/TargetedOfferData.ts index 636bd5a7..24bb4db6 100644 --- a/src/nitro/communication/messages/parser/catalog/TargetedOfferData.ts +++ b/src/nitro/communication/messages/parser/catalog/TargetedOfferData.ts @@ -42,7 +42,7 @@ export class TargetedOfferData let count = wrapper.readInt(); - while (count > 0) + while(count > 0) { this._Str_11962.push(wrapper.readString()); @@ -53,7 +53,7 @@ export class TargetedOfferData public populate(offerData: TargetedOfferData) { - if (!offerData) return; + if(!offerData) return; this._id = offerData.id; this._identifier = offerData.identifier; diff --git a/src/nitro/communication/messages/parser/inventory/badges/BadgesParser.ts b/src/nitro/communication/messages/parser/inventory/badges/BadgesParser.ts index 306c7463..9785e777 100644 --- a/src/nitro/communication/messages/parser/inventory/badges/BadgesParser.ts +++ b/src/nitro/communication/messages/parser/inventory/badges/BadgesParser.ts @@ -18,7 +18,7 @@ export class BadgesParser implements IMessageParser public parse(wrapper: IMessageDataWrapper): boolean { - if (!wrapper) return false; + if(!wrapper) return false; this._allBadgeCodes = []; this._activeBadgeCodes = new AdvancedMap(); @@ -26,7 +26,7 @@ export class BadgesParser implements IMessageParser let count = wrapper.readInt(); - while (count > 0) + while(count > 0) { const badgeId = wrapper.readInt(); const badgeCode = wrapper.readString(); @@ -40,7 +40,7 @@ export class BadgesParser implements IMessageParser count = wrapper.readInt(); - while (count > 0) + while(count > 0) { const badgeSlot = wrapper.readInt(); const badgeCode = wrapper.readString(); diff --git a/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListItemParser.ts b/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListItemParser.ts index 97d685ab..1f4900cc 100644 --- a/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListItemParser.ts +++ b/src/nitro/communication/messages/parser/inventory/furniture/FurnitureListItemParser.ts @@ -30,7 +30,7 @@ export class FurnitureListItemParser implements IFurnitureItemData constructor(wrapper: IMessageDataWrapper) { - if (!wrapper) throw new Error('invalid_wrapper'); + if(!wrapper) throw new Error('invalid_wrapper'); this.flush(); this.parse(wrapper); @@ -63,7 +63,7 @@ export class FurnitureListItemParser implements IFurnitureItemData public parse(wrapper: IMessageDataWrapper): boolean { - if (!wrapper) return false; + if(!wrapper) return false; this._itemId = wrapper.readInt(); this._furniType = wrapper.readString(); @@ -78,7 +78,7 @@ export class FurnitureListItemParser implements IFurnitureItemData this._secondsToExpiration = wrapper.readInt(); this._expirationTimeStamp = GetTickerTime(); - if (this.secondsToExpiration > -1) + if(this.secondsToExpiration > -1) { this._rentable = true; } @@ -92,7 +92,7 @@ export class FurnitureListItemParser implements IFurnitureItemData this._flatId = wrapper.readInt(); this._isWallItem = (this._furniType === FurnitureListItemParser.WALL_ITEM); - if (this._furniType === FurnitureListItemParser.FLOOR_ITEM) + if(this._furniType === FurnitureListItemParser.FLOOR_ITEM) { this._slotId = wrapper.readString(); this._extra = wrapper.readInt(); diff --git a/src/nitro/communication/messages/parser/inventory/pets/PetFigureDataParser.ts b/src/nitro/communication/messages/parser/inventory/pets/PetFigureDataParser.ts index e27f5b2b..4a8a2486 100644 --- a/src/nitro/communication/messages/parser/inventory/pets/PetFigureDataParser.ts +++ b/src/nitro/communication/messages/parser/inventory/pets/PetFigureDataParser.ts @@ -20,7 +20,7 @@ export class PetFigureDataParser implements IPetFigureData let i = 0; - while (i < this._customPartCount) + while(i < this._customPartCount) { this._customParts.push(wrapper.readInt()); this._customParts.push(wrapper.readInt()); @@ -56,7 +56,7 @@ export class PetFigureDataParser implements IPetFigureData figure = (figure + (' ' + this.custompartCount)); - for (const _local_2 of this.customParts) figure = (figure + (' ' + _local_2)); + for(const _local_2 of this.customParts) figure = (figure + (' ' + _local_2)); return figure; } diff --git a/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts b/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts index 330b21c9..0d78ee59 100644 --- a/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts +++ b/src/nitro/communication/messages/parser/moderation/IssueMessageData.ts @@ -133,11 +133,11 @@ export class IssueMessageData public dispose(): void { - if (this.disposed) + if(this.disposed) { return; } - for (const k of this._patterns) + for(const k of this._patterns) { k.dispose(); } diff --git a/src/nitro/communication/messages/parser/notifications/UnseenItemsParser.ts b/src/nitro/communication/messages/parser/notifications/UnseenItemsParser.ts index ec6852b5..96e1b9b0 100644 --- a/src/nitro/communication/messages/parser/notifications/UnseenItemsParser.ts +++ b/src/nitro/communication/messages/parser/notifications/UnseenItemsParser.ts @@ -14,18 +14,18 @@ export class UnseenItemsParser implements IMessageParser public parse(wrapper: IMessageDataWrapper): boolean { - if (!wrapper) return false; + if(!wrapper) return false; let totalUnseen = wrapper.readInt(); - while (totalUnseen > 0) + while(totalUnseen > 0) { const category = wrapper.readInt(); let totalItems = wrapper.readInt(); const itemIds: number[] = []; - while (totalItems > 0) + while(totalItems > 0) { itemIds.push(wrapper.readInt()); diff --git a/src/nitro/communication/messages/parser/poll/QuestionParser.ts b/src/nitro/communication/messages/parser/poll/QuestionParser.ts index c65f870a..65716fd0 100644 --- a/src/nitro/communication/messages/parser/poll/QuestionParser.ts +++ b/src/nitro/communication/messages/parser/poll/QuestionParser.ts @@ -32,7 +32,7 @@ export class QuestionParser implements IMessageParser this._question = { id: questionId, number: questionNumber, type: questionType, content: questionContent }; - if (((this._question.type == 1) || (this._question.type == 2))) + if(((this._question.type == 1) || (this._question.type == 2))) { this._question.selection_min = wrapper.readInt(); const count = wrapper.readInt(); @@ -41,7 +41,7 @@ export class QuestionParser implements IMessageParser this._question.selection_count = count; this._question.selection_max = count; - for (let i = 0; i < count; i++) + for(let i = 0; i < count; i++) { this._question.selection_values.push(wrapper.readString()); this._question.selections.push(wrapper.readString()); diff --git a/src/nitro/communication/messages/parser/sound/UserSongDisksInventoryMessageParser.ts b/src/nitro/communication/messages/parser/sound/UserSongDisksInventoryMessageParser.ts index 4e5e1940..b764acbe 100644 --- a/src/nitro/communication/messages/parser/sound/UserSongDisksInventoryMessageParser.ts +++ b/src/nitro/communication/messages/parser/sound/UserSongDisksInventoryMessageParser.ts @@ -15,7 +15,7 @@ export class UserSongDisksInventoryMessageParser implements IMessageParser { const count = wrapper.readInt(); - for (let i = 0; i < count; i++) + for(let i = 0; i < count; i++) { this._songDiskInventory.add(wrapper.readInt(), wrapper.readInt()); } @@ -24,7 +24,7 @@ export class UserSongDisksInventoryMessageParser implements IMessageParser public getDiskId(k: number): number { - if (((k >= 0) && (k < this._songDiskInventory.length))) + if(((k >= 0) && (k < this._songDiskInventory.length))) { return this._songDiskInventory.getKey(k); } @@ -33,7 +33,7 @@ export class UserSongDisksInventoryMessageParser implements IMessageParser public getSongId(k: number): number { - if (((k >= 0) && (k < this._songDiskInventory.length))) + if(((k >= 0) && (k < this._songDiskInventory.length))) { return this._songDiskInventory.getWithIndex(k); } diff --git a/src/nitro/communication/messages/parser/user/data/RelationshipStatusInfoMessageParser.ts b/src/nitro/communication/messages/parser/user/data/RelationshipStatusInfoMessageParser.ts index d77d1dcb..fff64271 100644 --- a/src/nitro/communication/messages/parser/user/data/RelationshipStatusInfoMessageParser.ts +++ b/src/nitro/communication/messages/parser/user/data/RelationshipStatusInfoMessageParser.ts @@ -17,14 +17,14 @@ export class RelationshipStatusInfoMessageParser implements IMessageParser public parse(wrapper: IMessageDataWrapper): boolean { - if (!wrapper) return false; + if(!wrapper) return false; this._userId = wrapper.readInt(); this._relationshipStatusMap = new AdvancedMap(); const relationshipsCount = wrapper.readInt(); - for (let i = 0; i < relationshipsCount; i++) + for(let i = 0; i < relationshipsCount; i++) { const relationship = new RelationshipStatusInfo(wrapper); diff --git a/src/nitro/localization/NitroLocalizationManager.ts b/src/nitro/localization/NitroLocalizationManager.ts index 0ad5d2f7..97856b42 100644 --- a/src/nitro/localization/NitroLocalizationManager.ts +++ b/src/nitro/localization/NitroLocalizationManager.ts @@ -31,12 +31,12 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca let urls: string[] = NitroConfiguration.getValue('external.texts.url'); - if (!Array.isArray(urls)) + if(!Array.isArray(urls)) { urls = [NitroConfiguration.getValue('external.texts.url')]; } - for (let i = 0; i < urls.length; i++) urls[i] = NitroConfiguration.interpolate(urls[i]); + for(let i = 0; i < urls.length; i++) urls[i] = NitroConfiguration.interpolate(urls[i]); this._pendingUrls = urls; @@ -45,7 +45,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private loadNextLocalization(): void { - if (!this._pendingUrls.length) + if(!this._pendingUrls.length) { this.events && this.events.dispatchEvent(new NitroLocalizationEvent(NitroLocalizationEvent.LOADED)); @@ -65,13 +65,13 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private onLocalizationLoaded(data: { [index: string]: any }, url: string): void { - if (!data) return; + if(!data) return; - if (!this.parseLocalization(data)) throw new Error(`Invalid json data for file ${url}`); + if(!this.parseLocalization(data)) throw new Error(`Invalid json data for file ${url}`); const index = this._pendingUrls.indexOf(url); - if (index >= 0) this._pendingUrls.splice(index, 1); + if(index >= 0) this._pendingUrls.splice(index, 1); this.loadNextLocalization(); } @@ -83,9 +83,9 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private parseLocalization(data: { [index: string]: any }): boolean { - if (!data) return false; + if(!data) return false; - for (const key in data) this._definitions.set(key, data[key]); + for(const key in data) this._definitions.set(key, data[key]); return true; } @@ -94,7 +94,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca { const parser = event.getParser(); - for (const data of parser.data) this.setBadgePointLimit(data.badgeId, data.limit); + for(const data of parser.data) this.setBadgePointLimit(data.badgeId, data.limit); } public getBadgePointLimit(badge: string): number @@ -128,31 +128,31 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca public getValue(key: string, doParams: boolean = true): string { - if (!key || !key.length) return null; + if(!key || !key.length) return null; const keys = key.match(/\$\{.[^}]*\}/g); - if (keys && keys.length) + if(keys && keys.length) { - for (const splitKey of keys) key = key.replace(splitKey, this.getValue(splitKey.slice(2, -1), doParams)); + for(const splitKey of keys) key = key.replace(splitKey, this.getValue(splitKey.slice(2, -1), doParams)); } let value = (this._definitions.get(key) || null); - if (!value) + if(!value) { value = (NitroConfiguration.definitions.get(key) as any); - if (value) return value; + if(value) return value; } - if (value && doParams) + if(value && doParams) { const parameters = this._parameters.get(key); - if (parameters) + if(parameters) { - for (const [parameter, replacement] of parameters) + for(const [parameter, replacement] of parameters) { value = value.replace('%' + parameter + '%', replacement); } @@ -168,7 +168,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca const replacedValue = value.replace('%' + parameter + '%', replacement); - if (value.startsWith('%{')) + if(value.startsWith('%{')) { // This adds support for multi-optioned texts like // catalog.vip.item.header.months=%{NUM_MONTHS|0 months|1 month|%% months} @@ -180,13 +180,13 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca const regex = new RegExp('%{' + parameter.toUpperCase() + '\\|([^|]*)\\|([^|]*)\\|([^|]*)}'); const result = value.match(regex); - if (!result) return replacedValue; + if(!result) return replacedValue; let indexKey = -1; const replacementAsNumber = Number.parseInt(replacement); let replace = false; - switch (replacementAsNumber) + switch(replacementAsNumber) { case 0: indexKey = 1; @@ -202,14 +202,14 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca } - if (indexKey == -1 || typeof result[indexKey] == 'undefined') + if(indexKey == -1 || typeof result[indexKey] == 'undefined') { return replacedValue; } const valueFromResults = result[indexKey]; - if (valueFromResults) + if(valueFromResults) { return valueFromResults.replace('%%', replacement); } @@ -222,30 +222,30 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca { let value = this.getValue(key, false); - if (parameters) + if(parameters) { - for (let i = 0; i < parameters.length; i++) + for(let i = 0; i < parameters.length; i++) { const parameter = parameters[i]; const replacement = replacements[i]; - if (replacement === undefined) continue; + if(replacement === undefined) continue; value = value.replace('%' + parameter + '%', replacement); - if (value.startsWith('%{')) + if(value.startsWith('%{')) { const regex = new RegExp('%{' + parameter.toUpperCase() + '\\|([^|]*)\\|([^|]*)\\|([^|]*)}'); const result = value.match(regex); - if (!result) continue; + if(!result) continue; const replacementAsNumber = parseInt(replacement); let indexKey = -1; let replace = false; - switch (replacementAsNumber) + switch(replacementAsNumber) { case 0: indexKey = 1; @@ -261,11 +261,11 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca } - if ((indexKey === -1) || (typeof result[indexKey] === 'undefined')) continue; + if((indexKey === -1) || (typeof result[indexKey] === 'undefined')) continue; const valueFromResults = result[indexKey]; - if (valueFromResults) + if(valueFromResults) { value = valueFromResults.replace('%%', replacement); } @@ -283,11 +283,11 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca public registerParameter(key: string, parameter: string, value: string): void { - if (!key || (key.length === 0) || !parameter || (parameter.length === 0)) return; + if(!key || (key.length === 0) || !parameter || (parameter.length === 0)) return; let existing = this._parameters.get(key); - if (!existing) + if(!existing) { existing = new Map(); @@ -318,7 +318,7 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca const limit = this.getBadgePointLimit(key); - if (limit > -1) desc = desc.replace('%limit%', limit.toString()); + if(limit > -1) desc = desc.replace('%limit%', limit.toString()); desc = desc.replace('%roman%', this.getRomanNumeral(badge.level)); @@ -327,10 +327,10 @@ export class NitroLocalizationManager extends NitroManager implements INitroLoca private getExistingKey(keys: string[]): string { - for (const entry of keys) + for(const entry of keys) { const item = this.getValue(entry); - if (item != entry) return item; + if(item != entry) return item; } return ''; diff --git a/src/nitro/room/RoomContentLoader.ts b/src/nitro/room/RoomContentLoader.ts index aebe720b..5facf8a8 100644 --- a/src/nitro/room/RoomContentLoader.ts +++ b/src/nitro/room/RoomContentLoader.ts @@ -80,7 +80,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo this.setFurnitureData(); - for (const [index, name] of NitroConfiguration.getValue('pet.types').entries()) this._pets[name] = index; + for(const [index, name] of NitroConfiguration.getValue('pet.types').entries()) this._pets[name] = index; } public dispose(): void @@ -92,7 +92,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { this._sessionDataManager = sessionData; - if (this._waitingForSessionDataManager) + if(this._waitingForSessionDataManager) { this._waitingForSessionDataManager = false; @@ -107,7 +107,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo private setFurnitureData(): void { - if (!this._sessionDataManager) + if(!this._sessionDataManager) { this._waitingForSessionDataManager = true; @@ -116,7 +116,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo const furnitureData = this._sessionDataManager.getAllFurnitureData(this); - if (!furnitureData) return; + if(!furnitureData) return; this._sessionDataManager.removePendingFurniDataListener(this); @@ -127,42 +127,42 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo 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'; @@ -171,12 +171,12 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo 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); @@ -195,7 +195,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { 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); } @@ -204,7 +204,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const type = this._activeObjectTypes.get(typeId); - if (!type) return -1; + if(!type) return -1; return this.getColorIndexFromName(type); } @@ -213,29 +213,29 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { 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); } @@ -244,7 +244,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const value = this._objectTypeAdUrls.get(type); - if (!value) return ''; + if(!value) return ''; return value; } @@ -253,7 +253,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const colorResults = this._petColors.get(petIndex); - if (!colorResults) return null; + if(!colorResults) return null; return colorResults.get(paletteIndex); } @@ -263,11 +263,11 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo const colorResults = this._petColors.get(petIndex); const results: IPetColorResult[] = []; - 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); } } @@ -276,15 +276,15 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo 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); @@ -299,18 +299,18 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo public getGifCollection(name: string): IGraphicAssetGifCollection { - 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(); @@ -323,14 +323,14 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { 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); @@ -341,7 +341,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo private createCollection(data: IAssetData, spritesheet: Spritesheet): GraphicAssetCollection { - if (!data || !spritesheet) return null; + if(!data || !spritesheet) return null; const collection = new GraphicAssetCollection(data, spritesheet); @@ -349,12 +349,12 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo 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]; @@ -377,14 +377,14 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { 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; } @@ -392,27 +392,27 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo 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; } @@ -426,7 +426,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { type = RoomObjectUserType.getRealType(type); - if (type === RoomObjectVisualizationType.USER) return false; + if(type === RoomObjectVisualizationType.USER) return false; return true; } @@ -436,13 +436,13 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo 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); } @@ -451,7 +451,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo assetUrls = this.getAssetUrls(type, param, true); } - if (assetUrls && assetUrls.length) + if(assetUrls && assetUrls.length) { const url = assetUrls[0]; @@ -487,18 +487,18 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { 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({ @@ -513,7 +513,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo const onDownloaded = (status: boolean, url: string) => { - if (!status) + if(!status) { NitroLogger.error('Failed to download asset', url); @@ -526,13 +526,13 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo 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)); @@ -542,11 +542,11 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo 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); @@ -555,7 +555,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo 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); @@ -574,7 +574,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const spritesheetData = data.spritesheet; - if (!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) + if(!baseTexture || !spritesheetData || !Object.keys(spritesheetData).length) { this.createCollection(data, null); @@ -595,7 +595,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo }); }; - if (baseTexture.valid) + if(baseTexture.valid) { createAsset(); } @@ -615,7 +615,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const existing = this._objectAliases.get(name); - if (!existing) return name; + if(!existing) return name; return existing; } @@ -624,14 +624,14 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { 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)]; @@ -648,13 +648,13 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo 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)))); @@ -664,7 +664,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo return [assetUrl]; } - if (category === RoomObjectCategory.UNIT) + if(category === RoomObjectCategory.UNIT) { return [this.getAssetUrlWithPetBase(type)]; } @@ -679,14 +679,14 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo 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); } @@ -695,7 +695,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo assetUrls = this.getAssetUrls(type, colorIndex, true); } - if (assetUrls && assetUrls.length) return assetUrls[0]; + if(assetUrls && assetUrls.length) return assetUrls[0]; return null; } @@ -724,7 +724,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { const model = object && object.model; - if (!model) return; + if(!model) return; model.setValue(RoomObjectVariable.OBJECT_ROOM_ID, roomId); } @@ -733,7 +733,7 @@ export class RoomContentLoader implements IFurnitureDataListener, IRoomContentLo { 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 17f2b09a..1b23803e 100644 --- a/src/nitro/room/RoomEngine.ts +++ b/src/nitro/room/RoomEngine.ts @@ -120,14 +120,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); @@ -143,7 +143,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); @@ -158,9 +158,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); } @@ -169,15 +169,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); @@ -188,15 +188,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); @@ -231,14 +231,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); @@ -254,11 +254,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); @@ -280,7 +280,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato return; } - if (!roomMap) + if(!roomMap) { NitroLogger.warn('Room property messages'); @@ -289,22 +289,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; } @@ -318,11 +318,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; @@ -331,7 +331,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); @@ -339,7 +339,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; @@ -353,44 +353,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; @@ -402,15 +402,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)); @@ -426,7 +426,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } instance.createRoomObjectAndInitalize(RoomEngine.CURSOR_OBJECT_ID, RoomEngine.CURSOR_OBJECT_TYPE, RoomObjectCategory.CURSOR); - if (NitroConfiguration.getValue('enable.avatar.arrow', false)) instance.createRoomObjectAndInitalize(RoomEngine.ARROW_OBJECT_ID, RoomEngine.ARROW_OBJECT_TYPE, RoomObjectCategory.CURSOR); + if(NitroConfiguration.getValue('enable.avatar.arrow', false)) instance.createRoomObjectAndInitalize(RoomEngine.ARROW_OBJECT_ID, RoomEngine.ARROW_OBJECT_TYPE, RoomObjectCategory.CURSOR); return instance; } @@ -435,15 +435,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; @@ -452,15 +452,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); @@ -473,7 +473,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); @@ -485,15 +485,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); @@ -511,16 +511,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); @@ -532,17 +532,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; } @@ -554,11 +554,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); } @@ -567,12 +567,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))); @@ -584,13 +584,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; } @@ -599,7 +599,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); } @@ -608,17 +608,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; } @@ -627,7 +627,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); } @@ -636,7 +636,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)); @@ -648,7 +648,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)); @@ -661,43 +661,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)); } @@ -709,7 +709,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); @@ -722,12 +722,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); @@ -739,11 +739,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)); } @@ -753,13 +753,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)); } @@ -773,7 +773,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); } @@ -785,7 +785,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); } @@ -803,12 +803,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 = GetTickerTime(); @@ -820,7 +820,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato this.updateRoomCameras(time); - if (this._mouseCursorUpdate) this.setPointer(); + if(this._mouseCursorUpdate) this.setPointer(); RoomEnterEffect.turnVisualizationOff(); } @@ -831,7 +831,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'; } @@ -843,7 +843,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato private processPendingFurniture(): void { - if (this._skipFurnitureCreationForNextFrame) + if(this._skipFurnitureCreationForNextFrame) { this._skipFurnitureCreationForNextFrame = false; @@ -854,25 +854,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; @@ -882,17 +882,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; @@ -902,28 +902,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); } @@ -931,19 +931,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; @@ -952,11 +952,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); @@ -969,53 +969,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); @@ -1029,13 +1029,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); } @@ -1045,18 +1045,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; @@ -1073,33 +1073,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; @@ -1111,29 +1111,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; @@ -1167,17 +1167,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); @@ -1204,7 +1204,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); @@ -1212,19 +1212,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); @@ -1232,17 +1232,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)); } @@ -1256,23 +1256,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; @@ -1281,17 +1281,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))); @@ -1304,19 +1304,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)); } @@ -1327,16 +1327,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; } @@ -1347,9 +1347,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; } } @@ -1362,9 +1362,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); } @@ -1374,7 +1374,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))); } @@ -1396,7 +1396,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); } @@ -1405,22 +1405,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); @@ -1436,7 +1436,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); @@ -1451,28 +1451,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); } @@ -1481,7 +1481,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); @@ -1494,7 +1494,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; } @@ -1503,7 +1503,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return; + if(!instanceData) return; instanceData.setModelName(name); } @@ -1512,7 +1512,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; } @@ -1526,7 +1526,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; } @@ -1535,7 +1535,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; } @@ -1544,18 +1544,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): ISelectedRoomObjectData { const instanceData = this.getRoomInstanceData(roomId); - if (!instanceData) return null; + if(!instanceData) return null; return instanceData.placedObject; } @@ -1564,14 +1564,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); } @@ -1580,7 +1580,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; } @@ -1589,7 +1589,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); } @@ -1598,7 +1598,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; } @@ -1607,7 +1607,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; } @@ -1616,18 +1616,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); } @@ -1636,15 +1636,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); @@ -1666,14 +1666,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); } @@ -1722,21 +1722,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); @@ -1744,11 +1744,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); @@ -1765,7 +1765,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 @@ -1775,25 +1775,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); @@ -1820,18 +1820,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); @@ -1844,7 +1844,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); @@ -1857,7 +1857,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(); @@ -1874,7 +1874,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)); @@ -1886,7 +1886,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(); @@ -1906,7 +1906,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)); @@ -1917,7 +1917,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)); @@ -1928,7 +1928,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, GetTickerTime()); @@ -1940,7 +1940,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, GetTickerTime()); @@ -1955,14 +1955,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); } } @@ -1973,14 +1973,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)); } @@ -1989,9 +1989,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); @@ -2002,23 +2002,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; } @@ -2027,19 +2027,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)); } @@ -2049,18 +2049,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); } @@ -2072,11 +2072,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); @@ -2119,7 +2119,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato break; } - if (!message) return false; + if(!message) return false; object.processUpdateMessage(message); @@ -2130,7 +2130,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)); @@ -2141,7 +2141,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))); @@ -2152,7 +2152,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)); @@ -2163,7 +2163,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)); @@ -2174,7 +2174,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)); @@ -2185,7 +2185,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)); @@ -2196,7 +2196,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()); } @@ -2205,11 +2205,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(); @@ -2224,18 +2224,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); @@ -2247,14 +2247,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); @@ -2267,11 +2267,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); @@ -2281,44 +2281,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)); @@ -2334,26 +2334,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); } @@ -2361,24 +2361,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(); @@ -2386,15 +2386,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)); } @@ -2403,13 +2403,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); @@ -2426,11 +2426,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; @@ -2440,25 +2440,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; @@ -2467,23 +2467,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; } @@ -2492,7 +2492,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; @@ -2502,11 +2502,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; @@ -2521,7 +2521,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); @@ -2534,67 +2534,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); @@ -2605,32 +2605,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); @@ -2646,32 +2646,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); @@ -2686,23 +2686,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); } @@ -2717,31 +2717,31 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let imageResult: IImageResult = 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); @@ -2761,11 +2761,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); @@ -2773,7 +2773,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)); @@ -2782,7 +2782,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): IImageResult { - if (!this._roomManager) return null; + if(!this._roomManager) return null; let id = -1; let type: string = null; @@ -2793,16 +2793,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: { @@ -2811,7 +2811,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); @@ -2835,7 +2835,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()); @@ -2856,7 +2856,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()); @@ -2877,13 +2877,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); } @@ -2896,13 +2896,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); } @@ -2915,56 +2915,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): IImageResult { - 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: @@ -2972,7 +2972,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); } @@ -2983,16 +2983,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: @@ -3003,16 +3003,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)); } @@ -3026,11 +3026,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); @@ -3043,11 +3043,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 = []; @@ -3074,27 +3074,27 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato public getGenericRoomObjectThumbnail(type: string, param: string, listener: IGetImageListener, extraData: string = null, stuffData: IObjectData = null): IImageResult { - 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++; @@ -3106,11 +3106,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 = []; @@ -3123,7 +3123,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato } else { - if (asset) + if(asset) { imageResult.image = asset; } @@ -3140,7 +3140,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); @@ -3148,29 +3148,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; @@ -3188,15 +3188,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); } } @@ -3204,19 +3204,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; } @@ -3226,7 +3226,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato { const canvas = this.getActiveRoomInstanceRenderingCanvas(); - if (!canvas) return; + if(!canvas) return; const sprite = this.getRenderingCanvasOverlay(canvas); @@ -3235,32 +3235,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); @@ -3281,17 +3281,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--; @@ -3302,13 +3302,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 []; @@ -3318,21 +3318,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); } @@ -3341,16 +3341,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; } @@ -3360,9 +3360,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); } @@ -3378,7 +3378,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); } @@ -3389,7 +3389,7 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato let texture: RenderTexture = null; - if (bounds) + if(bounds) { texture = TextureUtils.generateTexture(canvas.master, bounds); } @@ -3405,7 +3405,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); @@ -3417,7 +3417,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); @@ -3439,18 +3439,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)); } @@ -3464,11 +3464,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; @@ -3476,15 +3476,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'; } @@ -3494,28 +3494,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): IPetColorResult { - if (!this._roomContentLoader) return null; + if(!this._roomContentLoader) return null; return this._roomContentLoader.getPetColorResult(petIndex, paletteIndex); } public getPetColorResultsForTag(petIndex: number, tagName: string): IPetColorResult[] { - 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); } @@ -3592,7 +3592,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); @@ -3606,14 +3606,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/RoomMessageHandler.ts b/src/nitro/room/RoomMessageHandler.ts index 1a787184..ad1921c4 100644 --- a/src/nitro/room/RoomMessageHandler.ts +++ b/src/nitro/room/RoomMessageHandler.ts @@ -42,7 +42,7 @@ export class RoomMessageHandler extends Disposable this._roomCreator = null; this._latestEntryTileEvent = null; - if (this._planeParser) + if(this._planeParser) { this._planeParser.dispose(); @@ -52,7 +52,7 @@ export class RoomMessageHandler extends Disposable public setConnection(connection: IConnection) { - if (this._connection || !connection) return; + if(this._connection || !connection) return; this._connection = connection; @@ -104,9 +104,9 @@ export class RoomMessageHandler extends Disposable public setRoomId(id: number): void { - if (this._currentRoomId !== 0) + if(this._currentRoomId !== 0) { - if (this._roomCreator) this._roomCreator.destroyRoom(this._currentRoomId); + if(this._roomCreator) this._roomCreator.destroyRoom(this._currentRoomId); } this._currentRoomId = id; @@ -121,11 +121,11 @@ export class RoomMessageHandler extends Disposable private onUserInfoEvent(event: UserInfoEvent): void { - if (!(event instanceof UserInfoEvent) || !event.connection) return; + if(!(event instanceof UserInfoEvent) || !event.connection) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; this._ownUserId = parser.userInfo.userId; } @@ -134,17 +134,17 @@ export class RoomMessageHandler extends Disposable { const parser = event.getParser(); - if (this._currentRoomId !== parser.roomId) + if(this._currentRoomId !== parser.roomId) { this.setRoomId(parser.roomId); } - if (this._roomCreator) + if(this._roomCreator) { this._roomCreator.setRoomInstanceModelName(parser.roomId, parser.name); } - if (this._initialConnection) + if(this._initialConnection) { event.connection.send(new FurnitureAliasesComposer()); @@ -158,17 +158,17 @@ export class RoomMessageHandler extends Disposable private onRoomPaintEvent(event: RoomPaintEvent): void { - if (!(event instanceof RoomPaintEvent)) return; + if(!(event instanceof RoomPaintEvent)) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const floorType = parser.floorType; const wallType = parser.wallType; const landscapeType = parser.landscapeType; - if (this._roomCreator) + if(this._roomCreator) { this._roomCreator.updateRoomInstancePlaneType(this._currentRoomId, floorType, wallType, landscapeType); } @@ -176,15 +176,15 @@ export class RoomMessageHandler extends Disposable private onRoomModelEvent(event: FloorHeightMapEvent): void { - if (!(event instanceof FloorHeightMapEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof FloorHeightMapEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const wallGeometry = this._roomCreator.getLegacyWallGeometry(this._currentRoomId); - if (!wallGeometry) return; + if(!wallGeometry) return; this._planeParser.reset(); @@ -195,7 +195,7 @@ export class RoomMessageHandler extends Disposable let entryTile: RoomEntryTileMessageParser = null; - if (this._latestEntryTileEvent) entryTile = this._latestEntryTileEvent.getParser(); + if(this._latestEntryTileEvent) entryTile = this._latestEntryTileEvent.getParser(); let doorX = -1; let doorY = -1; @@ -204,17 +204,17 @@ export class RoomMessageHandler extends Disposable let y = 0; - while (y < height) + while(y < height) { let x = 0; - while (x < width) + while(x < width) { const tileHeight = parser.getHeight(x, y); - if (((((y > 0) && (y < (height - 1))) || ((x > 0) && (x < (width - 1)))) && (!(tileHeight == RoomPlaneParser.TILE_BLOCKED))) && ((entryTile == null) || ((x == entryTile.x) && (y == entryTile.y)))) + if(((((y > 0) && (y < (height - 1))) || ((x > 0) && (x < (width - 1)))) && (!(tileHeight == RoomPlaneParser.TILE_BLOCKED))) && ((entryTile == null) || ((x == entryTile.x) && (y == entryTile.y)))) { - if (((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight(x, (y + 1)) == RoomPlaneParser.TILE_BLOCKED)) + if(((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight(x, (y + 1)) == RoomPlaneParser.TILE_BLOCKED)) { doorX = (x + 0.5); doorY = y; @@ -222,7 +222,7 @@ export class RoomMessageHandler extends Disposable doorDirection = 90; } - if (((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight((x + 1), y) == RoomPlaneParser.TILE_BLOCKED)) + if(((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight((x + 1), y) == RoomPlaneParser.TILE_BLOCKED)) { doorX = x; doorY = (y + 0.5); @@ -243,7 +243,7 @@ export class RoomMessageHandler extends Disposable this._planeParser.initializeFromTileData(parser.wallHeight); this._planeParser.setTileHeight(Math.floor(doorX), Math.floor(doorY), (doorZ + this._planeParser.wallHeight)); - if (parser.scale === 64) + if(parser.scale === 64) { this._planeParser.restrictsDragging = true; this._planeParser.restrictsScaling = true; @@ -261,11 +261,11 @@ export class RoomMessageHandler extends Disposable let heightIterator = (parser.height - 1); - while (heightIterator >= 0) + while(heightIterator >= 0) { let widthIterator = (parser.width - 1); - while (widthIterator >= 0) + while(widthIterator >= 0) { wallGeometry.setHeight(widthIterator, heightIterator, this._planeParser.getTileHeight(widthIterator, heightIterator)); widthIterator--; @@ -288,11 +288,11 @@ export class RoomMessageHandler extends Disposable private onRoomHeightMapEvent(event: RoomHeightMapEvent): void { - if (!(event instanceof RoomHeightMapEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomHeightMapEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const width = parser.width; const height = parser.height; @@ -300,11 +300,11 @@ export class RoomMessageHandler extends Disposable let y = 0; - while (y < height) + while(y < height) { let x = 0; - while (x < width) + while(x < width) { heightMap.setTileHeight(x, y, parser.getTileHeight(x, y)); heightMap.setStackingBlocked(x, y, parser.getStackingBlocked(x, y)); @@ -321,17 +321,17 @@ export class RoomMessageHandler extends Disposable private onRoomHeightMapUpdateEvent(event: RoomHeightMapUpdateEvent): void { - if (!(event instanceof RoomHeightMapUpdateEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomHeightMapUpdateEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const heightMap = this._roomCreator.getFurnitureStackingHeightMap(this._currentRoomId); - if (!heightMap) return; + if(!heightMap) return; - while (parser.next()) + while(parser.next()) { heightMap.setTileHeight(parser.x, parser.y, parser.tileHeight()); heightMap.setStackingBlocked(parser.x, parser.y, parser.isStackingBlocked()); @@ -343,18 +343,18 @@ export class RoomMessageHandler extends Disposable private onRoomThicknessEvent(event: RoomVisualizationSettingsEvent): void { - if (!(event instanceof RoomVisualizationSettingsEvent)) return; + if(!(event instanceof RoomVisualizationSettingsEvent)) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const visibleWall = !parser.hideWalls; const visibleFloor = true; const thicknessWall = parser.thicknessWall; const thicknessFloor = parser.thicknessFloor; - if (this._roomCreator) + if(this._roomCreator) { this._roomCreator.updateRoomInstancePlaneVisibility(this._currentRoomId, visibleWall, visibleFloor); this._roomCreator.updateRoomInstancePlaneThickness(this._currentRoomId, thicknessWall, thicknessFloor); @@ -363,14 +363,14 @@ export class RoomMessageHandler extends Disposable private onRoomDoorEvent(event: RoomEntryTileMessageEvent): void { - if (!(event instanceof RoomEntryTileMessageEvent)) return; + if(!(event instanceof RoomEntryTileMessageEvent)) return; this._latestEntryTileEvent = event; } private onRoomRollingEvent(event: ObjectsRollingEvent): void { - if (!(event instanceof ObjectsRollingEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof ObjectsRollingEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); @@ -379,11 +379,11 @@ export class RoomMessageHandler extends Disposable const furnitureRolling = parser.itemsRolling; - if (furnitureRolling && furnitureRolling.length) + if(furnitureRolling && furnitureRolling.length) { - for (const rollData of furnitureRolling) + for(const rollData of furnitureRolling) { - if (!rollData) continue; + if(!rollData) continue; this._roomCreator.rollRoomObjectFloor(this._currentRoomId, rollData.id, rollData.location, rollData.targetLocation); } @@ -391,17 +391,17 @@ export class RoomMessageHandler extends Disposable const unitRollData = parser.unitRolling; - if (unitRollData) + if(unitRollData) { this._roomCreator.updateRoomObjectUserLocation(this._currentRoomId, unitRollData.id, unitRollData.location, unitRollData.targetLocation); const object = this._roomCreator.getRoomObjectUser(this._currentRoomId, unitRollData.id); - if (object && object.type !== RoomObjectUserType.MONSTER_PLANT) + if(object && object.type !== RoomObjectUserType.MONSTER_PLANT) { let posture = 'std'; - switch (unitRollData.movementType) + switch(unitRollData.movementType) { case ObjectRolling.MOVE: posture = 'mv'; @@ -418,13 +418,13 @@ export class RoomMessageHandler extends Disposable private onObjectsDataUpdateEvent(event: ObjectsDataUpdateEvent): void { - if (!(event instanceof ObjectsDataUpdateEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof ObjectsDataUpdateEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; - for (const object of parser.objects) + for(const object of parser.objects) { this._roomCreator.updateRoomObjectFloor(this._currentRoomId, object.id, null, null, object.state, object.data); } @@ -432,7 +432,7 @@ export class RoomMessageHandler extends Disposable private onFurnitureAliasesEvent(event: FurnitureAliasesEvent): void { - if (!(event instanceof FurnitureAliasesEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof FurnitureAliasesEvent) || !event.connection || !this._roomCreator) return; const alises = event.getParser().aliases; @@ -441,32 +441,32 @@ export class RoomMessageHandler extends Disposable private onFurnitureFloorAddEvent(event: FurnitureFloorAddEvent): void { - if (!(event instanceof FurnitureFloorAddEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof FurnitureFloorAddEvent) || !event.connection || !this._roomCreator) return; const item = event.getParser().item; - if (!item) return; + if(!item) return; this.addRoomObjectFurnitureFloor(this._currentRoomId, item); } private onFurnitureFloorEvent(event: FurnitureFloorEvent): void { - if (!(event instanceof FurnitureFloorEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof FurnitureFloorEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const totalObjects = parser.items.length; let iterator = 0; - while (iterator < totalObjects) + while(iterator < totalObjects) { const object = parser.items[iterator]; - if (object) this.addRoomObjectFurnitureFloor(this._currentRoomId, object); + if(object) this.addRoomObjectFurnitureFloor(this._currentRoomId, object); iterator++; } @@ -474,13 +474,13 @@ export class RoomMessageHandler extends Disposable private onFurnitureFloorRemoveEvent(event: FurnitureFloorRemoveEvent): void { - if (!(event instanceof FurnitureFloorRemoveEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof FurnitureFloorRemoveEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; - if (parser.delay > 0) + if(parser.delay > 0) { setTimeout(() => { @@ -495,11 +495,11 @@ export class RoomMessageHandler extends Disposable private onFurnitureFloorUpdateEvent(event: FurnitureFloorUpdateEvent): void { - if (!(event instanceof FurnitureFloorUpdateEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof FurnitureFloorUpdateEvent) || !event.connection || !this._roomCreator) return; const item = event.getParser().item; - if (!item) return; + if(!item) return; const location: IVector3D = new Vector3d(item.x, item.y, item.z); const direction: IVector3D = new Vector3d(item.direction); @@ -511,32 +511,32 @@ export class RoomMessageHandler extends Disposable private onFurnitureWallAddEvent(event: FurnitureWallAddEvent): void { - if (!(event instanceof FurnitureWallAddEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof FurnitureWallAddEvent) || !event.connection || !this._roomCreator) return; const data = event.getParser().item; - if (!data) return; + if(!data) return; this.addRoomObjectFurnitureWall(this._currentRoomId, data); } private onFurnitureWallEvent(event: FurnitureWallEvent): void { - if (!(event instanceof FurnitureWallEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof FurnitureWallEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const totalObjects = parser.items.length; let iterator = 0; - while (iterator < totalObjects) + while(iterator < totalObjects) { const data = parser.items[iterator]; - if (data) this.addRoomObjectFurnitureWall(this._currentRoomId, data); + if(data) this.addRoomObjectFurnitureWall(this._currentRoomId, data); iterator++; } @@ -544,26 +544,26 @@ export class RoomMessageHandler extends Disposable private onFurnitureWallRemoveEvent(event: FurnitureWallRemoveEvent): void { - if (!(event instanceof FurnitureWallRemoveEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof FurnitureWallRemoveEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; this._roomCreator.removeRoomObjectWall(this._currentRoomId, parser.itemId, parser.userId); } private onFurnitureWallUpdateEvent(event: FurnitureWallUpdateEvent): void { - if (!(event instanceof FurnitureWallUpdateEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof FurnitureWallUpdateEvent) || !event.connection || !this._roomCreator) return; const wallGeometry = this._roomCreator.getLegacyWallGeometry(this._currentRoomId); - if (!wallGeometry) return; + if(!wallGeometry) return; const item = event.getParser().item; - if (!item) return; + if(!item) return; const location = wallGeometry.getLocation(item.width, item.height, item.localX, item.localY, item.direction); const direction = new Vector3d(wallGeometry.getDirection(item.direction)); @@ -574,7 +574,7 @@ export class RoomMessageHandler extends Disposable private onFurnitureDataEvent(event: FurnitureDataEvent): void { - if (!(event instanceof FurnitureDataEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof FurnitureDataEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); @@ -583,7 +583,7 @@ export class RoomMessageHandler extends Disposable private onItemDataUpdateMessageEvent(event: ItemDataUpdateMessageEvent): void { - if (!(event instanceof ItemDataUpdateMessageEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof ItemDataUpdateMessageEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); @@ -592,7 +592,7 @@ export class RoomMessageHandler extends Disposable private onOneWayDoorStatusMessageEvent(event: OneWayDoorStatusMessageEvent): void { - if (!(event instanceof OneWayDoorStatusMessageEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof OneWayDoorStatusMessageEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); @@ -601,7 +601,7 @@ export class RoomMessageHandler extends Disposable private onDiceValueMessageEvent(event: DiceValueMessageEvent): void { - if (!(event instanceof DiceValueMessageEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof DiceValueMessageEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); @@ -610,36 +610,36 @@ export class RoomMessageHandler extends Disposable private onRoomUnitDanceEvent(event: RoomUnitDanceEvent): void { - if (!(event instanceof RoomUnitDanceEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomUnitDanceEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, event.getParser().unitId, RoomObjectVariable.FIGURE_DANCE, event.getParser().danceId); } private onRoomUnitEffectEvent(event: RoomUnitEffectEvent): void { - if (!(event instanceof RoomUnitEffectEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomUnitEffectEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserEffect(this._currentRoomId, event.getParser().unitId, event.getParser().effectId, event.getParser().delay); } private onRoomUnitEvent(event: RoomUnitEvent): void { - if (!(event instanceof RoomUnitEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomUnitEvent) || !event.connection || !this._roomCreator) return; const users = event.getParser().users; - if (!users || !users.length) return; + if(!users || !users.length) return; - for (const user of users) + for(const user of users) { - if (!user) continue; + if(!user) continue; const location = new Vector3d(user.x, user.y, user.z); const direction = new Vector3d(user.dir); this._roomCreator.addRoomObjectUser(this._currentRoomId, user.roomIndex, location, direction, user.dir, user.userType, user.figure); - if (user.webID === this._ownUserId) + if(user.webID === this._ownUserId) { this._roomCreator.setRoomSessionOwnUser(this._currentRoomId, user.roomIndex); this._roomCreator.updateRoomObjectUserOwn(this._currentRoomId, user.roomIndex); @@ -647,9 +647,9 @@ export class RoomMessageHandler extends Disposable this._roomCreator.updateRoomObjectUserFigure(this._currentRoomId, user.roomIndex, user.figure, user.sex, user.subType, user.isRiding); - if (RoomObjectUserType.getTypeString(user.userType) === RoomObjectUserType.PET) + if(RoomObjectUserType.getTypeString(user.userType) === RoomObjectUserType.PET) { - if (this._roomCreator.getPetTypeId(user.figure) === PetType.MONSTERPLANT) + if(this._roomCreator.getPetTypeId(user.figure) === PetType.MONSTERPLANT) { this._roomCreator.updateRoomObjectUserPosture(this._currentRoomId, user.roomIndex, user.petPosture); } @@ -663,46 +663,46 @@ export class RoomMessageHandler extends Disposable private onRoomUnitExpressionEvent(event: RoomUnitExpressionEvent): void { - if (!(event instanceof RoomUnitExpressionEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomUnitExpressionEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, event.getParser().unitId, RoomObjectVariable.FIGURE_EXPRESSION, event.getParser().expression); } private onRoomUnitHandItemEvent(event: RoomUnitHandItemEvent): void { - if (!(event instanceof RoomUnitHandItemEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomUnitHandItemEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, event.getParser().unitId, RoomObjectVariable.FIGURE_CARRY_OBJECT, event.getParser().handId); } private onRoomUnitIdleEvent(event: RoomUnitIdleEvent): void { - if (!(event instanceof RoomUnitIdleEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomUnitIdleEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, event.getParser().unitId, RoomObjectVariable.FIGURE_SLEEP, (event.getParser().isIdle ? 1 : 0)); } private onRoomUnitInfoEvent(event: RoomUnitInfoEvent): void { - if (!(event instanceof RoomUnitInfoEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomUnitInfoEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserFigure(this._currentRoomId, event.getParser().unitId, event.getParser().figure, event.getParser().gender); } private onRoomUnitNumberEvent(event: RoomUnitNumberEvent): void { - if (!(event instanceof RoomUnitNumberEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomUnitNumberEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, parser.unitId, RoomObjectVariable.FIGURE_NUMBER_VALUE, parser.value); } private onRoomUnitRemoveEvent(event: RoomUnitRemoveEvent): void { - if (!(event instanceof RoomUnitRemoveEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomUnitRemoveEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.removeRoomObjectUser(this._currentRoomId, event.getParser().unitId); @@ -711,32 +711,32 @@ export class RoomMessageHandler extends Disposable private onRoomUnitStatusEvent(event: RoomUnitStatusEvent): void { - if (!(event instanceof RoomUnitStatusEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomUnitStatusEvent) || !event.connection || !this._roomCreator) return; const statuses = event.getParser().statuses; - if (!statuses || !statuses.length) return; + if(!statuses || !statuses.length) return; const roomInstance = this._roomCreator.getRoomInstance(this._currentRoomId); - if (!roomInstance) return; + if(!roomInstance) return; const zScale = (roomInstance.model.getValue(RoomVariableEnum.ROOM_Z_SCALE) || 1); - for (const status of statuses) + for(const status of statuses) { - if (!status) continue; + if(!status) continue; let height = status.height; - if (height) height = (height / zScale); + if(height) height = (height / zScale); const location = new Vector3d(status.x, status.y, (status.z + height)); const direction = new Vector3d(status.direction); let goal: IVector3D = null; - if (status.didMove) goal = new Vector3d(status.targetX, status.targetY, status.targetZ); + if(status.didMove) goal = new Vector3d(status.targetX, status.targetY, status.targetZ); this._roomCreator.updateRoomObjectUserLocation(this._currentRoomId, status.id, location, goal, status.canStandUp, height, direction, status.headDirection); this._roomCreator.updateRoomObjectUserFlatControl(this._currentRoomId, status.id, null); @@ -746,24 +746,24 @@ export class RoomMessageHandler extends Disposable let postureType = RoomObjectVariable.STD; let parameter = ''; - if (status.actions && status.actions.length) + if(status.actions && status.actions.length) { - for (const action of status.actions) + for(const action of status.actions) { - if (!action) continue; + if(!action) continue; - switch (action.action) + switch(action.action) { case 'flatctrl': this._roomCreator.updateRoomObjectUserFlatControl(this._currentRoomId, status.id, action.value); break; case 'sign': - if (status.actions.length === 1) isPosture = false; + if(status.actions.length === 1) isPosture = false; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, status.id, RoomObjectVariable.FIGURE_SIGN, parseInt(action.value)); break; case 'gst': - if (status.actions.length === 1) isPosture = false; + if(status.actions.length === 1) isPosture = false; this._roomCreator.updateRoomObjectUserPetGesture(this._currentRoomId, status.id, action.value); break; @@ -783,8 +783,8 @@ export class RoomMessageHandler extends Disposable } } - if (postureUpdate) this._roomCreator.updateRoomObjectUserPosture(this._currentRoomId, status.id, postureType, parameter); - else if (isPosture) this._roomCreator.updateRoomObjectUserPosture(this._currentRoomId, status.id, RoomObjectVariable.STD, ''); + if(postureUpdate) this._roomCreator.updateRoomObjectUserPosture(this._currentRoomId, status.id, postureType, parameter); + else if(isPosture) this._roomCreator.updateRoomObjectUserPosture(this._currentRoomId, status.id, RoomObjectVariable.STD, ''); } this.updateGuideMarker(); @@ -792,11 +792,11 @@ export class RoomMessageHandler extends Disposable private onRoomUnitChatEvent(event: RoomUnitChatEvent): void { - if (!event.connection || !this._roomCreator) return; + if(!event.connection || !this._roomCreator) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; this._roomCreator.updateRoomObjectUserGesture(this._currentRoomId, parser.roomIndex, parser.gesture); this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, parser.roomIndex, RoomObjectVariable.FIGURE_TALK, (parser.message.length / 10)); @@ -804,18 +804,18 @@ export class RoomMessageHandler extends Disposable private onRoomUnitTypingEvent(event: RoomUnitTypingEvent): void { - if (!(event instanceof RoomUnitTypingEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof RoomUnitTypingEvent) || !event.connection || !this._roomCreator) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, event.getParser().unitId, RoomObjectVariable.FIGURE_IS_TYPING, event.getParser().isTyping ? 1 : 0); } private onPetFigureUpdateEvent(event: PetFigureUpdateEvent): void { - if (!(event instanceof PetFigureUpdateEvent) || !event.connection || !this._roomCreator) return; + if(!(event instanceof PetFigureUpdateEvent) || !event.connection || !this._roomCreator) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; this._roomCreator.updateRoomObjectUserFigure(this._currentRoomId, parser.roomIndex, parser.figureData.figuredata, '', '', parser.isRiding); } @@ -824,30 +824,30 @@ export class RoomMessageHandler extends Disposable { const parser = event.getParser(); - if (!parser) return; + if(!parser) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, parser.roomIndex, RoomObjectVariable.FIGURE_GAINED_EXPERIENCE, parser.gainedExperience); } private onYouArePlayingGameEvent(event: YouArePlayingGameEvent): void { - if (!event) return; + if(!event) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; this._roomCreator.setRoomEngineGameMode(this._currentRoomId, parser.isPlaying); } private addRoomObjectFurnitureFloor(roomId: number, data: FurnitureFloorDataParser): void { - if (!data || !this._roomCreator) return; + if(!data || !this._roomCreator) return; const location = new Vector3d(data.x, data.y, data.z); const direction = new Vector3d(data.direction); - if (data.spriteName) + if(data.spriteName) { this._roomCreator.addFurnitureFloorByTypeName(roomId, data.itemId, data.spriteName, location, direction, data.state, data.data, data.extra, data.expires, data.usagePolicy, data.userId, data.username, true, true, data.stackHeight); } @@ -859,15 +859,15 @@ export class RoomMessageHandler extends Disposable private addRoomObjectFurnitureWall(roomId: number, data: FurnitureWallDataParser): void { - if (!data || !this._roomCreator) return; + if(!data || !this._roomCreator) return; const wallGeometry = this._roomCreator.getLegacyWallGeometry(roomId); - if (!wallGeometry) return; + if(!wallGeometry) return; let location: IVector3D = null; - if (!data.isOldFormat) + if(!data.isOldFormat) { location = wallGeometry.getLocation(data.width, data.height, data.localX, data.localY, data.direction); } @@ -883,21 +883,21 @@ export class RoomMessageHandler extends Disposable private onIgnoreResultEvent(event: IgnoreResultEvent): void { - if (!event) return; + if(!event) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const roomSession = this._roomCreator.roomSessionManager.getSession(this._currentRoomId); - if (!roomSession) return; + if(!roomSession) return; const userData = roomSession.userDataManager.getUserDataByName(parser.name); - if (!userData) return; + if(!userData) return; - switch (parser.result) + switch(parser.result) { case 1: case 2: @@ -948,15 +948,15 @@ export class RoomMessageHandler extends Disposable private setUserGuideStatus(userId: number, status: number): void { - if (!this._roomCreator || !this._roomCreator.roomSessionManager) return; + if(!this._roomCreator || !this._roomCreator.roomSessionManager) return; const roomSession = this._roomCreator.roomSessionManager.getSession(this._currentRoomId); - if (!roomSession) return; + if(!roomSession) return; const userData = roomSession.userDataManager.getDataByType(userId, RoomObjectType.USER); - if (!userData) return; + if(!userData) return; this._roomCreator.updateRoomObjectUserAction(this._currentRoomId, userData.roomIndex, RoomObjectVariable.FIGURE_GUIDE_STATUS, status); } diff --git a/src/nitro/room/RoomObjectEventHandler.ts b/src/nitro/room/RoomObjectEventHandler.ts index 5433715b..3cd27034 100644 --- a/src/nitro/room/RoomObjectEventHandler.ts +++ b/src/nitro/room/RoomObjectEventHandler.ts @@ -40,7 +40,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou public dispose(): void { - if (this._eventIds) + if(this._eventIds) { this._eventIds = null; } @@ -54,19 +54,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]); @@ -76,7 +76,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou selectedData = this.getSelectedRoomObjectData(event.roomId); - if (!selectedData) return; + if(!selectedData) return; } } } @@ -87,31 +87,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 @@ -123,7 +123,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); @@ -143,7 +143,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); } @@ -152,7 +152,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou { let existing = this._eventIds.get(k); - if (!existing) + if(!existing) { existing = new Map(); @@ -166,16 +166,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: @@ -289,9 +289,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); @@ -316,20 +316,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); } @@ -337,50 +337,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); } @@ -391,9 +391,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 { @@ -401,24 +401,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; } @@ -428,27 +428,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; } @@ -459,14 +459,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); } @@ -475,16 +475,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); } @@ -493,32 +493,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); } @@ -533,14 +533,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; } @@ -548,24 +548,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; @@ -574,24 +574,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; @@ -604,7 +604,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)); } @@ -616,17 +616,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)); } @@ -636,9 +636,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); @@ -651,9 +651,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)); @@ -663,9 +663,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; @@ -674,7 +674,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(); @@ -690,18 +690,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))); @@ -819,27 +819,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)); @@ -858,20 +858,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)); @@ -890,9 +890,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); @@ -905,16 +905,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); } @@ -922,11 +922,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)); } @@ -942,14 +942,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; @@ -964,7 +964,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); } @@ -973,7 +973,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)); @@ -986,11 +986,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)); @@ -1009,9 +1009,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)); @@ -1021,9 +1021,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); @@ -1036,38 +1036,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); @@ -1075,11 +1075,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; @@ -1088,13 +1088,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); @@ -1103,7 +1103,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); @@ -1119,28 +1119,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); @@ -1150,9 +1150,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); } @@ -1160,13 +1160,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]); @@ -1176,7 +1176,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou selectedData = this.getSelectedRoomObjectData(roomId); - if (!selectedData) return; + if(!selectedData) return; } } } @@ -1185,15 +1185,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); @@ -1201,11 +1201,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; @@ -1214,13 +1214,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); } @@ -1228,9 +1228,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); @@ -1244,7 +1244,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleFurnitureMove(roomObject: IRoomObjectController, selectedObjectData: ISelectedRoomObjectData, x: number, y: number, stackingHeightMap: IFurnitureStackingHeightMap): boolean { - if (!roomObject || !selectedObjectData) return false; + if(!roomObject || !selectedObjectData) return false; const _local_6 = new Vector3d(); _local_6.assign(roomObject.getDirection()); @@ -1258,7 +1258,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); @@ -1267,7 +1267,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); @@ -1276,19 +1276,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: ISelectedRoomObjectData, _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); @@ -1298,19 +1298,19 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private validateFurnitureLocation(k: IRoomObject, _arg_2: IVector3D, _arg_3: IVector3D, _arg_4: IVector3D, _arg_5: IFurnitureStackingHeightMap): 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(); @@ -1323,9 +1323,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; @@ -1334,7 +1334,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; @@ -1344,18 +1344,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)); } @@ -1368,40 +1368,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: ISelectedRoomObjectData): 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; } @@ -1422,8 +1422,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)); @@ -1445,11 +1445,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)); } @@ -1459,7 +1459,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)); } @@ -1469,26 +1469,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; @@ -1499,12 +1499,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); @@ -1516,17 +1516,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(); @@ -1535,14 +1535,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; @@ -1555,44 +1555,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); @@ -1613,7 +1613,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; @@ -1625,24 +1625,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; @@ -1650,29 +1650,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)); } @@ -1689,7 +1689,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)); @@ -1699,23 +1699,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); } @@ -1727,19 +1727,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)); } @@ -1754,14 +1754,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); @@ -1770,11 +1770,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); @@ -1796,9 +1796,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(); @@ -1807,20 +1807,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(); @@ -1828,11 +1828,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)); } } } @@ -1841,23 +1841,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)); } @@ -1869,7 +1869,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)); @@ -1878,7 +1878,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)); @@ -1887,13 +1887,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); } @@ -1904,18 +1904,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++; @@ -1924,7 +1924,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]; @@ -1935,38 +1935,38 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private isValidLocation(object: IRoomObject, goalDirection: IVector3D, stackingHeightMap: IFurnitureStackingHeightMap): 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; @@ -1976,31 +1976,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); @@ -2009,13 +2009,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)); @@ -2033,11 +2033,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)); @@ -2048,12 +2048,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)); @@ -2062,11 +2062,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)); @@ -2076,34 +2076,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); @@ -2111,7 +2111,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); } @@ -2119,12 +2119,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); @@ -2144,14 +2144,14 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private getSelectedRoomObjectData(roomId: number): ISelectedRoomObjectData { - 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); } @@ -2172,7 +2172,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); @@ -2181,7 +2181,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); @@ -2190,7 +2190,7 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou private handleUserPlace(roomObject: IRoomObjectController, x: number, y: number, wallGeometry: ILegacyWallGeometry): 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 b76098de..ec210599 100644 --- a/src/nitro/room/RoomObjectLogicFactory.ts +++ b/src/nitro/room/RoomObjectLogicFactory.ts @@ -24,23 +24,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); } @@ -51,13 +51,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); } @@ -65,15 +65,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); } @@ -81,17 +81,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); } @@ -99,11 +99,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; @@ -307,7 +307,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 1d4c8055..671cf7f8 100644 --- a/src/nitro/room/object/RoomObjectVisualizationFactory.ts +++ b/src/nitro/room/object/RoomObjectVisualizationFactory.ts @@ -18,18 +18,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; @@ -140,7 +140,7 @@ export class RoomObjectVisualizationFactory implements IRoomObjectVisualizationF break; } - if (!visualization) + if(!visualization) { NitroLogger.log('Unknown Visualization', type); @@ -154,11 +154,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: @@ -210,21 +210,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/avatar/AvatarLogic.ts b/src/nitro/room/object/logic/avatar/AvatarLogic.ts index 283a8227..44da2386 100644 --- a/src/nitro/room/object/logic/avatar/AvatarLogic.ts +++ b/src/nitro/room/object/logic/avatar/AvatarLogic.ts @@ -64,9 +64,9 @@ export class AvatarLogic extends MovingObjectLogic public dispose(): void { - if (this._selected && this.object) + if(this._selected && this.object) { - if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMoveEvent(RoomObjectMoveEvent.OBJECT_REMOVED, this.object)); + if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMoveEvent(RoomObjectMoveEvent.OBJECT_REMOVED, this.object)); } super.dispose(); @@ -78,15 +78,15 @@ export class AvatarLogic extends MovingObjectLogic { super.update(time); - if (this._selected && this.object) + if(this._selected && this.object) { - if (this.eventDispatcher) + if(this.eventDispatcher) { const location = this.object.getLocation(); - if (((!this._reportedLocation || (this._reportedLocation.x !== location.x)) || (this._reportedLocation.y !== location.y)) || (this._reportedLocation.z !== location.z)) + if(((!this._reportedLocation || (this._reportedLocation.x !== location.x)) || (this._reportedLocation.y !== location.y)) || (this._reportedLocation.z !== location.z)) { - if (!this._reportedLocation) this._reportedLocation = new Vector3d(); + if(!this._reportedLocation) this._reportedLocation = new Vector3d(); this._reportedLocation.assign(location); @@ -97,14 +97,14 @@ export class AvatarLogic extends MovingObjectLogic const model = this.object && this.object.model; - if (model) this.updateModel(this.time, model); + if(model) this.updateModel(this.time, model); } private updateModel(time: number, model: IRoomObjectModel): void { - if (this._talkingEndTimestamp > 0) + if(this._talkingEndTimestamp > 0) { - if (time > this._talkingEndTimestamp) + if(time > this._talkingEndTimestamp) { model.setValue(RoomObjectVariable.FIGURE_TALK, 0); @@ -114,14 +114,14 @@ export class AvatarLogic extends MovingObjectLogic } else { - if (!this._talkingPauseEndTimestamp && !this._talkingPauseStartTimestamp) + if(!this._talkingPauseEndTimestamp && !this._talkingPauseStartTimestamp) { this._talkingPauseStartTimestamp = time + this.randomTalkingPauseStartTimestamp(); this._talkingPauseEndTimestamp = this._talkingPauseStartTimestamp + this.randomTalkingPauseEndTimestamp(); } else { - if ((this._talkingPauseStartTimestamp > 0) && (time > this._talkingPauseStartTimestamp)) + if((this._talkingPauseStartTimestamp > 0) && (time > this._talkingPauseStartTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_TALK, 0); @@ -129,7 +129,7 @@ export class AvatarLogic extends MovingObjectLogic } else { - if ((this._talkingPauseEndTimestamp > 0) && (time > this._talkingPauseEndTimestamp)) + if((this._talkingPauseEndTimestamp > 0) && (time > this._talkingPauseEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_TALK, 1); @@ -140,30 +140,30 @@ export class AvatarLogic extends MovingObjectLogic } } - if ((this._animationEndTimestamp > 0) && (time > this._animationEndTimestamp)) + if((this._animationEndTimestamp > 0) && (time > this._animationEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_EXPRESSION, 0); this._animationEndTimestamp = 0; } - if ((this._gestureEndTimestamp > 0) && (time > this._gestureEndTimestamp)) + if((this._gestureEndTimestamp > 0) && (time > this._gestureEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_GESTURE, 0); this._gestureEndTimestamp = 0; } - if ((this._signEndTimestamp > 0) && (time > this._signEndTimestamp)) + if((this._signEndTimestamp > 0) && (time > this._signEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_SIGN, -1); this._signEndTimestamp = 0; } - if (this._carryObjectEndTimestamp > 0) + if(this._carryObjectEndTimestamp > 0) { - if (time > this._carryObjectEndTimestamp) + if(time > this._carryObjectEndTimestamp) { model.setValue(RoomObjectVariable.FIGURE_CARRY_OBJECT, 0); model.setValue(RoomObjectVariable.FIGURE_USE_OBJECT, 0); @@ -174,11 +174,11 @@ export class AvatarLogic extends MovingObjectLogic } } - if (this._allowUseCarryObject) + if(this._allowUseCarryObject) { - if ((time - this._carryObjectStartTimestamp) > 5000) + if((time - this._carryObjectStartTimestamp) > 5000) { - if (((time - this._carryObjectStartTimestamp) % 10000) < 1000) + if(((time - this._carryObjectStartTimestamp) % 10000) < 1000) { model.setValue(RoomObjectVariable.FIGURE_USE_OBJECT, 1); } @@ -189,7 +189,7 @@ export class AvatarLogic extends MovingObjectLogic } } - if ((this._blinkingStartTimestamp > -1) && (time > this._blinkingStartTimestamp)) + if((this._blinkingStartTimestamp > -1) && (time > this._blinkingStartTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_BLINK, 1); @@ -197,21 +197,21 @@ export class AvatarLogic extends MovingObjectLogic this._blinkingEndTimestamp = time + this.randomBlinkEndTimestamp(); } - if ((this._blinkingEndTimestamp > 0) && (time > this._blinkingEndTimestamp)) + if((this._blinkingEndTimestamp > 0) && (time > this._blinkingEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_BLINK, 0); this._blinkingEndTimestamp = 0; } - if ((this._effectChangeTimeStamp > 0) && (time > this._effectChangeTimeStamp)) + if((this._effectChangeTimeStamp > 0) && (time > this._effectChangeTimeStamp)) { model.setValue(RoomObjectVariable.FIGURE_EFFECT, this._newEffect); this._effectChangeTimeStamp = 0; } - if ((this._numberValueEndTimestamp > 0) && (time > this._numberValueEndTimestamp)) + if((this._numberValueEndTimestamp > 0) && (time > this._numberValueEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_NUMBER_VALUE, 0); @@ -221,15 +221,15 @@ export class AvatarLogic extends MovingObjectLogic public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if (!message || !this.object) return; + if(!message || !this.object) return; super.processUpdateMessage(message); const model = this.object && this.object.model; - if (!model) return; + if(!model) return; - if (message instanceof ObjectAvatarPostureUpdateMessage) + if(message instanceof ObjectAvatarPostureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_POSTURE, message.postureType); model.setValue(RoomObjectVariable.FIGURE_POSTURE_PARAMETER, message.parameter); @@ -237,7 +237,7 @@ export class AvatarLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarChatUpdateMessage) + if(message instanceof ObjectAvatarChatUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_TALK, 1); @@ -246,28 +246,28 @@ export class AvatarLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarTypingUpdateMessage) + if(message instanceof ObjectAvatarTypingUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_IS_TYPING, message.isTyping ? 1 : 0); return; } - if (message instanceof ObjectAvatarMutedUpdateMessage) + if(message instanceof ObjectAvatarMutedUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_IS_MUTED, (message.isMuted ? 1 : 0)); return; } - if (message instanceof ObjectAvatarPlayingGameUpdateMessage) + if(message instanceof ObjectAvatarPlayingGameUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_IS_PLAYING_GAME, (message.isPlayingGame ? 1 : 0)); return; } - if (message instanceof ObjectAvatarUpdateMessage) + if(message instanceof ObjectAvatarUpdateMessage) { model.setValue(RoomObjectVariable.HEAD_DIRECTION, message.headDirection); model.setValue(RoomObjectVariable.FIGURE_CAN_STAND_UP, message.canStandUp); @@ -276,7 +276,7 @@ export class AvatarLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarGestureUpdateMessage) + if(message instanceof ObjectAvatarGestureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_GESTURE, message.gesture); @@ -285,35 +285,35 @@ export class AvatarLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarExpressionUpdateMessage) + if(message instanceof ObjectAvatarExpressionUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_EXPRESSION, message.expressionType); this._animationEndTimestamp = AvatarAction.getExpressionTimeout(model.getValue(RoomObjectVariable.FIGURE_EXPRESSION)); - if (this._animationEndTimestamp > -1) this._animationEndTimestamp += this.time; + if(this._animationEndTimestamp > -1) this._animationEndTimestamp += this.time; return; } - if (message instanceof ObjectAvatarDanceUpdateMessage) + if(message instanceof ObjectAvatarDanceUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_DANCE, message.danceStyle); return; } - if (message instanceof ObjectAvatarSleepUpdateMessage) + if(message instanceof ObjectAvatarSleepUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_SLEEP, message.isSleeping ? 1 : 0); - if (message.isSleeping) this._blinkingStartTimestamp = -1; + if(message.isSleeping) this._blinkingStartTimestamp = -1; else this._blinkingStartTimestamp = (this.time + this.randomBlinkStartTimestamp()); return; } - if (message instanceof ObjectAvatarPlayerValueUpdateMessage) + if(message instanceof ObjectAvatarPlayerValueUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_NUMBER_VALUE, message.value); @@ -322,19 +322,19 @@ export class AvatarLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarEffectUpdateMessage) + if(message instanceof ObjectAvatarEffectUpdateMessage) { this.updateAvatarEffect(message.effect, message.delayMilliseconds, model); return; } - if (message instanceof ObjectAvatarCarryObjectUpdateMessage) + if(message instanceof ObjectAvatarCarryObjectUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_CARRY_OBJECT, message.itemType); model.setValue(RoomObjectVariable.FIGURE_USE_OBJECT, 0); - if (message.itemType === 0) + if(message.itemType === 0) { this._carryObjectStartTimestamp = 0; this._carryObjectEndTimestamp = 0; @@ -344,7 +344,7 @@ export class AvatarLogic extends MovingObjectLogic { this._carryObjectStartTimestamp = this.time; - if (message.itemType < AvatarLogic.MAX_HAND_ID) + if(message.itemType < AvatarLogic.MAX_HAND_ID) { this._carryObjectEndTimestamp = 0; this._allowUseCarryObject = message.itemType <= AvatarLogic.MAX_HAND_USE_ID; @@ -359,14 +359,14 @@ export class AvatarLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarUseObjectUpdateMessage) + if(message instanceof ObjectAvatarUseObjectUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_USE_OBJECT, message.itemType); return; } - if (message instanceof ObjectAvatarSignUpdateMessage) + if(message instanceof ObjectAvatarSignUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_SIGN, message.signType); @@ -375,14 +375,14 @@ export class AvatarLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarFlatControlUpdateMessage) + if(message instanceof ObjectAvatarFlatControlUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_FLAT_CONTROL, message.level); return; } - if (message instanceof ObjectAvatarFigureUpdateMessage) + if(message instanceof ObjectAvatarFigureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE, message.figure); model.setValue(RoomObjectVariable.GENDER, message.gender); @@ -390,7 +390,7 @@ export class AvatarLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarSelectedMessage) + if(message instanceof ObjectAvatarSelectedMessage) { this._selected = message.selected; this._reportedLocation = null; @@ -398,7 +398,7 @@ export class AvatarLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarOwnMessage) + if(message instanceof ObjectAvatarOwnMessage) { model.setValue(RoomObjectVariable.OWN_USER, 1); @@ -408,19 +408,19 @@ export class AvatarLogic extends MovingObjectLogic private updateAvatarEffect(effect: number, delay: number, model: IRoomObjectModel): void { - if (effect === AvatarLogic.EFFECT_TYPE_SPLASH) + if(effect === AvatarLogic.EFFECT_TYPE_SPLASH) { this._effectChangeTimeStamp = (GetTickerTime() + AvatarLogic.EFFECT_SPLASH_LENGTH); this._newEffect = AvatarLogic.EFFECT_TYPE_SWIM; } - else if (effect === AvatarLogic.EFFECT_TYPE_SPLASH_DARK) + else if(effect === AvatarLogic.EFFECT_TYPE_SPLASH_DARK) { this._effectChangeTimeStamp = (GetTickerTime() + AvatarLogic.EFFECT_SPLASH_LENGTH); this._newEffect = AvatarLogic.EFFECT_TYPE_SWIM_DARK; } - else if (model.getValue(RoomObjectVariable.FIGURE_EFFECT) === AvatarLogic.EFFECT_TYPE_SWIM) + else if(model.getValue(RoomObjectVariable.FIGURE_EFFECT) === AvatarLogic.EFFECT_TYPE_SWIM) { this._effectChangeTimeStamp = (GetTickerTime() + AvatarLogic.EFFECT_SPLASH_LENGTH); this._newEffect = effect; @@ -428,7 +428,7 @@ export class AvatarLogic extends MovingObjectLogic effect = AvatarLogic.EFFECT_TYPE_SPLASH; } - else if (model.getValue(RoomObjectVariable.FIGURE_EFFECT) === AvatarLogic.EFFECT_TYPE_SWIM_DARK) + else if(model.getValue(RoomObjectVariable.FIGURE_EFFECT) === AvatarLogic.EFFECT_TYPE_SWIM_DARK) { this._effectChangeTimeStamp = (GetTickerTime() + AvatarLogic.EFFECT_SPLASH_LENGTH); this._newEffect = effect; @@ -436,7 +436,7 @@ export class AvatarLogic extends MovingObjectLogic effect = AvatarLogic.EFFECT_TYPE_SPLASH_DARK; } - else if (delay === 0) + else if(delay === 0) { this._effectChangeTimeStamp = 0; } @@ -456,7 +456,7 @@ export class AvatarLogic extends MovingObjectLogic { let eventType: string = null; - switch (event.type) + switch(event.type) { case MouseEventType.MOUSE_CLICK: eventType = RoomObjectMouseEvent.CLICK; @@ -464,20 +464,20 @@ export class AvatarLogic extends MovingObjectLogic case MouseEventType.ROLL_OVER: eventType = RoomObjectMouseEvent.MOUSE_ENTER; - if (this.object.model) this.object.model.setValue(RoomObjectVariable.FIGURE_HIGHLIGHT, 1); + if(this.object.model) this.object.model.setValue(RoomObjectVariable.FIGURE_HIGHLIGHT, 1); - if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_BUTTON, this.object)); + if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_BUTTON, this.object)); break; case MouseEventType.ROLL_OUT: eventType = RoomObjectMouseEvent.MOUSE_LEAVE; - if (this.object.model) this.object.model.setValue(RoomObjectVariable.FIGURE_HIGHLIGHT, 0); + if(this.object.model) this.object.model.setValue(RoomObjectVariable.FIGURE_HIGHLIGHT, 0); - if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_ARROW, this.object)); + if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_ARROW, this.object)); break; } - if (eventType && this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(eventType, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); + if(eventType && this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(eventType, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); } private randomTalkingPauseStartTimestamp(): number diff --git a/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts index 07f32de0..230e66de 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureAchievementResolutionLogic.ts @@ -24,17 +24,17 @@ export class FurnitureAchievementResolutionLogic extends FurnitureBadgeDisplayLo { super.processUpdateMessage(message); - if (message instanceof ObjectGroupBadgeUpdateMessage) + if(message instanceof ObjectGroupBadgeUpdateMessage) { - if (message.assetName !== 'loading_icon') + if(message.assetName !== 'loading_icon') { this.object.model.setValue(RoomObjectVariable.FURNITURE_BADGE_VISIBLE_IN_STATE, FurnitureAchievementResolutionLogic.BADGE_VISIBLE_IN_STATE); } } - if (message instanceof ObjectSelectedMessage) + if(message instanceof ObjectSelectedMessage) { - if (!this.eventDispatcher || !this.object) return; + if(!this.eventDispatcher || !this.object) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU, this.object)); } @@ -42,11 +42,11 @@ export class FurnitureAchievementResolutionLogic extends FurnitureBadgeDisplayLo public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; let event: RoomObjectEvent = null; - switch (this.object.getState(0)) + switch(this.object.getState(0)) { case FurnitureAchievementResolutionLogic.STATE_RESOLUTION_NOT_STARTED: case FurnitureAchievementResolutionLogic.STATE_RESOLUTION_IN_PROGRESS: @@ -60,12 +60,12 @@ export class FurnitureAchievementResolutionLogic extends FurnitureBadgeDisplayLo break; } - if (event) this.eventDispatcher.dispatchEvent(event); + if(event) this.eventDispatcher.dispatchEvent(event); } protected updateBadge(badgeId: string): void { - if (badgeId === FurnitureAchievementResolutionLogic.ACH_NOT_SET) return; + if(badgeId === FurnitureAchievementResolutionLogic.ACH_NOT_SET) return; super.updateBadge(badgeId); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts index 238247fe..b92d698f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureBadgeDisplayLogic.ts @@ -18,20 +18,20 @@ export class FurnitureBadgeDisplayLogic extends FurnitureLogic { super.processUpdateMessage(message); - if (!this.object) return; + if(!this.object) return; - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { const data = message.data; - if (data instanceof StringDataType) this.updateBadge(data.getValue(1)); + if(data instanceof StringDataType) this.updateBadge(data.getValue(1)); return; } - if (message instanceof ObjectGroupBadgeUpdateMessage) + if(message instanceof ObjectGroupBadgeUpdateMessage) { - if (message.assetName !== 'loading_icon') + if(message.assetName !== 'loading_icon') { this.object.model.setValue(RoomObjectVariable.FURNITURE_BADGE_ASSET_NAME, message.assetName); this.object.model.setValue(RoomObjectVariable.FURNITURE_BADGE_IMAGE_STATUS, 1); @@ -45,16 +45,16 @@ export class FurnitureBadgeDisplayLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.BADGE_DISPLAY_ENGRAVING, this.object)); } protected updateBadge(badgeId: string): void { - if (badgeId === '') return; + if(badgeId === '') return; - if (this.eventDispatcher) + if(this.eventDispatcher) { this.object.model.setValue(RoomObjectVariable.FURNITURE_BADGE_IMAGE_STATUS, -1); diff --git a/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts index 253ebc49..14cec74c 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureChangeStateWhenStepOnLogic.ts @@ -15,33 +15,33 @@ export class FurnitureChangeStateWhenStepOnLogic extends FurnitureLogic { super.initialize(asset); - if (this.eventDispatcher) this.eventDispatcher.addEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); + if(this.eventDispatcher) this.eventDispatcher.addEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); } public tearDown(): void { - if (this.eventDispatcher) this.eventDispatcher.removeEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); + if(this.eventDispatcher) this.eventDispatcher.removeEventListener(RoomToObjectOwnAvatarMoveEvent.ROAME_MOVE_TO, this.onRoomToObjectOwnAvatarMoveEvent); super.tearDown(); } private onRoomToObjectOwnAvatarMoveEvent(event: RoomToObjectOwnAvatarMoveEvent): void { - if (!event || !this.object) return; + if(!event || !this.object) return; const location = this.object.getLocation(); const targetLocation = event.targetLocation; - if (!targetLocation) return; + if(!targetLocation) return; let sizeX = this.object.model.getValue(RoomObjectVariable.FURNITURE_SIZE_X); let sizeY = this.object.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Y); const direction = (((Math.floor(this.object.getDirection().x) + 45) % 360) / 90); - if ((direction === 1) || (direction === 3)) [sizeX, sizeY] = [sizeY, sizeX]; + if((direction === 1) || (direction === 3)) [sizeX, sizeY] = [sizeY, sizeX]; - if (((targetLocation.x >= location.x) && (targetLocation.x < (location.x + sizeX))) && ((targetLocation.y >= location.y) && (targetLocation.y < (location.y + sizeY)))) + if(((targetLocation.x >= location.x) && (targetLocation.x < (location.x + sizeX))) && ((targetLocation.y >= location.y) && (targetLocation.y < (location.y + sizeY)))) { this.object.setState(1, 0); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts index 9b55d4a1..385e2e06 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureClothingChangeLogic.ts @@ -26,22 +26,22 @@ export class FurnitureClothingChangeLogic extends FurnitureLogic { super.processUpdateMessage(message); - if (message instanceof ObjectDataUpdateMessage) message.data && this.updateClothingData(message.data.getLegacyString()); + if(message instanceof ObjectDataUpdateMessage) message.data && this.updateClothingData(message.data.getLegacyString()); } private updateClothingData(furnitureData: string): void { - if (!furnitureData || !furnitureData.length) return; + if(!furnitureData || !furnitureData.length) return; const [boyClothing, girlClothing] = furnitureData.split(','); - if (boyClothing && boyClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_BOY, boyClothing); - if (girlClothing && girlClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_GIRL, girlClothing); + if(boyClothing && boyClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_BOY, boyClothing); + if(girlClothing && girlClothing.length) this.object.model.setValue(RoomObjectVariable.FURNITURE_CLOTHING_GIRL, girlClothing); } public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOTHING_CHANGE, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts index c264c484..f1538130 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCounterClockLogic.ts @@ -14,14 +14,14 @@ export class FurnitureCounterClockLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry || !this.object) return; + if(!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; - switch (event.type) + switch(event.type) { case MouseEventType.DOUBLE_CLICK: - switch (event.spriteTag) + switch(event.spriteTag) { case 'start_stop': objectEvent = new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 1); @@ -31,7 +31,7 @@ export class FurnitureCounterClockLogic extends FurnitureLogic break; } - if (this.eventDispatcher && objectEvent) + if(this.eventDispatcher && objectEvent) { this.eventDispatcher.dispatchEvent(objectEvent); @@ -45,7 +45,7 @@ export class FurnitureCounterClockLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 1)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts index c055cb85..244f7c52 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCrackableLogic.ts @@ -8,9 +8,9 @@ export class FurnitureCrackableLogic extends FurnitureLogic { super.processUpdateMessage(message); - if (!this.object) return; + if(!this.object) return; - if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { this.object.model.setValue(RoomWidgetEnumItemExtradataParameter.INFOSTAND_EXTRA_PARAM, RoomWidgetEnumItemExtradataParameter.CRACKABLE_FURNI); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts index 7441621a..aa313fa6 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCreditLogic.ts @@ -19,9 +19,9 @@ export class FurnitureCreditLogic extends FurnitureLogic let creditValue = 0; - if (asset.logic) + if(asset.logic) { - if (asset.logic.credits && (asset.logic.credits !== '') && (asset.logic.credits.length > 0)) creditValue = parseInt(asset.logic.credits); + if(asset.logic.credits && (asset.logic.credits !== '') && (asset.logic.credits.length > 0)) creditValue = parseInt(asset.logic.credits); } this.object.model.setValue(RoomObjectVariable.FURNITURE_CREDIT_VALUE, creditValue); @@ -29,7 +29,7 @@ export class FurnitureCreditLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CREDITFURNI, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts index 7a305ae0..3d4cf05f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCuckooClockLogic.ts @@ -18,9 +18,9 @@ export class FurnitureCuckooClockLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { - if ((this._state !== -1) && (message.state !== this._state)) + if((this._state !== -1) && (message.state !== this._state)) { this.dispatchSoundEvent(this.object.location.z); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts index 9c8a7c4c..d902d54e 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts @@ -17,12 +17,12 @@ export class FurnitureCustomStackHeightLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if (this.object && this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE, 1); + if(this.object && this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE, 1); } public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.STACK_HEIGHT, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts index a126ff37..c68fb78f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureDiceLogic.ts @@ -25,16 +25,16 @@ export class FurnitureDiceLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry || !this.object) return; + if(!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; - switch (event.type) + switch(event.type) { case MouseEventType.DOUBLE_CLICK: - if (this._noTags) + if(this._noTags) { - if (((!(this._noTagsLastStateActivate)) || (this.object.getState(0) === 0)) || (this.object.getState(0) === 100)) + if(((!(this._noTagsLastStateActivate)) || (this.object.getState(0) === 0)) || (this.object.getState(0) === 100)) { objectEvent = new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.DICE_ACTIVATE, this.object); @@ -49,18 +49,18 @@ export class FurnitureDiceLogic extends FurnitureLogic } else { - if (((event.spriteTag === 'activate') || (this.object.getState(0) === 0)) || (this.object.getState(0) === 100)) + if(((event.spriteTag === 'activate') || (this.object.getState(0) === 0)) || (this.object.getState(0) === 100)) { objectEvent = new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.DICE_ACTIVATE, this.object); } - else if (event.spriteTag === 'deactivate') + else if(event.spriteTag === 'deactivate') { objectEvent = new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.DICE_OFF, this.object); } } - if (objectEvent && this.eventDispatcher) this.eventDispatcher.dispatchEvent(objectEvent); + if(objectEvent && this.eventDispatcher) this.eventDispatcher.dispatchEvent(objectEvent); return; } diff --git a/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts index af1a4f2e..e4b32144 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEcotronBoxLogic.ts @@ -14,7 +14,7 @@ export class FurnitureEcotronBoxLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.ECOTRONBOX, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts index e7d31174..56dafb38 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEditableInternalLinkLogic.ts @@ -27,11 +27,11 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic { super.initialize(asset); - if (asset.logic) + if(asset.logic) { - if (asset.logic.action) + if(asset.logic.action) { - if (asset.logic.action.startState === 1) this._showStateOnceRendered = true; + if(asset.logic.action.startState === 1) this._showStateOnceRendered = true; } } } @@ -40,11 +40,11 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic { super.update(time); - if (!this._showStateOnceRendered) return; + if(!this._showStateOnceRendered) return; this._updateCount++; - if (this._showStateOnceRendered && (this._updateCount > 20)) + if(this._showStateOnceRendered && (this._updateCount > 20)) { this.setAutomaticStateIndex(1); @@ -54,9 +54,9 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic private setAutomaticStateIndex(state: number): void { - if (!this.object) return; + if(!this.object) return; - if (this.object.model) + if(this.object.model) { this.object.model.setValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX, state); } @@ -64,9 +64,9 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry) return; + if(!event || !geometry) return; - if (event.type === MouseEventType.DOUBLE_CLICK) + if(event.type === MouseEventType.DOUBLE_CLICK) { this.setAutomaticStateIndex(0); } @@ -76,7 +76,7 @@ export class FurnitureEditableInternalLinkLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts index 7c137cfa..f7c1eee0 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEditableRoomLinkLogic.ts @@ -17,11 +17,11 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic { super.initialize(asset); - if (asset.logic) + if(asset.logic) { - if (asset.logic.action) + if(asset.logic.action) { - if (asset.logic.action.link && (asset.logic.action.link !== '') && (asset.logic.action.link.length > 0)) + if(asset.logic.action.link && (asset.logic.action.link !== '') && (asset.logic.action.link.length > 0)) { (this.object && this.object.model && this.object.model.setValue(RoomObjectVariable.FURNITURE_INTERNAL_LINK, asset.logic.action.link)); } @@ -31,7 +31,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic protected onDispose(): void { - if (this._timer) + if(this._timer) { clearTimeout(this._timer); @@ -43,9 +43,9 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic private setAutomaticStateIndex(state: number): void { - if (!this.object) return; + if(!this.object) return; - if (this.object.model) + if(this.object.model) { this.object.model.setValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX, state); } @@ -55,7 +55,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic { this.setAutomaticStateIndex(1); - if (this._timer) + if(this._timer) { clearTimeout(this._timer); @@ -69,7 +69,7 @@ export class FurnitureEditableRoomLinkLogic extends FurnitureLogic this._timer = null; }, 2500); - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.ROOM_LINK, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts index 98f9eedf..5b92580b 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureEffectBoxLogic.ts @@ -15,7 +15,7 @@ export class FurnitureEffectBoxLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.EFFECTBOX_OPEN_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts index 82676ec2..e2bfdb52 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts @@ -17,15 +17,15 @@ export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if (!asset) return; + if(!asset) return; - if (this.object && this.object.model) + if(this.object && this.object.model) { let maskType = ''; - if (asset.logic) + if(asset.logic) { - if (asset.logic.maskType && (asset.logic.maskType !== '') && (asset.logic.maskType.length > 0)) maskType = asset.logic.maskType; + if(asset.logic.maskType && (asset.logic.maskType !== '') && (asset.logic.maskType.length > 0)) maskType = asset.logic.maskType; } this.object.model.setValue(RoomObjectVariable.FURNITURE_USES_PLANE_MASK, 0); @@ -35,7 +35,7 @@ export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.EXTERNAL_IMAGE, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts index 0cc4304b..40a1f999 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFireworksLogic.ts @@ -16,9 +16,9 @@ export class FurnitureFireworksLogic extends FurnitureLogic { super.initialize(asset); - if (asset.logic) + if(asset.logic) { - if (asset.logic.particleSystems && asset.logic.particleSystems.length) + if(asset.logic.particleSystems && asset.logic.particleSystems.length) { this.object.model.setValue(RoomObjectVariable.FURNITURE_FIREWORKS_DATA, asset.logic.particleSystems); } @@ -27,14 +27,14 @@ export class FurnitureFireworksLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry || !this.object) return; + if(!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; - switch (event.type) + switch(event.type) { case MouseEventType.DOUBLE_CLICK: - switch (event.spriteTag) + switch(event.spriteTag) { case 'start_stop': objectEvent = new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 1); @@ -44,7 +44,7 @@ export class FurnitureFireworksLogic extends FurnitureLogic break; } - if (this.eventDispatcher && objectEvent) + if(this.eventDispatcher && objectEvent) { this.eventDispatcher.dispatchEvent(objectEvent); @@ -58,7 +58,7 @@ export class FurnitureFireworksLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 0)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts index 6c67390d..37fb6151 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts @@ -28,7 +28,7 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic protected onDispose(): void { - if (this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) + if(this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) { this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.REMOVE_HOLE, this.object)); } @@ -47,26 +47,26 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if (!this.object) return; + if(!this.object) return; - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { this.handleStateUpdate(this.object.getState(0)); } const location = this.object.getLocation(); - if (!this._currentLocation) + if(!this._currentLocation) { this._currentLocation = new Vector3d(); } else { - if ((location.x !== this._currentLocation.x) || (location.y !== this._currentLocation.y)) + if((location.x !== this._currentLocation.x) || (location.y !== this._currentLocation.y)) { - if (this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) + if(this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) { - if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.ADD_HOLE, this.object)); + if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.ADD_HOLE, this.object)); } } } @@ -76,16 +76,16 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic private handleStateUpdate(state: number): void { - if (state === this._currentState) return; + if(state === this._currentState) return; - if (this.eventDispatcher) + if(this.eventDispatcher) { - if (state === FurnitureFloorHoleLogic.STATE_HOLE) + if(state === FurnitureFloorHoleLogic.STATE_HOLE) { this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.ADD_HOLE, this.object)); } - else if (this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) + else if(this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) { this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.REMOVE_HOLE, this.object)); } @@ -96,14 +96,14 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic private handleAutomaticStateUpdate(): void { - if (!this.object) return; + if(!this.object) return; const model = this.object.model; - if (!model) return; + if(!model) return; const stateIndex = model.getValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX); - if (!isNaN(stateIndex)) this.handleStateUpdate((stateIndex % 2)); + if(!isNaN(stateIndex)) this.handleStateUpdate((stateIndex % 2)); } } diff --git a/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts index e99f9d8e..2b024b7e 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFriendFurniLogic.ts @@ -16,16 +16,16 @@ export class FurnitureFriendFurniLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if (this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_FRIENDFURNI_ENGRAVING, this.engravingDialogType); + if(this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_FRIENDFURNI_ENGRAVING, this.engravingDialogType); } public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { const data = (message.data as StringDataType); - if (data) + if(data) { this._state = data.state; } @@ -47,9 +47,9 @@ export class FurnitureFriendFurniLogic extends FurnitureMultiStateLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; - if (this._state === FurnitureFriendFurniLogic.STATE_LOCKED) + if(this._state === FurnitureFriendFurniLogic.STATE_LOCKED) { this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.FRIEND_FURNITURE_ENGRAVING, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts index 9be4b2d3..405db1f2 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureGroupForumTerminalLogic.ts @@ -22,7 +22,7 @@ export class FurnitureGroupForumTerminalLogic extends FurnitureGuildCustomizedLo public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts index b2dd8125..7ecf76b9 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureGuildCustomizedLogic.ts @@ -27,11 +27,11 @@ export class FurnitureGuildCustomizedLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { const data = message.data; - if (data instanceof StringDataType) + if(data instanceof StringDataType) { this.updateGroupId(data.getValue(FurnitureGuildCustomizedLogic.GROUPID_KEY)); this.updateBadge(data.getValue(FurnitureGuildCustomizedLogic.BADGE_KEY)); @@ -39,9 +39,9 @@ export class FurnitureGuildCustomizedLogic extends FurnitureMultiStateLogic } } - else if (message instanceof ObjectGroupBadgeUpdateMessage) + else if(message instanceof ObjectGroupBadgeUpdateMessage) { - if (message.assetName !== 'loading_icon') + if(message.assetName !== 'loading_icon') { this.object.model.setValue(RoomObjectVariable.FURNITURE_GUILD_CUSTOMIZED_ASSET_NAME, message.assetName); @@ -49,9 +49,9 @@ export class FurnitureGuildCustomizedLogic extends FurnitureMultiStateLogic } } - else if (message instanceof ObjectSelectedMessage) + else if(message instanceof ObjectSelectedMessage) { - if (!message.selected) + if(!message.selected) { this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU, this.object)); } @@ -76,9 +76,9 @@ export class FurnitureGuildCustomizedLogic extends FurnitureMultiStateLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry || !this.object) return; + if(!event || !geometry || !this.object) return; - switch (event.type) + switch(event.type) { case MouseEventType.MOUSE_CLICK: this.openContextMenu(); diff --git a/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts index cfba25d7..344e4da2 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureHabboWheelLogic.ts @@ -12,7 +12,7 @@ export class FurnitureHabboWheelLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.USE_HABBOWHEEL, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts index 28fbc392..7aae7b4e 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureHighScoreLogic.ts @@ -17,7 +17,7 @@ export class FurnitureHighScoreLogic extends FurnitureLogic public tearDown(): void { - if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.HIDE_HIGH_SCORE_DISPLAY, this.object)); } @@ -29,11 +29,11 @@ export class FurnitureHighScoreLogic extends FurnitureLogic { super.processUpdateMessage(message); - if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; + if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { - if (message.state === FurnitureHighScoreLogic.SHOW_WIDGET_IN_STATE) + if(message.state === FurnitureHighScoreLogic.SHOW_WIDGET_IN_STATE) { this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.HIGH_SCORE_DISPLAY, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts index 1ef63e2e..19f1b8b1 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureHockeyScoreLogic.ts @@ -14,14 +14,14 @@ export class FurnitureHockeyScoreLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry || !this.object) return; + if(!event || !geometry || !this.object) return; let objectEvent: RoomObjectEvent = null; - switch (event.type) + switch(event.type) { case MouseEventType.DOUBLE_CLICK: - switch (event.spriteTag) + switch(event.spriteTag) { case 'off': objectEvent = new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 3); @@ -29,7 +29,7 @@ export class FurnitureHockeyScoreLogic extends FurnitureLogic } break; case MouseEventType.MOUSE_CLICK: - switch (event.spriteTag) + switch(event.spriteTag) { case 'inc': objectEvent = new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 2); @@ -41,7 +41,7 @@ export class FurnitureHockeyScoreLogic extends FurnitureLogic break; } - if (this.eventDispatcher && objectEvent) + if(this.eventDispatcher && objectEvent) { this.eventDispatcher.dispatchEvent(objectEvent); @@ -53,7 +53,7 @@ export class FurnitureHockeyScoreLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, 3)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts index 2a4ab41e..0b99c64d 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureInternalLinkLogic.ts @@ -21,13 +21,13 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic { super.initialize(asset); - if (asset.logic) + if(asset.logic) { - if (asset.logic.action) + if(asset.logic.action) { this.object.model.setValue(RoomObjectVariable.FURNITURE_INTERNAL_LINK, asset.logic.action.link); - if (asset.logic.action.startState === 1) this._showStateOnceRendered = true; + if(asset.logic.action.startState === 1) this._showStateOnceRendered = true; } } } @@ -36,11 +36,11 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic { super.update(time); - if (!this._showStateOnceRendered) return; + if(!this._showStateOnceRendered) return; this._updateCount++; - if (this._showStateOnceRendered && (this._updateCount === 20)) + if(this._showStateOnceRendered && (this._updateCount === 20)) { this.setAutomaticStateIndex(1); @@ -50,9 +50,9 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic private setAutomaticStateIndex(state: number): void { - if (!this.object) return; + if(!this.object) return; - if (this.object.model) + if(this.object.model) { this.object.model.setValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX, state); } @@ -60,9 +60,9 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry) return; + if(!event || !geometry) return; - if ((event.type === MouseEventType.DOUBLE_CLICK) && this._showStateOnceRendered) + if((event.type === MouseEventType.DOUBLE_CLICK) && this._showStateOnceRendered) { this.setAutomaticStateIndex(0); } @@ -72,7 +72,7 @@ export class FurnitureInternalLinkLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.INERNAL_LINK, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts index d9b4cd23..3e315f20 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureJukeboxLogic.ts @@ -34,29 +34,29 @@ export class FurnitureJukeboxLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; + if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; - if (!this._isInitialized) this.requestInit(); + if(!this._isInitialized) this.requestInit(); this.object.model.setValue(RoomWidgetEnumItemExtradataParameter.INFOSTAND_EXTRA_PARAM, RoomWidgetEnumItemExtradataParameter.JUKEBOX); - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { const state = this.object.getState(0); - if (state !== this._currentState) + if(state !== this._currentState) { this._currentState = state; - if (state === 1) this.requestPlayList(); - else if (state === 0) this.requestStopPlaying(); + if(state === 1) this.requestPlayList(); + else if(state === 0) this.requestStopPlaying(); } } } private requestInit(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this._disposeEventsAllowed = true; @@ -67,7 +67,7 @@ export class FurnitureJukeboxLogic extends FurnitureMultiStateLogic private requestPlayList(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this._disposeEventsAllowed = true; @@ -76,21 +76,21 @@ export class FurnitureJukeboxLogic extends FurnitureMultiStateLogic private requestStopPlaying(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.JUKEBOX_MACHINE_STOP, this.object)); } private requestDispose(): void { - if (!this._disposeEventsAllowed || !this.object || !this.eventDispatcher) return; + if(!this._disposeEventsAllowed || !this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.JUKEBOX_DISPOSE, this.object)); } public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.JUKEBOX_PLAYLIST_EDITOR, this.object)); this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object, -1)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureLogic.ts index 221357ba..13c95b3e 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureLogic.ts @@ -45,12 +45,12 @@ export class FurnitureLogic extends MovingObjectLogic this._storedRotateMessage = null; this._directionInitialized = false; - if (FurnitureLogic.BOUNCING_STEPS === -1) + if(FurnitureLogic.BOUNCING_STEPS === -1) { FurnitureLogic.BOUNCING_STEPS = NitroConfiguration.getValue('furni.rotation.bounce.steps', 8); } - if (FurnitureLogic.BOUNCING_Z === -1) + if(FurnitureLogic.BOUNCING_Z === -1) { FurnitureLogic.BOUNCING_Z = NitroConfiguration.getValue('furni.rotation.bounce.height', 0.0625); } @@ -68,28 +68,28 @@ export class FurnitureLogic extends MovingObjectLogic RoomObjectRoomAdEvent.ROOM_AD_FURNI_DOUBLE_CLICK, RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK]; - if (this.widget) types.push(RoomObjectWidgetRequestEvent.OPEN_WIDGET, RoomObjectWidgetRequestEvent.CLOSE_WIDGET); + if(this.widget) types.push(RoomObjectWidgetRequestEvent.OPEN_WIDGET, RoomObjectWidgetRequestEvent.CLOSE_WIDGET); - if (this.contextMenu) types.push(RoomObjectWidgetRequestEvent.OPEN_FURNI_CONTEXT_MENU, RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU); + if(this.contextMenu) types.push(RoomObjectWidgetRequestEvent.OPEN_FURNI_CONTEXT_MENU, RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU); return this.mergeTypes(super.getEventTypes(), types); } public initialize(asset: IAssetData): void { - if (!asset) return; + if(!asset) return; const model = this.object && this.object.model; - if (!model) return; + if(!model) return; - if (asset.logic) + if(asset.logic) { - if (asset.logic.model) + if(asset.logic.model) { const dimensions = asset.logic.model.dimensions; - if (dimensions) + if(dimensions) { this._sizeX = dimensions.x; this._sizeY = dimensions.y; @@ -102,19 +102,19 @@ export class FurnitureLogic extends MovingObjectLogic const directions = asset.logic.model.directions; - if (directions && directions.length) + if(directions && directions.length) { - for (const direction of directions) this._directions.push(direction); + for(const direction of directions) this._directions.push(direction); this._directions.sort((a, b) => (a - b)); } } - if (asset.logic.customVars) + if(asset.logic.customVars) { const variables = asset.logic.customVars.variables; - if (variables && variables.length) + if(variables && variables.length) { model.setValue(RoomObjectVariable.FURNITURE_CUSTOM_VARIABLES, variables); } @@ -143,7 +143,7 @@ export class FurnitureLogic extends MovingObjectLogic { super.setObject(object); - if (object && object.getLocation().length) this._directionInitialized = true; + if(object && object.getLocation().length) this._directionInitialized = true; } protected getAdClickUrl(model: IRoomObjectModel): string @@ -153,7 +153,7 @@ export class FurnitureLogic extends MovingObjectLogic protected handleAdClick(objectId: number, objectType: string, clickUrl: string): void { - if (!this.eventDispatcher) return; + if(!this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK, this.object)); } @@ -162,31 +162,31 @@ export class FurnitureLogic extends MovingObjectLogic { super.update(time); - if (this._bouncingStep > 0) + if(this._bouncingStep > 0) { this._bouncingStep++; - if (this._bouncingStep > FurnitureLogic.BOUNCING_STEPS) this._bouncingStep = 0; + if(this._bouncingStep > FurnitureLogic.BOUNCING_STEPS) this._bouncingStep = 0; } } public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { this.processDataUpdateMessage(message); return; } - if (message instanceof ObjectHeightUpdateMessage) + if(message instanceof ObjectHeightUpdateMessage) { this.processObjectHeightUpdateMessage(message); return; } - if (message instanceof ObjectItemDataUpdateMessage) + if(message instanceof ObjectItemDataUpdateMessage) { this.processItemDataUpdateMessage(message); @@ -195,16 +195,16 @@ export class FurnitureLogic extends MovingObjectLogic this._mouseOver = false; - if (message.location && message.direction) + if(message.location && message.direction) { - if (!(message instanceof ObjectMoveUpdateMessage)) + if(!(message instanceof ObjectMoveUpdateMessage)) { const direction = this.object.getDirection(); const location = this.object.getLocation(); - if ((direction.x !== message.direction.x) && this._directionInitialized) + if((direction.x !== message.direction.x) && this._directionInitialized) { - if ((location.x === message.location.x) && (location.y === message.location.y) && (location.z === message.location.z)) + if((location.x === message.location.x) && (location.y === message.location.y) && (location.z === message.location.z)) { this._bouncingStep = 1; this._storedRotateMessage = new RoomObjectUpdateMessage(message.location, message.direction); @@ -217,9 +217,9 @@ export class FurnitureLogic extends MovingObjectLogic this._directionInitialized = true; } - if (message instanceof ObjectSelectedMessage) + if(message instanceof ObjectSelectedMessage) { - if (this.contextMenu && this.eventDispatcher && this.object) + if(this.contextMenu && this.eventDispatcher && this.object) { const eventType = (message.selected) ? RoomObjectWidgetRequestEvent.OPEN_FURNI_CONTEXT_MENU : RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU; @@ -232,27 +232,27 @@ export class FurnitureLogic extends MovingObjectLogic private processDataUpdateMessage(message: ObjectDataUpdateMessage): void { - if (!message) return; + if(!message) return; this.object.setState(message.state, 0); - if (message.data) message.data.writeRoomObjectModel(this.object.model); + if(message.data) message.data.writeRoomObjectModel(this.object.model); - if (message.extra !== null) this.object.model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, message.extra.toString()); + if(message.extra !== null) this.object.model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, message.extra.toString()); this.object.model.setValue(RoomObjectVariable.FURNITURE_STATE_UPDATE_TIME, this.lastUpdateTime); } private processObjectHeightUpdateMessage(message: ObjectHeightUpdateMessage): void { - if (!message) return; + if(!message) return; this.object.model.setValue(RoomObjectVariable.FURNITURE_SIZE_Z, message.height); } private processItemDataUpdateMessage(message: ObjectItemDataUpdateMessage): void { - if (!message) return; + if(!message) return; this.object.model.setValue(RoomObjectVariable.FURNITURE_ITEMDATA, message.data); } @@ -261,10 +261,10 @@ export class FurnitureLogic extends MovingObjectLogic { const adUrl = this.getAdClickUrl(this.object.model); - switch (event.type) + switch(event.type) { case MouseEventType.MOUSE_MOVE: - if (this.eventDispatcher) + if(this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_MOVE, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -277,11 +277,11 @@ export class FurnitureLogic extends MovingObjectLogic } return; case MouseEventType.ROLL_OVER: - if (!this._mouseOver) + if(!this._mouseOver) { - if (this.eventDispatcher) + if(this.eventDispatcher) { - if (adUrl && (adUrl.indexOf('http') === 0)) + if(adUrl && (adUrl.indexOf('http') === 0)) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_TOOLTIP_SHOW, this.object)); } @@ -300,11 +300,11 @@ export class FurnitureLogic extends MovingObjectLogic } return; case MouseEventType.ROLL_OUT: - if (this._mouseOver) + if(this._mouseOver) { - if (this.eventDispatcher) + if(this.eventDispatcher) { - if (adUrl && (adUrl.indexOf('http') === 0)) + if(adUrl && (adUrl.indexOf('http') === 0)) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_TOOLTIP_HIDE, this.object)); } @@ -326,7 +326,7 @@ export class FurnitureLogic extends MovingObjectLogic this.useObject(); return; case MouseEventType.MOUSE_CLICK: - if (this.eventDispatcher) + if(this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.CLICK, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -337,16 +337,16 @@ export class FurnitureLogic extends MovingObjectLogic this.eventDispatcher.dispatchEvent(mouseEvent); - if (adUrl && (adUrl.indexOf('http') === 0)) + if(adUrl && (adUrl.indexOf('http') === 0)) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_TOOLTIP_HIDE, this.object)); } - if (adUrl && adUrl.length) this.handleAdClick(this.object.id, this.object.type, adUrl); + if(adUrl && adUrl.length) this.handleAdClick(this.object.id, this.object.type, adUrl); } return; case MouseEventType.MOUSE_DOWN: - if (this.eventDispatcher) + if(this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -354,7 +354,7 @@ export class FurnitureLogic extends MovingObjectLogic } return; case MouseEventType.MOUSE_DOWN_LONG: - if (this.eventDispatcher) + if(this.eventDispatcher) { const mouseEvent = new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN_LONG, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); @@ -366,20 +366,20 @@ export class FurnitureLogic extends MovingObjectLogic protected getLocationOffset(): IVector3D { - if (this._bouncingStep <= 0) return null; + if(this._bouncingStep <= 0) return null; this._locationOffset.x = 0; this._locationOffset.y = 0; - if (this._bouncingStep <= (FurnitureLogic.BOUNCING_STEPS / 2)) + if(this._bouncingStep <= (FurnitureLogic.BOUNCING_STEPS / 2)) { this._locationOffset.z = FurnitureLogic.BOUNCING_Z * this._bouncingStep; } else { - if (this._bouncingStep <= FurnitureLogic.BOUNCING_STEPS) + if(this._bouncingStep <= FurnitureLogic.BOUNCING_STEPS) { - if (this._storedRotateMessage) + if(this._storedRotateMessage) { super.processUpdateMessage(this._storedRotateMessage); @@ -395,27 +395,27 @@ export class FurnitureLogic extends MovingObjectLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; const clickUrl = this.getAdClickUrl(this.object.model); - if (clickUrl && clickUrl.length) + if(clickUrl && clickUrl.length) { this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_FURNI_DOUBLE_CLICK, this.object, null, clickUrl)); } - if (this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.OPEN_WIDGET, this.object)); + if(this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.OPEN_WIDGET, this.object)); this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object)); } public tearDown(): void { - if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { - if (this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_WIDGET, this.object)); + if(this.widget) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_WIDGET, this.object)); - if (this.contextMenu) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU, this.object)); + if(this.contextMenu) this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU, this.object)); } super.tearDown(); diff --git a/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts index 074720d5..8517ce28 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMannequinLogic.ts @@ -21,7 +21,7 @@ export class FurnitureMannequinLogic extends FurnitureLogic { super.processUpdateMessage(message); - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { message.data.writeRoomObjectModel(this.object.model); @@ -31,7 +31,7 @@ export class FurnitureMannequinLogic extends FurnitureLogic private processObjectData(): void { - if (!this.object || !this.object.model) return; + if(!this.object || !this.object.model) return; const data = new MapDataType(); @@ -44,7 +44,7 @@ export class FurnitureMannequinLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MANNEQUIN, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts index c710f77c..90790502 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMonsterplantSeedLogic.ts @@ -13,7 +13,7 @@ export class FurnitureMonsterplantSeedLogic extends FurnitureMultiStateLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MONSTERPLANT_SEED_PLANT_CONFIRMATION_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts index baeab833..a1333a8b 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMultiStateLogic.ts @@ -14,9 +14,9 @@ export class FurnitureMultiStateLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry || !this.object) return; + if(!event || !geometry || !this.object) return; - switch (event.type) + switch(event.type) { case MouseEventType.ROLL_OVER: this.eventDispatcher && this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_BUTTON, this.object)); diff --git a/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts index 748d96e9..ae94007f 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMysteryBoxLogic.ts @@ -13,7 +13,7 @@ export class FurnitureMysteryBoxLogic extends FurnitureMultiStateLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MYSTERYBOX_OPEN_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts index cc936a9e..a35e8182 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureMysteryTrophyLogic.ts @@ -13,7 +13,7 @@ export class FurnitureMysteryTrophyLogic extends FurnitureMultiStateLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.MYSTERYTROPHY_OPEN_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts index 7b36ae75..bd085892 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureOneWayDoorLogic.ts @@ -12,7 +12,7 @@ export class FurnitureOneWayDoorLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.ENTER_ONEWAYDOOR, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts index e36f6360..c28d8824 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePetCustomizationLogic.ts @@ -16,9 +16,9 @@ export class FurniturePetCustomizationLogic extends FurnitureLogic { super.processUpdateMessage(message); - if (!this.object) return; + if(!this.object) return; - if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { this.object.model.setValue(RoomWidgetEnumItemExtradataParameter.INFOSTAND_EXTRA_PARAM, RoomWidgetEnumItemExtradataParameter.USABLE_PRODUCT); } @@ -26,7 +26,7 @@ export class FurniturePetCustomizationLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PET_PRODUCT_MENU, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts index 46a5d08f..1aa40828 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePlaceholderLogic.ts @@ -14,7 +14,7 @@ export class FurniturePlaceholderLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PLACEHOLDER, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts index 59c575ca..077deda6 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePresentLogic.ts @@ -25,9 +25,9 @@ export class FurniturePresentLogic extends FurnitureLogic { super.initialize(asset); - if (asset.logic) + if(asset.logic) { - if (asset.logic.particleSystems && asset.logic.particleSystems.length) + if(asset.logic.particleSystems && asset.logic.particleSystems.length) { this.object.model.setValue(RoomObjectVariable.FURNITURE_FIREWORKS_DATA, asset.logic.particleSystems); } @@ -38,16 +38,16 @@ export class FurniturePresentLogic extends FurnitureLogic { super.processUpdateMessage(message); - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { message.data.writeRoomObjectModel(this.object.model); this.updateStuffData(); } - if (message instanceof ObjectModelDataUpdateMessage) + if(message instanceof ObjectModelDataUpdateMessage) { - if (message.numberKey === RoomObjectVariable.FURNITURE_DISABLE_PICKING_ANIMATION) + if(message.numberKey === RoomObjectVariable.FURNITURE_DISABLE_PICKING_ANIMATION) { this.object.model.setValue(RoomObjectVariable.FURNITURE_DISABLE_PICKING_ANIMATION, message.numberValue); } @@ -56,7 +56,7 @@ export class FurniturePresentLogic extends FurnitureLogic private updateStuffData(): void { - if (!this.object || !this.object.model) return; + if(!this.object || !this.object.model) return; const stuffData = new MapDataType(); @@ -65,7 +65,7 @@ export class FurniturePresentLogic extends FurnitureLogic const message = stuffData.getValue(FurniturePresentLogic.MESSAGE); const data = this.object.model.getValue(RoomObjectVariable.FURNITURE_DATA); - if (!message && (typeof data === 'string')) + if(!message && (typeof data === 'string')) { this.object.model.setValue(RoomObjectVariable.FURNITURE_DATA, data.substr(1)); } @@ -81,16 +81,16 @@ export class FurniturePresentLogic extends FurnitureLogic private writeToModel(key: string, value: string): void { - if (!value) return; + if(!value) return; this.object.model.setValue(key, value); } public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry || !this.object) return; + if(!event || !geometry || !this.object) return; - switch (event.type) + switch(event.type) { case MouseEventType.ROLL_OVER: this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.MOUSE_BUTTON, this.object)); @@ -105,7 +105,7 @@ export class FurniturePresentLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PRESENT, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts b/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts index b3df32f1..b20df93b 100644 --- a/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurniturePurchaseableClothingLogic.ts @@ -16,7 +16,7 @@ export class FurniturePurchaseableClothingLogic extends FurnitureMultiStateLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.PURCHASABLE_CLOTHING_CONFIRMATION_DIALOG, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts index 5de901c4..be73b9c1 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRandomStateLogic.ts @@ -14,7 +14,7 @@ export class FurnitureRandomStateLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_RANDOM, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts index 4ebf53ae..b97ffa80 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRentableSpaceLogic.ts @@ -18,9 +18,9 @@ export class FurnitureRentableSpaceLogic extends FurnitureLogic { super.update(time); - if (this.object && this.object.model) + if(this.object && this.object.model) { - if (!this.object.model.getValue(RoomObjectVariable.SESSION_CURRENT_USER_ID)) + if(!this.object.model.getValue(RoomObjectVariable.SESSION_CURRENT_USER_ID)) { this.eventDispatcher.dispatchEvent(new RoomObjectDataRequestEvent(RoomObjectDataRequestEvent.RODRE_CURRENT_USER_ID, this.object)); } @@ -28,9 +28,9 @@ export class FurnitureRentableSpaceLogic extends FurnitureLogic const renterId = this.object.model.getValue>(RoomObjectVariable.FURNITURE_DATA).getValue('renterId'); const userId = this.object.model.getValue(RoomObjectVariable.SESSION_CURRENT_USER_ID); - if (renterId) + if(renterId) { - if (parseInt(renterId) === userId) this.object.setState(2, 0); + if(parseInt(renterId) === userId) this.object.setState(2, 0); else this.object.setState(1, 0); } else diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts index b8ed03f1..ac9ada64 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBackgroundColorLogic.ts @@ -28,13 +28,13 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic protected onDispose(): void { - if (this._roomColorUpdated) + if(this._roomColorUpdated) { - if (this.eventDispatcher && this.object) + if(this.eventDispatcher && this.object) { const realRoomObject = this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT); - if (realRoomObject === 1) + if(realRoomObject === 1) { this.eventDispatcher.dispatchEvent(new RoomObjectHSLColorEnableEvent(RoomObjectHSLColorEnableEvent.ROOM_BACKGROUND_COLOR, this.object, false, 0, 0, 0)); } @@ -50,19 +50,19 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { message.data.writeRoomObjectModel(this.object.model); const realRoomObject = this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT); - if (realRoomObject === 1) this.processColorUpdate(); + if(realRoomObject === 1) this.processColorUpdate(); } } private processColorUpdate(): void { - if (!this.object || !this.object.model) return; + if(!this.object || !this.object.model) return; const numberData = new NumberDataType(); @@ -73,7 +73,7 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic const saturation = numberData.getValue(2); const lightness = numberData.getValue(3); - if ((state > -1) && (hue > -1) && (saturation > -1) && (lightness > -1)) + if((state > -1) && (hue > -1) && (saturation > -1) && (lightness > -1)) { this.object.model.setValue(RoomObjectVariable.FURNITURE_ROOM_BACKGROUND_COLOR_HUE, hue); this.object.model.setValue(RoomObjectVariable.FURNITURE_ROOM_BACKGROUND_COLOR_SATURATION, saturation); @@ -81,7 +81,7 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic this.object.setState(state, 0); - if (this.eventDispatcher) + if(this.eventDispatcher) { this.eventDispatcher.dispatchEvent(new RoomObjectHSLColorEnableEvent(RoomObjectHSLColorEnableEvent.ROOM_BACKGROUND_COLOR, this.object, (state === 1), hue, saturation, lightness)); } @@ -92,9 +92,9 @@ export class FurnitureRoomBackgroundColorLogic extends FurnitureMultiStateLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry || !this.object) return; + if(!event || !geometry || !this.object) return; - switch (event.type) + switch(event.type) { case MouseEventType.DOUBLE_CLICK: (this.eventDispatcher && this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.BACKGROUND_COLOR, this.object))); diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts index a07da9a6..176a127b 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBillboardLogic.ts @@ -19,13 +19,13 @@ export class FurnitureRoomBillboardLogic extends FurnitureRoomBrandingLogic protected handleAdClick(objectId: number, objectType: string, clickUrl: string): void { - if (clickUrl.indexOf('http') === 0) + if(clickUrl.indexOf('http') === 0) { HabboWebTools.openWebPage(clickUrl); return; } - if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK, this.object, '', clickUrl)); + if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectRoomAdEvent(RoomObjectRoomAdEvent.ROOM_AD_FURNI_CLICK, this.object, '', clickUrl)); } } diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts index 24dd7c92..a77ade0a 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomBrandingLogic.ts @@ -38,7 +38,7 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { super.initialize(asset); - if (this._disableFurnitureSelection) + if(this._disableFurnitureSelection) { this.object.model.setValue(RoomObjectVariable.FURNITURE_SELECTION_DISABLED, 1); } @@ -48,14 +48,14 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { super.processUpdateMessage(message); - if (message instanceof ObjectDataUpdateMessage) this.processAdDataUpdateMessage(message); + if(message instanceof ObjectDataUpdateMessage) this.processAdDataUpdateMessage(message); - if (message instanceof ObjectAdUpdateMessage) this.processAdUpdate(message); + if(message instanceof ObjectAdUpdateMessage) this.processAdUpdate(message); } private processAdDataUpdateMessage(message: ObjectDataUpdateMessage): void { - if (!message) return; + if(!message) return; const objectData = new MapDataType(); @@ -63,12 +63,12 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic const state = parseInt(objectData.getValue(FurnitureRoomBrandingLogic.STATE)); - if (!isNaN(state) && (this.object.getState(0) !== state)) this.object.setState(state, 0); + if(!isNaN(state) && (this.object.getState(0) !== state)) this.object.setState(state, 0); const imageUrl = objectData.getValue(FurnitureRoomBrandingLogic.IMAGEURL_KEY); const existingUrl = this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_URL); - if (!existingUrl || (existingUrl !== imageUrl)) + if(!existingUrl || (existingUrl !== imageUrl)) { this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_URL, imageUrl); this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_STATUS, 0); @@ -78,13 +78,13 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic const clickUrl = objectData.getValue(FurnitureRoomBrandingLogic.CLICKURL_KEY); - if (clickUrl) + if(clickUrl) { const existingUrl = this.object.model.getValue(RoomObjectVariable.FURNITURE_BRANDING_URL); - if (!existingUrl || existingUrl !== clickUrl) + if(!existingUrl || existingUrl !== clickUrl) { - if (this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_URL, clickUrl); + if(this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_URL, clickUrl); } } @@ -92,13 +92,13 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic const offsetY = parseInt(objectData.getValue(FurnitureRoomBrandingLogic.OFFSETY_KEY)); const offsetZ = parseInt(objectData.getValue(FurnitureRoomBrandingLogic.OFFSETZ_KEY)); - if (!isNaN(offsetX)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_X, offsetX); - if (!isNaN(offsetY)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Y, offsetY); - if (!isNaN(offsetZ)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Z, offsetZ); + if(!isNaN(offsetX)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_X, offsetX); + if(!isNaN(offsetY)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Y, offsetY); + if(!isNaN(offsetZ)) this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_OFFSET_Z, offsetZ); let options = (((FurnitureRoomBrandingLogic.IMAGEURL_KEY + '=') + ((imageUrl !== null) ? imageUrl : '')) + '\t'); - if (this._hasClickUrl) + if(this._hasClickUrl) { options = (options + (((FurnitureRoomBrandingLogic.CLICKURL_KEY + '=') + ((clickUrl !== null) ? clickUrl : '')) + '\t')); } @@ -112,9 +112,9 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic private processAdUpdate(message: ObjectAdUpdateMessage): void { - if (!message || !this.object) return; + if(!message || !this.object) return; - switch (message.type) + switch(message.type) { case ObjectAdUpdateMessage.IMAGE_LOADED: this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_STATUS, 1); @@ -127,9 +127,9 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry) return; + if(!event || !geometry) return; - if ((event.type === MouseEventType.MOUSE_MOVE) || (event.type === MouseEventType.DOUBLE_CLICK)) return; + if((event.type === MouseEventType.MOUSE_MOVE) || (event.type === MouseEventType.DOUBLE_CLICK)) return; super.mouseEvent(event, geometry); } @@ -138,14 +138,14 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { const model = this.object && this.object.model; - if (!model) return; + if(!model) return; const imageUrl = model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_URL); const imageStatus = model.getValue(RoomObjectVariable.FURNITURE_BRANDING_IMAGE_STATUS); - if (!imageUrl || (imageUrl === '') || (imageStatus === 1)) return; + if(!imageUrl || (imageUrl === '') || (imageStatus === 1)) return; - if (imageUrl.endsWith('.gif')) + if(imageUrl.endsWith('.gif')) { this.object.model.setValue(RoomObjectVariable.FURNITURE_BRANDING_IS_ANIMATED, true); @@ -163,23 +163,23 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic let frame = new Uint8Array(wh * 4); - for (let ind = 0; ind < frames.length; ind++) + for(let ind = 0; ind < frames.length; ind++) { - if (ind > 0) frame = frame.slice(0); + if(ind > 0) frame = frame.slice(0); const pixels = frames[ind].pixels; const colorTable = frames[ind].colorTable; const trans = frames[ind].transparentIndex; const dims = frames[ind].dims; - for (let j = 0; j < dims.height; j++) + for(let j = 0; j < dims.height; j++) { - for (let i = 0; i < dims.width; i++) + for(let i = 0; i < dims.width; i++) { const pixel = pixels[j * dims.width + i]; const coord = (j + dims.top) * width + (i + dims.left); - if (trans !== pixel) + if(trans !== pixel) { const c = colorTable[pixel]; @@ -210,15 +210,15 @@ export class FurnitureRoomBrandingLogic extends FurnitureLogic { const asset = Nitro.instance.core && Nitro.instance.core.asset; - if (!asset) return; + if(!asset) return; const texture = asset.getTexture(imageUrl); - if (!texture) + if(!texture) { asset.downloadAsset(imageUrl, (flag: boolean) => { - if (flag) + if(flag) { this.processUpdateMessage(new ObjectAdUpdateMessage(ObjectAdUpdateMessage.IMAGE_LOADED)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts index 3786f3f1..de04b420 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureRoomDimmerLogic.ts @@ -28,13 +28,13 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic protected onDispose(): void { - if (this._roomColorUpdated) + if(this._roomColorUpdated) { - if (this.eventDispatcher && this.object) + if(this.eventDispatcher && this.object) { const realRoomObject = this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT); - if (realRoomObject === 1) + if(realRoomObject === 1) { this.eventDispatcher.dispatchEvent(new RoomObjectDimmerStateUpdateEvent(this.object, 0, 1, 1, 0xFFFFFF, 0xFF)); this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.WIDGET_REMOVE_DIMMER, this.object)); @@ -49,15 +49,15 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { - if (message.data) + if(message.data) { const extra = message.data.getLegacyString(); const realRoomObject = this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT); - if (realRoomObject === 1) this.processDimmerData(extra); + if(realRoomObject === 1) this.processDimmerData(extra); super.processUpdateMessage(new ObjectDataUpdateMessage(this.getStateFromDimmerData(extra), message.data)); } @@ -70,22 +70,22 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic private getStateFromDimmerData(data: string): number { - if (!data) return 0; + if(!data) return 0; const parts = data.split(','); - if (parts.length >= 5) return (parseInt(parts[0]) - 1); + if(parts.length >= 5) return (parseInt(parts[0]) - 1); return 0; } private processDimmerData(data: string): void { - if (!data) return; + if(!data) return; const parts = data.split(','); - if (parts.length >= 5) + if(parts.length >= 5) { const state = this.getStateFromDimmerData(data); const presetId = parseInt(parts[1]); @@ -95,13 +95,13 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic let colorCode = parseInt(color.substr(1), 16); let brightness = parseInt(parts[4]); - if (!state) + if(!state) { colorCode = 0xFFFFFF; brightness = 0xFF; } - if (this.eventDispatcher && this.object) + if(this.eventDispatcher && this.object) { this.eventDispatcher.dispatchEvent(new RoomObjectDimmerStateUpdateEvent(this.object, state, presetId, effectId, colorCode, brightness)); @@ -112,7 +112,7 @@ export class FurnitureRoomDimmerLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.DIMMER, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts index 3886269b..416b7376 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureScoreLogic.ts @@ -23,7 +23,7 @@ export class FurnitureScoreLogic extends FurnitureLogic public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if (message instanceof ObjectDataUpdateMessage) return this.updateScore(message.state); + if(message instanceof ObjectDataUpdateMessage) return this.updateScore(message.state); super.processUpdateMessage(message); } @@ -34,13 +34,13 @@ export class FurnitureScoreLogic extends FurnitureLogic const currentScore = this.object.getState(0); - if (this._score !== currentScore) + if(this._score !== currentScore) { let difference = (this._score - currentScore); - if (difference < 0) difference = -(difference); + if(difference < 0) difference = -(difference); - if ((difference * FurnitureScoreLogic.UPDATE_INTERVAL) > FurnitureScoreLogic.MAX_UPDATE_TIME) this._scoreIncreaser = (FurnitureScoreLogic.MAX_UPDATE_TIME / difference); + if((difference * FurnitureScoreLogic.UPDATE_INTERVAL) > FurnitureScoreLogic.MAX_UPDATE_TIME) this._scoreIncreaser = (FurnitureScoreLogic.MAX_UPDATE_TIME / difference); else this._scoreIncreaser = FurnitureScoreLogic.UPDATE_INTERVAL; this._scoreTimer = GetTickerTime(); @@ -53,15 +53,15 @@ export class FurnitureScoreLogic extends FurnitureLogic const currentScore = this.object.getState(0); - if ((currentScore !== this._score) && (time >= (this._scoreTimer + this._scoreIncreaser))) + if((currentScore !== this._score) && (time >= (this._scoreTimer + this._scoreIncreaser))) { const _local_3 = (time - this._scoreTimer); let _local_4 = (_local_3 / this._scoreIncreaser); let _local_5 = 1; - if (this._score < currentScore) _local_5 = -1; + if(this._score < currentScore) _local_5 = -1; - if (_local_4 > (_local_5 * (this._score - currentScore))) _local_4 = (_local_5 * (this._score - currentScore)); + if(_local_4 > (_local_5 * (this._score - currentScore))) _local_4 = (_local_5 * (this._score - currentScore)); this.object.setState((currentScore + (_local_5 * _local_4)), 0); diff --git a/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts index 2dad2f01..355c7dc6 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureSongDiskLogic.ts @@ -8,7 +8,7 @@ export class FurnitureSongDiskLogic extends FurnitureLogic { super.processUpdateMessage(message); - if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { const extras = this.object.model.getValue(RoomObjectVariable.FURNITURE_EXTRAS); const diskId = parseInt(extras); diff --git a/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts index 68b2c6e8..70d87b29 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureSoundBlockLogic.ts @@ -31,9 +31,9 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic { super.initialize(asset); - if (asset.logic) + if(asset.logic) { - if (asset.logic.soundSample) + if(asset.logic.soundSample) { this._sampleId = asset.logic.soundSample.id; this._noPitch = asset.logic.soundSample.noPitch; @@ -45,7 +45,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic protected onDispose(): void { - if (this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED) + if(this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED) { this.eventDispatcher.dispatchEvent(new RoomObjectSamplePlaybackEvent(RoomObjectSamplePlaybackEvent.ROOM_OBJECT_DISPOSED, this.object, this._sampleId)); } @@ -57,27 +57,27 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if (message instanceof ObjectDataUpdateMessage) this.updateSoundBlockMessage(message); + if(message instanceof ObjectDataUpdateMessage) this.updateSoundBlockMessage(message); } private updateSoundBlockMessage(message: ObjectDataUpdateMessage): void { - if (!message) return; + if(!message) return; const model = this.object && this.object.model; const location = this.object && this.object.location; - if (!model || !location) return; + if(!model || !location) return; - if (this._state === FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if(this._state === FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { this._lastLocZ = location.z; this.eventDispatcher.dispatchEvent(new RoomObjectSamplePlaybackEvent(RoomObjectSamplePlaybackEvent.ROOM_OBJECT_INITIALIZED, this.object, this._sampleId, this.getPitchForHeight(location.z))); } - if (this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) + if(this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) === 1) { - if (this._lastLocZ !== location.z) + if(this._lastLocZ !== location.z) { this._lastLocZ = location.z; this.eventDispatcher.dispatchEvent(new RoomObjectSamplePlaybackEvent(RoomObjectSamplePlaybackEvent.CHANGE_PITCH, this.object, this._sampleId, this.getPitchForHeight(location.z))); @@ -85,7 +85,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic } - if (this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && message.state !== this._state) + if(this._state !== FurnitureSoundBlockLogic.STATE_UNINITIALIZED && message.state !== this._state) { this.playSoundAt(location.z); } @@ -95,7 +95,7 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic private playSoundAt(height: number): void { - if (!this.object) return; + if(!this.object) return; const pitch: number = this.getPitchForHeight(height); @@ -106,11 +106,11 @@ export class FurnitureSoundBlockLogic extends FurnitureMultiStateLogic private getPitchForHeight(height: number): number { - if (this._noPitch) return 1; + if(this._noPitch) return 1; let heightScaled: number = (height * 2); - if (heightScaled > FurnitureSoundBlockLogic.HIGHEST_SEMITONE) + if(heightScaled > FurnitureSoundBlockLogic.HIGHEST_SEMITONE) { heightScaled = Math.min(0, (FurnitureSoundBlockLogic.LOWEST_SEMITONE + ((heightScaled - FurnitureSoundBlockLogic.HIGHEST_SEMITONE) - 1))); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts index 794d132f..fee543b7 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureSoundMachineLogic.ts @@ -33,29 +33,29 @@ export class FurnitureSoundMachineLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if (this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; + if(this.object.model.getValue(RoomObjectVariable.FURNITURE_REAL_ROOM_OBJECT) !== 1) return; - if (!this._isInitialized) this.requestInit(); + if(!this._isInitialized) this.requestInit(); this.object.model.setValue(RoomWidgetEnumItemExtradataParameter.INFOSTAND_EXTRA_PARAM, RoomWidgetEnumItemExtradataParameter.JUKEBOX); - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { const state = this.object.getState(0); - if (state !== this._currentState) + if(state !== this._currentState) { this._currentState = state; - if (state === 1) this.requestPlayList(); - else if (state === 0) this.requestStopPlaying(); + if(state === 1) this.requestPlayList(); + else if(state === 0) this.requestStopPlaying(); } } } private requestInit(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this._disposeEventsAllowed = true; @@ -66,7 +66,7 @@ export class FurnitureSoundMachineLogic extends FurnitureMultiStateLogic private requestPlayList(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this._disposeEventsAllowed = true; @@ -75,14 +75,14 @@ export class FurnitureSoundMachineLogic extends FurnitureMultiStateLogic private requestStopPlaying(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.SOUND_MACHINE_STOP, this.object)); } private requestDispose(): void { - if (!this._disposeEventsAllowed || !this.object || !this.eventDispatcher) return; + if(!this._disposeEventsAllowed || !this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.SOUND_MACHINE_DISPOSE, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts index 2952793d..b1194e19 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureStickieLogic.ts @@ -24,14 +24,14 @@ export class FurnitureStickieLogic extends FurnitureLogic this.updateColor(); - if (this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_IS_STICKIE, ''); + if(this.object) this.object.model.setValue(RoomObjectVariable.FURNITURE_IS_STICKIE, ''); } public processUpdateMessage(message: RoomObjectUpdateMessage): void { super.processUpdateMessage(message); - if (message instanceof ObjectItemDataUpdateMessage) + if(message instanceof ObjectItemDataUpdateMessage) { this.eventDispatcher && this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.STICKIE, this.object)); } @@ -41,20 +41,20 @@ export class FurnitureStickieLogic extends FurnitureLogic protected updateColor(): void { - if (!this.object) return; + if(!this.object) return; const furnitureData = this.object.model.getValue(RoomObjectVariable.FURNITURE_DATA); let colorIndex = FurnitureStickieLogic.STICKIE_COLORS.indexOf(furnitureData); - if (colorIndex < 0) colorIndex = 3; + if(colorIndex < 0) colorIndex = 3; this.object.model.setValue(RoomObjectVariable.FURNITURE_COLOR, (colorIndex + 1)); } public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectFurnitureActionEvent(RoomObjectFurnitureActionEvent.STICKIE, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts index 456e8c64..621f337b 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureTrophyLogic.ts @@ -12,7 +12,7 @@ export class FurnitureTrophyLogic extends FurnitureLogic public useObject(): void { - if (!this.object || !this.eventDispatcher) return; + if(!this.object || !this.eventDispatcher) return; this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.TROPHY, this.object)); } diff --git a/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts index 7df28e05..2716346e 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureVoteCounterLogic.ts @@ -26,11 +26,11 @@ export class FurnitureVoteCounterLogic extends FurnitureMultiStateLogic { super.processUpdateMessage(message); - if (message instanceof ObjectDataUpdateMessage) + if(message instanceof ObjectDataUpdateMessage) { const stuffData = (message.data as VoteDataType); - if (!stuffData) return; + if(!stuffData) return; this.updateTotal(stuffData.result); } @@ -40,7 +40,7 @@ export class FurnitureVoteCounterLogic extends FurnitureMultiStateLogic { this._total = k; - if (!this._lastUpdate) + if(!this._lastUpdate) { this.object.model.setValue(RoomObjectVariable.FURNITURE_VOTE_COUNTER_COUNT, k); @@ -49,11 +49,11 @@ export class FurnitureVoteCounterLogic extends FurnitureMultiStateLogic return; } - if (this._total !== this.currentTotal) + if(this._total !== this.currentTotal) { const difference = Math.abs((this._total - this.currentTotal)); - if ((difference * FurnitureVoteCounterLogic.UPDATE_INTERVAL) > FurnitureVoteCounterLogic.MAX_UPDATE_TIME) + if((difference * FurnitureVoteCounterLogic.UPDATE_INTERVAL) > FurnitureVoteCounterLogic.MAX_UPDATE_TIME) { this._interval = (FurnitureVoteCounterLogic.MAX_UPDATE_TIME / difference); } @@ -70,17 +70,17 @@ export class FurnitureVoteCounterLogic extends FurnitureMultiStateLogic { super.update(time); - if (this.object) + if(this.object) { - if ((this.currentTotal !== this._total) && (time >= (this._lastUpdate + this._interval))) + if((this.currentTotal !== this._total) && (time >= (this._lastUpdate + this._interval))) { const _local_2 = (time - this._lastUpdate); let _local_3 = (_local_2 / this._interval); let _local_4 = 1; - if (this._total < this.currentTotal) _local_4 = -1; + if(this._total < this.currentTotal) _local_4 = -1; - if (_local_3 > (_local_4 * (this._total - this.currentTotal))) _local_3 = (_local_4 * (this._total - this.currentTotal)); + if(_local_3 > (_local_4 * (this._total - this.currentTotal))) _local_3 = (_local_4 * (this._total - this.currentTotal)); this.object.model.setValue(RoomObjectVariable.FURNITURE_VOTE_COUNTER_COUNT, (this.currentTotal + (_local_4 * _local_3))); diff --git a/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts index 8ea320c9..add762ab 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureWelcomeGiftLogic.ts @@ -7,11 +7,11 @@ export class FurnitureWelcomeGiftLogic extends FurnitureMultiStateLogic { public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry) return; + if(!event || !geometry) return; - if (event.type === MouseEventType.DOUBLE_CLICK) + if(event.type === MouseEventType.DOUBLE_CLICK) { - if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object)); + if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectStateChangedEvent(RoomObjectStateChangedEvent.STATE_CHANGE, this.object)); } super.mouseEvent(event, geometry); diff --git a/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts index b2606937..94fcd2d6 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureYoutubeLogic.ts @@ -18,7 +18,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)); } @@ -26,7 +26,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/logic/pet/PetLogic.ts b/src/nitro/room/object/logic/pet/PetLogic.ts index 2c8a225d..2b77f19d 100644 --- a/src/nitro/room/object/logic/pet/PetLogic.ts +++ b/src/nitro/room/object/logic/pet/PetLogic.ts @@ -43,21 +43,21 @@ export class PetLogic extends MovingObjectLogic public initialize(asset: IAssetData): void { - if (!asset) return; + if(!asset) return; const model = this.object && this.object.model; - if (!model) return; + if(!model) return; - if (asset.logic) + if(asset.logic) { - if (asset.logic.model) + if(asset.logic.model) { const directions = asset.logic.model.directions; - if (directions && directions.length) + if(directions && directions.length) { - for (const direction of directions) this._directions.push(direction); + for(const direction of directions) this._directions.push(direction); this._directions.sort(); } @@ -69,9 +69,9 @@ export class PetLogic extends MovingObjectLogic public dispose(): void { - if (this._selected && this.object) + if(this._selected && this.object) { - if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMoveEvent(RoomObjectMoveEvent.OBJECT_REMOVED, this.object)); + if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMoveEvent(RoomObjectMoveEvent.OBJECT_REMOVED, this.object)); } this._directions = null; @@ -82,15 +82,15 @@ export class PetLogic extends MovingObjectLogic { super.update(totalTimeRunning); - if (this._selected && this.object) + if(this._selected && this.object) { - if (this.eventDispatcher) + if(this.eventDispatcher) { const location = this.object.getLocation(); - if (((!this._reportedLocation || (this._reportedLocation.x !== location.x)) || (this._reportedLocation.y !== location.y)) || (this._reportedLocation.z !== location.z)) + if(((!this._reportedLocation || (this._reportedLocation.x !== location.x)) || (this._reportedLocation.y !== location.y)) || (this._reportedLocation.z !== location.z)) { - if (!this._reportedLocation) this._reportedLocation = new Vector3d(); + if(!this._reportedLocation) this._reportedLocation = new Vector3d(); this._reportedLocation.assign(location); @@ -99,21 +99,21 @@ export class PetLogic extends MovingObjectLogic } } - if (this.object && this.object.model) this.updateModel(totalTimeRunning, this.object.model); + if(this.object && this.object.model) this.updateModel(totalTimeRunning, this.object.model); } private updateModel(time: number, model: IRoomObjectModel): void { - if ((this._gestureEndTimestamp > 0) && (time > this._gestureEndTimestamp)) + if((this._gestureEndTimestamp > 0) && (time > this._gestureEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_GESTURE, null); this._gestureEndTimestamp = 0; } - if (this._talkingEndTimestamp > 0) + if(this._talkingEndTimestamp > 0) { - if (time > this._talkingEndTimestamp) + if(time > this._talkingEndTimestamp) { model.setValue(RoomObjectVariable.FIGURE_TALK, 0); @@ -121,7 +121,7 @@ export class PetLogic extends MovingObjectLogic } } - if ((this._expressionEndTimestamp > 0) && (time > this._expressionEndTimestamp)) + if((this._expressionEndTimestamp > 0) && (time > this._expressionEndTimestamp)) { model.setValue(RoomObjectVariable.FIGURE_EXPRESSION, 0); @@ -131,22 +131,22 @@ export class PetLogic extends MovingObjectLogic public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if (!message || !this.object) return; + if(!message || !this.object) return; super.processUpdateMessage(message); const model = this.object && this.object.model; - if (!model) return; + if(!model) return; - if (message instanceof ObjectAvatarUpdateMessage) + if(message instanceof ObjectAvatarUpdateMessage) { model.setValue(RoomObjectVariable.HEAD_DIRECTION, message.headDirection); return; } - if (message instanceof ObjectAvatarFigureUpdateMessage) + if(message instanceof ObjectAvatarFigureUpdateMessage) { const petFigureData = new PetFigureData(message.figure); @@ -163,14 +163,14 @@ export class PetLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarPostureUpdateMessage) + if(message instanceof ObjectAvatarPostureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_POSTURE, message.postureType); return; } - if (message instanceof ObjectAvatarChatUpdateMessage) + if(message instanceof ObjectAvatarChatUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_TALK, 1); @@ -179,14 +179,14 @@ export class PetLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarSleepUpdateMessage) + if(message instanceof ObjectAvatarSleepUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_SLEEP, message.isSleeping ? 1 : 0); return; } - if (message instanceof ObjectAvatarPetGestureUpdateMessage) + if(message instanceof ObjectAvatarPetGestureUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_GESTURE, message.gesture); @@ -195,7 +195,7 @@ export class PetLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarSelectedMessage) + if(message instanceof ObjectAvatarSelectedMessage) { this._selected = message.selected; this._reportedLocation = null; @@ -203,7 +203,7 @@ export class PetLogic extends MovingObjectLogic return; } - if (message instanceof ObjectAvatarExperienceUpdateMessage) + if(message instanceof ObjectAvatarExperienceUpdateMessage) { model.setValue(RoomObjectVariable.FIGURE_EXPERIENCE_TIMESTAMP, this.time); model.setValue(RoomObjectVariable.FIGURE_GAINED_EXPERIENCE, message.gainedExperience); @@ -216,7 +216,7 @@ export class PetLogic extends MovingObjectLogic { let eventType: string = null; - switch (event.type) + switch(event.type) { case MouseEventType.MOUSE_CLICK: eventType = RoomObjectMouseEvent.CLICK; @@ -226,14 +226,14 @@ export class PetLogic extends MovingObjectLogic case MouseEventType.MOUSE_DOWN: { const petType = this.object.model.getValue(RoomObjectVariable.PET_TYPE); - if (petType === PetType.MONSTERPLANT) + if(petType === PetType.MONSTERPLANT) { - if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); + if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(RoomObjectMouseEvent.MOUSE_DOWN, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); } break; } } - if (eventType && this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(eventType, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); + if(eventType && this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectMouseEvent(eventType, this.object, event.eventId, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown)); } } diff --git a/src/nitro/room/object/logic/room/RoomLogic.ts b/src/nitro/room/object/logic/room/RoomLogic.ts index 9d4fcc18..81faf26a 100644 --- a/src/nitro/room/object/logic/room/RoomLogic.ts +++ b/src/nitro/room/object/logic/room/RoomLogic.ts @@ -55,14 +55,14 @@ export class RoomLogic extends RoomObjectLogicBase { super.dispose(); - if (this._planeParser) + if(this._planeParser) { this._planeParser.dispose(); this._planeParser = null; } - if (this._planeBitmapMaskParser) + if(this._planeBitmapMaskParser) { this._planeBitmapMaskParser.dispose(); @@ -72,11 +72,11 @@ export class RoomLogic extends RoomObjectLogicBase public initialize(roomMap: RoomMapData): void { - if (!roomMap || !this.object) return; + if(!roomMap || !this.object) return; - if (!(roomMap instanceof RoomMapData)) return; + if(!(roomMap instanceof RoomMapData)) return; - if (!this._planeParser.initializeFromMapData(roomMap)) return; + if(!this._planeParser.initializeFromMapData(roomMap)) return; this.object.model.setValue(RoomObjectVariable.ROOM_MAP_DATA, roomMap); this.object.model.setValue(RoomObjectVariable.ROOM_BACKGROUND_COLOR, 0xFFFFFF); @@ -93,13 +93,13 @@ export class RoomLogic extends RoomObjectLogicBase this.updateBackgroundColor(time); - if (this._needsMapUpdate) + if(this._needsMapUpdate) { - if (this._lastHoleUpdate && (time - this._lastHoleUpdate) < 5) return; + if(this._lastHoleUpdate && (time - this._lastHoleUpdate) < 5) return; const model = this.object && this.object.model; - if (model) + if(model) { const mapData = this._planeParser.getMapData(); @@ -117,12 +117,12 @@ export class RoomLogic extends RoomObjectLogicBase private updateBackgroundColor(k: number): void { - if (!this.object || !this._colorChangedTime) return; + if(!this.object || !this._colorChangedTime) return; let color = this._color; let newColor = this._light; - if ((k - this._colorChangedTime) >= this._colorTransitionLength) + if((k - this._colorChangedTime) >= this._colorTransitionLength) { color = this._targetColor; newColor = this._targetLight; @@ -156,60 +156,60 @@ export class RoomLogic extends RoomObjectLogicBase _local_5 = ((_local_5 & 0xFFFF00) + newColor); color = ColorConverter.hslToRGB(_local_5); - if (this.object.model) this.object.model.setValue(RoomObjectVariable.ROOM_BACKGROUND_COLOR, color); + if(this.object.model) this.object.model.setValue(RoomObjectVariable.ROOM_BACKGROUND_COLOR, color); } public processUpdateMessage(message: RoomObjectUpdateMessage): void { - if (!message || !this.object) return; + if(!message || !this.object) return; const model = this.object.model; - if (!model) return; + if(!model) return; - if (message instanceof ObjectRoomUpdateMessage) + if(message instanceof ObjectRoomUpdateMessage) { this.onObjectRoomUpdateMessage(message, model); return; } - if (message instanceof ObjectRoomMaskUpdateMessage) + if(message instanceof ObjectRoomMaskUpdateMessage) { this.onObjectRoomMaskUpdateMessage(message, model); return; } - if (message instanceof ObjectRoomPlaneVisibilityUpdateMessage) + if(message instanceof ObjectRoomPlaneVisibilityUpdateMessage) { this.onObjectRoomPlaneVisibilityUpdateMessage(message, model); return; } - if (message instanceof ObjectRoomPlanePropertyUpdateMessage) + if(message instanceof ObjectRoomPlanePropertyUpdateMessage) { this.onObjectRoomPlanePropertyUpdateMessage(message, model); return; } - if (message instanceof ObjectRoomFloorHoleUpdateMessage) + if(message instanceof ObjectRoomFloorHoleUpdateMessage) { this.onObjectRoomFloorHoleUpdateMessage(message, model); return; } - if (message instanceof ObjectRoomColorUpdateMessage) + if(message instanceof ObjectRoomColorUpdateMessage) { this.onObjectRoomColorUpdateMessage(message, model); return; } - if (message instanceof ObjectRoomMapUpdateMessage) + if(message instanceof ObjectRoomMapUpdateMessage) { this.onObjectRoomMapUpdateMessage(message); } @@ -217,7 +217,7 @@ export class RoomLogic extends RoomObjectLogicBase private onObjectRoomUpdateMessage(message: ObjectRoomUpdateMessage, model: IRoomObjectModel): void { - switch (message.type) + switch(message.type) { case ObjectRoomUpdateMessage.ROOM_FLOOR_UPDATE: model.setValue(RoomObjectVariable.ROOM_FLOOR_TYPE, message.value); @@ -236,12 +236,12 @@ export class RoomLogic extends RoomObjectLogicBase let maskType: string = null; let update = false; - switch (message.type) + switch(message.type) { case ObjectRoomMaskUpdateMessage.ADD_MASK: maskType = RoomPlaneBitmapMaskData.WINDOW; - if (message.maskCategory === ObjectRoomMaskUpdateMessage.HOLE) maskType = RoomPlaneBitmapMaskData.HOLE; + if(message.maskCategory === ObjectRoomMaskUpdateMessage.HOLE) maskType = RoomPlaneBitmapMaskData.HOLE; this._planeBitmapMaskParser.addMask(message.maskId, message.maskType, message.maskLocation, maskType); @@ -253,16 +253,16 @@ export class RoomLogic extends RoomObjectLogicBase } - if (update) _arg_2.setValue(RoomObjectVariable.ROOM_PLANE_MASK_XML, this._planeBitmapMaskParser.getXML()); + if(update) _arg_2.setValue(RoomObjectVariable.ROOM_PLANE_MASK_XML, this._planeBitmapMaskParser.getXML()); } private onObjectRoomPlaneVisibilityUpdateMessage(message: ObjectRoomPlaneVisibilityUpdateMessage, model: IRoomObjectModel): void { let visible = 0; - if (message.visible) visible = 1; + if(message.visible) visible = 1; - switch (message.type) + switch(message.type) { case ObjectRoomPlaneVisibilityUpdateMessage.FLOOR_VISIBILITY: model.setValue(RoomObjectVariable.ROOM_FLOOR_VISIBILITY, visible); @@ -276,7 +276,7 @@ export class RoomLogic extends RoomObjectLogicBase private onObjectRoomPlanePropertyUpdateMessage(message: ObjectRoomPlanePropertyUpdateMessage, model: IRoomObjectModel): void { - switch (message.type) + switch(message.type) { case ObjectRoomPlanePropertyUpdateMessage.FLOOR_THICKNESS: model.setValue(RoomObjectVariable.ROOM_FLOOR_THICKNESS, message.value); @@ -289,7 +289,7 @@ export class RoomLogic extends RoomObjectLogicBase private onObjectRoomFloorHoleUpdateMessage(message: ObjectRoomFloorHoleUpdateMessage, model: IRoomObjectModel): void { - switch (message.type) + switch(message.type) { case ObjectRoomFloorHoleUpdateMessage.ADD: this._planeParser.addFloorHole(message.id, message.x, message.y, message.width, message.height); @@ -306,7 +306,7 @@ export class RoomLogic extends RoomObjectLogicBase private onObjectRoomColorUpdateMessage(message: ObjectRoomColorUpdateMessage, model: IRoomObjectModel): void { - if (!message || !model) return; + if(!message || !model) return; this._originalColor = this._color; this._originalLight = this._light; @@ -314,7 +314,7 @@ export class RoomLogic extends RoomObjectLogicBase this._targetLight = message.light; this._colorChangedTime = this.time; - if (this._skipColorTransition) + if(this._skipColorTransition) this._colorTransitionLength = 0; else this._colorTransitionLength = 1500; @@ -324,7 +324,7 @@ export class RoomLogic extends RoomObjectLogicBase private onObjectRoomMapUpdateMessage(message: ObjectRoomMapUpdateMessage): void { - if (!message || !message.mapData) return; + if(!message || !message.mapData) return; this.object.model.setValue(RoomObjectVariable.ROOM_MAP_DATA, message.mapData); this.object.model.setValue(RoomObjectVariable.ROOM_FLOOR_HOLE_UPDATE_TIME, this.time); @@ -334,20 +334,20 @@ export class RoomLogic extends RoomObjectLogicBase public mouseEvent(event: RoomSpriteMouseEvent, geometry: IRoomGeometry): void { - if (!event || !geometry || !this.object || !this.object.model) return; + if(!event || !geometry || !this.object || !this.object.model) return; const tag = event.spriteTag; let planeId = 0; - if (tag && (tag.indexOf('@') >= 0)) + if(tag && (tag.indexOf('@') >= 0)) { planeId = parseInt(tag.substr(tag.indexOf('@') + 1)); } - if ((planeId < 1) || (planeId > this._planeParser.planeCount)) + if((planeId < 1) || (planeId > this._planeParser.planeCount)) { - if (event.type === MouseEventType.ROLL_OUT) + if(event.type === MouseEventType.ROLL_OUT) { this.object.model.setValue(RoomObjectVariable.ROOM_SELECTED_PLANE, 0); } @@ -365,12 +365,12 @@ export class RoomLogic extends RoomObjectLogicBase const planeNormalDirection = this._planeParser.getPlaneNormalDirection(planeId); const planeType = this._planeParser.getPlaneType(planeId); - if (((((planeLocation == null) || (planeLeftSide == null)) || (planeRightSide == null)) || (planeNormalDirection == null))) return; + if(((((planeLocation == null) || (planeLeftSide == null)) || (planeRightSide == null)) || (planeNormalDirection == null))) return; const leftSideLength = planeLeftSide.length; const rightSideLength = planeRightSide.length; - if (((leftSideLength == 0) || (rightSideLength == 0))) return; + if(((leftSideLength == 0) || (rightSideLength == 0))) return; const screenX = event.screenX; const screenY = event.screenY; @@ -378,7 +378,7 @@ export class RoomLogic extends RoomObjectLogicBase planePosition = geometry.getPlanePosition(screenPoint, planeLocation, planeLeftSide, planeRightSide); - if (!planePosition) + if(!planePosition) { this.object.model.setValue(RoomObjectVariable.ROOM_SELECTED_PLANE, 0); @@ -394,7 +394,7 @@ export class RoomLogic extends RoomObjectLogicBase const tileY = _local_18.y; const tileZ = _local_18.z; - if (((((planePosition.x >= 0) && (planePosition.x < leftSideLength)) && (planePosition.y >= 0)) && (planePosition.y < rightSideLength))) + if(((((planePosition.x >= 0) && (planePosition.x < leftSideLength)) && (planePosition.y >= 0)) && (planePosition.y < rightSideLength))) { this.object.model.setValue(RoomObjectVariable.ROOM_SELECTED_X, tileX); this.object.model.setValue(RoomObjectVariable.ROOM_SELECTED_Y, tileY); @@ -410,30 +410,30 @@ export class RoomLogic extends RoomObjectLogicBase let eventType: string = null; - if ((event.type === MouseEventType.MOUSE_MOVE) || (event.type === MouseEventType.ROLL_OVER)) eventType = RoomObjectMouseEvent.MOUSE_MOVE; - else if ((event.type === MouseEventType.MOUSE_CLICK)) eventType = RoomObjectMouseEvent.CLICK; + if((event.type === MouseEventType.MOUSE_MOVE) || (event.type === MouseEventType.ROLL_OVER)) eventType = RoomObjectMouseEvent.MOUSE_MOVE; + else if((event.type === MouseEventType.MOUSE_CLICK)) eventType = RoomObjectMouseEvent.CLICK; - switch (event.type) + switch(event.type) { case MouseEventType.MOUSE_MOVE: case MouseEventType.ROLL_OVER: case MouseEventType.MOUSE_CLICK: { let newEvent: RoomObjectEvent = null; - if (planeType === RoomPlaneData.PLANE_FLOOR) + if(planeType === RoomPlaneData.PLANE_FLOOR) { newEvent = new RoomObjectTileMouseEvent(eventType, this.object, event.eventId, tileX, tileY, tileZ, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); } - else if ((planeType === RoomPlaneData.PLANE_WALL) || (planeType === RoomPlaneData.PLANE_LANDSCAPE)) + else if((planeType === RoomPlaneData.PLANE_WALL) || (planeType === RoomPlaneData.PLANE_LANDSCAPE)) { let direction = 90; - if (planeNormalDirection) + if(planeNormalDirection) { direction = (planeNormalDirection.x + 90); - if (direction > 360) direction -= 360; + if(direction > 360) direction -= 360; } const _local_27 = ((planeLeftSide.length * planePosition.x) / leftSideLength); @@ -442,7 +442,7 @@ export class RoomLogic extends RoomObjectLogicBase newEvent = new RoomObjectWallMouseEvent(eventType, this.object, event.eventId, planeLocation, planeLeftSide, planeRightSide, _local_27, _local_28, direction, event.altKey, event.ctrlKey, event.shiftKey, event.buttonDown); } - if (this.eventDispatcher) this.eventDispatcher.dispatchEvent(newEvent); + if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(newEvent); return; } diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts index 17835ea8..26d5718e 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts @@ -132,7 +132,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement public initialize(data: IObjectVisualizationData): boolean { - if (!(data instanceof AvatarVisualizationData)) return false; + if(!(data instanceof AvatarVisualizationData)) return false; this._data = data; @@ -145,11 +145,11 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement public dispose(): void { - if (this._disposed) return; + if(this._disposed) return; super.dispose(); - if (this._avatarImage) this._avatarImage.dispose(); + if(this._avatarImage) this._avatarImage.dispose(); this._shadow = null; this._disposed = true; @@ -157,13 +157,13 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement public update(geometry: IRoomGeometry, time: number, update: boolean, skipUpdate: boolean): void { - if (!this.object || !geometry || !this._data) return; + if(!this.object || !geometry || !this._data) return; - if (time < (this._lastUpdate + AvatarVisualization.UPDATE_TIME_INCREASER)) return; + if(time < (this._lastUpdate + AvatarVisualization.UPDATE_TIME_INCREASER)) return; this._lastUpdate += AvatarVisualization.UPDATE_TIME_INCREASER; - if ((this._lastUpdate + AvatarVisualization.UPDATE_TIME_INCREASER) < time) this._lastUpdate = (time - AvatarVisualization.UPDATE_TIME_INCREASER); + if((this._lastUpdate + AvatarVisualization.UPDATE_TIME_INCREASER) < time) this._lastUpdate = (time - AvatarVisualization.UPDATE_TIME_INCREASER); const model = this.object.model; const scale = geometry.scale; @@ -176,41 +176,41 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const updateModel = this.updateModel(model, scale); - if ((updateModel || (scale !== this._scale)) || !this._avatarImage) + if((updateModel || (scale !== this._scale)) || !this._avatarImage) { - if (scale !== this._scale) + if(scale !== this._scale) { didScaleUpdate = true; this.updateScale(scale); } - if (effect !== this._effect) didEffectUpdate = true; + if(effect !== this._effect) didEffectUpdate = true; - if (didScaleUpdate || !this._avatarImage || didEffectUpdate) + if(didScaleUpdate || !this._avatarImage || didEffectUpdate) { this._avatarImage = this.createAvatarImage(scale, this._effect); - if (!this._avatarImage) return; + if(!this._avatarImage) return; otherUpdate = true; const sprite = this.getSprite(AvatarVisualization.AVATAR_LAYER_ID); - if ((sprite && this._avatarImage) && this._avatarImage.isPlaceholder()) + if((sprite && this._avatarImage) && this._avatarImage.isPlaceholder()) { sprite.alpha = 150; } - else if (sprite) + else if(sprite) { sprite.alpha = 255; } } - if (!this._avatarImage) return; + if(!this._avatarImage) return; - if (didEffectUpdate && this._avatarImage.animationHasResetOnToggle) this._avatarImage.resetAnimationFrameCounter(); + if(didEffectUpdate && this._avatarImage.animationHasResetOnToggle) this._avatarImage.resetAnimationFrameCounter(); this.updateShadow(scale); @@ -218,11 +218,11 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement this.processActionsForAvatar(this._avatarImage); - if (this._additions) + if(this._additions) { let index = this._extraSpritesStartIndex; - for (const addition of this._additions.values()) + for(const addition of this._additions.values()) { addition.update(this.getSprite(index++), scale); } @@ -235,29 +235,29 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement objectUpdate = this.updateObject(this.object, geometry, update); } - if (this._additions) + if(this._additions) { let index = this._extraSpritesStartIndex; - for (const addition of this._additions.values()) + for(const addition of this._additions.values()) { - if (addition.animate(this.getSprite(index++))) this.updateSpriteCounter++; + if(addition.animate(this.getSprite(index++))) this.updateSpriteCounter++; } } const update1 = (objectUpdate || updateModel || didScaleUpdate); const update2 = ((this._isAnimating || (this._forcedAnimFrames > 0)) && update); - if (update1) this._forcedAnimFrames = AvatarVisualization.ANIMATION_FRAME_UPDATE_INTERVAL; + if(update1) this._forcedAnimFrames = AvatarVisualization.ANIMATION_FRAME_UPDATE_INTERVAL; - if (update1 || update2) + if(update1 || update2) { this.updateSpriteCounter++; this._forcedAnimFrames--; this._updatesUntilFrameUpdate--; - if ((((this._updatesUntilFrameUpdate <= 0) || didScaleUpdate) || updateModel) || otherUpdate) + if((((this._updatesUntilFrameUpdate <= 0) || didScaleUpdate) || updateModel) || otherUpdate) { this._avatarImage.updateAnimationByFrames(1); @@ -270,21 +270,21 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let _local_20 = this._avatarImage.getCanvasOffsets(); - if (!_local_20 || (_local_20.length < 3)) _local_20 = AvatarVisualization.DEFAULT_CANVAS_OFFSETS; + if(!_local_20 || (_local_20.length < 3)) _local_20 = AvatarVisualization.DEFAULT_CANVAS_OFFSETS; const sprite = this.getSprite(AvatarVisualization.SPRITE_INDEX_AVATAR); - if (sprite) + if(sprite) { const highlightEnabled = ((this.object.model.getValue(RoomObjectVariable.FIGURE_HIGHLIGHT_ENABLE) === 1) && (this.object.model.getValue(RoomObjectVariable.FIGURE_HIGHLIGHT) === 1)); const avatarImage = this._avatarImage.getImage(AvatarSetType.FULL, highlightEnabled); - if (avatarImage) + if(avatarImage) { sprite.texture = avatarImage; - if (highlightEnabled) + if(highlightEnabled) { // sprite.filters = [ // new GlowFilter({ @@ -299,15 +299,15 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement } } - if (sprite.texture) + if(sprite.texture) { sprite.offsetX = ((((-1 * scale) / 2) + _local_20[0]) - ((sprite.texture.width - scale) / 2)); sprite.offsetY = (((-(sprite.texture.height) + (scale / 4)) + _local_20[1]) + this._postureOffset); } - if (this._isLaying) + if(this._isLaying) { - if (this._layInside) sprite.relativeDepth = -0.5; + if(this._layInside) sprite.relativeDepth = -0.5; else sprite.relativeDepth = (AvatarVisualization.AVATAR_SPRITE_LAYING_DEPTH + _local_20[2]); } else @@ -315,7 +315,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement sprite.relativeDepth = (AvatarVisualization.AVATAR_SPRITE_DEFAULT_DEPTH + _local_20[2]); } - if (this._ownUser) + if(this._ownUser) { sprite.relativeDepth -= AvatarVisualization.AVATAR_OWN_DEPTH_ADJUST; sprite.spriteType = RoomObjectSpriteType.AVATAR_OWN; @@ -328,9 +328,9 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const typingBubble = this.getAddition(AvatarVisualization.TYPING_BUBBLE_ID) as TypingBubbleAddition; - if (typingBubble) + if(typingBubble) { - if (!this._isLaying) typingBubble.relativeDepth = ((AvatarVisualization.AVATAR_SPRITE_DEFAULT_DEPTH - 0.01) + _local_20[2]); + if(!this._isLaying) typingBubble.relativeDepth = ((AvatarVisualization.AVATAR_SPRITE_DEFAULT_DEPTH - 0.01) + _local_20[2]); else typingBubble.relativeDepth = ((AvatarVisualization.AVATAR_SPRITE_LAYING_DEPTH - 0.01) + _local_20[2]); } @@ -339,32 +339,32 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let _local_21 = AvatarVisualization.INITIAL_RESERVED_SPRITES; const direction = this._avatarImage.getDirection(); - for (const spriteData of this._avatarImage.getSprites()) + for(const spriteData of this._avatarImage.getSprites()) { - if (spriteData.id === AvatarVisualization.AVATAR) + if(spriteData.id === AvatarVisualization.AVATAR) { const sprite = this.getSprite(AvatarVisualization.SPRITE_INDEX_AVATAR); - if (sprite) + if(sprite) { const layerData = this._avatarImage.getLayerData(spriteData); let offsetX = spriteData.getDirectionOffsetX(direction); let offsetY = spriteData.getDirectionOffsetY(direction); - if (layerData) + if(layerData) { offsetX += layerData.dx; offsetY += layerData.dy; } - if (scale < 48) + if(scale < 48) { offsetX /= 2; offsetY /= 2; } - if (!this._canStandUp) + if(!this._canStandUp) { sprite.offsetX += offsetX; sprite.offsetY += offsetY; @@ -375,7 +375,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement { const sprite = this.getSprite(_local_21); - if (sprite) + if(sprite) { sprite.alphaTolerance = AlphaTolerance.MATCH_NOTHING; sprite.visible = true; @@ -388,9 +388,9 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const offsetZ = spriteData.getDirectionOffsetZ(direction); let dd = 0; - if (spriteData.hasDirections) dd = direction; + if(spriteData.hasDirections) dd = direction; - if (layerData) + if(layerData) { frameNumber = layerData.animationFrame; offsetX += layerData.dx; @@ -398,30 +398,30 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement dd += layerData.dd; } - if (scale < 48) + if(scale < 48) { offsetX /= 2; offsetY /= 2; } - if (dd < 0) dd += 8; + if(dd < 0) dd += 8; else { - if (dd > 7) dd -= 8; + if(dd > 7) dd -= 8; } const assetName = ((((((this._avatarImage.getScale() + '_') + spriteData.member) + '_') + dd) + '_') + frameNumber); const asset = this._avatarImage.getAsset(assetName); - if (!asset) continue; + if(!asset) continue; sprite.texture = asset.texture; sprite.offsetX = ((asset.offsetX - (scale / 2)) + offsetX); sprite.offsetY = (asset.offsetY + offsetY); sprite.flipH = asset.flipH; - if (spriteData.hasStaticY) + if(spriteData.hasStaticY) { sprite.offsetY += ((this._verticalOffset * scale) / (2 * AvatarVisualization.BASE_Y_SCALE)); } @@ -430,7 +430,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement sprite.offsetY += this._postureOffset; } - if (this._isLaying) + if(this._isLaying) { sprite.relativeDepth = (AvatarVisualization.AVATAR_SPRITE_LAYING_DEPTH - ((0.001 * this.totalSprites) * offsetZ)); } @@ -439,7 +439,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement sprite.relativeDepth = (AvatarVisualization.AVATAR_SPRITE_DEFAULT_DEPTH - ((0.001 * this.totalSprites) * offsetZ)); } - if (spriteData.ink === 33) sprite.blendMode = BLEND_MODES.ADD; + if(spriteData.ink === 33) sprite.blendMode = BLEND_MODES.ADD; else sprite.blendMode = BLEND_MODES.NORMAL; } @@ -454,7 +454,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let cachedImage: IAvatarImage = null; let imageName = 'avatarImage' + scale.toString(); - if (!effectId) + if(!effectId) { cachedImage = this._cachedAvatars.getValue(imageName); } @@ -465,24 +465,24 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement cachedImage = this._cachedAvatarEffects.getValue(imageName); } - if (!cachedImage) + if(!cachedImage) { cachedImage = this._data.createAvatarImage(this._figure, scale, this._gender, this, this); - if (cachedImage) + if(cachedImage) { - if (!effectId) + if(!effectId) { this._cachedAvatars.add(imageName, cachedImage); } else { - if (this._cachedAvatarEffects.length >= AvatarVisualization.MAX_EFFECT_CACHE) + if(this._cachedAvatarEffects.length >= AvatarVisualization.MAX_EFFECT_CACHE) { const cached = this._cachedAvatarEffects.remove(this._cachedAvatarEffects.getKey(0)); - if (cached) cached.dispose(); + if(cached) cached.dispose(); } this._cachedAvatarEffects.add(imageName, cachedImage); @@ -495,23 +495,23 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement protected updateObject(object: IRoomObject, geometry: IRoomGeometry, update: boolean, _arg_4: boolean = false): boolean { - if ((!_arg_4 && (this.updateObjectCounter === object.updateCounter)) && (this._geometryUpdateCounter === geometry.updateId)) return false; + if((!_arg_4 && (this.updateObjectCounter === object.updateCounter)) && (this._geometryUpdateCounter === geometry.updateId)) return false; let direction = (object.getDirection().x - geometry.direction.x); let headDirection = (this._headDirection - geometry.direction.x); - if (this._posture === 'float') headDirection = direction; + if(this._posture === 'float') headDirection = direction; direction = (((direction % 360) + 360) % 360); headDirection = (((headDirection % 360) + 360) % 360); - if ((this._posture === 'sit') && this._canStandUp) + if((this._posture === 'sit') && this._canStandUp) { direction -= ((direction % 90) - 45); headDirection -= ((headDirection % 90) - 45); } - if ((direction !== this._angle) || _arg_4) + if((direction !== this._angle) || _arg_4) { update = true; @@ -523,13 +523,13 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement this._avatarImage.setDirectionAngle(AvatarSetType.FULL, direction); } - if ((headDirection !== this._headAngle) || _arg_4) + if((headDirection !== this._headAngle) || _arg_4) { update = true; this._headAngle = headDirection; - if (this._headAngle !== this._angle) + if(this._headAngle !== this._angle) { headDirection = (headDirection - (135 - 22.5)); headDirection = ((headDirection + 360) % 360); @@ -547,15 +547,15 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement protected updateModel(model: IRoomObjectModel, scale: number): boolean { - if (!model) return false; + if(!model) return false; - if (this.updateModelCounter === model.updateCounter) return false; + if(this.updateModelCounter === model.updateCounter) return false; let needsUpdate = false; const talk = (model.getValue(RoomObjectVariable.FIGURE_TALK) > 0); - if (talk !== this._talk) + if(talk !== this._talk) { this._talk = talk; @@ -564,7 +564,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const expression = model.getValue(RoomObjectVariable.FIGURE_EXPRESSION); - if (expression !== this._expression) + if(expression !== this._expression) { this._expression = expression; @@ -573,7 +573,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const sleep = (model.getValue(RoomObjectVariable.FIGURE_SLEEP) > 0); - if (sleep !== this._sleep) + if(sleep !== this._sleep) { this._sleep = sleep; @@ -582,7 +582,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const blink = (model.getValue(RoomObjectVariable.FIGURE_BLINK) > 0); - if (blink !== this._blink) + if(blink !== this._blink) { this._blink = blink; @@ -591,7 +591,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const gesture = (model.getValue(RoomObjectVariable.FIGURE_GESTURE) || 0); - if (gesture !== this._gesture) + if(gesture !== this._gesture) { this._gesture = gesture; @@ -600,7 +600,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const posture = model.getValue(RoomObjectVariable.FIGURE_POSTURE); - if (posture !== this._posture) + if(posture !== this._posture) { this._posture = posture; @@ -609,7 +609,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const postureParameter = model.getValue(RoomObjectVariable.FIGURE_POSTURE_PARAMETER); - if (postureParameter !== this._postureParameter) + if(postureParameter !== this._postureParameter) { this._postureParameter = postureParameter; @@ -618,7 +618,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const canStandUp = model.getValue(RoomObjectVariable.FIGURE_CAN_STAND_UP); - if (canStandUp !== this._canStandUp) + if(canStandUp !== this._canStandUp) { this._canStandUp = canStandUp; @@ -627,7 +627,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const verticalOffset = (model.getValue(RoomObjectVariable.FIGURE_VERTICAL_OFFSET) * AvatarVisualization.BASE_Y_SCALE); - if (verticalOffset !== this._verticalOffset) + if(verticalOffset !== this._verticalOffset) { this._verticalOffset = verticalOffset; @@ -636,7 +636,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const dance = (model.getValue(RoomObjectVariable.FIGURE_DANCE) || 0); - if (dance !== this._dance) + if(dance !== this._dance) { this._dance = dance; @@ -645,7 +645,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const effect = (model.getValue(RoomObjectVariable.FIGURE_EFFECT) || 0); - if (effect !== this._effect) + if(effect !== this._effect) { this._effect = effect; @@ -654,7 +654,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const carryObject = (model.getValue(RoomObjectVariable.FIGURE_CARRY_OBJECT) || 0); - if (carryObject !== this._carryObject) + if(carryObject !== this._carryObject) { this._carryObject = carryObject; @@ -663,7 +663,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const useObject = (model.getValue(RoomObjectVariable.FIGURE_USE_OBJECT) || 0); - if (useObject !== this._useObject) + if(useObject !== this._useObject) { this._useObject = useObject; @@ -672,16 +672,16 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const headDirection = model.getValue(RoomObjectVariable.HEAD_DIRECTION); - if (headDirection !== this._headDirection) + if(headDirection !== this._headDirection) { this._headDirection = headDirection; needsUpdate = true; } - if ((this._carryObject > 0) && (useObject > 0)) + if((this._carryObject > 0) && (useObject > 0)) { - if (this._useObject !== this._carryObject) + if(this._useObject !== this._carryObject) { this._useObject = this._carryObject; @@ -690,7 +690,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement } else { - if (this._useObject !== 0) + if(this._useObject !== 0) { this._useObject = 0; @@ -700,30 +700,30 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let idleAddition = this.getAddition(AvatarVisualization.FLOATING_IDLE_Z_ID); - if (this._sleep) + if(this._sleep) { - if (!idleAddition) idleAddition = this.addAddition(new FloatingIdleZAddition(AvatarVisualization.FLOATING_IDLE_Z_ID, this)); + if(!idleAddition) idleAddition = this.addAddition(new FloatingIdleZAddition(AvatarVisualization.FLOATING_IDLE_Z_ID, this)); needsUpdate = true; } else { - if (idleAddition) this.removeAddition(AvatarVisualization.FLOATING_IDLE_Z_ID); + if(idleAddition) this.removeAddition(AvatarVisualization.FLOATING_IDLE_Z_ID); } const isMuted = (model.getValue(RoomObjectVariable.FIGURE_IS_MUTED) > 0); let mutedAddition = this.getAddition(AvatarVisualization.MUTED_BUBBLE_ID); - if (isMuted) + if(isMuted) { - if (!mutedAddition) mutedAddition = this.addAddition(new MutedBubbleAddition(AvatarVisualization.MUTED_BUBBLE_ID, this)); + if(!mutedAddition) mutedAddition = this.addAddition(new MutedBubbleAddition(AvatarVisualization.MUTED_BUBBLE_ID, this)); needsUpdate = true; } else { - if (mutedAddition) + if(mutedAddition) { this.removeAddition(AvatarVisualization.MUTED_BUBBLE_ID); @@ -734,15 +734,15 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let typingAddition = this.getAddition(AvatarVisualization.TYPING_BUBBLE_ID); - if (isTyping) + if(isTyping) { - if (!typingAddition) typingAddition = this.addAddition(new TypingBubbleAddition(AvatarVisualization.TYPING_BUBBLE_ID, this)); + if(!typingAddition) typingAddition = this.addAddition(new TypingBubbleAddition(AvatarVisualization.TYPING_BUBBLE_ID, this)); needsUpdate = true; } else { - if (typingAddition) + if(typingAddition) { this.removeAddition(AvatarVisualization.TYPING_BUBBLE_ID); @@ -753,7 +753,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const guideStatusValue = (model.getValue(RoomObjectVariable.FIGURE_GUIDE_STATUS) || 0); - if (guideStatusValue !== AvatarGuideStatus.NONE) + if(guideStatusValue !== AvatarGuideStatus.NONE) { this.removeAddition(AvatarVisualization.GUIDE_BUBBLE_ID); this.addAddition(new GuideStatusBubbleAddition(AvatarVisualization.GUIDE_BUBBLE_ID, this, guideStatusValue)); @@ -762,7 +762,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement } else { - if (this.getAddition(AvatarVisualization.GUIDE_BUBBLE_ID)) + if(this.getAddition(AvatarVisualization.GUIDE_BUBBLE_ID)) { this.removeAddition(AvatarVisualization.GUIDE_BUBBLE_ID); @@ -774,66 +774,66 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let gameClickAddition = this.getAddition(AvatarVisualization.GAME_CLICK_TARGET_ID); - if (isPlayingGame) + if(isPlayingGame) { - if (!gameClickAddition) gameClickAddition = this.addAddition(new GameClickTargetAddition(AvatarVisualization.GAME_CLICK_TARGET_ID)); + if(!gameClickAddition) gameClickAddition = this.addAddition(new GameClickTargetAddition(AvatarVisualization.GAME_CLICK_TARGET_ID)); needsUpdate = true; } else { - if (gameClickAddition) this.removeAddition(AvatarVisualization.GAME_CLICK_TARGET_ID); + if(gameClickAddition) this.removeAddition(AvatarVisualization.GAME_CLICK_TARGET_ID); } const numberValue = model.getValue(RoomObjectVariable.FIGURE_NUMBER_VALUE); let numberAddition = this.getAddition(AvatarVisualization.NUMBER_BUBBLE_ID); - if (numberValue > 0) + if(numberValue > 0) { - if (!numberAddition) numberAddition = this.addAddition(new NumberBubbleAddition(AvatarVisualization.NUMBER_BUBBLE_ID, numberValue, this)); + if(!numberAddition) numberAddition = this.addAddition(new NumberBubbleAddition(AvatarVisualization.NUMBER_BUBBLE_ID, numberValue, this)); needsUpdate = true; } else { - if (numberAddition) this.removeAddition(AvatarVisualization.NUMBER_BUBBLE_ID); + if(numberAddition) this.removeAddition(AvatarVisualization.NUMBER_BUBBLE_ID); } let expressionAddition = this.getAddition(AvatarVisualization.EXPRESSION_ID); - if (this._expression > 0) + if(this._expression > 0) { - if (!expressionAddition) + if(!expressionAddition) { expressionAddition = ExpressionAdditionFactory.getExpressionAddition(AvatarVisualization.EXPRESSION_ID, this._expression, this); - if (expressionAddition) this.addAddition(expressionAddition); + if(expressionAddition) this.addAddition(expressionAddition); } } else { - if (expressionAddition) this.removeAddition(AvatarVisualization.EXPRESSION_ID); + if(expressionAddition) this.removeAddition(AvatarVisualization.EXPRESSION_ID); } this.updateScale(scale); const gender = model.getValue(RoomObjectVariable.GENDER); - if (gender !== this._gender) + if(gender !== this._gender) { this._gender = gender; needsUpdate = true; } - if (this.updateFigure(model.getValue(RoomObjectVariable.FIGURE))) needsUpdate = true; + if(this.updateFigure(model.getValue(RoomObjectVariable.FIGURE))) needsUpdate = true; let sign = model.getValue(RoomObjectVariable.FIGURE_SIGN); - if (sign === null) sign = -1; + if(sign === null) sign = -1; - if (this._sign !== sign) + if(this._sign !== sign) { this._sign = sign; @@ -842,18 +842,18 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const highlightEnabled = (model.getValue(RoomObjectVariable.FIGURE_HIGHLIGHT_ENABLE) > 0); - if (highlightEnabled !== this._highlightEnabled) + if(highlightEnabled !== this._highlightEnabled) { this._highlightEnabled = highlightEnabled; needsUpdate = true; } - if (this._highlightEnabled) + if(this._highlightEnabled) { const highlight = (model.getValue(RoomObjectVariable.FIGURE_HIGHLIGHT) > 0); - if (highlight !== this._highlight) + if(highlight !== this._highlight) { this._highlight = highlight; @@ -863,7 +863,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const ownUser = (model.getValue(RoomObjectVariable.OWN_USER) > 0); - if (ownUser !== this._ownUser) + if(ownUser !== this._ownUser) { this._ownUser = ownUser; @@ -877,7 +877,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement protected setDirection(direction: number): void { - if (this._direction === direction) return; + if(this._direction === direction) return; this._direction = direction; @@ -886,9 +886,9 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement private updateScale(scale: number): void { - if (scale < 48) this._blink = false; + if(scale < 48) this._blink = false; - if ((this._posture === 'sit') || (this._posture === 'lay')) + if((this._posture === 'sit') || (this._posture === 'lay')) { this._postureOffset = (scale / 2); } @@ -900,45 +900,45 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement this._layInside = false; this._isLaying = false; - if (this._posture === 'lay') + if(this._posture === 'lay') { this._isLaying = true; const _local_2 = parseInt(this._postureParameter); - if (_local_2 < 0) this._layInside = true; + if(_local_2 < 0) this._layInside = true; } } private processActionsForAvatar(avatar: IAvatarImage): void { - if (!avatar) return; + if(!avatar) return; avatar.initActionAppends(); avatar.appendAction(AvatarAction.POSTURE, this._posture, this._postureParameter); - if (this._gesture > 0) this._avatarImage.appendAction(AvatarAction.GESTURE, AvatarAction.getGesture(this._gesture)); + if(this._gesture > 0) this._avatarImage.appendAction(AvatarAction.GESTURE, AvatarAction.getGesture(this._gesture)); - if (this._dance > 0) this._avatarImage.appendAction(AvatarAction.DANCE, this._dance); + if(this._dance > 0) this._avatarImage.appendAction(AvatarAction.DANCE, this._dance); - if (this._sign > -1) this._avatarImage.appendAction(AvatarAction.SIGN, this._sign); + if(this._sign > -1) this._avatarImage.appendAction(AvatarAction.SIGN, this._sign); - if (this._carryObject > 0) this._avatarImage.appendAction(AvatarAction.CARRY_OBJECT, this._carryObject); + if(this._carryObject > 0) this._avatarImage.appendAction(AvatarAction.CARRY_OBJECT, this._carryObject); - if (this._useObject > 0) this._avatarImage.appendAction(AvatarAction.USE_OBJECT, this._useObject); + if(this._useObject > 0) this._avatarImage.appendAction(AvatarAction.USE_OBJECT, this._useObject); - if (this._talk) this._avatarImage.appendAction(AvatarAction.TALK); + if(this._talk) this._avatarImage.appendAction(AvatarAction.TALK); - if (this._sleep || this._blink) this._avatarImage.appendAction(AvatarAction.SLEEP); + if(this._sleep || this._blink) this._avatarImage.appendAction(AvatarAction.SLEEP); - if (this._expression > 0) + if(this._expression > 0) { const expression = AvatarAction.getExpression(this._expression); - if (expression !== '') + if(expression !== '') { - switch (expression) + switch(expression) { case AvatarAction.DANCE: this._avatarImage.appendAction(AvatarAction.DANCE, 2); @@ -950,7 +950,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement } } - if (this._effect > 0) this._avatarImage.appendAction(AvatarAction.EFFECT, this._effect); + if(this._effect > 0) this._avatarImage.appendAction(AvatarAction.EFFECT, this._effect); avatar.endActionAppends(); @@ -958,24 +958,24 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement let spriteCount = AvatarVisualization.INITIAL_RESERVED_SPRITES; - for (const sprite of this._avatarImage.getSprites()) + for(const sprite of this._avatarImage.getSprites()) { - if (sprite.id !== AvatarVisualization.AVATAR) spriteCount++; + if(sprite.id !== AvatarVisualization.AVATAR) spriteCount++; } - if (spriteCount !== this.totalSprites) this.createSprites(spriteCount); + if(spriteCount !== this.totalSprites) this.createSprites(spriteCount); this._extraSpritesStartIndex = spriteCount; - if (this._additions) + if(this._additions) { - for (const addition of this._additions.values()) this.createSprite(); + for(const addition of this._additions.values()) this.createSprite(); } } private updateFigure(figure: string): boolean { - if (this._figure === figure) return false; + if(this._figure === figure) return false; this._figure = figure; @@ -996,9 +996,9 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement private clearAvatar(): void { - for (const avatar of this._cachedAvatars.getValues()) avatar && avatar.dispose(); + for(const avatar of this._cachedAvatars.getValues()) avatar && avatar.dispose(); - for (const avatar of this._cachedAvatarEffects.getValues()) avatar && avatar.dispose(); + for(const avatar of this._cachedAvatarEffects.getValues()) avatar && avatar.dispose(); this._cachedAvatars.reset(); this._cachedAvatarEffects.reset(); @@ -1007,7 +1007,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const sprite = this.getSprite(AvatarVisualization.AVATAR_LAYER_ID); - if (sprite) + if(sprite) { sprite.texture = Texture.EMPTY; sprite.alpha = 255; @@ -1016,11 +1016,11 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement private getAddition(id: number): IAvatarAddition { - if (!this._additions) return null; + if(!this._additions) return null; const existing = this._additions.get(id); - if (!existing) return null; + if(!existing) return null; return existing; } @@ -1029,7 +1029,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement { const existing = this.getAddition(addition.id); - if (existing) return; + if(existing) return; this._additions.set(addition.id, addition); @@ -1040,7 +1040,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement { const addition = this.getAddition(id); - if (!addition) return; + if(!addition) return; this._additions.delete(addition.id); @@ -1053,22 +1053,22 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement const sprite = this.getSprite(AvatarVisualization.SHADOW_LAYER_ID); - if (!sprite) return; + if(!sprite) return; let hasShadow = (((this._posture === 'mv') || (this._posture === 'std')) || ((this._posture === 'sit') && this._canStandUp)); - if (this._effect === AvatarVisualization.SNOWBOARDING_EFFECT) hasShadow = false; + if(this._effect === AvatarVisualization.SNOWBOARDING_EFFECT) hasShadow = false; - if (hasShadow) + if(hasShadow) { sprite.visible = true; - if (!this._shadow || (scale !== this._scale)) + if(!this._shadow || (scale !== this._scale)) { let offsetX = 0; let offsetY = 0; - if (scale < 48) + if(scale < 48) { sprite.libraryAssetName = 'sh_std_sd_1_0_0'; @@ -1087,7 +1087,7 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement offsetY = ((this._canStandUp) ? 10 : -7); } - if (this._shadow) + if(this._shadow) { sprite.texture = this._shadow.texture; sprite.offsetX = offsetX; diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts index 0b9fd904..a5ca3708 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualizationData.ts @@ -25,7 +25,7 @@ export class AvatarVisualizationData extends Disposable implements IObjectVisual { let avatarImage: IAvatarImage = null; - if (size > 48) avatarImage = this._avatarRenderer.createAvatarImage(figure, AvatarScaleType.LARGE, gender, avatarListener, effectListener); + if(size > 48) avatarImage = this._avatarRenderer.createAvatarImage(figure, AvatarScaleType.LARGE, gender, avatarListener, effectListener); else avatarImage = this._avatarRenderer.createAvatarImage(figure, AvatarScaleType.SMALL, gender, avatarListener, effectListener); return avatarImage; @@ -33,7 +33,7 @@ export class AvatarVisualizationData extends Disposable implements IObjectVisual public getAvatarRendererAsset(name: string): Texture { - if (!this._avatarRenderer) return null; + if(!this._avatarRenderer) return null; return this._avatarRenderer.assets.getTexture(name); } diff --git a/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts b/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts index 6d1571b9..c17de994 100644 --- a/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/FloatingHeartAddition.ts @@ -33,23 +33,23 @@ export class FloatingHeartAddition extends ExpressionAddition public update(sprite: IRoomObjectSprite, scale: number): void { - if (!sprite) return; + if(!sprite) return; this._scale = scale; let additionScale = 64; let offsetX = 0; - if (scale < 48) + if(scale < 48) { this._asset = this.visualization.getAvatarRenderAsset('avatar_addition_user_blowkiss_small'); - if ((this.visualization.angle === 90) || (this.visualization.angle === 270)) + if((this.visualization.angle === 90) || (this.visualization.angle === 270)) { offsetX = 0; } - else if ((this.visualization.angle === 135) || (this.visualization.angle === 180) || (this.visualization.angle === 225)) + else if((this.visualization.angle === 135) || (this.visualization.angle === 180) || (this.visualization.angle === 225)) { offsetX = 6; } @@ -64,12 +64,12 @@ export class FloatingHeartAddition extends ExpressionAddition { this._asset = this.visualization.getAvatarRenderAsset('avatar_addition_user_blowkiss'); - if ((this.visualization.angle === 90) || (this.visualization.angle === 270)) + if((this.visualization.angle === 90) || (this.visualization.angle === 270)) { offsetX = -3; } - else if ((this.visualization.angle === 135) || (this.visualization.angle === 180) || (this.visualization.angle === 225)) + else if((this.visualization.angle === 135) || (this.visualization.angle === 180) || (this.visualization.angle === 225)) { offsetX = 22; } @@ -79,17 +79,17 @@ export class FloatingHeartAddition extends ExpressionAddition this._offsetY = -70; } - if (this.visualization.posture === AvatarAction.POSTURE_SIT) + if(this.visualization.posture === AvatarAction.POSTURE_SIT) { this._offsetY += (additionScale / 2); } - else if (this.visualization.posture === AvatarAction.POSTURE_LAY) + else if(this.visualization.posture === AvatarAction.POSTURE_LAY) { this._offsetY += additionScale; } - if (this._asset) + if(this._asset) { sprite.texture = this._asset; sprite.offsetX = offsetX; @@ -107,13 +107,13 @@ export class FloatingHeartAddition extends ExpressionAddition public animate(sprite: IRoomObjectSprite): boolean { - if (!sprite) return false; + if(!sprite) return false; - if (this._asset) sprite.texture = this._asset; + if(this._asset) sprite.texture = this._asset; - if (this._state === FloatingHeartAddition.STATE_DELAY) + if(this._state === FloatingHeartAddition.STATE_DELAY) { - if ((GetTickerTime() - this._startTime) < FloatingHeartAddition.DELAY_BEFORE_ANIMATION) return false; + if((GetTickerTime() - this._startTime) < FloatingHeartAddition.DELAY_BEFORE_ANIMATION) return false; this._state = FloatingHeartAddition.STATE_FADE_IN; @@ -125,14 +125,14 @@ export class FloatingHeartAddition extends ExpressionAddition return true; } - if (this._state === FloatingHeartAddition.STATE_FADE_IN) + if(this._state === FloatingHeartAddition.STATE_FADE_IN) { this._delta += 0.1; sprite.offsetY = this._offsetY; sprite.alpha = (Math.pow(this._delta, 0.9) * 255); - if (this._delta >= 1) + if(this._delta >= 1) { sprite.alpha = 255; @@ -143,7 +143,7 @@ export class FloatingHeartAddition extends ExpressionAddition return true; } - if (this._state === FloatingHeartAddition.STATE_FLOAT) + if(this._state === FloatingHeartAddition.STATE_FLOAT) { const alpha = Math.pow(this._delta, 0.9); @@ -154,7 +154,7 @@ export class FloatingHeartAddition extends ExpressionAddition sprite.offsetY = (this._offsetY + (((this._delta < 1) ? alpha : 1) * offset)); sprite.alpha = ((1 - alpha) * 255); - if (sprite.alpha <= 0) + if(sprite.alpha <= 0) { sprite.visible = false; diff --git a/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts b/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts index c6ce4160..0f2fca53 100644 --- a/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/FloatingIdleZAddition.ts @@ -41,14 +41,14 @@ export class FloatingIdleZAddition implements IAvatarAddition { let side = 'left'; - if ((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) side = 'right'; + if((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) side = 'right'; return ('avatar_addition_user_idle_' + side + '_' + state + ((this._scale < 48) ? '_small' : '')); } public update(sprite: IRoomObjectSprite, scale: number): void { - if (!sprite) return; + if(!sprite) return; this._scale = scale; this._asset = this._visualization.getAvatarRenderAsset(this.getSpriteAssetName((this._state === FloatingIdleZAddition.STATE_FRAME_A) ? 1 : 2)); @@ -56,9 +56,9 @@ export class FloatingIdleZAddition implements IAvatarAddition let additionScale = 64; let offsetX = 0; - if (scale < 48) + if(scale < 48) { - if ((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) + if((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) { offsetX = 10; } @@ -73,7 +73,7 @@ export class FloatingIdleZAddition implements IAvatarAddition } else { - if ((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) + if((this._visualization.angle === 135) || (this._visualization.angle === 180) || (this._visualization.angle === 225) || (this._visualization.angle === 270)) { offsetX = 22; } @@ -85,17 +85,17 @@ export class FloatingIdleZAddition implements IAvatarAddition this._offsetY = -70; } - if (this._visualization.posture === AvatarAction.POSTURE_SIT) + if(this._visualization.posture === AvatarAction.POSTURE_SIT) { this._offsetY += (additionScale / 2); } - else if (this._visualization.posture === AvatarAction.POSTURE_LAY) + else if(this._visualization.posture === AvatarAction.POSTURE_LAY) { this._offsetY += (additionScale - (0.3 * additionScale)); } - if (this._asset) + if(this._asset) { sprite.texture = this._asset; sprite.offsetX = offsetX; @@ -107,13 +107,13 @@ export class FloatingIdleZAddition implements IAvatarAddition public animate(sprite: IRoomObjectSprite): boolean { - if (!sprite) return false; + if(!sprite) return false; const totalTimeRunning = GetTickerTime(); - if (this._state === FloatingIdleZAddition.STATE_DELAY) + if(this._state === FloatingIdleZAddition.STATE_DELAY) { - if ((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_BEFORE_ANIMATION) + if((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_BEFORE_ANIMATION) { this._state = FloatingIdleZAddition.STATE_FRAME_A; this._startTime = totalTimeRunning; @@ -121,9 +121,9 @@ export class FloatingIdleZAddition implements IAvatarAddition } } - if (this._state === FloatingIdleZAddition.STATE_FRAME_A) + if(this._state === FloatingIdleZAddition.STATE_FRAME_A) { - if ((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_PER_FRAME) + if((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_PER_FRAME) { this._state = FloatingIdleZAddition.STATE_FRAME_B; this._startTime = totalTimeRunning; @@ -131,9 +131,9 @@ export class FloatingIdleZAddition implements IAvatarAddition } } - if (this._state === FloatingIdleZAddition.STATE_FRAME_B) + if(this._state === FloatingIdleZAddition.STATE_FRAME_B) { - if ((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_PER_FRAME) + if((totalTimeRunning - this._startTime) >= FloatingIdleZAddition.DELAY_PER_FRAME) { this._state = FloatingIdleZAddition.STATE_FRAME_A; this._startTime = totalTimeRunning; @@ -141,7 +141,7 @@ export class FloatingIdleZAddition implements IAvatarAddition } } - if (this._asset) + if(this._asset) { sprite.texture = this._asset; sprite.alpha = 255; diff --git a/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts index ff2903f7..05c8ca41 100644 --- a/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/GuideStatusBubbleAddition.ts @@ -28,7 +28,7 @@ export class GuideStatusBubbleAddition implements IAvatarAddition public update(sprite: IRoomObjectSprite, scale: number): void { - if (!sprite) return; + if(!sprite) return; sprite.visible = true; sprite.relativeDepth = this._relativeDepth; @@ -40,7 +40,7 @@ export class GuideStatusBubbleAddition implements IAvatarAddition this._asset = this._visualization.getAvatarRenderAsset((this._status === AvatarGuideStatus.GUIDE) ? 'avatar_addition_user_guide_bubble' : 'avatar_addition_user_guide_requester_bubble'); - if (scale < 48) + if(scale < 48) { offsetX = -19; offsetY = -80; @@ -52,17 +52,17 @@ export class GuideStatusBubbleAddition implements IAvatarAddition offsetY = -120; } - if (this._visualization.posture === AvatarAction.POSTURE_SIT) + if(this._visualization.posture === AvatarAction.POSTURE_SIT) { offsetY += (additionScale / 2); } - else if (this._visualization.posture === AvatarAction.POSTURE_LAY) + else if(this._visualization.posture === AvatarAction.POSTURE_LAY) { offsetY += scale; } - if (this._asset) + if(this._asset) { sprite.texture = this._asset; sprite.offsetX = offsetX; @@ -73,7 +73,7 @@ export class GuideStatusBubbleAddition implements IAvatarAddition public animate(sprite: IRoomObjectSprite): boolean { - if (this._asset && sprite) + if(this._asset && sprite) { sprite.texture = this._asset; } diff --git a/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts index f26446ea..772bd333 100644 --- a/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/MutedBubbleAddition.ts @@ -24,13 +24,13 @@ export class MutedBubbleAddition implements IAvatarAddition public update(sprite: IRoomObjectSprite, scale: number): void { - if (!sprite) return; + if(!sprite) return; let additionScale = 64; let offsetX = 0; let offsetY = 0; - if (scale < 48) + if(scale < 48) { this._asset = this._visualization.getAvatarRenderAsset('avatar_addition_user_muted_small'); @@ -46,10 +46,10 @@ export class MutedBubbleAddition implements IAvatarAddition offsetY = -110; } - if (this._visualization.posture === AvatarAction.POSTURE_SIT) offsetY += (additionScale / 2); - else if (this._visualization.posture === AvatarAction.POSTURE_LAY) offsetY += scale; + if(this._visualization.posture === AvatarAction.POSTURE_SIT) offsetY += (additionScale / 2); + else if(this._visualization.posture === AvatarAction.POSTURE_LAY) offsetY += scale; - if (this._asset) + if(this._asset) { sprite.visible = true; sprite.texture = this._asset; @@ -65,7 +65,7 @@ export class MutedBubbleAddition implements IAvatarAddition public animate(sprite: IRoomObjectSprite): boolean { - if (this._asset && sprite) + if(this._asset && sprite) { sprite.texture = this._asset; } diff --git a/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts index dd0f9008..55da56e8 100644 --- a/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/NumberBubbleAddition.ts @@ -34,7 +34,7 @@ export class NumberBubbleAddition implements IAvatarAddition public update(sprite: IRoomObjectSprite, scale: number): void { - if (!sprite) return; + if(!sprite) return; this._scale = scale; @@ -42,9 +42,9 @@ export class NumberBubbleAddition implements IAvatarAddition let offsetX = 0; let offsetY = 0; - if (this._number > 0) + if(this._number > 0) { - if (scale < 48) + if(scale < 48) { this._asset = this._visualization.getAvatarRenderAsset('avatar_addition_number_' + this._number + '_small'); @@ -60,17 +60,17 @@ export class NumberBubbleAddition implements IAvatarAddition offsetY = -105; } - if (this._visualization.posture === AvatarAction.POSTURE_SIT) + if(this._visualization.posture === AvatarAction.POSTURE_SIT) { offsetY += (additionScale / 2); } - else if (this._visualization.posture === AvatarAction.POSTURE_LAY) + else if(this._visualization.posture === AvatarAction.POSTURE_LAY) { offsetY += scale; } - if (this._asset) + if(this._asset) { sprite.visible = true; sprite.texture = this._asset; @@ -90,15 +90,15 @@ export class NumberBubbleAddition implements IAvatarAddition } else { - if (sprite.visible) this._numberValueFadeDirection = -1; + if(sprite.visible) this._numberValueFadeDirection = -1; } } public animate(sprite: IRoomObjectSprite): boolean { - if (!sprite) return false; + if(!sprite) return false; - if (this._asset) + if(this._asset) { sprite.texture = this._asset; } @@ -106,15 +106,15 @@ export class NumberBubbleAddition implements IAvatarAddition let alpha = sprite.alpha; let didAnimate = false; - if (this._numberValueMoving) + if(this._numberValueMoving) { this._numberValueMoveCounter++; - if (this._numberValueMoveCounter < 10) return false; + if(this._numberValueMoveCounter < 10) return false; - if (this._numberValueFadeDirection < 0) + if(this._numberValueFadeDirection < 0) { - if (this._scale < 48) + if(this._scale < 48) { sprite.offsetY -= 2; } @@ -127,9 +127,9 @@ export class NumberBubbleAddition implements IAvatarAddition { let count = 4; - if (this._scale < 48) count = 8; + if(this._scale < 48) count = 8; - if (!(this._numberValueMoveCounter % count)) + if(!(this._numberValueMoveCounter % count)) { sprite.offsetY--; @@ -138,11 +138,11 @@ export class NumberBubbleAddition implements IAvatarAddition } } - if (this._numberValueFadeDirection > 0) + if(this._numberValueFadeDirection > 0) { - if (alpha < 255) alpha += 32; + if(alpha < 255) alpha += 32; - if (alpha >= 255) + if(alpha >= 255) { alpha = 255; @@ -154,11 +154,11 @@ export class NumberBubbleAddition implements IAvatarAddition return true; } - if (this._numberValueFadeDirection < 0) + if(this._numberValueFadeDirection < 0) { - if (alpha >= 0) alpha -= 32; + if(alpha >= 0) alpha -= 32; - if (alpha <= 0) + if(alpha <= 0) { this._numberValueFadeDirection = 0; this._numberValueMoving = false; diff --git a/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts b/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts index b61e3df3..f396a246 100644 --- a/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts +++ b/src/nitro/room/object/visualization/avatar/additions/TypingBubbleAddition.ts @@ -26,7 +26,7 @@ export class TypingBubbleAddition implements IAvatarAddition public update(sprite: IRoomObjectSprite, scale: number): void { - if (!sprite) return; + if(!sprite) return; sprite.visible = true; sprite.relativeDepth = this._relativeDepth; @@ -36,7 +36,7 @@ export class TypingBubbleAddition implements IAvatarAddition let offsetX = 0; let offsetY = 0; - if (scale < 48) + if(scale < 48) { this._asset = this._visualization.getAvatarRenderAsset('avatar_addition_user_typing_small'); @@ -53,17 +53,17 @@ export class TypingBubbleAddition implements IAvatarAddition offsetY = -83; } - if (this._visualization.posture === AvatarAction.POSTURE_SIT) + if(this._visualization.posture === AvatarAction.POSTURE_SIT) { offsetY += (additionScale / 2); } - else if (this._visualization.posture === AvatarAction.POSTURE_LAY) + else if(this._visualization.posture === AvatarAction.POSTURE_LAY) { offsetY += scale; } - if (this._asset) + if(this._asset) { sprite.texture = this._asset; sprite.offsetX = offsetX; @@ -74,7 +74,7 @@ export class TypingBubbleAddition implements IAvatarAddition public animate(sprite: IRoomObjectSprite): boolean { - if (this._asset && sprite) + if(this._asset && sprite) { sprite.texture = this._asset; } diff --git a/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureFireworksVisualization.ts index 8149228f..36d18db7 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/object/visualization/furniture/FurnitureMannequinVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts index 61cbbd7e..10e7fdac 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualization.ts @@ -35,18 +35,18 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl public initialize(data: IObjectVisualizationData): boolean { - if (!(data instanceof FurnitureMannequinVisualizationData)) return false; + if(!(data instanceof FurnitureMannequinVisualizationData)) return false; return super.initialize(data); } public dispose(): void { - if (this._disposed) return; + if(this._disposed) return; this._disposed = true; - if (this._dynamicAssetName && this.asset) + if(this._dynamicAssetName && this.asset) { this.asset.disposeAsset(this._dynamicAssetName); @@ -60,9 +60,9 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl { const updateObject = super.updateObject(scale, direction); - if (updateObject) + if(updateObject) { - if (this._mannequinScale !== scale) + if(this._mannequinScale !== scale) { this._mannequinScale = scale; @@ -77,11 +77,11 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl { let updateModel = super.updateModel(scale); - if (updateModel) + if(updateModel) { const figure = (this.object.model.getValue(RoomObjectVariable.FURNITURE_MANNEQUIN_FIGURE) || null); - if (figure) + if(figure) { this._figure = (figure + '.' + this._placeHolderFigure); this._gender = (this.object.model.getValue(RoomObjectVariable.FURNITURE_MANNEQUIN_GENDER) || null); @@ -99,15 +99,15 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl private updateAvatar(forceUpdate: boolean = false): void { - if (!this.avatarExists() || forceUpdate) + if(!this.avatarExists() || forceUpdate) { const avatarImage = this._data.createAvatarImage(this._figure, this._mannequinScale, this._gender, this); - if (avatarImage) + if(avatarImage) { avatarImage.setDirection(AvatarSetType.FULL, this.direction); - if (this._dynamicAssetName) this.asset.disposeAsset(this._dynamicAssetName); + if(this._dynamicAssetName) this.asset.disposeAsset(this._dynamicAssetName); this.asset.addAsset(this.getAvatarAssetName(), avatarImage.getImage(AvatarSetType.FULL, false, 1, false), true); @@ -131,14 +131,14 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl public resetFigure(figure: string): void { - if (figure === this._figure) this.updateAvatar(true); + if(figure === this._figure) this.updateAvatar(true); } protected getSpriteAssetName(scale: number, layerId: number): string { const tag = this.getLayerTag(scale, this.direction, layerId); - if (this._figure && (tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) + if(this._figure && (tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) { return this.getAvatarAssetName(); } @@ -150,7 +150,7 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl { const tag = this.getLayerTag(scale, direction, layerId); - if ((tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) return (-(this.getSprite(layerId).width) / 2); + if((tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) return (-(this.getSprite(layerId).width) / 2); return super.getLayerXOffset(scale, direction, layerId); } @@ -159,7 +159,7 @@ export class FurnitureMannequinVisualization extends FurnitureVisualization impl { const tag = this.getLayerTag(scale, direction, layerId); - if ((tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) return -(this.getSprite(layerId).height); + if((tag === FurnitureMannequinVisualization.AVATAR_IMAGE_SPRITE_TAG) && this.avatarExists()) return -(this.getSprite(layerId).height); return super.getLayerYOffset(scale, direction, layerId); } diff --git a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts index 9a0742a9..52185aac 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureMannequinVisualizationData.ts @@ -17,7 +17,7 @@ export class FurnitureMannequinVisualizationData extends FurnitureVisualizationD { super.dispose(); - if (this._avatarData) + if(this._avatarData) { this._avatarData.dispose(); diff --git a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts index 8f6e352b..5605ccb8 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureParticleSystem.ts @@ -46,23 +46,23 @@ export class FurnitureParticleSystem public dispose(): void { - for (const emitter of this._emitters.getValues()) emitter.dispose(); + for(const emitter of this._emitters.getValues()) emitter.dispose(); this._emitters = null; - if (this._canvasTexture) + if(this._canvasTexture) { this._canvasTexture.destroy(); this._canvasTexture = null; } - if (this._blackOverlay) + if(this._blackOverlay) { this._blackOverlay.destroy(); this._blackOverlay = null; } - if (this._emptySprite) + if(this._emptySprite) { this._emptySprite.destroy(); this._emptySprite = null; @@ -76,7 +76,7 @@ export class FurnitureParticleSystem public reset(): void { - if (this._currentEmitter) this._currentEmitter.reset(); + if(this._currentEmitter) this._currentEmitter.reset(); this._currentEmitter = null; this._hasIgnited = false; @@ -87,7 +87,7 @@ export class FurnitureParticleSystem public setAnimation(id: number): void { - if (this._currentEmitter) this._currentEmitter.reset(); + if(this._currentEmitter) this._currentEmitter.reset(); this._currentEmitter = this._emitters.getValue(id); this._hasIgnited = false; @@ -98,15 +98,15 @@ export class FurnitureParticleSystem private updateCanvas(): void { - if (!this._currentEmitter || (this._canvasId === -1)) return; + if(!this._currentEmitter || (this._canvasId === -1)) return; this._roomSprite = this._visualization.getSprite(this._canvasId); - if (this._roomSprite && this._roomSprite.texture) + if(this._roomSprite && this._roomSprite.texture) { - if ((this._roomSprite.width <= 1) || (this._roomSprite.height <= 1)) return; + if((this._roomSprite.width <= 1) || (this._roomSprite.height <= 1)) return; - if (this._canvasTexture && ((this._canvasTexture.width !== this._roomSprite.width) || (this._canvasTexture.height !== this._roomSprite.height))) this._canvasTexture = null; + if(this._canvasTexture && ((this._canvasTexture.width !== this._roomSprite.width) || (this._canvasTexture.height !== this._roomSprite.height))) this._canvasTexture = null; this.clearCanvas(); @@ -118,7 +118,7 @@ export class FurnitureParticleSystem public getLayerYOffset(scale: number, direction: number, layerId: number): number { - if (this._currentEmitter && (this._currentEmitter.roomObjectSpriteId === layerId)) + if(this._currentEmitter && (this._currentEmitter.roomObjectSpriteId === layerId)) { return this._currentEmitter.y * this._scaleMultiplier; } @@ -128,58 +128,58 @@ export class FurnitureParticleSystem public controlsSprite(k: number): boolean { - if (this._currentEmitter) return this._currentEmitter.roomObjectSpriteId == k; + if(this._currentEmitter) return this._currentEmitter.roomObjectSpriteId == k; return false; } public updateSprites(): void { - if (!this._currentEmitter || !this._roomSprite) return; + if(!this._currentEmitter || !this._roomSprite) return; - if (this._canvasTexture && (this._roomSprite.texture !== this._canvasTexture)) + if(this._canvasTexture && (this._roomSprite.texture !== this._canvasTexture)) { this._roomSprite.texture = this._canvasTexture; } - if (this._hasIgnited) + if(this._hasIgnited) { - if (this._currentEmitter.roomObjectSpriteId >= 0) this._visualization.getSprite(this._currentEmitter.roomObjectSpriteId).visible = false; + if(this._currentEmitter.roomObjectSpriteId >= 0) this._visualization.getSprite(this._currentEmitter.roomObjectSpriteId).visible = false; } } public updateAnimation(): void { - if (!this._currentEmitter || !this._roomSprite || this._isDone) return; + if(!this._currentEmitter || !this._roomSprite || this._isDone) return; const k = 10; - if (!this._hasIgnited && this._currentEmitter.hasIgnited) this._hasIgnited = true; + if(!this._hasIgnited && this._currentEmitter.hasIgnited) this._hasIgnited = true; const offsetY = (this._offsetY * this._scaleMultiplier); this._currentEmitter.update(); - if (this._hasIgnited) + if(this._hasIgnited) { - if (this._currentEmitter.roomObjectSpriteId >= 0) + if(this._currentEmitter.roomObjectSpriteId >= 0) { this._visualization.getSprite(this._currentEmitter.roomObjectSpriteId).visible = false; } - if (!this._canvasTexture) this.updateCanvas(); + if(!this._canvasTexture) this.updateCanvas(); this.clearCanvas(); - for (const particle of this._currentEmitter.particles) + for(const particle of this._currentEmitter.particles) { const tx = (this._centerX + ((((particle.x - particle.z) * k) / 10) * this._scaleMultiplier)); const ty = ((this._centerY - offsetY) + ((((particle.y + ((particle.x + particle.z) / 2)) * k) / 10) * this._scaleMultiplier)); const asset = particle.getAsset(); - if (asset && asset.texture) + if(asset && asset.texture) { - if (particle.fade && (particle.alphaMultiplier < 1)) + if(particle.fade && (particle.alphaMultiplier < 1)) { this._translationMatrix.identity(); this._translationMatrix.translate((tx + asset.offsetX), (ty + asset.offsetY)); @@ -227,7 +227,7 @@ export class FurnitureParticleSystem } } - if (!this._currentEmitter.particles.length) + if(!this._currentEmitter.particles.length) { this._isDone = true; @@ -251,9 +251,9 @@ export class FurnitureParticleSystem this._bgColor = (parseInt(bgColor, 16) || 0x000000); - if (!particleSystem.emitters || !particleSystem.emitters.length) return; + if(!particleSystem.emitters || !particleSystem.emitters.length) return; - for (const emitter of particleSystem.emitters) + for(const emitter of particleSystem.emitters) { const emitterId = emitter.id; const emitterName = emitter.name; @@ -274,7 +274,7 @@ export class FurnitureParticleSystem const simulationShape = emitter.simulation.shape; const simulationEnergy = emitter.simulation.energy; - for (const particle of emitter.particles) + for(const particle of emitter.particles) { const lifeTime = particle.lifeTime; const isEmitter = (particle.isEmitter || false); @@ -282,7 +282,7 @@ export class FurnitureParticleSystem const frames: IGraphicAsset[] = []; - for (const name of particle.frames) frames.push(this._visualization.asset.getAsset(name)); + for(const name of particle.frames) frames.push(this._visualization.asset.getAsset(name)); particleEmitter.configureParticle(lifeTime, isEmitter, frames, fade); } @@ -295,28 +295,28 @@ export class FurnitureParticleSystem { let emitterId = 0; - if (particleSystem._emitters && particleSystem._currentEmitter) + if(particleSystem._emitters && particleSystem._currentEmitter) { emitterId = particleSystem._emitters.getKey(particleSystem._emitters.getValues().indexOf(particleSystem._currentEmitter)); } this.setAnimation(emitterId); - if (this._currentEmitter) this._currentEmitter.copyStateFrom(particleSystem._currentEmitter, (particleSystem._size / this._size)); + if(this._currentEmitter) this._currentEmitter.copyStateFrom(particleSystem._currentEmitter, (particleSystem._size / this._size)); this._canvasTexture = null; } private clearCanvas(): void { - if (!this._emptySprite) + if(!this._emptySprite) { this._emptySprite = new NitroSprite(Texture.EMPTY); this._emptySprite.alpha = 0; } - if (!this._canvasTexture) + if(!this._canvasTexture) { this._canvasTexture = RenderTexture.create({ width: this._roomSprite.width, diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts index 17c00d26..caf241be 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/animated/LandscapeRasterizer.ts @@ -13,9 +13,9 @@ export class LandscapeRasterizer extends PlaneRasterizer public initializeDimensions(k: number, _arg_2: number): boolean { - if (k < 0) k = 0; + if(k < 0) k = 0; - if (_arg_2 < 0) _arg_2 = 0; + if(_arg_2 < 0) _arg_2 = 0; this._landscapeWidth = k; this._landscapeHeight = _arg_2; @@ -25,41 +25,41 @@ export class LandscapeRasterizer extends PlaneRasterizer protected initializePlanes(): void { - if (!this.data) return; + if(!this.data) return; const landscapes = this.data.landscapes; - if (landscapes && landscapes.length) this.parseLandscapes(landscapes); + if(landscapes && landscapes.length) this.parseLandscapes(landscapes); } private parseLandscapes(k: any): void { - if (!k) return; + if(!k) return; const randomNumber = Math.trunc((Math.random() * 654321)); - for (const landscapeIndex in k) + for(const landscapeIndex in k) { const landscape = k[landscapeIndex]; - if (!landscape) continue; + if(!landscape) continue; const id = landscape.id; const visualizations = landscape.animatedVisualizations; const plane = new LandscapePlane(); - for (const visualization of visualizations) + for(const visualization of visualizations) { - if (!visualization) continue; + if(!visualization) continue; const size = visualization.size; let horizontalAngle = LandscapePlane.HORIZONTAL_ANGLE_DEFAULT; let verticalAngle = LandscapePlane.VERTICAL_ANGLE_DEFAULT; - if (visualization.horizontalAngle) horizontalAngle = visualization.horizontalAngle; - if (visualization.verticalAngle) verticalAngle = visualization.verticalAngle; + if(visualization.horizontalAngle) horizontalAngle = visualization.horizontalAngle; + if(visualization.verticalAngle) verticalAngle = visualization.verticalAngle; const basicLayers = visualization.layers; const animatedLayers = visualization.animationLayers; @@ -69,39 +69,39 @@ export class LandscapeRasterizer extends PlaneRasterizer const planeVisualization = plane.createPlaneVisualization(size, (totalLayers || 0), this.getGeometry(size, horizontalAngle, verticalAngle)); - if (planeVisualization) + if(planeVisualization) { Randomizer.setSeed(randomNumber); let layerId = 0; - if (totalBasicLayers) + if(totalBasicLayers) { - while (layerId < basicLayers.length) + while(layerId < basicLayers.length) { const layer = basicLayers[layerId]; - if (layer) + if(layer) { let material: PlaneMaterial = null; let align: number = PlaneVisualizationLayer.ALIGN_DEFAULT; let color: number = LandscapePlane.DEFAULT_COLOR; let offset: number = PlaneVisualizationLayer.DEFAULT_OFFSET; - if (layer.materialId) material = this.getMaterial(layer.materialId); + if(layer.materialId) material = this.getMaterial(layer.materialId); - if (layer.color) color = layer.color; + if(layer.color) color = layer.color; - if (layer.offset) offset = layer.offset; + if(layer.offset) offset = layer.offset; - if (layer.align) + if(layer.align) { - if (layer.align === 'bottom') + if(layer.align === 'bottom') { align = PlaneVisualizationLayer.ALIGN_BOTTOM; } - else if (layer.align === 'top') align = PlaneVisualizationLayer.ALIGN_TOP; + else if(layer.align === 'top') align = PlaneVisualizationLayer.ALIGN_TOP; } planeVisualization.setLayer(layerId, material, color, align, offset); @@ -113,23 +113,23 @@ export class LandscapeRasterizer extends PlaneRasterizer layerId = 0; - if (totalAnimatedLayers) + if(totalAnimatedLayers) { const animationItems: {}[] = []; - while (layerId < animatedLayers.length) + while(layerId < animatedLayers.length) { const layer = animatedLayers[layerId]; - if (layer) + if(layer) { const items = layer.animationItems; - if (items && items.length) + if(items && items.length) { - for (const item of items) + for(const item of items) { - if (item) + if(item) { const id = item.id; const assetId = item.assetId; @@ -158,7 +158,7 @@ export class LandscapeRasterizer extends PlaneRasterizer } } - if (!this.addPlane(id, plane)) plane.dispose(); + if(!this.addPlane(id, plane)) plane.dispose(); } } @@ -166,9 +166,9 @@ export class LandscapeRasterizer extends PlaneRasterizer { let _local_3 = 0; - if ((k.length > 0)) + if((k.length > 0)) { - if (k.charAt((k.length - 1)) === '%') + if(k.charAt((k.length - 1)) === '%') { k = k.substr(0, (k.length - 1)); @@ -176,13 +176,13 @@ export class LandscapeRasterizer extends PlaneRasterizer } } - if ((_arg_2.length > 0)) + if((_arg_2.length > 0)) { const _local_4 = 10000; const _local_5 = Randomizer.getValues(1, 0, _local_4); const _local_6 = (_local_5[0] / _local_4); - if (_arg_2.charAt((_arg_2.length - 1)) === '%') + if(_arg_2.charAt((_arg_2.length - 1)) === '%') { _arg_2 = _arg_2.substr(0, (_arg_2.length - 1)); @@ -197,27 +197,27 @@ export class LandscapeRasterizer extends PlaneRasterizer { let plane = this.getPlane(id) as LandscapePlane; - if (!plane) plane = this.getPlane(LandscapeRasterizer.DEFAULT) as LandscapePlane; + if(!plane) plane = this.getPlane(LandscapeRasterizer.DEFAULT) as LandscapePlane; - if (!plane) return null; + if(!plane) return null; - if (canvas) + if(canvas) { canvas.clear(); } let graphic = plane.render(canvas, width, height, scale, normal, useTexture, offsetX, offsetY, maxX, maxY, timeSinceStartMs); - if (graphic && (graphic !== canvas)) + if(graphic && (graphic !== canvas)) { graphic = graphic.clone(); - if (!graphic) return null; + if(!graphic) return null; } let planeBitmapData: PlaneBitmapData = null; - if (!plane.isStatic(scale) && (LandscapeRasterizer.UPDATE_INTERVAL > 0)) + if(!plane.isStatic(scale) && (LandscapeRasterizer.UPDATE_INTERVAL > 0)) { planeBitmapData = new PlaneBitmapData(graphic, ((Math.round((timeSinceStartMs / LandscapeRasterizer.UPDATE_INTERVAL)) * LandscapeRasterizer.UPDATE_INTERVAL) + LandscapeRasterizer.UPDATE_INTERVAL)); } @@ -231,9 +231,9 @@ export class LandscapeRasterizer extends PlaneRasterizer public getTextureIdentifier(k: number, _arg_2: IVector3D): string { - if (_arg_2) + if(_arg_2) { - if (_arg_2.x < 0) return (k + '_0'); + if(_arg_2.x < 0) return (k + '_0'); return (k + '_1'); } diff --git a/src/nitro/room/preview/RoomPreviewer.ts b/src/nitro/room/preview/RoomPreviewer.ts index 58f874bd..a02c0772 100644 --- a/src/nitro/room/preview/RoomPreviewer.ts +++ b/src/nitro/room/preview/RoomPreviewer.ts @@ -54,7 +54,7 @@ export class RoomPreviewer this.onRoomObjectAdded = this.onRoomObjectAdded.bind(this); this.onRoomInitializedonRoomInitialized = this.onRoomInitializedonRoomInitialized.bind(this); - if (this.isRoomEngineReady && this._roomEngine.events) + if(this.isRoomEngineReady && this._roomEngine.events) { this._roomEngine.events.addEventListener(RoomEngineObjectEvent.ADDED, this.onRoomObjectAdded); this._roomEngine.events.addEventListener(RoomEngineObjectEvent.CONTENT_UPDATED, this.onRoomObjectAdded); @@ -68,21 +68,21 @@ export class RoomPreviewer { this.reset(true); - if (this.isRoomEngineReady && this._roomEngine.events) + if(this.isRoomEngineReady && this._roomEngine.events) { this._roomEngine.events.removeEventListener(RoomEngineObjectEvent.ADDED, this.onRoomObjectAdded); this._roomEngine.events.removeEventListener(RoomEngineObjectEvent.CONTENT_UPDATED, this.onRoomObjectAdded); this._roomEngine.events.removeEventListener(RoomEngineEvent.INITIALIZED, this.onRoomInitializedonRoomInitialized); } - if (this._backgroundSprite) + if(this._backgroundSprite) { this._backgroundSprite.destroy(); this._backgroundSprite = null; } - if (this._planeParser) + if(this._planeParser) { this._planeParser.dispose(); @@ -92,7 +92,7 @@ export class RoomPreviewer private createRoomForPreview(): void { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { const size = 7; @@ -102,11 +102,11 @@ export class RoomPreviewer let y = 1; - while (y < (1 + size)) + while(y < (1 + size)) { let x = 1; - while (x < (1 + size)) + while(x < (1 + size)) { planeParser.setTileHeight(x, y, 0); @@ -126,13 +126,13 @@ export class RoomPreviewer public reset(k: boolean): void { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { this._roomEngine.removeRoomObjectFloor(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID); this._roomEngine.removeRoomObjectWall(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID); this._roomEngine.removeRoomObjectUser(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID); - if (!k) this.updatePreviewRoomView(); + if(!k) this.updatePreviewRoomView(); } this._currentPreviewObjectCategory = RoomObjectCategory.MINIMUM; @@ -148,7 +148,7 @@ export class RoomPreviewer //@ts-ignore const wallGeometry = (this._roomEngine as IRoomCreator).getLegacyWallGeometry(this._previewRoomId); - if (!wallGeometry) return; + if(!wallGeometry) return; this._planeParser.reset(); @@ -166,17 +166,17 @@ export class RoomPreviewer let y = 0; - while (y < height) + while(y < height) { let x = 0; - while (x < width) + while(x < width) { const tileHeight = parser.getHeight(x, y); - if (((((y > 0) && (y < (height - 1))) || ((x > 0) && (x < (width - 1)))) && (!(tileHeight == RoomPlaneParser.TILE_BLOCKED))) && ((entryTile == null) || ((x == entryTile.x) && (y == entryTile.y)))) + if(((((y > 0) && (y < (height - 1))) || ((x > 0) && (x < (width - 1)))) && (!(tileHeight == RoomPlaneParser.TILE_BLOCKED))) && ((entryTile == null) || ((x == entryTile.x) && (y == entryTile.y)))) { - if (((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight(x, (y + 1)) == RoomPlaneParser.TILE_BLOCKED)) + if(((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight(x, (y + 1)) == RoomPlaneParser.TILE_BLOCKED)) { doorX = (x + 0.5); doorY = y; @@ -184,7 +184,7 @@ export class RoomPreviewer doorDirection = 90; } - if (((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight((x + 1), y) == RoomPlaneParser.TILE_BLOCKED)) + if(((parser.getHeight(x, (y - 1)) == RoomPlaneParser.TILE_BLOCKED) && (parser.getHeight((x - 1), y) == RoomPlaneParser.TILE_BLOCKED)) && (parser.getHeight((x + 1), y) == RoomPlaneParser.TILE_BLOCKED)) { doorX = x; doorY = (y + 0.5); @@ -210,11 +210,11 @@ export class RoomPreviewer let heightIterator = (parser.height - 1); - while (heightIterator >= 0) + while(heightIterator >= 0) { let widthIterator = (parser.width - 1); - while (widthIterator >= 0) + while(widthIterator >= 0) { wallGeometry.setHeight(widthIterator, heightIterator, this._planeParser.getTileHeight(widthIterator, heightIterator)); widthIterator--; @@ -234,14 +234,14 @@ export class RoomPreviewer const roomObject = this.getRoomPreviewOwnRoomObject(); - if (roomObject) roomObject.processUpdateMessage(new ObjectRoomMapUpdateMessage(roomMap)); + if(roomObject) roomObject.processUpdateMessage(new ObjectRoomMapUpdateMessage(roomMap)); } public addFurnitureIntoRoom(classId: number, direction: IVector3D, objectData: IObjectData = null, extra: string = null): number { - if (!objectData) objectData = new LegacyDataType(); + if(!objectData) objectData = new LegacyDataType(); - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { this.reset(false); @@ -249,14 +249,14 @@ export class RoomPreviewer this._currentPreviewObjectCategory = RoomObjectCategory.FLOOR; this._currentPreviewObjectData = ''; - if (this._roomEngine.addFurnitureFloor(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, classId, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), direction, 0, objectData, NaN, -1, 0, -1, '', true, false)) + if(this._roomEngine.addFurnitureFloor(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, classId, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), direction, 0, objectData, NaN, -1, 0, -1, '', true, false)) { this._previousAutomaticStateChangeTime = GetTickerTime(); this._automaticStateChange = true; const roomObject = this._roomEngine.getRoomObject(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); - if (roomObject && extra) roomObject.model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, extra); + if(roomObject && extra) roomObject.model.setValue(RoomObjectVariable.FURNITURE_EXTRAS, extra); this.updatePreviewRoomView(); @@ -269,9 +269,9 @@ export class RoomPreviewer public addWallItemIntoRoom(classId: number, direction: IVector3D, objectData: string): number { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { - if ((this._currentPreviewObjectCategory === RoomObjectCategory.WALL) && (this._currentPreviewObjectType === classId) && (this._currentPreviewObjectData === objectData)) return RoomPreviewer.PREVIEW_OBJECT_ID; + if((this._currentPreviewObjectCategory === RoomObjectCategory.WALL) && (this._currentPreviewObjectType === classId) && (this._currentPreviewObjectData === objectData)) return RoomPreviewer.PREVIEW_OBJECT_ID; this.reset(false); @@ -279,7 +279,7 @@ export class RoomPreviewer this._currentPreviewObjectCategory = RoomObjectCategory.WALL; this._currentPreviewObjectData = objectData; - if (this._roomEngine.addFurnitureWall(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, classId, new Vector3d(0.5, 2.3, 1.8), direction, 0, objectData, 0, 0, -1, '', false)) + if(this._roomEngine.addFurnitureWall(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, classId, new Vector3d(0.5, 2.3, 1.8), direction, 0, objectData, 0, 0, -1, '', false)) { this._previousAutomaticStateChangeTime = GetTickerTime(); this._automaticStateChange = true; @@ -295,7 +295,7 @@ export class RoomPreviewer public addAvatarIntoRoom(figure: string, effect: number): number { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { this.reset(false); @@ -303,7 +303,7 @@ export class RoomPreviewer this._currentPreviewObjectCategory = RoomObjectCategory.UNIT; this._currentPreviewObjectData = figure; - if (this._roomEngine.addRoomObjectUser(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), new Vector3d(90, 0, 0), 135, RoomObjectUserType.getTypeNumber(RoomObjectUserType.USER), figure)) + if(this._roomEngine.addRoomObjectUser(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), new Vector3d(90, 0, 0), 135, RoomObjectUserType.getTypeNumber(RoomObjectUserType.USER), figure)) { this._previousAutomaticStateChangeTime = GetTickerTime(); this._automaticStateChange = true; @@ -323,7 +323,7 @@ export class RoomPreviewer public addPetIntoRoom(figure: string): number { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { this.reset(false); @@ -331,7 +331,7 @@ export class RoomPreviewer this._currentPreviewObjectCategory = RoomObjectCategory.UNIT; this._currentPreviewObjectData = figure; - if (this._roomEngine.addRoomObjectUser(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), new Vector3d(90, 0, 0), 90, RoomObjectUserType.getTypeNumber(RoomObjectUserType.PET), figure)) + if(this._roomEngine.addRoomObjectUser(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), new Vector3d(90, 0, 0), 90, RoomObjectUserType.getTypeNumber(RoomObjectUserType.PET), figure)) { this._previousAutomaticStateChangeTime = GetTickerTime(); this._automaticStateChange = false; @@ -350,57 +350,57 @@ export class RoomPreviewer public updateUserPosture(type: string, parameter: string = ''): void { - if (this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserPosture(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, type, parameter); + if(this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserPosture(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, type, parameter); } public updateUserGesture(gestureId: number): void { - if (this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserGesture(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, gestureId); + if(this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserGesture(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, gestureId); } public updateUserEffect(effectId: number): void { - if (this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserEffect(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, effectId); + if(this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserEffect(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, effectId); } public updateObjectUserFigure(figure: string, gender: string = null, subType: string = null, isRiding: boolean = false): boolean { - if (this.isRoomEngineReady) return this._roomEngine.updateRoomObjectUserFigure(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, figure, gender, subType, isRiding); + if(this.isRoomEngineReady) return this._roomEngine.updateRoomObjectUserFigure(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, figure, gender, subType, isRiding); return false; } public updateObjectUserAction(action: string, value: number, parameter: string = null): void { - if (this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserAction(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, action, value, parameter); + if(this.isRoomEngineReady) this._roomEngine.updateRoomObjectUserAction(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, action, value, parameter); } public updateObjectStuffData(stuffData: IObjectData): void { - if (this.isRoomEngineReady) this._roomEngine.updateRoomObjectFloor(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, null, null, stuffData.state, stuffData); + if(this.isRoomEngineReady) this._roomEngine.updateRoomObjectFloor(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, null, null, stuffData.state, stuffData); } public changeRoomObjectState(): void { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { this._automaticStateChange = false; - if (this._currentPreviewObjectCategory !== RoomObjectCategory.UNIT) this._roomEngine.changeObjectState(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); + if(this._currentPreviewObjectCategory !== RoomObjectCategory.UNIT) this._roomEngine.changeObjectState(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); } } public changeRoomObjectDirection(): void { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { const roomObject = this._roomEngine.getRoomObject(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); - if (!roomObject) return; + if(!roomObject) return; const direction = this._roomEngine.objectEventHandler.getValidRoomObjectDirection(roomObject, true); - switch (this._currentPreviewObjectCategory) + switch(this._currentPreviewObjectCategory) { case RoomObjectCategory.FLOOR: { const floorLocation = new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y); @@ -418,30 +418,30 @@ export class RoomPreviewer private checkAutomaticRoomObjectStateChange(): void { - if (this._automaticStateChange) + if(this._automaticStateChange) { const time = GetTickerTime(); - if (time > (this._previousAutomaticStateChangeTime + RoomPreviewer.AUTOMATIC_STATE_CHANGE_INTERVAL)) + if(time > (this._previousAutomaticStateChangeTime + RoomPreviewer.AUTOMATIC_STATE_CHANGE_INTERVAL)) { this._previousAutomaticStateChangeTime = time; - if (this.isRoomEngineReady) this._roomEngine.changeObjectState(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); + if(this.isRoomEngineReady) this._roomEngine.changeObjectState(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); } } } public getRoomCanvas(width: number, height: number): DisplayObject { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { const displayObject = (this._roomEngine.getRoomInstanceDisplay(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, width, height, this._currentPreviewScale) as Container); - if (displayObject && (this._backgroundColor !== null)) + if(displayObject && (this._backgroundColor !== null)) { let backgroundSprite = this._backgroundSprite; - if (!backgroundSprite) + if(!backgroundSprite) { backgroundSprite = new NitroSprite(Texture.WHITE); @@ -457,7 +457,7 @@ export class RoomPreviewer const geometry = this._roomEngine.getRoomInstanceGeometry(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID); - if (geometry) geometry.adjustLocation(new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), 30); + if(geometry) geometry.adjustLocation(new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), 30); this._currentPreviewCanvasWidth = width; this._currentPreviewCanvasHeight = height; @@ -470,12 +470,12 @@ export class RoomPreviewer public modifyRoomCanvas(width: number, height: number): void { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { this._currentPreviewCanvasWidth = width; this._currentPreviewCanvasHeight = height; - if (this._backgroundSprite) + if(this._backgroundSprite) { this._backgroundSprite.width = width; this._backgroundSprite.height = height; @@ -499,7 +499,7 @@ export class RoomPreviewer { const objectBounds = this._roomEngine.getRoomObjectBoundingRectangle(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory, RoomPreviewer.PREVIEW_CANVAS_ID); - if (objectBounds && point) + if(objectBounds && point) { objectBounds.x += -(this._currentPreviewCanvasWidth >> 1); objectBounds.y += -(this._currentPreviewCanvasHeight >> 1); @@ -507,7 +507,7 @@ export class RoomPreviewer objectBounds.x += -(point.x); objectBounds.y += -(point.y); - if (!this._currentPreviewRectangle) + if(!this._currentPreviewRectangle) { this._currentPreviewRectangle = objectBounds; } @@ -515,27 +515,27 @@ export class RoomPreviewer { const bounds = this._currentPreviewRectangle.clone().enlarge(objectBounds); - if (((((bounds.width - this._currentPreviewRectangle.width) > ((this._currentPreviewCanvasWidth - this._currentPreviewRectangle.width) >> 1)) || ((bounds.height - this._currentPreviewRectangle.height) > ((this._currentPreviewCanvasHeight - this._currentPreviewRectangle.height) >> 1))) || (this._currentPreviewRectangle.width < 1)) || (this._currentPreviewRectangle.height < 1)) this._currentPreviewRectangle = bounds; + if(((((bounds.width - this._currentPreviewRectangle.width) > ((this._currentPreviewCanvasWidth - this._currentPreviewRectangle.width) >> 1)) || ((bounds.height - this._currentPreviewRectangle.height) > ((this._currentPreviewCanvasHeight - this._currentPreviewRectangle.height) >> 1))) || (this._currentPreviewRectangle.width < 1)) || (this._currentPreviewRectangle.height < 1)) this._currentPreviewRectangle = bounds; } } } private validatePreviewSize(point: Point): Point { - if (((this._currentPreviewRectangle.width < 1) || (this._currentPreviewRectangle.height < 1))) + if(((this._currentPreviewRectangle.width < 1) || (this._currentPreviewRectangle.height < 1))) { return point; } - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { const geometry = this._roomEngine.getRoomInstanceGeometry(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID); - if ((this._currentPreviewRectangle.width > (this._currentPreviewCanvasWidth * (1 + RoomPreviewer.ALLOWED_IMAGE_CUT))) || (this._currentPreviewRectangle.height > (this._currentPreviewCanvasHeight * (1 + RoomPreviewer.ALLOWED_IMAGE_CUT)))) + if((this._currentPreviewRectangle.width > (this._currentPreviewCanvasWidth * (1 + RoomPreviewer.ALLOWED_IMAGE_CUT))) || (this._currentPreviewRectangle.height > (this._currentPreviewCanvasHeight * (1 + RoomPreviewer.ALLOWED_IMAGE_CUT)))) { - if (RoomPreviewer.ZOOM_ENABLED) + if(RoomPreviewer.ZOOM_ENABLED) { - if (this._roomEngine.getRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID) !== 0.5) + if(this._roomEngine.getRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID) !== 0.5) { this._roomEngine.setRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, 0.5, null, null); @@ -553,7 +553,7 @@ export class RoomPreviewer } else { - if (geometry.isZoomedIn()) + if(geometry.isZoomedIn()) { geometry.performZoomOut(); @@ -563,11 +563,11 @@ export class RoomPreviewer } } - else if (!this._currentPreviewNeedsZoomOut) + else if(!this._currentPreviewNeedsZoomOut) { - if (RoomPreviewer.ZOOM_ENABLED) + if(RoomPreviewer.ZOOM_ENABLED) { - if (this._roomEngine.getRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID) !== 1) + if(this._roomEngine.getRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID) !== 1) { this._roomEngine.setRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, 1, null, null); @@ -576,7 +576,7 @@ export class RoomPreviewer } else { - if (!geometry.isZoomedIn()) + if(!geometry.isZoomedIn()) { geometry.performZoomIn(); @@ -591,9 +591,9 @@ export class RoomPreviewer public zoomIn(): void { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { - if (RoomPreviewer.ZOOM_ENABLED) + if(RoomPreviewer.ZOOM_ENABLED) { this._roomEngine.setRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, 1); } @@ -610,9 +610,9 @@ export class RoomPreviewer public zoomOut(): void { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { - if (RoomPreviewer.ZOOM_ENABLED) + if(RoomPreviewer.ZOOM_ENABLED) { this._roomEngine.setRoomInstanceRenderingCanvasScale(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, 0.5); } @@ -629,7 +629,7 @@ export class RoomPreviewer public updateAvatarDirection(direction: number, headDirection: number): void { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { this._roomEngine.updateRoomObjectUserLocation(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), new Vector3d(RoomPreviewer.PREVIEW_OBJECT_LOCATION_X, RoomPreviewer.PREVIEW_OBJECT_LOCATION_Y, 0), false, 0, new Vector3d((direction * 45), 0, 0), (headDirection * 45)); } @@ -637,31 +637,31 @@ export class RoomPreviewer public updateObjectRoom(floorType: string = null, wallType: string = null, landscapeType: string = null, _arg_4: boolean = false): boolean { - if (this.isRoomEngineReady) return this._roomEngine.updateRoomInstancePlaneType(this._previewRoomId, floorType, wallType, landscapeType, _arg_4); + if(this.isRoomEngineReady) return this._roomEngine.updateRoomInstancePlaneType(this._previewRoomId, floorType, wallType, landscapeType, _arg_4); return false; } public updateRoomWallsAndFloorVisibility(wallsVisible: boolean, floorsVisible: boolean = true): void { - if (this.isRoomEngineReady) this._roomEngine.updateRoomInstancePlaneVisibility(this._previewRoomId, wallsVisible, floorsVisible); + if(this.isRoomEngineReady) this._roomEngine.updateRoomInstancePlaneVisibility(this._previewRoomId, wallsVisible, floorsVisible); } private getCanvasOffset(point: Point): Point { - if (((this._currentPreviewRectangle.width < 1) || (this._currentPreviewRectangle.height < 1))) return point; + if(((this._currentPreviewRectangle.width < 1) || (this._currentPreviewRectangle.height < 1))) return point; let x = (-(this._currentPreviewRectangle.left + this._currentPreviewRectangle.right) >> 1); let y = (-(this._currentPreviewRectangle.top + this._currentPreviewRectangle.bottom) >> 1); const height = ((this._currentPreviewCanvasHeight - this._currentPreviewRectangle.height) >> 1); - if (height > 10) + if(height > 10) { y = (y + Math.min(15, (height - 10))); } else { - if (this._currentPreviewObjectCategory !== RoomObjectCategory.UNIT) + if(this._currentPreviewObjectCategory !== RoomObjectCategory.UNIT) { y = (y + (5 - Math.max(0, (height / 2)))); } @@ -677,11 +677,11 @@ export class RoomPreviewer const offsetX = (x - point.x); const offsetY = (y - point.y); - if ((offsetX !== 0) || (offsetY !== 0)) + if((offsetX !== 0) || (offsetY !== 0)) { const _local_7 = Math.sqrt(((offsetX * offsetX) + (offsetY * offsetY))); - if (_local_7 > 10) + if(_local_7 > 10) { x = (point.x + ((offsetX * 10) / _local_7)); y = (point.y + ((offsetY * 10) / _local_7)); @@ -695,19 +695,19 @@ export class RoomPreviewer public updatePreviewRoomView(k: boolean = false): void { - if (this._disableUpdate && !k) return; + if(this._disableUpdate && !k) return; this.checkAutomaticRoomObjectStateChange(); - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { let offset = this._roomEngine.getRoomInstanceRenderingCanvasOffset(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID); - if (offset) + if(offset) { this.updatePreviewObjectBoundingRectangle(offset); - if (this._currentPreviewRectangle) + if(this._currentPreviewRectangle) { const scale = this._currentPreviewScale; @@ -715,12 +715,12 @@ export class RoomPreviewer const canvasOffset = this.getCanvasOffset(offset); - if (canvasOffset) + if(canvasOffset) { this._roomEngine.setRoomInstanceRenderingCanvasOffset(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID, canvasOffset); } - if (this._currentPreviewScale !== scale) this._currentPreviewRectangle = null; + if(this._currentPreviewScale !== scale) this._currentPreviewRectangle = null; } } } @@ -733,17 +733,17 @@ export class RoomPreviewer public set disableRoomEngineUpdate(flag: boolean) { - if (this.isRoomEngineReady) this._roomEngine.disableUpdate(flag); + if(this.isRoomEngineReady) this._roomEngine.disableUpdate(flag); } private onRoomInitializedonRoomInitialized(event: RoomEngineEvent): void { - if (!event) return; + if(!event) return; - switch (event.type) + switch(event.type) { case RoomEngineEvent.INITIALIZED: - if ((event.roomId === this._previewRoomId) && this.isRoomEngineReady) + if((event.roomId === this._previewRoomId) && this.isRoomEngineReady) { this._roomEngine.updateRoomInstancePlaneType(this._previewRoomId, '110', '99999'); } @@ -753,19 +753,19 @@ export class RoomPreviewer private onRoomObjectAdded(event: RoomEngineObjectEvent): void { - if ((event.roomId === this._previewRoomId) && (event.objectId === RoomPreviewer.PREVIEW_OBJECT_ID) && (event.category === this._currentPreviewObjectCategory)) + if((event.roomId === this._previewRoomId) && (event.objectId === RoomPreviewer.PREVIEW_OBJECT_ID) && (event.category === this._currentPreviewObjectCategory)) { this._currentPreviewRectangle = null; this._currentPreviewNeedsZoomOut = false; const roomObject = this._roomEngine.getRoomObject(event.roomId, event.objectId, event.category); - if (roomObject && roomObject.model && (event.category === RoomObjectCategory.WALL)) + if(roomObject && roomObject.model && (event.category === RoomObjectCategory.WALL)) { const sizeZ = roomObject.model.getValue(RoomObjectVariable.FURNITURE_SIZE_Z); const centerZ = roomObject.model.getValue(RoomObjectVariable.FURNITURE_CENTER_Z); - if ((sizeZ !== null) || (centerZ !== null)) + if((sizeZ !== null) || (centerZ !== null)) { this._roomEngine.updateRoomObjectWallLocation(event.roomId, event.objectId, new Vector3d(0.5, 2.3, (((3.6 - sizeZ) / 2) + centerZ))); } @@ -775,21 +775,21 @@ export class RoomPreviewer public updateRoomEngine(): void { - if (this.isRoomEngineReady) this._roomEngine.runUpdate(); + if(this.isRoomEngineReady) this._roomEngine.runUpdate(); } public getRenderingCanvas(): IRoomRenderingCanvas { const renderingCanvas = this._roomEngine.getRoomInstanceRenderingCanvas(this._previewRoomId, RoomPreviewer.PREVIEW_CANVAS_ID); - if (!renderingCanvas) return null; + if(!renderingCanvas) return null; return renderingCanvas; } public getGenericRoomObjectImage(type: string, value: string, direction: IVector3D, scale: number, listener: IGetImageListener, bgColor: number = 0, extras: string = null, objectData: IObjectData = null, state: number = -1, frame: number = -1, posture: string = null): IImageResult { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { return this._roomEngine.getGenericRoomObjectImage(type, value, direction, scale, listener, bgColor, extras, objectData, state, frame, posture); } @@ -799,7 +799,7 @@ export class RoomPreviewer public getRoomObjectImage(direction: IVector3D, scale: number, listener: IGetImageListener, bgColor: number = 0): IImageResult { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { return this._roomEngine.getRoomObjectImage(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory, direction, scale, listener, bgColor); } @@ -809,11 +809,11 @@ export class RoomPreviewer public getRoomObjectCurrentImage(): RenderTexture { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { const roomObject = this._roomEngine.getRoomObject(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); - if (roomObject && roomObject.visualization) return roomObject.visualization.getImage(0xFFFFFF, -1); + if(roomObject && roomObject.visualization) return roomObject.visualization.getImage(0xFFFFFF, -1); } return null; @@ -821,11 +821,11 @@ export class RoomPreviewer public getRoomPreviewObject(): IRoomObjectController { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { const roomObject = this._roomEngine.getRoomObject(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory); - if (roomObject) return roomObject; + if(roomObject) return roomObject; } return null; @@ -833,11 +833,11 @@ export class RoomPreviewer public getRoomPreviewOwnRoomObject(): IRoomObjectController { - if (this.isRoomEngineReady) + if(this.isRoomEngineReady) { const roomObject = this._roomEngine.getRoomObject(this._previewRoomId, RoomEngine.ROOM_OBJECT_ID, RoomObjectCategory.ROOM); - if (roomObject) return roomObject; + if(roomObject) return roomObject; } return null; diff --git a/src/nitro/room/utils/TileObjectMap.ts b/src/nitro/room/utils/TileObjectMap.ts index 0db6b7d6..ac09d86a 100644 --- a/src/nitro/room/utils/TileObjectMap.ts +++ b/src/nitro/room/utils/TileObjectMap.ts @@ -12,7 +12,7 @@ export class TileObjectMap implements ITileObjectMap let index = 0; - while (index < _arg_2) + while(index < _arg_2) { this._tileObjectMap.set(index, new Map()); @@ -25,9 +25,9 @@ export class TileObjectMap implements ITileObjectMap 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(); } @@ -39,7 +39,7 @@ export class TileObjectMap implements ITileObjectMap { 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 @@ -51,11 +51,11 @@ export class TileObjectMap implements ITileObjectMap 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; @@ -63,51 +63,51 @@ export class TileObjectMap implements ITileObjectMap 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 994e1db2..bff1ca0c 100644 --- a/src/nitro/session/RoomSession.ts +++ b/src/nitro/session/RoomSession.ts @@ -48,7 +48,7 @@ export class RoomSession extends Disposable implements IRoomSession protected onDispose(): void { - if (this._userData) + if(this._userData) { this._userData.dispose(); @@ -60,16 +60,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; @@ -91,7 +91,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; @@ -100,7 +100,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)); @@ -109,7 +109,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; } @@ -131,7 +131,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()); } @@ -152,7 +152,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)); } @@ -227,21 +227,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/RoomSessionManager.ts b/src/nitro/session/RoomSessionManager.ts index 3d6d99ca..83c948dd 100644 --- a/src/nitro/session/RoomSessionManager.ts +++ b/src/nitro/session/RoomSessionManager.ts @@ -53,7 +53,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const connection = this._communication && this._communication.connection; - if (!connection) return; + if(!connection) return; this._handlers.push( new RoomChatHandler(connection, this), @@ -71,11 +71,11 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana private setHandlers(session: IRoomSession): void { - if (!this._handlers || !this._handlers.length) return; + if(!this._handlers || !this._handlers.length) return; - for (const handler of this._handlers) + for(const handler of this._handlers) { - if (!handler) continue; + if(!handler) continue; handler.setRoomId(session.roomId); } @@ -88,7 +88,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana private processPendingSession(): void { - if (!this._pendingSession || !this._roomEngine.ready) return; + if(!this._pendingSession || !this._roomEngine.ready) return; this.addSession(this._pendingSession); @@ -99,7 +99,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const existing = this._sessions.get(this.getRoomId(id)); - if (!existing) return null; + if(!existing) return null; return existing; } @@ -116,7 +116,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana private addSession(roomSession: IRoomSession): boolean { - if (!this._roomEngine.ready) + if(!this._roomEngine.ready) { this._pendingSession = roomSession; @@ -125,7 +125,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana this._sessionStarting = true; - if (this._sessions.get(this.getRoomId(roomSession.roomId))) + if(this._sessions.get(this.getRoomId(roomSession.roomId))) { this.removeSession(roomSession.roomId, false); } @@ -145,11 +145,11 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana public startSession(session: IRoomSession): boolean { - if (session.state === RoomSessionEvent.STARTED) return false; + if(session.state === RoomSessionEvent.STARTED) return false; this._sessionStarting = false; - if (!session.start()) + if(!session.start()) { this.removeSession(session.roomId); @@ -167,7 +167,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const session = this.getSession(id); - if (!session) return; + if(!session) return; this._sessions.delete(this.getRoomId(id)); @@ -180,9 +180,9 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const session = this.getSession(id); - if (!session) return; + if(!session) return; - switch (type) + switch(type) { case RoomSessionHandler.RS_CONNECTED: return; @@ -198,7 +198,7 @@ export class RoomSessionManager extends NitroManager implements IRoomSessionMana { const existing = this.getSession(fromRoomId); - if (!existing) return; + if(!existing) return; this._sessions.delete(this.getRoomId(fromRoomId)); diff --git a/src/nitro/session/SessionDataManager.ts b/src/nitro/session/SessionDataManager.ts index b2458bfa..8107802f 100644 --- a/src/nitro/session/SessionDataManager.ts +++ b/src/nitro/session/SessionDataManager.ts @@ -120,14 +120,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(); @@ -173,7 +173,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(); @@ -181,34 +181,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); } @@ -218,18 +218,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; @@ -239,13 +239,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; @@ -262,7 +262,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; @@ -271,11 +271,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; @@ -284,13 +284,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; @@ -299,13 +299,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; @@ -315,11 +315,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); } @@ -330,13 +330,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(); } } @@ -349,29 +349,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)); } @@ -380,7 +380,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) { NitroConfiguration.setValue('new.identity', 1); } @@ -396,7 +396,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private destroyFurnitureData(): void { - if (!this._furnitureData) return; + if(!this._furnitureData) return; this._furnitureData.dispose(); @@ -405,7 +405,7 @@ export class SessionDataManager extends NitroManager implements ISessionDataMana private destroyProductData(): void { - if (!this._productData) return; + if(!this._productData) return; this._productData.dispose(); @@ -416,18 +416,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; } @@ -437,18 +437,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; } @@ -456,7 +456,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); } @@ -498,7 +498,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)); @@ -507,7 +507,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 d62033a9..ca85d65c 100644 --- a/src/nitro/session/badge/BadgeImageManager.ts +++ b/src/nitro/session/badge/BadgeImageManager.ts @@ -43,21 +43,21 @@ export class BadgeImageManager implements IDisposable public init(): void { - if (this._sessionDataManager && this._sessionDataManager.communication) + if(this._sessionDataManager && this._sessionDataManager.communication) { this._messages = [ new GroupBadgePartsEvent(this.onGroupBadgePartsEvent.bind(this)) ]; - for (const message of this._messages) this._sessionDataManager.communication.registerMessageEvent(message); + for(const message of this._messages) this._sessionDataManager.communication.registerMessageEvent(message); } } public dispose(): void { - if (this._messages && this._messages.length) + if(this._messages && this._messages.length) { - for (const message of this._messages) this._sessionDataManager.communication.removeMessageEvent(message); + for(const message of this._messages) this._sessionDataManager.communication.removeMessageEvent(message); this._messages = null; } @@ -69,7 +69,7 @@ export class BadgeImageManager implements IDisposable { let badge = this.getBadgeTexture(badgeName, type); - if (!badge && load) badge = this.getBadgePlaceholder(); + if(!badge && load) badge = this.getBadgePlaceholder(); return badge; } @@ -83,7 +83,7 @@ export class BadgeImageManager implements IDisposable public loadBadgeImage(badgeName: string, type: string = BadgeImageManager.NORMAL_BADGE): string { - if (this._assets.getTexture(this.getBadgeUrl(badgeName, type))) return badgeName; + if(this._assets.getTexture(this.getBadgeUrl(badgeName, type))) return badgeName; this.getBadgeTexture(badgeName, type); @@ -94,38 +94,38 @@ export class BadgeImageManager implements IDisposable { const url = this.getBadgeUrl(badgeName, type); - if (!url || !url.length) return null; + if(!url || !url.length) return null; const existing = this._assets.getTexture(url); - if (existing) return existing.clone(); + if(existing) return existing.clone(); - if (type === BadgeImageManager.NORMAL_BADGE) + if(type === BadgeImageManager.NORMAL_BADGE) { - if (this._requestedBadges.get(badgeName)) return null; + if(this._requestedBadges.get(badgeName)) return null; this._requestedBadges.set(badgeName, true); this._assets.downloadAsset(url, (flag: boolean) => { - if (flag) + if(flag) { this._requestedBadges.delete(badgeName); const texture = this._assets.getTexture(url); - if (texture && this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(badgeName, texture.clone())); + if(texture && this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(badgeName, texture.clone())); } }); } - else if (type === BadgeImageManager.GROUP_BADGE) + else if(type === BadgeImageManager.GROUP_BADGE) { - if (this._groupBadgesQueue.get(badgeName)) return; + if(this._groupBadgesQueue.get(badgeName)) return; this._groupBadgesQueue.set(badgeName, true); - if (this._readyToGenerateGroupBadges) this.loadGroupBadge(badgeName); + if(this._readyToGenerateGroupBadges) this.loadGroupBadge(badgeName); } return null; @@ -136,7 +136,7 @@ export class BadgeImageManager implements IDisposable const url = (NitroConfiguration.getValue('images.url') + '/loading_icon.png'); const existing = this._assets.getTexture(url); - if (!existing) return null; + if(!existing) return null; return existing.clone(); } @@ -145,7 +145,7 @@ export class BadgeImageManager implements IDisposable { let url = null; - switch (type) + switch(type) { case BadgeImageManager.NORMAL_BADGE: url = (NitroConfiguration.getValue('badge.asset.url')).replace('%badgename%', badge); @@ -163,7 +163,7 @@ export class BadgeImageManager implements IDisposable const groupBadge = new GroupBadge(badgeCode); const partMatches = [...badgeCode.matchAll(/[b|s][0-9]{4,6}/g)]; - for (const partMatch of partMatches) + for(const partMatch of partMatches) { const partCode = partMatch[0]; const shortMethod = (partCode.length === 6); @@ -189,28 +189,28 @@ export class BadgeImageManager implements IDisposable container.addChild(tempSprite); - for (const part of groupBadge.parts) + for(const part of groupBadge.parts) { let isFirst = true; const partNames = ((part.type === 'b') ? this._groupBases.get(part.key) : this._groupSymbols.get(part.key)); - if (partNames) + if(partNames) { - for (const partName of partNames) + for(const partName of partNames) { - if (!partName || !partName.length) continue; + if(!partName || !partName.length) continue; const texture = this._assets.getTexture(`badgepart_${partName}`); - if (!texture) continue; + if(!texture) continue; const { x, y } = part.calculatePosition(texture); const sprite = new NitroSprite(texture); sprite.position.set(x, y); - if (isFirst) sprite.tint = parseInt(this._groupPartColors.get(part.color), 16); + if(isFirst) sprite.tint = parseInt(this._groupPartColors.get(part.color), 16); isFirst = false; @@ -225,16 +225,16 @@ export class BadgeImageManager implements IDisposable const texture = TextureUtils.generateTexture(container); this._assets.setTexture(groupBadge.code, texture); - if (this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(groupBadge.code, texture)); + if(this._sessionDataManager) this._sessionDataManager.events.dispatchEvent(new BadgeImageReadyEvent(groupBadge.code, texture)); } private onGroupBadgePartsEvent(event: GroupBadgePartsEvent): void { - if (!event) return; + if(!event) return; const data = event.getParser(); - if (!data) return; + if(!data) return; data.bases.forEach((names, id) => this._groupBases.set(id, names.map(val => val.replace('.png', '').replace('.gif', '')))); @@ -243,7 +243,7 @@ export class BadgeImageManager implements IDisposable this._groupPartColors = data.partColors; this._readyToGenerateGroupBadges = true; - for (const badgeCode of this._groupBadgesQueue.keys()) this.loadGroupBadge(badgeCode); + for(const badgeCode of this._groupBadgesQueue.keys()) this.loadGroupBadge(badgeCode); } public get disposed(): boolean diff --git a/src/nitro/session/furniture/FurnitureDataLoader.ts b/src/nitro/session/furniture/FurnitureDataLoader.ts index d0d60a42..393005fc 100644 --- a/src/nitro/session/furniture/FurnitureDataLoader.ts +++ b/src/nitro/session/furniture/FurnitureDataLoader.ts @@ -23,7 +23,7 @@ export class FurnitureDataLoader extends EventDispatcher public loadFurnitureData(url: string): void { - if (!url) return; + if(!url) return; fetch(url) .then(response => response.json()) @@ -33,20 +33,20 @@ export class FurnitureDataLoader extends EventDispatcher private onFurnitureDataLoaded(data: { [index: string]: any }): void { - if (!data) return; + if(!data) return; - if ((typeof data.roomitemtypes == 'undefined') || (typeof data.wallitemtypes == 'undefined')) NitroLogger.warn('Could not find `roomitemtypes` or `wallitemtypes` in furnidata.'); + if((typeof data.roomitemtypes == 'undefined') || (typeof data.wallitemtypes == 'undefined')) NitroLogger.warn('Could not find `roomitemtypes` or `wallitemtypes` in furnidata.'); - if (data.roomitemtypes) this.parseFloorItems(data.roomitemtypes); + if(data.roomitemtypes) this.parseFloorItems(data.roomitemtypes); - if (data.wallitemtypes) this.parseWallItems(data.wallitemtypes); + if(data.wallitemtypes) this.parseWallItems(data.wallitemtypes); this.dispatchEvent(new NitroEvent(FurnitureDataLoader.FURNITURE_DATA_READY)); } private onFurnitureDataError(error: Error): void { - if (!error) return; + if(!error) return; console.error(error); @@ -55,21 +55,21 @@ export class FurnitureDataLoader extends EventDispatcher private parseFloorItems(data: any): void { - if (!data || !data.furnitype) return; + if(!data || !data.furnitype) return; - for (const furniture of data.furnitype) + for(const furniture of data.furnitype) { - if (!furniture) continue; + if(!furniture) continue; const colors: number[] = []; - if (furniture.partcolors) + if(furniture.partcolors) { - for (const color of furniture.partcolors.color) + for(const color of furniture.partcolors.color) { let colorCode = (color as string); - if (colorCode.charAt(0) === '#') + if(colorCode.charAt(0) === '#') { colorCode = colorCode.replace('#', ''); @@ -97,11 +97,11 @@ export class FurnitureDataLoader extends EventDispatcher private parseWallItems(data: any): void { - if (!data || !data.furnitype) return; + if(!data || !data.furnitype) return; - for (const furniture of data.furnitype) + for(const furniture of data.furnitype) { - if (!furniture) continue; + if(!furniture) continue; const furnitureData = new FurnitureData(FurnitureType.WALL, furniture.id, furniture.classname, furniture.classname, furniture.category, furniture.name, furniture.description, furniture.revision, 0, 0, 0, null, false, 0, furniture.adurl, furniture.offerid, furniture.buyout, furniture.rentofferid, furniture.rentbuyout, furniture.bc, null, furniture.specialtype, false, false, false, furniture.excludeddynamic, furniture.furniline, furniture.environment, furniture.rare); @@ -113,9 +113,9 @@ export class FurnitureDataLoader extends EventDispatcher private updateLocalizations(furniture: FurnitureData): void { - if (!this._localization) return; + if(!this._localization) return; - switch (furniture.type) + switch(furniture.type) { case FurnitureType.FLOOR: this._localization.setValue(('roomItem.name.' + furniture.id), furniture.name); diff --git a/src/nitro/session/handler/GenericErrorHandler.ts b/src/nitro/session/handler/GenericErrorHandler.ts index c9016478..79ed20aa 100644 --- a/src/nitro/session/handler/GenericErrorHandler.ts +++ b/src/nitro/session/handler/GenericErrorHandler.ts @@ -14,19 +14,19 @@ export class GenericErrorHandler extends BaseHandler private onRoomGenericError(event: GenericErrorEvent): void { - if (!(event instanceof GenericErrorEvent)) return; + if(!(event instanceof GenericErrorEvent)) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const roomSession = this.listener.getSession(this.roomId); - if (!roomSession) return; + if(!roomSession) return; let type: string = null; - switch (parser.errorCode) + switch(parser.errorCode) { case GenericErrorEnum.KICKED_OUT_OF_ROOM: type = RoomSessionErrorMessageEvent.RSEME_KICKED; @@ -35,7 +35,7 @@ export class GenericErrorHandler extends BaseHandler return; } - if (!type || type.length == 0) return; + if(!type || type.length == 0) return; this.listener.events.dispatchEvent(new RoomSessionErrorMessageEvent(type, roomSession)); } diff --git a/src/nitro/session/handler/PollHandler.ts b/src/nitro/session/handler/PollHandler.ts index bb6388af..c64c6cf4 100644 --- a/src/nitro/session/handler/PollHandler.ts +++ b/src/nitro/session/handler/PollHandler.ts @@ -16,15 +16,15 @@ export class PollHandler extends BaseHandler private onPollContentsEvent(event: PollContentsEvent): 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; const pollEvent = new RoomSessionPollEvent(RoomSessionPollEvent.CONTENT, session, parser.id); @@ -39,15 +39,15 @@ export class PollHandler extends BaseHandler private onPollOfferEvent(event: PollOfferEvent): 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; const pollEvent = new RoomSessionPollEvent(RoomSessionPollEvent.OFFER, session, parser.id); @@ -59,15 +59,15 @@ export class PollHandler extends BaseHandler private onPollErrorEvent(event: PollErrorEvent): 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; const pollEvent = new RoomSessionPollEvent(RoomSessionPollEvent.ERROR, session, -1); pollEvent.headline = '???'; diff --git a/src/nitro/session/handler/RoomChatHandler.ts b/src/nitro/session/handler/RoomChatHandler.ts index 7e9d3d0a..5f84504a 100644 --- a/src/nitro/session/handler/RoomChatHandler.ts +++ b/src/nitro/session/handler/RoomChatHandler.ts @@ -22,20 +22,20 @@ export class RoomChatHandler extends BaseHandler private onRoomUnitChatEvent(event: RoomUnitChatEvent): 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; let chatType: number = RoomSessionChatEvent.CHAT_TYPE_SPEAK; - if (event instanceof RoomUnitChatShoutEvent) chatType = RoomSessionChatEvent.CHAT_TYPE_SHOUT; - else if (event instanceof RoomUnitChatWhisperEvent) chatType = RoomSessionChatEvent.CHAT_TYPE_WHISPER; + if(event instanceof RoomUnitChatShoutEvent) chatType = RoomSessionChatEvent.CHAT_TYPE_SHOUT; + else if(event instanceof RoomUnitChatWhisperEvent) chatType = RoomSessionChatEvent.CHAT_TYPE_WHISPER; const chatEvent = new RoomSessionChatEvent(RoomSessionChatEvent.CHAT_EVENT, session, parser.roomIndex, parser.message, chatType, parser.bubble); @@ -44,86 +44,86 @@ export class RoomChatHandler extends BaseHandler private onRoomUnitHandItemReceivedEvent(event: RoomUnitHandItemReceivedEvent): 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; this.listener.events.dispatchEvent(new RoomSessionChatEvent(RoomSessionChatEvent.CHAT_EVENT, session, parser.giverUserId, '', RoomSessionChatEvent.CHAT_TYPE_HAND_ITEM_RECEIVED, SystemChatStyleEnum.GENERIC, null, parser.handItemType)); } private onRespectReceivedEvent(event: RespectReceivedEvent): 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; const userData = session.userDataManager.getUserData(parser.userId); - if (!userData) return; + if(!userData) return; this.listener.events.dispatchEvent(new RoomSessionChatEvent(RoomSessionChatEvent.CHAT_EVENT, session, userData.roomIndex, '', RoomSessionChatEvent.CHAT_TYPE_RESPECT, SystemChatStyleEnum.GENERIC)); } private onPetRespectNoficationEvent(event: PetRespectNoficationEvent): 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; const petData = session.userDataManager.getPetData(parser.petData.id); - if (!petData) return; + if(!petData) return; let chatType = RoomSessionChatEvent.CHAT_TYPE_PETRESPECT; - if (parser.isTreat) chatType = RoomSessionChatEvent.CHAT_TYPE_PETTREAT; + if(parser.isTreat) chatType = RoomSessionChatEvent.CHAT_TYPE_PETTREAT; this.listener.events.dispatchEvent(new RoomSessionChatEvent(RoomSessionChatEvent.CHAT_EVENT, session, petData.roomIndex, '', chatType, SystemChatStyleEnum.GENERIC)); } private onPetSupplementedNotificationEvent(event: PetSupplementedNotificationEvent): 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; const petData = session.userDataManager.getPetData(parser.petId); - if (!petData) return; + if(!petData) return; let userRoomIndex = -1; const userData = session.userDataManager.getUserData(parser.userId); - if (userData) userRoomIndex = userData.roomIndex; + if(userData) userRoomIndex = userData.roomIndex; let chatType = RoomSessionChatEvent.CHAT_TYPE_PETREVIVE; - switch (parser.supplementType) + switch(parser.supplementType) { case PetSupplementTypeEnum.REVIVE: chatType = RoomSessionChatEvent.CHAT_TYPE_PETREVIVE; @@ -141,15 +141,15 @@ export class RoomChatHandler extends BaseHandler private onFloodControlEvent(event: FloodControlEvent): 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; const seconds = parser.seconds; @@ -158,15 +158,15 @@ export class RoomChatHandler extends BaseHandler private onRemainingMuteEvent(event: RemainingMuteEvent): 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; this.listener.events.dispatchEvent(new RoomSessionChatEvent(RoomSessionChatEvent.CHAT_EVENT, session, session.ownRoomIndex, '', RoomSessionChatEvent.CHAT_TYPE_MUTE_REMAINING, SystemChatStyleEnum.GENERIC, null, parser.seconds)); } diff --git a/src/nitro/session/handler/RoomDataHandler.ts b/src/nitro/session/handler/RoomDataHandler.ts index 5a48bd3c..18c3f70f 100644 --- a/src/nitro/session/handler/RoomDataHandler.ts +++ b/src/nitro/session/handler/RoomDataHandler.ts @@ -14,17 +14,17 @@ export class RoomDataHandler extends BaseHandler private onGetGuestRoomResultEvent(event: GetGuestRoomResultEvent): void { - if (!(event instanceof GetGuestRoomResultEvent)) return; + if(!(event instanceof GetGuestRoomResultEvent)) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; - if (parser.roomForward) return; + if(parser.roomForward) return; const roomSession = this.listener.getSession(this.roomId); - if (!roomSession) return; + if(!roomSession) return; const roomData = parser.data; diff --git a/src/nitro/session/handler/RoomDimmerPresetsHandler.ts b/src/nitro/session/handler/RoomDimmerPresetsHandler.ts index 35f4460c..e1d0307b 100644 --- a/src/nitro/session/handler/RoomDimmerPresetsHandler.ts +++ b/src/nitro/session/handler/RoomDimmerPresetsHandler.ts @@ -14,15 +14,15 @@ export class RoomDimmerPresetsHandler extends BaseHandler private onRoomDimmerPresets(event: RoomDimmerPresetsEvent): void { - if (!event) return; + if(!event) 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 presetEvent = new RoomSessionDimmerPresetsEvent(RoomSessionDimmerPresetsEvent.ROOM_DIMMER_PRESETS, session); @@ -30,11 +30,11 @@ export class RoomDimmerPresetsHandler extends BaseHandler let i = 0; - while (i < parser.presetCount) + while(i < parser.presetCount) { const preset = parser.getPreset(i); - if (preset) presetEvent.storePreset(preset.id, preset.type, preset.color, preset.brightness); + if(preset) presetEvent.storePreset(preset.id, preset.type, preset.color, preset.brightness); i++; } diff --git a/src/nitro/session/handler/RoomPresentHandler.ts b/src/nitro/session/handler/RoomPresentHandler.ts index f4c4a7b7..8ba41da0 100644 --- a/src/nitro/session/handler/RoomPresentHandler.ts +++ b/src/nitro/session/handler/RoomPresentHandler.ts @@ -9,24 +9,24 @@ export class RoomPresentHandler extends BaseHandler { super(connection, listener); - if (!connection) return; + if(!connection) return; connection.addMessageEvent(new PresentOpenedMessageEvent(this.onFurnitureGiftOpenedEvent.bind(this))); } private onFurnitureGiftOpenedEvent(event: PresentOpenedMessageEvent): void { - if (!event) return; + if(!event) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; - if (this.listener && this.listener.events) this.listener.events.dispatchEvent( + if(this.listener && this.listener.events) this.listener.events.dispatchEvent( new RoomSessionPresentEvent(RoomSessionPresentEvent.RSPE_PRESENT_OPENED, session, parser.classId, parser.itemType, parser.productCode, parser.placedItemId, parser.placedItemType, parser.placedInRoom, parser.petFigureString)); diff --git a/src/nitro/session/handler/RoomSessionHandler.ts b/src/nitro/session/handler/RoomSessionHandler.ts index e578e378..57ce678e 100644 --- a/src/nitro/session/handler/RoomSessionHandler.ts +++ b/src/nitro/session/handler/RoomSessionHandler.ts @@ -23,19 +23,19 @@ export class RoomSessionHandler extends BaseHandler private onRoomEnterEvent(event: RoomEnterEvent): void { - if (!(event instanceof RoomEnterEvent)) return; + if(!(event instanceof RoomEnterEvent)) return; - if (this.listener) this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_CONNECTED); + if(this.listener) this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_CONNECTED); } private onRoomReadyMessageEvent(event: RoomReadyMessageEvent): void { - if (!(event instanceof RoomReadyMessageEvent)) return; + if(!(event instanceof RoomReadyMessageEvent)) return; const fromRoomId = this.roomId; const toRoomId = event.getParser().roomId; - if (this.listener) + if(this.listener) { this.listener.sessionReinitialize(fromRoomId, toRoomId); this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_READY); @@ -44,32 +44,32 @@ export class RoomSessionHandler extends BaseHandler private onDesktopViewEvent(event: DesktopViewEvent): void { - if (!(event instanceof DesktopViewEvent)) return; + if(!(event instanceof DesktopViewEvent)) return; - if (this.listener) this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_DISCONNECTED); + if(this.listener) this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_DISCONNECTED); } private onRoomDoorbellAcceptedEvent(event: RoomDoorbellAcceptedEvent): void { - if (!(event instanceof RoomDoorbellAcceptedEvent) || !this.listener) return; + if(!(event instanceof RoomDoorbellAcceptedEvent) || !this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const username = parser.userName; - if (!username || !username.length) + if(!username || !username.length) { this.connection.send(new GoToFlatMessageComposer(this.roomId)); } else { - if (this.listener.events) + if(this.listener.events) { const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; this.listener.events.dispatchEvent(new RoomSessionDoorbellEvent(RoomSessionDoorbellEvent.RSDE_ACCEPTED, session, username)); } @@ -78,25 +78,25 @@ export class RoomSessionHandler extends BaseHandler private onRoomDoorbellRejectedEvent(event: FlatAccessDeniedMessageEvent): void { - if (!(event instanceof FlatAccessDeniedMessageEvent) || !this.listener) return; + if(!(event instanceof FlatAccessDeniedMessageEvent) || !this.listener) return; const parser = event.getParser(); - if (!parser) return; + if(!parser) return; const username = parser.userName; - if (!username || !username.length) + if(!username || !username.length) { this.listener.sessionUpdate(this.roomId, RoomSessionHandler.RS_DISCONNECTED); } else { - if (this.listener.events) + if(this.listener.events) { const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; this.listener.events.dispatchEvent(new RoomSessionDoorbellEvent(RoomSessionDoorbellEvent.RSDE_REJECTED, session, username)); } @@ -105,11 +105,11 @@ export class RoomSessionHandler extends BaseHandler private onYouAreSpectatorMessageEvent(event: YouAreSpectatorMessageEvent): void { - if (this.listener) + if(this.listener) { const session = this.listener.getSession(this.roomId); - if (!session) return; + if(!session) return; session.isSpectator = true; this.listener.events.dispatchEvent(new RoomSessionSpectatorModeEvent(RoomSessionSpectatorModeEvent.SPECTATOR_MODE, session)); diff --git a/src/nitro/session/handler/RoomUsersHandler.ts b/src/nitro/session/handler/RoomUsersHandler.ts index 32e9bd9f..490254e0 100644 --- a/src/nitro/session/handler/RoomUsersHandler.ts +++ b/src/nitro/session/handler/RoomUsersHandler.ts @@ -29,21 +29,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: IRoomUserData[] = []; - 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); @@ -70,7 +70,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); } @@ -81,15 +81,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); @@ -101,41 +101,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); @@ -144,49 +144,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; @@ -195,15 +195,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(); @@ -239,15 +239,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); @@ -256,15 +256,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; @@ -275,21 +275,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; @@ -311,28 +311,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; @@ -351,23 +351,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; diff --git a/src/nitro/session/handler/WordQuizHandler.ts b/src/nitro/session/handler/WordQuizHandler.ts index 6330397a..4907ce38 100644 --- a/src/nitro/session/handler/WordQuizHandler.ts +++ b/src/nitro/session/handler/WordQuizHandler.ts @@ -16,15 +16,15 @@ export class WordQuizHandler extends BaseHandler private onQuestionEvent(event: QuestionEvent): 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; const quizEvent = new RoomSessionWordQuizEvent(RoomSessionWordQuizEvent.QUESTION, session, parser.pollId); @@ -39,15 +39,15 @@ export class WordQuizHandler extends BaseHandler private onQuestionAnsweredEvent(event: QuestionAnsweredEvent): 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; const quizEvent = new RoomSessionWordQuizEvent(RoomSessionWordQuizEvent.ANSWERED, session, parser.userId); @@ -60,15 +60,15 @@ export class WordQuizHandler extends BaseHandler private onQuestionFinishedEvent(event: QuestionFinishedEvent): 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; const quizEvent = new RoomSessionWordQuizEvent(RoomSessionWordQuizEvent.FINISHED, session); quizEvent.questionId = parser.questionId; diff --git a/src/nitro/session/product/ProductDataLoader.ts b/src/nitro/session/product/ProductDataLoader.ts index 01360245..2eadf727 100644 --- a/src/nitro/session/product/ProductDataLoader.ts +++ b/src/nitro/session/product/ProductDataLoader.ts @@ -24,7 +24,7 @@ export class ProductDataLoader extends EventDispatcher public loadProductData(url: string): void { - if (!url) return; + if(!url) return; fetch(url) .then(response => response.json()) @@ -34,7 +34,7 @@ export class ProductDataLoader extends EventDispatcher private onProductDataLoadedEvent(data: { [index: string]: any }): void { - if (!data) return; + if(!data) return; this.parseProducts(data.productdata); @@ -43,15 +43,15 @@ export class ProductDataLoader extends EventDispatcher private onProductDataError(error: Error): void { - if (!error) return; + if(!error) return; this.dispatchEvent(new NitroEvent(ProductDataLoader.PDP_PRODUCT_DATA_FAILED)); } private parseProducts(data: { [index: string]: any }): void { - if (!data) return; + if(!data) return; - for (const product of data.product) (product && this._products.set(product.code, new ProductData(product.code, product.name, product.description))); + for(const product of data.product) (product && this._products.set(product.code, new ProductData(product.code, product.name, product.description))); } } diff --git a/src/nitro/sound/SoundManager.ts b/src/nitro/sound/SoundManager.ts index d4b7f76c..dbb61aff 100644 --- a/src/nitro/sound/SoundManager.ts +++ b/src/nitro/sound/SoundManager.ts @@ -46,7 +46,7 @@ export class SoundManager extends NitroManager implements ISoundManager public onDispose(): void { - if (this._musicManager) + if(this._musicManager) { this._musicManager.dispose(); this._musicManager = null; @@ -61,7 +61,7 @@ export class SoundManager extends NitroManager implements ISoundManager private onEvent(event: INitroEvent) { - switch (event.type) + switch(event.type) { case RoomEngineSamplePlaybackEvent.PLAY_SAMPLE: { const castedEvent = (event as RoomEngineSamplePlaybackEvent); @@ -91,7 +91,7 @@ export class SoundManager extends NitroManager implements ISoundManager this._volumeFurni = (castedEvent.volumeFurni / 100); this._volumeTrax = (castedEvent.volumeTrax / 100); - if (volumeFurniUpdated) this.updateFurniSamplesVolume(this._volumeFurni); + if(volumeFurniUpdated) this.updateFurniSamplesVolume(this._volumeFurni); return; } case NitroSoundEvent.PLAY_SOUND: { @@ -122,7 +122,7 @@ export class SoundManager extends NitroManager implements ISoundManager { let sample = this._internalSamples.getValue(code); - if (!sample) + if(!sample) { const sampleUrl = NitroConfiguration.getValue('sounds.url'); @@ -137,7 +137,7 @@ export class SoundManager extends NitroManager implements ISoundManager { let sample = this._furniSamples.getValue(code); - if (!sample) + if(!sample) { const sampleUrl = NitroConfiguration.getValue('external.samples.url'); @@ -145,7 +145,7 @@ export class SoundManager extends NitroManager implements ISoundManager this._furniSamples.add(code, sample); } - if (!this._furnitureBeingPlayed.hasKey(objectId)) this._furnitureBeingPlayed.add(objectId, code); + if(!this._furnitureBeingPlayed.hasKey(objectId)) this._furnitureBeingPlayed.add(objectId, code); sample.onended = (event) => { @@ -169,7 +169,7 @@ export class SoundManager extends NitroManager implements ISoundManager { const sample = this._internalSamples.getValue(code); - if (!sample) return; + if(!sample) return; try { @@ -185,13 +185,13 @@ export class SoundManager extends NitroManager implements ISoundManager { const furnitureBeingPlayed = this._furnitureBeingPlayed.getValue(objectId); - if (!furnitureBeingPlayed) return; + if(!furnitureBeingPlayed) return; const sample = this._furniSamples.getValue(furnitureBeingPlayed); this._furnitureBeingPlayed.remove(objectId); - if (!sample) return; + if(!sample) return; try { diff --git a/src/nitro/sound/common/SongStartRequestData.ts b/src/nitro/sound/common/SongStartRequestData.ts index 5b589599..fd6827d9 100644 --- a/src/nitro/sound/common/SongStartRequestData.ts +++ b/src/nitro/sound/common/SongStartRequestData.ts @@ -26,7 +26,7 @@ export class SongStartRequestData public get startPos(): number { - if (this._startPos < 0) return 0; + if(this._startPos < 0) return 0; return this._startPos + ((GetTickerTime() - this._playRequestTime) / 1000); } diff --git a/src/nitro/sound/music/MusicManager.ts b/src/nitro/sound/music/MusicManager.ts index ec1ee249..bd3c64dc 100644 --- a/src/nitro/sound/music/MusicManager.ts +++ b/src/nitro/sound/music/MusicManager.ts @@ -57,7 +57,7 @@ export class MusicManager extends NitroManager implements IMusicManager public onDispose(): void { - if (this._timerInstance) + if(this._timerInstance) { clearInterval(this._timerInstance); this._timerInstance = null; @@ -84,14 +84,14 @@ export class MusicManager extends NitroManager implements IMusicManager { const parser = event.getParser(); - for (const song of parser.songs) + for(const song of parser.songs) { const songAvailable: boolean = (this._availableSongs.get(song.id) !== null); const areSamplesRequested: boolean = (this._requestedSongs.get(song.id) !== null); - if (!songAvailable) + if(!songAvailable) { - if (areSamplesRequested) + if(areSamplesRequested) { //LoadTraxSong } @@ -113,7 +113,7 @@ export class MusicManager extends NitroManager implements IMusicManager this._isPlaying = (parser.currentSongId !== -1); - if (parser.currentSongId >= 0) + if(parser.currentSongId >= 0) { this.playSong(parser.currentSongId, MusicPriorities.PRIORITY_ROOM_PLAYLIST, (parser.syncCount / 1000), 0, 1, 1); } @@ -122,7 +122,7 @@ export class MusicManager extends NitroManager implements IMusicManager this.stopPlaying(); } - if (parser.nextSongId >= 0) this.requestSong(parser.nextSongId, true); + if(parser.nextSongId >= 0) this.requestSong(parser.nextSongId, true); this._playPosition = parser.currentPosition; //Dispatch local event NowPlayingEvent @@ -130,7 +130,7 @@ export class MusicManager extends NitroManager implements IMusicManager private onTick(): void { - if (this._songRequestList.length === 0) return; + if(this._songRequestList.length === 0) return; Nitro.instance.communication.connection.send(new GetSongInfoMessageComposer(...this._songRequestList)); this._songRequestList = []; @@ -138,7 +138,7 @@ export class MusicManager extends NitroManager implements IMusicManager private requestSong(songId: number, arg2: boolean): void { - if (this._requestedSongs.get(songId) === null) + if(this._requestedSongs.get(songId) === null) { this._requestedSongs.set(songId, arg2); this._songRequestList.push(songId); @@ -164,9 +164,9 @@ export class MusicManager extends NitroManager implements IMusicManager private getSongIdRequestedAtPriority(priorityIndex: number): number { - if (priorityIndex < 0 || priorityIndex >= MusicPriorities.PRIORITY_COUNT) return -1; + if(priorityIndex < 0 || priorityIndex >= MusicPriorities.PRIORITY_COUNT) return -1; - if (!this._songRequestsPerPriority[priorityIndex]) return -1; + if(!this._songRequestsPerPriority[priorityIndex]) return -1; return this._songRequestsPerPriority[priorityIndex].songId; } diff --git a/src/nitro/utils/FigureDataContainer.ts b/src/nitro/utils/FigureDataContainer.ts index 743746e8..71dd4876 100644 --- a/src/nitro/utils/FigureDataContainer.ts +++ b/src/nitro/utils/FigureDataContainer.ts @@ -50,13 +50,13 @@ private parseFigureString(k: string): void { - if (!k) return; + if(!k) return; - for (const set of k.split('.')) + for(const set of k.split('.')) { const _local_3 = set.split('-'); - if (_local_3.length > 0) + if(_local_3.length > 0) { const part = _local_3[0]; const setId = parseInt(_local_3[1]); @@ -64,14 +64,14 @@ let i = 2; - while (i < _local_3.length) + while(i < _local_3.length) { colors.push(parseInt(_local_3[i])); i++; } - if (!colors.length) colors.push(0); + if(!colors.length) colors.push(0); this.savePartSetId(part, setId, false); this.savePartSetColourId(part, colors, false); @@ -86,14 +86,14 @@ public getPartSetId(k: string): number { - if (this.hasSetType(k)) return this._data.get(k); + if(this.hasSetType(k)) return this._data.get(k); return -1; } public getColourIds(k: string): number[] { - if (this._colors.get(k)) return this._colors.get(k); + if(this._colors.get(k)) return this._colors.get(k); return []; } @@ -104,24 +104,24 @@ const sets: string[] = []; - for (const [key, value] of this._data.entries()) + for(const [key, value] of this._data.entries()) { let set = ((key + '-') + value); const colors = this._colors.get(key); - if (colors) for (const color of colors) set = (set + ('-' + color)); + if(colors) for(const color of colors) set = (set + ('-' + color)); sets.push(set); } let i = 0; - while (i < sets.length) + while(i < sets.length) { figure = (figure + sets[i]); - if (i < (sets.length - 1)) figure = (figure + '.'); + if(i < (sets.length - 1)) figure = (figure + '.'); i++; } @@ -137,7 +137,7 @@ private savePartSetId(k: string, _arg_2: number, _arg_3: boolean = true): void { - switch (k) + switch(k) { case FigureDataContainer.HD: case FigureDataContainer.HAIR: @@ -152,7 +152,7 @@ case FigureDataContainer.TROUSERS: case FigureDataContainer.SHOES: case FigureDataContainer.TROUSER_ACCESSORIES: - if (_arg_2 >= 0) + if(_arg_2 >= 0) { this._data.set(k, _arg_2); } @@ -165,7 +165,7 @@ public savePartSetColourId(k: string, _arg_2: number[], _arg_3: boolean = true): void { - switch (k) + switch(k) { case FigureDataContainer.HD: case FigureDataContainer.HAIR: @@ -192,23 +192,23 @@ let figure = ''; const sets: string[] = []; - for (const part of partSets) + for(const part of partSets) { const colors = this._colors.get(part); - if (colors) + if(colors) { let setId = this._data.get(part); - if (part === FigureDataContainer.HD) setId = k; + if(part === FigureDataContainer.HD) setId = k; let set = ((part + '-') + setId); - if (setId >= 0) + if(setId >= 0) { let i = 0; - while (i < colors.length) + while(i < colors.length) { set = (set + ('-' + colors[i])); @@ -222,11 +222,11 @@ let i = 0; - while (i < sets.length) + while(i < sets.length) { figure = (figure + sets[i]); - if (i < (sets.length - 1)) figure = (figure + '.'); + if(i < (sets.length - 1)) figure = (figure + '.'); i++; } diff --git a/src/nitro/utils/HabboWebTools.ts b/src/nitro/utils/HabboWebTools.ts index 446575bd..f83dbfc1 100644 --- a/src/nitro/utils/HabboWebTools.ts +++ b/src/nitro/utils/HabboWebTools.ts @@ -11,7 +11,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('logEventLog', data); } @@ -27,7 +27,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('openPage', pageUrl); } @@ -52,7 +52,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('heartBeat'); } @@ -68,7 +68,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { HabboWebTools.openPage(pageUrl); } @@ -84,7 +84,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('closeWebPageAndRestoreClient'); } @@ -100,7 +100,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('openHabblet', name, param); } @@ -116,7 +116,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('closeHabblet', name, param); } @@ -132,7 +132,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('disconnect', reasonCode, reasonString); } @@ -148,7 +148,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.callGame('showGame', gameUrl); } @@ -164,7 +164,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.callGame('hideGame'); } @@ -180,7 +180,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('openExternalLink', escape(url)); } @@ -200,7 +200,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('roomVisited', roomId); } @@ -220,7 +220,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('openMinimail', target); } @@ -240,7 +240,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('openNews'); } @@ -260,7 +260,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('closeNews'); } @@ -280,7 +280,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('openAvatars'); } @@ -300,7 +300,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('openRoomEnterAd'); } @@ -320,7 +320,7 @@ export class HabboWebTools { try { - if (LegacyExternalInterface.available) + if(LegacyExternalInterface.available) { LegacyExternalInterface.call('updateFigure', figure); } diff --git a/src/nitro/window/motion/Interval.ts b/src/nitro/window/motion/Interval.ts index fa055e98..77b2707a 100644 --- a/src/nitro/window/motion/Interval.ts +++ b/src/nitro/window/motion/Interval.ts @@ -33,7 +33,7 @@ export class Interval extends Motion const elapsed = ((time - this._startTimeMs) / this._duration); - if (elapsed < 1) + if(elapsed < 1) { this.update(elapsed); } diff --git a/src/nitro/window/motion/Motions.ts b/src/nitro/window/motion/Motions.ts index 79b9cd33..962b6fc4 100644 --- a/src/nitro/window/motion/Motions.ts +++ b/src/nitro/window/motion/Motions.ts @@ -17,9 +17,9 @@ export class Motions public static runMotion(k: Motion): Motion { - if (((Motions._RUNNING_MOTIONS.indexOf(k) === -1) && (Motions._QUEUED_MOTIONS.indexOf(k) === -1))) + if(((Motions._RUNNING_MOTIONS.indexOf(k) === -1) && (Motions._QUEUED_MOTIONS.indexOf(k) === -1))) { - if (Motions._IS_UPDATING) + if(Motions._IS_UPDATING) { Motions._QUEUED_MOTIONS.push(k); } @@ -40,41 +40,41 @@ export class Motions { let _local_2: number = Motions._RUNNING_MOTIONS.indexOf(k); - if (_local_2 > -1) + if(_local_2 > -1) { - if (Motions._IS_UPDATING) + if(Motions._IS_UPDATING) { _local_2 = Motions._REMOVED_MOTIONS.indexOf(k); - if (_local_2 == -1) Motions._REMOVED_MOTIONS.push(k); + if(_local_2 == -1) Motions._REMOVED_MOTIONS.push(k); } else { Motions._RUNNING_MOTIONS.splice(_local_2, 1); - if (k.running) k.stop(); + if(k.running) k.stop(); - if (!Motions._RUNNING_MOTIONS.length) Motions.stopTimer(); + if(!Motions._RUNNING_MOTIONS.length) Motions.stopTimer(); } } else { _local_2 = Motions._QUEUED_MOTIONS.indexOf(k); - if (_local_2 > -1) Motions._QUEUED_MOTIONS.splice(_local_2, 1); + if(_local_2 > -1) Motions._QUEUED_MOTIONS.splice(_local_2, 1); } } public static getMotionByTag(k: string): Motion { - for (const _local_2 of Motions._RUNNING_MOTIONS) + for(const _local_2 of Motions._RUNNING_MOTIONS) { - if (_local_2.tag == k) return _local_2; + if(_local_2.tag == k) return _local_2; } - for (const _local_2 of Motions._QUEUED_MOTIONS) + for(const _local_2 of Motions._QUEUED_MOTIONS) { - if (_local_2.tag == k) return _local_2; + if(_local_2.tag == k) return _local_2; } return null; @@ -82,14 +82,14 @@ export class Motions public static getMotionByTarget(k: HTMLElement): Motion { - for (const _local_2 of Motions._RUNNING_MOTIONS) + for(const _local_2 of Motions._RUNNING_MOTIONS) { - if (_local_2.target == k) return _local_2; + if(_local_2.target == k) return _local_2; } - for (const _local_2 of Motions._QUEUED_MOTIONS) + for(const _local_2 of Motions._QUEUED_MOTIONS) { - if (_local_2.target == k) return _local_2; + if(_local_2.target == k) return _local_2; } return null; @@ -97,14 +97,14 @@ export class Motions public static getMotionByTagAndTarget(k: string, _arg_2: HTMLElement): Motion { - for (const _local_3 of Motions._RUNNING_MOTIONS) + for(const _local_3 of Motions._RUNNING_MOTIONS) { - if (((_local_3.tag == k) && (_local_3.target == _arg_2))) return _local_3; + if(((_local_3.tag == k) && (_local_3.target == _arg_2))) return _local_3; } - for (const _local_3 of Motions._QUEUED_MOTIONS) + for(const _local_3 of Motions._QUEUED_MOTIONS) { - if (((_local_3.tag == k) && (_local_3.target == _arg_2))) return _local_3; + if(((_local_3.tag == k) && (_local_3.target == _arg_2))) return _local_3; } return null; @@ -129,23 +129,23 @@ export class Motions let _local_3: Motion = null; // eslint-disable-next-line no-cond-assign - while (_local_3 = Motions._QUEUED_MOTIONS.pop()) Motions._RUNNING_MOTIONS.push(_local_3); + while(_local_3 = Motions._QUEUED_MOTIONS.pop()) Motions._RUNNING_MOTIONS.push(_local_3); // eslint-disable-next-line no-cond-assign - while (_local_3 = Motions._REMOVED_MOTIONS.pop()) + while(_local_3 = Motions._REMOVED_MOTIONS.pop()) { Motions._RUNNING_MOTIONS.splice(Motions._RUNNING_MOTIONS.indexOf(_local_3), 1); - if (_local_3.running) _local_3.stop(); + if(_local_3.running) _local_3.stop(); } - for (_local_3 of Motions._RUNNING_MOTIONS) + for(_local_3 of Motions._RUNNING_MOTIONS) { - if (_local_3.running) + if(_local_3.running) { _local_3.tick(_local_2); - if (_local_3.complete) + if(_local_3.complete) { Motions.removeMotion(_local_3); } @@ -156,14 +156,14 @@ export class Motions } } - if (!Motions._RUNNING_MOTIONS.length) Motions.stopTimer(); + if(!Motions._RUNNING_MOTIONS.length) Motions.stopTimer(); Motions._IS_UPDATING = false; } private static startTimer(): void { - if (!Motions._TIMER) + if(!Motions._TIMER) { Motions._TIMER = setInterval(Motions.onTick, Motions.TIMER_TIME); } @@ -171,7 +171,7 @@ export class Motions private static stopTimer(): void { - if (Motions._TIMER) + if(Motions._TIMER) { clearInterval(Motions._TIMER); @@ -184,9 +184,9 @@ export class Motions { let _local_2 = 0; - for (const _local_3 of Motions._RUNNING_MOTIONS) + for(const _local_3 of Motions._RUNNING_MOTIONS) { - if (_local_3.target === k) _local_2++; + if(_local_3.target === k) _local_2++; } return _local_2; diff --git a/src/nitro/window/motion/Wait.ts b/src/nitro/window/motion/Wait.ts index f4d789fb..feb23250 100644 --- a/src/nitro/window/motion/Wait.ts +++ b/src/nitro/window/motion/Wait.ts @@ -32,6 +32,6 @@ export class Wait extends Motion this._complete = ((k - this._startTimeMs) >= this._waitTimeMs); - if (this._complete) this.stop(); + if(this._complete) this.stop(); } } diff --git a/src/room/RoomManager.ts b/src/room/RoomManager.ts index 044f0fc4..29482e20 100644 --- a/src/room/RoomManager.ts +++ b/src/room/RoomManager.ts @@ -57,15 +57,15 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst public onInit(): void { - if (this._state >= RoomManager.ROOM_MANAGER_INITIALIZING || !this._contentLoader) return; + if(this._state >= RoomManager.ROOM_MANAGER_INITIALIZING || !this._contentLoader) return; const mandatoryLibraries = RoomContentLoader.MANDATORY_LIBRARIES; - for (const library of mandatoryLibraries) + for(const library of mandatoryLibraries) { - if (!library) continue; + if(!library) continue; - if (this._initialLoadList.indexOf(library) === -1) + if(this._initialLoadList.indexOf(library) === -1) { this._contentLoader.downloadAsset(library, this.events); @@ -80,22 +80,22 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { const existing = this._rooms.get(roomId); - if (!existing) return null; + if(!existing) return null; return existing; } public createRoomInstance(roomId: string): IRoomInstance { - if (this._rooms.get(roomId)) return null; + if(this._rooms.get(roomId)) return null; const instance = new RoomInstance(roomId, this); this._rooms.set(instance.id, instance); - if (this._updateCategories.length) + if(this._updateCategories.length) { - for (const category of this._updateCategories) + for(const category of this._updateCategories) { instance.addUpdateCategory(category); } @@ -108,7 +108,7 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { const existing = this._rooms.get(roomId); - if (!existing) return false; + if(!existing) return false; this._rooms.delete(roomId); @@ -121,7 +121,7 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { const instance = this.getRoomInstance(roomId); - if (!instance) return null; + if(!instance) return null; let visualization = type; let logic = type; @@ -129,11 +129,11 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst let asset: IGraphicAssetCollection = null; let isLoading = false; - if (this._contentLoader.isLoaderType(type)) + if(this._contentLoader.isLoaderType(type)) { asset = this._contentLoader.getCollection(type); - if (!asset) + if(!asset) { isLoading = true; @@ -142,7 +142,7 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst assetName = this._contentLoader.getPlaceholderName(type); asset = this._contentLoader.getCollection(assetName); - if (!asset) return null; + if(!asset) return null; } visualization = asset.data.visualizationType; @@ -151,13 +151,13 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst const object = (instance.createRoomObject(objectId, 1, type, category) as IRoomObjectController); - if (!object) return null; + if(!object) return null; - if (this._visualizationFactory) + if(this._visualizationFactory) { const visualizationInstance = this._visualizationFactory.getVisualization(visualization); - if (!visualizationInstance) + if(!visualizationInstance) { instance.removeRoomObject(objectId, category); @@ -168,7 +168,7 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst const visualizationData = this._visualizationFactory.getVisualizationData(assetName, visualization, ((asset && asset.data) || null)); - if (!visualizationData || !visualizationInstance.initialize(visualizationData)) + if(!visualizationData || !visualizationInstance.initialize(visualizationData)) { instance.removeRoomObject(objectId, category); @@ -178,19 +178,19 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst object.setVisualization(visualizationInstance); } - if (this._logicFactory) + if(this._logicFactory) { const logicInstance = this._logicFactory.getLogic(logic); object.setLogic(logicInstance); - if (logicInstance) + if(logicInstance) { logicInstance.initialize((asset && asset.data) || null); } } - if (!isLoading) object.isReady = true; + if(!isLoading) object.isReady = true; this._contentLoader.setRoomObjectRoomId(object, roomId); @@ -199,35 +199,35 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst private reinitializeRoomObjectsByType(type: string): void { - if (!type || !this._contentLoader || !this._visualizationFactory || !this._logicFactory) return; + if(!type || !this._contentLoader || !this._visualizationFactory || !this._logicFactory) return; const asset = this._contentLoader.getCollection(type); - if (!asset) return; + if(!asset) return; const visualization = asset.data.visualizationType; const logic = asset.data.logicType; const visualizationData = this._visualizationFactory.getVisualizationData(type, visualization, asset.data); - for (const room of this._rooms.values()) + for(const room of this._rooms.values()) { - if (!room) continue; + if(!room) continue; - for (const [category, manager] of room.managers.entries()) + for(const [category, manager] of room.managers.entries()) { - if (!manager) continue; + if(!manager) continue; - for (const object of manager.objects.getValues()) + for(const object of manager.objects.getValues()) { - if (!object || object.type !== type) continue; + if(!object || object.type !== type) continue; const visualizationInstance = this._visualizationFactory.getVisualization(visualization); - if (visualizationInstance) + if(visualizationInstance) { visualizationInstance.asset = asset; - if (!visualizationData || !visualizationInstance.initialize(visualizationData)) + if(!visualizationData || !visualizationInstance.initialize(visualizationData)) { manager.removeObject(object.id); } @@ -239,14 +239,14 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst object.setLogic(logicInstance); - if (logicInstance) + if(logicInstance) { logicInstance.initialize(asset.data); } object.isReady = true; - if (this._listener) this._listener.objectInitialized(room.id, object.id, category); + if(this._listener) this._listener.objectInitialized(room.id, object.id, category); } } else @@ -262,15 +262,15 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { const index = this._updateCategories.indexOf(category); - if (index >= 0) return; + if(index >= 0) return; this._updateCategories.push(category); - if (!this._rooms.size) return; + if(!this._rooms.size) return; - for (const room of this._rooms.values()) + for(const room of this._rooms.values()) { - if (!room) continue; + if(!room) continue; room.addUpdateCategory(category); } @@ -280,15 +280,15 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { const index = this._updateCategories.indexOf(category); - if (index === -1) return; + if(index === -1) return; this._updateCategories.splice(index, 1); - if (!this._rooms.size) return; + if(!this._rooms.size) return; - for (const room of this._rooms.values()) + for(const room of this._rooms.values()) { - if (!room) continue; + if(!room) continue; room.removeUpdateCategory(category); } @@ -296,29 +296,29 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst public setContentLoader(loader: IRoomContentLoader): void { - if (this._contentLoader) this._contentLoader.dispose(); + if(this._contentLoader) this._contentLoader.dispose(); this._contentLoader = loader; } private processPendingContentTypes(time: number): void { - if (this._skipContentProcessing) + if(this._skipContentProcessing) { this._skipContentProcessing = false; return; } - while (this._pendingContentTypes.length) + while(this._pendingContentTypes.length) { const type = this._pendingContentTypes.shift(); const collection = this._contentLoader.getCollection(type); - if (!collection) + if(!collection) { - if (this._listener) + if(this._listener) { this._listener.initalizeTemporaryObjectsByType(type, false); } @@ -330,29 +330,29 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst this.reinitializeRoomObjectsByType(type); - if (this._listener) this._listener.initalizeTemporaryObjectsByType(type, true); + if(this._listener) this._listener.initalizeTemporaryObjectsByType(type, true); - if (this._initialLoadList.length > 0) this.removeFromInitialLoad(type); + if(this._initialLoadList.length > 0) this.removeFromInitialLoad(type); } } private removeFromInitialLoad(type: string): void { - if (!type || this._state === RoomManager.ROOM_MANAGER_ERROR) return; + if(!type || this._state === RoomManager.ROOM_MANAGER_ERROR) return; - if (!this._contentLoader) this._state = RoomManager.ROOM_MANAGER_ERROR; + if(!this._contentLoader) this._state = RoomManager.ROOM_MANAGER_ERROR; - if (this._contentLoader.getCollection(type)) + if(this._contentLoader.getCollection(type)) { const i = this._initialLoadList.indexOf(type); - if (i >= 0) this._initialLoadList.splice(i, 1); + if(i >= 0) this._initialLoadList.splice(i, 1); - if (!this._initialLoadList.length) + if(!this._initialLoadList.length) { this._state = RoomManager.ROOM_MANAGER_INITIALIZED; - if (this._listener) + if(this._listener) { this._listener.onRoomEngineInitalized(true); } @@ -362,17 +362,17 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { this._state = RoomManager.ROOM_MANAGER_ERROR; - if (this._listener) this._listener.onRoomEngineInitalized(false); + if(this._listener) this._listener.onRoomEngineInitalized(false); } } private onRoomContentLoadedEvent(event: RoomContentLoadedEvent): void { - if (!this._contentLoader) return; + if(!this._contentLoader) return; const contentType = event.contentType; - if (this._pendingContentTypes.indexOf(contentType) >= 0) return; + if(this._pendingContentTypes.indexOf(contentType) >= 0) return; this._pendingContentTypes.push(contentType); } @@ -381,9 +381,9 @@ export class RoomManager extends NitroManager implements IRoomManager, IRoomInst { this.processPendingContentTypes(time); - if (!this._rooms.size) return; + if(!this._rooms.size) return; - for (const room of this._rooms.values()) room && room.update(time, update); + for(const room of this._rooms.values()) room && room.update(time, update); } public createRoomObjectManager(category: number): IRoomObjectManager diff --git a/src/room/RoomObjectManager.ts b/src/room/RoomObjectManager.ts index 41edf413..be195920 100644 --- a/src/room/RoomObjectManager.ts +++ b/src/room/RoomObjectManager.ts @@ -22,7 +22,7 @@ export class RoomObjectManager implements IRoomObjectManager { const object = this._objects.getValue(id); - if (!object) return null; + if(!object) return null; return object; } @@ -31,7 +31,7 @@ export class RoomObjectManager implements IRoomObjectManager { const object = this._objects.getWithIndex(index); - if (!object) return null; + if(!object) return null; return object; } @@ -45,7 +45,7 @@ export class RoomObjectManager implements IRoomObjectManager private addObject(id: number, type: string, object: IRoomObjectController): IRoomObjectController { - if (this._objects.getValue(id)) + if(this._objects.getValue(id)) { object.dispose(); @@ -56,7 +56,7 @@ export class RoomObjectManager implements IRoomObjectManager const typeMap = this.getTypeMap(type); - if (typeMap) typeMap.add(id, object); + if(typeMap) typeMap.add(id, object); return object; } @@ -65,11 +65,11 @@ export class RoomObjectManager implements IRoomObjectManager { const object = this._objects.remove(id); - if (object) + if(object) { const typeMap = this.getTypeMap(object.type); - if (typeMap) typeMap.remove(object.id); + if(typeMap) typeMap.remove(object.id); object.dispose(); } @@ -79,11 +79,11 @@ export class RoomObjectManager implements IRoomObjectManager { let i = 0; - while (i < this._objects.length) + while(i < this._objects.length) { const object = this._objects.getWithIndex(i); - if (object) object.dispose(); + if(object) object.dispose(); i++; } @@ -92,11 +92,11 @@ export class RoomObjectManager implements IRoomObjectManager i = 0; - while (i < this._objectsPerType.length) + while(i < this._objectsPerType.length) { const typeMap = this._objectsPerType.getWithIndex(i); - if (typeMap) typeMap.dispose(); + if(typeMap) typeMap.dispose(); i++; } @@ -108,7 +108,7 @@ export class RoomObjectManager implements IRoomObjectManager { let existing = this._objectsPerType.getValue(k); - if (!existing && _arg_2) + if(!existing && _arg_2) { existing = new AdvancedMap(); diff --git a/src/room/events/RoomObjectEvent.ts b/src/room/events/RoomObjectEvent.ts index 231ef3fd..954f0a9c 100644 --- a/src/room/events/RoomObjectEvent.ts +++ b/src/room/events/RoomObjectEvent.ts @@ -19,14 +19,14 @@ export class RoomObjectEvent extends NitroEvent public get objectId(): number { - if (!this._object) return -1; + if(!this._object) return -1; return this._object.id; } public get objectType(): string { - if (!this._object) return null; + if(!this._object) return null; return this._object.type; } diff --git a/src/room/renderer/RoomSpriteCanvas.ts b/src/room/renderer/RoomSpriteCanvas.ts index f43d9a3b..d5abb918 100644 --- a/src/room/renderer/RoomSpriteCanvas.ts +++ b/src/room/renderer/RoomSpriteCanvas.ts @@ -121,14 +121,14 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas private setupCanvas(): void { - if (!this._master) + if(!this._master) { this._master = new NitroSprite(); this._master.interactiveChildren = false; } - if (!this._display) + if(!this._display) { const display = new NitroContainer(); @@ -142,32 +142,32 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas { this.cleanSprites(0, true); - if (this._geometry) + if(this._geometry) { this._geometry.dispose(); this._geometry = null; } - if (this._mask) this._mask = null; + if(this._mask) this._mask = null; - if (this._objectCache) + if(this._objectCache) { this._objectCache.dispose(); this._objectCache = null; } - if (this._master) + if(this._master) { - while (this._master.children.length) + while(this._master.children.length) { const child = this._master.removeChildAt(0); child.destroy(); } - if (this._master.parent) this._master.parent.removeChild(this._master); + if(this._master.parent) this._master.parent.removeChild(this._master); this._master.destroy(); @@ -177,16 +177,16 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas this._display = null; this._sortableSprites = []; - if (this._mouseActiveObjects) + if(this._mouseActiveObjects) { this._mouseActiveObjects.clear(); this._mouseActiveObjects = null; } - if (this._spritePool) + if(this._spritePool) { - for (const sprite of this._spritePool) + for(const sprite of this._spritePool) { this.cleanSprite(sprite, true); } @@ -194,7 +194,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas this._spritePool = []; } - if (this._eventCache) + if(this._eventCache) { this._eventCache.clear(); @@ -209,20 +209,20 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas width = width < 1 ? 1 : width; height = height < 1 ? 1 : height; - if (this._usesMask) + if(this._usesMask) { - if (!this._mask) + if(!this._mask) { this._mask = new Graphics() .beginFill(0xFF0000) .drawRect(0, 0, width, height) .endFill(); - if (this._master) + if(this._master) { this._master.addChild(this._mask); - if (this._display) this._display.mask = this._mask; + if(this._display) this._display.mask = this._mask; } } else @@ -235,9 +235,9 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas } } - if (this._master) + if(this._master) { - if (this._master.hitArea) + if(this._master.hitArea) { const hitArea = (this._master.hitArea as Rectangle); @@ -249,7 +249,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas this._master.hitArea = new Rectangle(0, 0, width, height); } - if (this._master.filterArea) + if(this._master.filterArea) { const filterArea = this._master.filterArea; @@ -268,11 +268,11 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas public setMask(flag: boolean): void { - if (flag && !this._usesMask) + if(flag && !this._usesMask) { this._usesMask = true; - if (this._mask && (this._mask.parent !== this._master)) + if(this._mask && (this._mask.parent !== this._master)) { this._master.addChild(this._mask); @@ -280,11 +280,11 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas } } - else if (!flag && this._usesMask) + else if(!flag && this._usesMask) { this._usesMask = false; - if (this._mask && (this._mask.parent === this._master)) + if(this._mask && (this._mask.parent === this._master)) { this._master.removeChild(this._mask); @@ -295,17 +295,17 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas public setScale(scale: number, point: Point = null, offsetPoint: Point = null, override: boolean = false, asDelta: boolean = false): void { - if (!this._master || !this._display) return; + if(!this._master || !this._display) return; - if (this._restrictsScaling && !override) return; + if(this._restrictsScaling && !override) return; - if (!point) point = new Point((this._width / 2), (this._height / 2)); + if(!point) point = new Point((this._width / 2), (this._height / 2)); - if (!offsetPoint) offsetPoint = point; + if(!offsetPoint) offsetPoint = point; point = this._display.toLocal(point); - if (asDelta) + if(asDelta) { this._scale *= scale; } @@ -324,15 +324,15 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas this._totalTimeRunning += PixiApplicationProxy.instance.ticker.deltaTime; - if (this._totalTimeRunning === this._renderTimestamp) return; + if(this._totalTimeRunning === this._renderTimestamp) return; - if (time === -1) time = (this._renderTimestamp + 1); + if(time === -1) time = (this._renderTimestamp + 1); - if (!this._container || !this._geometry) return; + if(!this._container || !this._geometry) return; - if ((this._width !== this._renderedWidth) || (this._height !== this._renderedHeight)) update = true; + if((this._width !== this._renderedWidth) || (this._height !== this._renderedHeight)) update = true; - if ((this._display.x !== this._screenOffsetX) || (this._display.y !== this._screenOffsetY)) + if((this._display.x !== this._screenOffsetX) || (this._display.y !== this._screenOffsetY)) { this._display.x = this._screenOffsetX; this._display.y = this._screenOffsetY; @@ -340,7 +340,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas update = true; } - if (this._display.scale.x !== this._scale) + if(this._display.scale.x !== this._scale) { this._display.scale.set(this._scale); @@ -353,7 +353,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas let updateVisuals = false; - if (frame !== this._lastFrame) + if(frame !== this._lastFrame) { this._lastFrame = frame; @@ -364,11 +364,11 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas const objects = this._container.objects; - if (objects.size) + if(objects.size) { - for (const object of objects.values()) + for(const object of objects.values()) { - if (!object) continue; + if(!object) continue; spriteCount = (spriteCount + this.renderObject(object, object.instanceId.toString(), time, update, updateVisuals, spriteCount)); } @@ -379,25 +379,25 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas return b.z - a.z; }); - if (spriteCount < this._sortableSprites.length) + if(spriteCount < this._sortableSprites.length) { this._sortableSprites.splice(spriteCount); } let iterator = 0; - while (iterator < spriteCount) + while(iterator < spriteCount) { const sprite = this._sortableSprites[iterator]; - if (sprite && sprite.sprite) this.renderSprite(iterator, sprite); + if(sprite && sprite.sprite) this.renderSprite(iterator, sprite); iterator++; } this.cleanSprites(spriteCount); - if (update || updateVisuals) this._canvasUpdated = true; + if(update || updateVisuals) this._canvasUpdated = true; this._renderTimestamp = this._totalTimeRunning; this._renderedWidth = this._width; @@ -433,11 +433,11 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas private renderObject(object: IRoomObject, identifier: string, time: number, update: boolean, updateVisuals: boolean, count: number): number { - if (!object) return 0; + if(!object) return 0; const visualization = object.visualization as IRoomObjectSpriteVisualization; - if (!visualization) + if(!visualization) { this.removeFromCache(identifier); @@ -452,18 +452,18 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas const vector = locationCache.updateLocation(object, this._geometry); - if (!vector) + if(!vector) { this.removeFromCache(identifier); return 0; } - if (updateVisuals) visualization.update(this._geometry, time, (!sortableCache.isEmpty || update), (this._skipObjectUpdate && this._runningSlow)); + if(updateVisuals) visualization.update(this._geometry, time, (!sortableCache.isEmpty || update), (this._skipObjectUpdate && this._runningSlow)); - if (locationCache.locationChanged) update = true; + if(locationCache.locationChanged) update = true; - if (!sortableCache.needsUpdate(visualization.instanceId, visualization.updateSpriteCounter) && !update) + if(!sortableCache.needsUpdate(visualization.instanceId, visualization.updateSpriteCounter) && !update) { return sortableCache.spriteCount; } @@ -472,7 +472,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas let y = vector.y; let z = vector.z; - if (x > 0) z = (z + (x * 1.2E-7)); + if(x > 0) z = (z + (x * 1.2E-7)); else z = (z + (-(x) * 1.2E-7)); x = (x + Math.trunc(this._width / 2)); @@ -480,40 +480,40 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas let spriteCount = 0; - for (const sprite of visualization.sprites.values()) + for(const sprite of visualization.sprites.values()) { - if (!sprite || !sprite.visible) continue; + if(!sprite || !sprite.visible) continue; const texture = sprite.texture; const baseTexture = texture && texture.baseTexture; - if (!texture || !baseTexture) continue; + if(!texture || !baseTexture) continue; const spriteX = ((x + sprite.offsetX) + this._screenOffsetX); const spriteY = ((y + sprite.offsetY) + this._screenOffsetY); - if (sprite.flipH) + if(sprite.flipH) { const checkX = ((x + (-(texture.width + (-(sprite.offsetX))))) + this._screenOffsetX); - if (!this.isSpriteVisible(checkX, spriteY, texture.width, texture.height)) continue; + if(!this.isSpriteVisible(checkX, spriteY, texture.width, texture.height)) continue; } - else if (sprite.flipV) + else if(sprite.flipV) { const checkY = ((y + (-(texture.height + (-(sprite.offsetY))))) + this._screenOffsetY); - if (!this.isSpriteVisible(spriteX, checkY, texture.width, texture.height)) continue; + if(!this.isSpriteVisible(spriteX, checkY, texture.width, texture.height)) continue; } else { - if (!this.isSpriteVisible(spriteX, spriteY, texture.width, texture.height)) continue; + if(!this.isSpriteVisible(spriteX, spriteY, texture.width, texture.height)) continue; } let sortableSprite = sortableCache.getSprite(spriteCount); - if (!sortableSprite) + if(!sortableSprite) { sortableSprite = new SortableSprite(); @@ -526,7 +526,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas sortableSprite.sprite = sprite; - if ((sprite.spriteType === RoomObjectSpriteType.AVATAR) || (sprite.spriteType === RoomObjectSpriteType.AVATAR_OWN)) + if((sprite.spriteType === RoomObjectSpriteType.AVATAR) || (sprite.spriteType === RoomObjectSpriteType.AVATAR_OWN)) { sortableSprite.sprite.libraryAssetName = 'avatar_' + object.id; } @@ -548,41 +548,41 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas private getExtendedSprite(index: number): ExtendedSprite { - if ((index < 0) || (index >= this._spriteCount)) return null; + if((index < 0) || (index >= this._spriteCount)) return null; const sprite = (this._display.getChildAt(index) as ExtendedSprite); - if (!sprite) return null; + if(!sprite) return null; return sprite; } protected getExtendedSpriteIdentifier(sprite: ExtendedSprite): string { - if (!sprite) return ''; + if(!sprite) return ''; return sprite.name; } private renderSprite(index: number, sprite: SortableSprite): boolean { - if (index >= this._spriteCount) + if(index >= this._spriteCount) { this.createAndAddSprite(sprite); return true; } - if (!sprite) return false; + if(!sprite) return false; const objectSprite = sprite.sprite; const extendedSprite = this.getExtendedSprite(index); - if (!objectSprite || !extendedSprite) return false; + if(!objectSprite || !extendedSprite) return false; - if (extendedSprite.varyingDepth !== objectSprite.varyingDepth) + if(extendedSprite.varyingDepth !== objectSprite.varyingDepth) { - if (extendedSprite.varyingDepth && !objectSprite.varyingDepth) + if(extendedSprite.varyingDepth && !objectSprite.varyingDepth) { this._display.removeChildAt(index); @@ -596,7 +596,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas return true; } - if (extendedSprite.needsUpdate(objectSprite.id, objectSprite.updateCounter) || RoomEnterEffect.isVisualizationOn()) + if(extendedSprite.needsUpdate(objectSprite.id, objectSprite.updateCounter) || RoomEnterEffect.isVisualizationOn()) { extendedSprite.tag = objectSprite.tag; extendedSprite.alphaTolerance = objectSprite.alphaTolerance; @@ -607,48 +607,48 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas const alpha = (objectSprite.alpha / 255); - if (extendedSprite.alpha !== alpha) extendedSprite.alpha = alpha; + if(extendedSprite.alpha !== alpha) extendedSprite.alpha = alpha; - if (extendedSprite.tint !== objectSprite.color) extendedSprite.tint = objectSprite.color; + if(extendedSprite.tint !== objectSprite.color) extendedSprite.tint = objectSprite.color; - if (extendedSprite.blendMode !== objectSprite.blendMode) extendedSprite.blendMode = objectSprite.blendMode; + if(extendedSprite.blendMode !== objectSprite.blendMode) extendedSprite.blendMode = objectSprite.blendMode; - if (extendedSprite.texture !== objectSprite.texture) extendedSprite.setTexture(objectSprite.texture); + if(extendedSprite.texture !== objectSprite.texture) extendedSprite.setTexture(objectSprite.texture); - if (objectSprite.updateContainer) + if(objectSprite.updateContainer) { const length = extendedSprite.children.length; - if (length === 1) extendedSprite.removeChildAt(0); + if(length === 1) extendedSprite.removeChildAt(0); extendedSprite.addChild(objectSprite.container); objectSprite.updateContainer = false; } - if (objectSprite.flipH) + if(objectSprite.flipH) { - if (extendedSprite.scale.x !== -1) extendedSprite.scale.x = -1; + if(extendedSprite.scale.x !== -1) extendedSprite.scale.x = -1; } else { - if (extendedSprite.scale.x !== 1) extendedSprite.scale.x = 1; + if(extendedSprite.scale.x !== 1) extendedSprite.scale.x = 1; } - if (objectSprite.flipV) + if(objectSprite.flipV) { - if (extendedSprite.scale.y !== -1) extendedSprite.scale.y = -1; + if(extendedSprite.scale.y !== -1) extendedSprite.scale.y = -1; } else { - if (extendedSprite.scale.y !== 1) extendedSprite.scale.y = 1; + if(extendedSprite.scale.y !== 1) extendedSprite.scale.y = 1; } this.updateEnterRoomEffect(extendedSprite, objectSprite); } - if (extendedSprite.x !== sprite.x) extendedSprite.x = sprite.x; - if (extendedSprite.y !== sprite.y) extendedSprite.y = sprite.y; + if(extendedSprite.x !== sprite.x) extendedSprite.x = sprite.x; + if(extendedSprite.y !== sprite.y) extendedSprite.y = sprite.y; extendedSprite.offsetX = objectSprite.offsetX; extendedSprite.offsetY = objectSprite.offsetY; @@ -660,15 +660,15 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas { const sprite = sortableSprite.sprite; - if (!sprite) return; + if(!sprite) return; let extendedSprite: ExtendedSprite = null; - if (this._spritePool.length > 0) extendedSprite = this._spritePool.pop(); + if(this._spritePool.length > 0) extendedSprite = this._spritePool.pop(); - if (!extendedSprite) extendedSprite = new ExtendedSprite(); + if(!extendedSprite) extendedSprite = new ExtendedSprite(); - if (extendedSprite.children.length) extendedSprite.removeChildren(); + if(extendedSprite.children.length) extendedSprite.removeChildren(); extendedSprite.tag = sprite.tag; extendedSprite.alphaTolerance = sprite.alphaTolerance; @@ -686,20 +686,20 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas extendedSprite.setTexture(sprite.texture); - if (sprite.updateContainer) + if(sprite.updateContainer) { extendedSprite.addChild(sprite.container); sprite.updateContainer = false; } - if (sprite.flipH) extendedSprite.scale.x = -1; + if(sprite.flipH) extendedSprite.scale.x = -1; - if (sprite.flipV) extendedSprite.scale.y = -1; + if(sprite.flipV) extendedSprite.scale.y = -1; this.updateEnterRoomEffect(extendedSprite, sprite); - if ((index < 0) || (index >= this._spriteCount)) + if((index < 0) || (index >= this._spriteCount)) { this._display.addChild(extendedSprite); @@ -715,15 +715,15 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas private cleanSprites(spriteCount: number, _arg_2: boolean = false): void { - if (!this._display) return; + if(!this._display) return; - if (spriteCount < 0) spriteCount = 0; + if(spriteCount < 0) spriteCount = 0; - if ((spriteCount < this._activeSpriteCount) || !this._activeSpriteCount) + if((spriteCount < this._activeSpriteCount) || !this._activeSpriteCount) { let iterator = (this._spriteCount - 1); - while (iterator >= spriteCount) + while(iterator >= spriteCount) { this.cleanSprite(this.getExtendedSprite(iterator), _arg_2); @@ -736,9 +736,9 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas private updateEnterRoomEffect(sprite: ExtendedSprite, _arg_2: IRoomObjectSprite): void { - if (!RoomEnterEffect.isVisualizationOn() || !_arg_2) return; + if(!RoomEnterEffect.isVisualizationOn() || !_arg_2) return; - switch (_arg_2.spriteType) + switch(_arg_2.spriteType) { case RoomObjectSpriteType.AVATAR_OWN: return; @@ -755,15 +755,15 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas private cleanSprite(sprite: ExtendedSprite, _arg_2: boolean): void { - if (!sprite) return; + if(!sprite) return; - if (!_arg_2) + if(!_arg_2) { sprite.setTexture(null); } else { - if (sprite.parent) sprite.parent.removeChild(sprite); + if(sprite.parent) sprite.parent.removeChild(sprite); sprite.destroy({ children: true @@ -773,7 +773,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas public update(): void { - if (!this._mouseCheckCount) + if(!this._mouseCheckCount) { //this.checkMouseHits(this._mouseLocation.x, this._mouseLocation.y, MouseEventType.MOUSE_MOVE); } @@ -795,16 +795,16 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas private isSpriteVisible(x: number, y: number, width: number, height: number): boolean { - if (this._noSpriteVisibilityChecking) return true; + if(this._noSpriteVisibilityChecking) return true; x = (((x - this._screenOffsetX) * this._scale) + this._screenOffsetX); y = (((y - this._screenOffsetY) * this._scale) + this._screenOffsetY); width = (width * this._scale); height = (height * this._scale); - if (((x < this._width) && ((x + width) >= 0)) && ((y < this._height) && ((y + height) >= 0))) + if(((x < this._width) && ((x + width) >= 0)) && ((y < this._height) && ((y + height) >= 0))) { - if (!this._usesExclusionRectangles) return true; + if(!this._usesExclusionRectangles) return true; } return false; @@ -818,7 +818,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas this._mouseLocation.x = (x / this._scale); this._mouseLocation.y = (y / this._scale); - if ((this._mouseCheckCount > 0) && (type == MouseEventType.MOUSE_MOVE)) return this._mouseSpriteWasHit; + if((this._mouseCheckCount > 0) && (type == MouseEventType.MOUSE_MOVE)) return this._mouseSpriteWasHit; this._mouseSpriteWasHit = this.checkMouseHits(Math.trunc(x / this._scale), Math.trunc(y / this._scale), type, altKey, ctrlKey, shiftKey, buttonDown); @@ -835,13 +835,13 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas let mouseEvent: IRoomSpriteMouseEvent = null; let spriteId = (this._activeSpriteCount - 1); - while (spriteId >= 0) + while(spriteId >= 0) { const extendedSprite = this.getExtendedSprite(spriteId); - if (extendedSprite && extendedSprite.containsPoint(new Point((x - extendedSprite.x), (y - extendedSprite.y)))) + if(extendedSprite && extendedSprite.containsPoint(new Point((x - extendedSprite.x), (y - extendedSprite.y)))) { - if (extendedSprite.clickHandling && ((type === MouseEventType.MOUSE_CLICK) || (type === MouseEventType.DOUBLE_CLICK))) + if(extendedSprite.clickHandling && ((type === MouseEventType.MOUSE_CLICK) || (type === MouseEventType.DOUBLE_CLICK))) { // } @@ -849,15 +849,15 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas { const identifier = this.getExtendedSpriteIdentifier(extendedSprite); - if (checkedSprites.indexOf(identifier) === -1) + if(checkedSprites.indexOf(identifier) === -1) { const tag = extendedSprite.tag; let mouseData = this._mouseActiveObjects.get(identifier); - if (mouseData) + if(mouseData) { - if (mouseData.spriteTag !== tag) + if(mouseData.spriteTag !== tag) { mouseEvent = this.createMouseEvent(0, 0, 0, 0, MouseEventType.ROLL_OUT, mouseData.spriteTag, altKey, ctrlKey, shiftKey, buttonDown); @@ -865,7 +865,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas } } - if ((type === MouseEventType.MOUSE_MOVE) && (!mouseData || (mouseData.spriteTag !== tag))) + if((type === MouseEventType.MOUSE_MOVE) && (!mouseData || (mouseData.spriteTag !== tag))) { mouseEvent = this.createMouseEvent(x, y, (x - extendedSprite.x), (y - extendedSprite.y), MouseEventType.ROLL_OVER, tag, altKey, ctrlKey, shiftKey, buttonDown); } @@ -877,7 +877,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas mouseEvent.spriteOffsetY = extendedSprite.offsetY; } - if (!mouseData) + if(!mouseData) { mouseData = new ObjectMouseData(); @@ -887,7 +887,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas mouseData.spriteTag = tag; - if (((type !== MouseEventType.MOUSE_MOVE) || (x !== this._mouseOldX)) || (y !== this._mouseOldY)) + if(((type !== MouseEventType.MOUSE_MOVE) || (x !== this._mouseOldX)) || (y !== this._mouseOldY)) { this.bufferMouseEvent(mouseEvent, identifier); } @@ -904,30 +904,30 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas const keys: string[] = []; - for (const key of this._mouseActiveObjects.keys()) key && keys.push(key); + for(const key of this._mouseActiveObjects.keys()) key && keys.push(key); let index = 0; - while (index < keys.length) + while(index < keys.length) { const key = keys[index]; - if (checkedSprites.indexOf(key) >= 0) keys[index] = null; + if(checkedSprites.indexOf(key) >= 0) keys[index] = null; index++; } index = 0; - while (index < keys.length) + while(index < keys.length) { const key = keys[index]; - if (key !== null) + if(key !== null) { const existing = this._mouseActiveObjects.get(key); - if (existing) this._mouseActiveObjects.delete(key); + if(existing) this._mouseActiveObjects.delete(key); const mouseEvent = this.createMouseEvent(0, 0, 0, 0, MouseEventType.ROLL_OUT, existing.spriteTag, altKey, ctrlKey, shiftKey, buttonDown); @@ -955,7 +955,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas protected bufferMouseEvent(k: IRoomSpriteMouseEvent, _arg_2: string): void { - if (!k || !this._eventCache) return; + if(!k || !this._eventCache) return; this._eventCache.delete(_arg_2); this._eventCache.set(_arg_2, k); @@ -963,19 +963,19 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas protected processMouseEvents(): void { - if (!this._container || !this._eventCache) return; + if(!this._container || !this._eventCache) return; - for (const [key, event] of this._eventCache.entries()) + for(const [key, event] of this._eventCache.entries()) { - if (!this._eventCache) return; + if(!this._eventCache) return; - if (!event) continue; + if(!event) continue; const roomObject = this._container.getRoomObject(parseInt(key)); - if (!roomObject) continue; + if(!roomObject) continue; - if (this._mouseListener) + if(this._mouseListener) { this._mouseListener.processRoomCanvasMouseEvent(event, roomObject, this._geometry); } @@ -983,14 +983,14 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas { const logic = roomObject.mouseHandler; - if (logic) + if(logic) { logic.mouseEvent(event, this._geometry); } } } - if (this._eventCache) this._eventCache.clear(); + if(this._eventCache) this._eventCache.clear(); } public getDisplayAsTexture(): RenderTexture @@ -1033,7 +1033,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas { const geometry = (this.geometry as RoomGeometry); - if (this._rotation !== 0) + if(this._rotation !== 0) { let direction = this._effectDirection; @@ -1059,18 +1059,18 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas this._effectDirection.assign(geometry.direction); } - if (RoomShakingEffect.isVisualizationOn() && !this._SafeStr_4507) + if(RoomShakingEffect.isVisualizationOn() && !this._SafeStr_4507) { this.changeShaking(); } else { - if (!RoomShakingEffect.isVisualizationOn() && this._SafeStr_4507) this.changeShaking(); + if(!RoomShakingEffect.isVisualizationOn() && this._SafeStr_4507) this.changeShaking(); } - if (RoomRotatingEffect.isVisualizationOn()) this.changeRotation(); + if(RoomRotatingEffect.isVisualizationOn()) this.changeRotation(); - if (this._SafeStr_4507) + if(this._SafeStr_4507) { this._SafeStr_795++; @@ -1091,7 +1091,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas { this._SafeStr_4507 = !this._SafeStr_4507; - if (this._SafeStr_4507) + if(this._SafeStr_4507) { const direction = this.geometry.direction; @@ -1101,13 +1101,13 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas private changeRotation(): void { - if (this._SafeStr_4507) return; + if(this._SafeStr_4507) return; const geometry = (this.geometry as RoomGeometry); - if (!geometry) return; + if(!geometry) return; - if (this._rotation === 0) + if(this._rotation === 0) { const location = geometry.location; const directionAxis = geometry.directionAxis; @@ -1119,7 +1119,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas const intersection = RoomGeometry.getIntersectionVector(location, directionAxis, new Vector3d(0, 0, 0), new Vector3d(0, 0, 1)); - if (intersection !== null) + if(intersection !== null) { this._rotationOrigin = new Vector3d(intersection.x, intersection.y, intersection.z); this._rotationRodLength = Vector3d.dif(intersection, location).length; @@ -1138,9 +1138,9 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas public moveLeft(): void { - if (this._rotation !== 0) + if(this._rotation !== 0) { - if (this._rotation === 1) + if(this._rotation === 1) { this._rotation = -1; } @@ -1160,9 +1160,9 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas public moveRight(): void { - if (this._rotation !== 0) + if(this._rotation !== 0) { - if (this._rotation === -1) + if(this._rotation === -1) { this._rotation = 1; } @@ -1182,7 +1182,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas public moveUp(): void { - if (this._rotation !== 0) return; + if(this._rotation !== 0) return; const geometry = (this.geometry as RoomGeometry); const direction = ((geometry.direction.x / 180) * 3.14159265358979); @@ -1192,7 +1192,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas public moveDown(): void { - if (this._rotation !== 0) return; + if(this._rotation !== 0) return; const geometry = (this.geometry as RoomGeometry); const direction = (((geometry.direction.x + 180) / 180) * 3.14159265358979); diff --git a/src/room/utils/RoomEnterEffect.ts b/src/room/utils/RoomEnterEffect.ts index ae85dba7..407aaf5d 100644 --- a/src/room/utils/RoomEnterEffect.ts +++ b/src/room/utils/RoomEnterEffect.ts @@ -25,11 +25,11 @@ export class RoomEnterEffect public static turnVisualizationOn(): void { - if ((RoomEnterEffect._state === RoomEnterEffect.STATE_NOT_INITIALIZED) || (RoomEnterEffect._state === RoomEnterEffect.STATE_OVER)) return; + if((RoomEnterEffect._state === RoomEnterEffect.STATE_NOT_INITIALIZED) || (RoomEnterEffect._state === RoomEnterEffect.STATE_OVER)) return; const k = (GetTickerTime() - RoomEnterEffect._initializationTimeMs); - if (k > (RoomEnterEffect._startDelayMs + RoomEnterEffect._effectDurationMs)) + if(k > (RoomEnterEffect._startDelayMs + RoomEnterEffect._effectDurationMs)) { RoomEnterEffect._state = RoomEnterEffect.STATE_OVER; @@ -38,7 +38,7 @@ export class RoomEnterEffect RoomEnterEffect._visualizationOn = true; - if (k < RoomEnterEffect._startDelayMs) + if(k < RoomEnterEffect._startDelayMs) { RoomEnterEffect._state = RoomEnterEffect.STATE_START_DELAY; @@ -61,7 +61,7 @@ export class RoomEnterEffect public static isRunning(): boolean { - if ((RoomEnterEffect._state === RoomEnterEffect.STATE_START_DELAY) || (RoomEnterEffect._state === RoomEnterEffect.STATE_RUNNING)) return true; + if((RoomEnterEffect._state === RoomEnterEffect.STATE_START_DELAY) || (RoomEnterEffect._state === RoomEnterEffect.STATE_RUNNING)) return true; return false; } diff --git a/src/room/utils/RoomGeometry.ts b/src/room/utils/RoomGeometry.ts index 595218a3..45885e16 100644 --- a/src/room/utils/RoomGeometry.ts +++ b/src/room/utils/RoomGeometry.ts @@ -45,7 +45,7 @@ export class RoomGeometry implements IRoomGeometry this.z_scale = 1; this.location = new Vector3d(location.x, location.y, location.z); this.direction = new Vector3d(direction.x, direction.y, direction.z); - if (_arg_4 != null) + if(_arg_4 != null) { this.setDepthVector(_arg_4); } @@ -59,7 +59,7 @@ export class RoomGeometry implements IRoomGeometry public static getIntersectionVector(k: IVector3D, _arg_2: IVector3D, _arg_3: IVector3D, _arg_4: IVector3D): IVector3D { const _local_5: number = Vector3d.dotProduct(_arg_2, _arg_4); - if (Math.abs(_local_5) < 1E-5) + if(Math.abs(_local_5) < 1E-5) { return null; } @@ -82,12 +82,12 @@ export class RoomGeometry implements IRoomGeometry public set scale(scale: number) { - if (scale <= 1) + if(scale <= 1) { scale = 1; } scale = (scale * Math.sqrt(0.5)); - if (scale != this._scale) + if(scale != this._scale) { this._scale = scale; this._updateId++; @@ -110,11 +110,11 @@ export class RoomGeometry implements IRoomGeometry public set location(location: IVector3D) { - if (location == null) + if(location == null) { return; } - if (this._loc == null) + if(this._loc == null) { this._loc = new Vector3d(); } @@ -125,7 +125,7 @@ export class RoomGeometry implements IRoomGeometry this._loc.x = (this._loc.x / this._x_scale); this._loc.y = (this._loc.y / this._y_scale); this._loc.z = (this._loc.z / this._z_scale); - if ((((!(this._loc.x == _local_2)) || (!(this._loc.y == _local_3))) || (!(this._loc.z == _local_4)))) + if((((!(this._loc.x == _local_2)) || (!(this._loc.y == _local_3))) || (!(this._loc.z == _local_4)))) { this._updateId++; } @@ -143,11 +143,11 @@ export class RoomGeometry implements IRoomGeometry let _local_23: IVector3D; let _local_24: IVector3D; let _local_25: IVector3D; - if (direction == null) + if(direction == null) { return; } - if (this._dir == null) + if(this._dir == null) { this._dir = new Vector3d(); } @@ -156,7 +156,7 @@ export class RoomGeometry implements IRoomGeometry const _local_4: number = this._dir.z; this._dir.assign(direction); this._direction.assign(direction); - if ((((!(this._dir.x == _local_2)) || (!(this._dir.y == _local_3))) || (!(this._dir.z == _local_4)))) + if((((!(this._dir.x == _local_2)) || (!(this._dir.y == _local_3))) || (!(this._dir.z == _local_4)))) { this._updateId++; } @@ -176,7 +176,7 @@ export class RoomGeometry implements IRoomGeometry const _local_18: IVector3D = new Vector3d(_local_13.x, _local_13.y, _local_13.z); const _local_19: IVector3D = Vector3d.sum(Vector3d.product(_local_14, _local_16), Vector3d.product(_local_15, _local_17)); const _local_20: IVector3D = Vector3d.sum(Vector3d.product(_local_14, -(_local_17)), Vector3d.product(_local_15, _local_16)); - if (_local_10 != 0) + if(_local_10 != 0) { _local_21 = Math.cos(_local_10); _local_22 = Math.sin(_local_10); @@ -199,7 +199,7 @@ export class RoomGeometry implements IRoomGeometry public set x_scale(xScale: number) { - if (this._x_scale != (xScale * this._x_scale_internal)) + if(this._x_scale != (xScale * this._x_scale_internal)) { this._x_scale = (xScale * this._x_scale_internal); this._updateId++; @@ -208,7 +208,7 @@ export class RoomGeometry implements IRoomGeometry public set y_scale(yScale: number) { - if (this._y_scale != (yScale * this._y_scale_internal)) + if(this._y_scale != (yScale * this._y_scale_internal)) { this._y_scale = (yScale * this._y_scale_internal); this._updateId++; @@ -217,7 +217,7 @@ export class RoomGeometry implements IRoomGeometry public set z_scale(zScale: number) { - if (this._z_scale != (zScale * this._z_scale_internal)) + if(this._z_scale != (zScale * this._z_scale_internal)) { this._z_scale = (zScale * this._z_scale_internal); this._updateId++; @@ -233,7 +233,7 @@ export class RoomGeometry implements IRoomGeometry this._dir = null; this._directionAxis = null; this._location = null; - if (this._displacements != null) + if(this._displacements != null) { this._displacements.clear(); this._displacements = null; @@ -244,11 +244,11 @@ export class RoomGeometry implements IRoomGeometry { let _local_3: string; let _local_4: IVector3D; - if (((k == null) || (_arg_2 == null))) + if(((k == null) || (_arg_2 == null))) { return; } - if (this._displacements != null) + if(this._displacements != null) { _local_3 = Math.trunc(Math.round(k.x)) + '_' + Math.trunc(Math.round(k.y)) + '_' + Math.trunc(Math.round(k.z)); this._displacements.delete(_local_3); @@ -262,7 +262,7 @@ export class RoomGeometry implements IRoomGeometry private getDisplacenent(k: IVector3D): IVector3D { let _local_2: string; - if (this._displacements != null) + if(this._displacements != null) { _local_2 = Math.trunc(Math.round(k.x)) + '_' + Math.trunc(Math.round(k.y)) + '_' + Math.trunc(Math.round(k.z)); return this._displacements.get(_local_2); @@ -293,7 +293,7 @@ export class RoomGeometry implements IRoomGeometry const _local_15: IVector3D = new Vector3d(_local_10.x, _local_10.y, _local_10.z); const _local_16: IVector3D = Vector3d.sum(Vector3d.product(_local_11, _local_13), Vector3d.product(_local_12, _local_14)); const _local_17: IVector3D = Vector3d.sum(Vector3d.product(_local_11, -(_local_14)), Vector3d.product(_local_12, _local_13)); - if (_local_7 != 0) + if(_local_7 != 0) { _local_18 = Math.cos(_local_7); _local_19 = Math.sin(_local_7); @@ -311,7 +311,7 @@ export class RoomGeometry implements IRoomGeometry public adjustLocation(k: IVector3D, _arg_2: number): void { - if (((k == null) || (this._z == null))) + if(((k == null) || (this._z == null))) { return; } @@ -322,7 +322,7 @@ export class RoomGeometry implements IRoomGeometry public getCoordinatePosition(k: IVector3D): IVector3D { - if (k == null) + if(k == null) { return null; } @@ -340,7 +340,7 @@ export class RoomGeometry implements IRoomGeometry _local_2.y = (_local_2.y * this._y_scale); _local_2.z = (_local_2.z * this._z_scale); let _local_3: number = Vector3d.scalarProjection(_local_2, this._depth); - if (((_local_3 < this._clipNear) || (_local_3 > this._clipFar))) + if(((_local_3 < this._clipNear) || (_local_3 > this._clipFar))) { return null; } @@ -349,7 +349,7 @@ export class RoomGeometry implements IRoomGeometry _local_4 = (_local_4 * this._scale); _local_5 = (_local_5 * this._scale); const _local_6: IVector3D = this.getDisplacenent(k); - if (_local_6 != null) + if(_local_6 != null) { _local_2 = Vector3d.dif(k, this._loc); _local_2.add(_local_6); @@ -367,7 +367,7 @@ export class RoomGeometry implements IRoomGeometry public getScreenPoint(k: IVector3D): Point { const _local_2: IVector3D = this.getScreenPosition(k); - if (_local_2 == null) + if(_local_2 == null) { return null; } @@ -392,7 +392,7 @@ export class RoomGeometry implements IRoomGeometry const _local_13: IVector3D = Vector3d.crossProduct(_local_11, _local_12); const _local_14: IVector3D = new Vector3d(); _local_14.assign(RoomGeometry.getIntersectionVector(_local_8, _local_9, _local_10, _local_13)); - if (_local_14 != null) + if(_local_14 != null) { _local_14.subtract(_local_10); _local_15 = ((Vector3d.scalarProjection(_local_14, _arg_3) / _local_11.length) * _arg_3.length); @@ -404,7 +404,7 @@ export class RoomGeometry implements IRoomGeometry public performZoom(): void { - if (this.isZoomedIn()) + if(this.isZoomedIn()) { this.scale = RoomGeometry.SCALE_ZOOMED_OUT; } diff --git a/src/room/utils/RoomRotatingEffect.ts b/src/room/utils/RoomRotatingEffect.ts index 81568ef1..8b2e3135 100644 --- a/src/room/utils/RoomRotatingEffect.ts +++ b/src/room/utils/RoomRotatingEffect.ts @@ -26,13 +26,13 @@ export class RoomRotatingEffect public static turnVisualizationOn(): void { - if ((this._SafeStr_448 === 0) || (this._SafeStr_448 === 3)) return; + if((this._SafeStr_448 === 0) || (this._SafeStr_448 === 3)) return; - if (!this._SafeStr_4524) this._SafeStr_4524 = setTimeout(() => this.turnVisualizationOff(), this._SafeStr_4516); + if(!this._SafeStr_4524) this._SafeStr_4524 = setTimeout(() => this.turnVisualizationOff(), this._SafeStr_4516); const _local_1 = (GetTickerTime() - this._SafeStr_4514); - if (_local_1 > (this._SafeStr_4515 + this._SafeStr_4516)) + if(_local_1 > (this._SafeStr_4515 + this._SafeStr_4516)) { this._SafeStr_448 = 3; @@ -41,7 +41,7 @@ export class RoomRotatingEffect this._SafeStr_4512 = true; - if (_local_1 < this._SafeStr_4515) + if(_local_1 < this._SafeStr_4515) { this._SafeStr_448 = 1; @@ -68,7 +68,7 @@ export class RoomRotatingEffect private static isRunning(): boolean { - if ((this._SafeStr_448 === 1) || (this._SafeStr_448 === 2)) return true; + if((this._SafeStr_448 === 1) || (this._SafeStr_448 === 2)) return true; return false; } diff --git a/src/room/utils/RoomShakingEffect.ts b/src/room/utils/RoomShakingEffect.ts index ce1e0e74..5fd142e7 100644 --- a/src/room/utils/RoomShakingEffect.ts +++ b/src/room/utils/RoomShakingEffect.ts @@ -26,13 +26,13 @@ export class RoomShakingEffect public static turnVisualizationOn(): void { - if ((this._SafeStr_448 === 0) || (this._SafeStr_448 === 3)) return; + if((this._SafeStr_448 === 0) || (this._SafeStr_448 === 3)) return; - if (!this._SafeStr_4524) this._SafeStr_4524 = setTimeout(() => this.turnVisualizationOff(), this._SafeStr_4516); + if(!this._SafeStr_4524) this._SafeStr_4524 = setTimeout(() => this.turnVisualizationOff(), this._SafeStr_4516); const _local_1 = (GetTickerTime() - this._SafeStr_4514); - if (_local_1 > (this._SafeStr_4515 + this._SafeStr_4516)) + if(_local_1 > (this._SafeStr_4515 + this._SafeStr_4516)) { this._SafeStr_448 = 3; @@ -41,7 +41,7 @@ export class RoomShakingEffect this._SafeStr_4512 = true; - if (_local_1 < this._SafeStr_4515) + if(_local_1 < this._SafeStr_4515) { this._SafeStr_448 = 1; @@ -68,7 +68,7 @@ export class RoomShakingEffect private static isRunning(): boolean { - if ((this._SafeStr_448 === 1) || (this._SafeStr_448 === 2)) return true; + if((this._SafeStr_448 === 1) || (this._SafeStr_448 === 2)) return true; return false; }