From 7179c7e770f4353435e67a935ae7fd95b2b13e97 Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 2 Feb 2022 16:09:50 -0500 Subject: [PATCH] Random changes --- src/core/common/logger/NitroLogger.ts | 2 +- src/nitro/avatar/pets/PetFigureData.ts | 2 +- .../object/visualization/furniture/FurnitureVisualization.ts | 2 +- src/nitro/room/preview/RoomPreviewer.ts | 4 +--- src/room/utils/SpriteUtilities.ts | 4 ++++ 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/core/common/logger/NitroLogger.ts b/src/core/common/logger/NitroLogger.ts index d2074498..68e69f93 100644 --- a/src/core/common/logger/NitroLogger.ts +++ b/src/core/common/logger/NitroLogger.ts @@ -39,7 +39,7 @@ export class NitroLogger implements INitroLogger public static log(message: string, name: string = 'Nitro', modus: string = null): void { - const logString = `[Nitro] ${ new Date().toDateString() } [${ name }] ${ message } ${ this.getTimestamp() }`; + const logString = `[Nitro] [${ name }] ${ message } ${ this.getTimestamp() }`; switch(modus) { diff --git a/src/nitro/avatar/pets/PetFigureData.ts b/src/nitro/avatar/pets/PetFigureData.ts index 57a0f102..105811c3 100644 --- a/src/nitro/avatar/pets/PetFigureData.ts +++ b/src/nitro/avatar/pets/PetFigureData.ts @@ -225,4 +225,4 @@ export class PetFigureData return false; } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts b/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts index 34fa84dd..fd1a3aff 100644 --- a/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts +++ b/src/nitro/room/object/visualization/furniture/FurnitureVisualization.ts @@ -506,7 +506,7 @@ export class FurnitureVisualization extends RoomObjectSpriteVisualization protected getLayerYOffset(scale: number, direction: number, layerId: number): number { - if(layerId === this._shadowLayerIndex) return Math.ceil((this._furnitureLift * (64 / 2))); + if(layerId === this._shadowLayerIndex) return Math.ceil((this._furnitureLift * (scale / 2))); const existing = this._spriteYOffsets[layerId]; diff --git a/src/nitro/room/preview/RoomPreviewer.ts b/src/nitro/room/preview/RoomPreviewer.ts index 1dbefffa..11bd9eeb 100644 --- a/src/nitro/room/preview/RoomPreviewer.ts +++ b/src/nitro/room/preview/RoomPreviewer.ts @@ -258,8 +258,6 @@ export class RoomPreviewer if(this.isRoomEngineReady) { - if((this._currentPreviewObjectCategory === RoomObjectCategory.FLOOR) && (this._currentPreviewObjectType === classId)) return RoomPreviewer.PREVIEW_OBJECT_ID; - this.reset(false); this._currentPreviewObjectType = classId; @@ -512,7 +510,7 @@ export class RoomPreviewer return this._addViewOffset; } - private updatePreviewObjectBoundingRectangle(point: Point): void + public updatePreviewObjectBoundingRectangle(point: Point): void { const objectBounds = this._roomEngine.getRoomObjectBoundingRectangle(this._previewRoomId, RoomPreviewer.PREVIEW_OBJECT_ID, this._currentPreviewObjectCategory, RoomPreviewer.PREVIEW_CANVAS_ID); diff --git a/src/room/utils/SpriteUtilities.ts b/src/room/utils/SpriteUtilities.ts index 00a7186d..4cd5f31e 100644 --- a/src/room/utils/SpriteUtilities.ts +++ b/src/room/utils/SpriteUtilities.ts @@ -11,6 +11,10 @@ export class SpriteUtilities { if(ink == 'ADD' || ink == 33) return BLEND_MODES.ADD; + if(ink == 'SUBTRACT') return BLEND_MODES.SUBTRACT; + + if(ink == 'DARKEN') return BLEND_MODES.DARKEN; + return BLEND_MODES.NORMAL; } }