From 70a6410a99811e80754a8828985395bf89003980 Mon Sep 17 00:00:00 2001
From: Bill <billsonnn@live.com>
Date: Wed, 20 Apr 2022 11:58:03 -0400
Subject: [PATCH] Updates

---
 .../handshake/ClientHelloMessageComposer.ts   |  2 +-
 src/nitro/room/RoomEngine.ts                  |  8 ++++----
 src/nitro/room/RoomObjectEventHandler.ts      |  8 ++++++++
 .../events/RoomEngineTriggerWidgetEvent.ts    |  2 ++
 .../events/RoomObjectWidgetRequestEvent.ts    |  2 ++
 .../FurnitureCustomStackHeightLogic.ts        | 19 ++++++++++++++++---
 .../furniture/FurnitureExternalImageLogic.ts  | 19 ++++++++++++++++---
 .../visualization/pet/PetVisualization.ts     |  2 ++
 8 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/src/nitro/communication/messages/outgoing/handshake/ClientHelloMessageComposer.ts b/src/nitro/communication/messages/outgoing/handshake/ClientHelloMessageComposer.ts
index 775075bc..41bdd43c 100644
--- a/src/nitro/communication/messages/outgoing/handshake/ClientHelloMessageComposer.ts
+++ b/src/nitro/communication/messages/outgoing/handshake/ClientHelloMessageComposer.ts
@@ -9,7 +9,7 @@ export class ClientHelloMessageComposer implements IMessageComposer<ConstructorP
 
     constructor(releaseVersion: string, type: string, platform: number, category: number)
     {
-        this._data = [ NitroVersion.RENDERER_VERSION, 'HTML5', ClientPlatformEnum.HTML5, ClientDeviceCategoryEnum.BROWSER ];
+        this._data = [ `NITRO-${ NitroVersion.RENDERER_VERSION.replaceAll('.', '-') }`, 'HTML5', ClientPlatformEnum.HTML5, ClientDeviceCategoryEnum.BROWSER ];
     }
 
     public getMessageArray()
diff --git a/src/nitro/room/RoomEngine.ts b/src/nitro/room/RoomEngine.ts
index 38c6f35d..b40a6a9f 100644
--- a/src/nitro/room/RoomEngine.ts
+++ b/src/nitro/room/RoomEngine.ts
@@ -802,17 +802,17 @@ export class RoomEngine extends NitroManager implements IRoomEngine, IRoomCreato
         return true;
     }
 
-    public updateObjectRoomColor(k: number, _arg_2: number, _arg_3: number, _arg_4: boolean): boolean
+    public updateObjectRoomColor(roomId: number, color: number, light: number, backgroundOnly: boolean): boolean
     {
-        const roomObject = this.getRoomOwnObject(k);
+        const roomObject = this.getRoomOwnObject(roomId);
 
         if(!roomObject || !roomObject.logic) return false;
 
-        const event = new ObjectRoomColorUpdateMessage(ObjectRoomColorUpdateMessage.BACKGROUND_COLOR, _arg_2, _arg_3, _arg_4);
+        const event = new ObjectRoomColorUpdateMessage(ObjectRoomColorUpdateMessage.BACKGROUND_COLOR, color, light, backgroundOnly);
 
         roomObject.logic.processUpdateMessage(event);
 
-        this.events.dispatchEvent(new RoomBackgroundColorEvent(k, _arg_2, _arg_3, _arg_4));
+        this.events.dispatchEvent(new RoomBackgroundColorEvent(roomId, color, light, backgroundOnly));
 
         return true;
     }
diff --git a/src/nitro/room/RoomObjectEventHandler.ts b/src/nitro/room/RoomObjectEventHandler.ts
index 1ce23390..713e2147 100644
--- a/src/nitro/room/RoomObjectEventHandler.ts
+++ b/src/nitro/room/RoomObjectEventHandler.ts
@@ -259,6 +259,8 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
             case RoomObjectWidgetRequestEvent.CLOSE_FURNI_CONTEXT_MENU:
             case RoomObjectWidgetRequestEvent.PLACEHOLDER:
             case RoomObjectWidgetRequestEvent.CREDITFURNI:
+            case RoomObjectWidgetRequestEvent.STACK_HEIGHT:
+            case RoomObjectWidgetRequestEvent.EXTERNAL_IMAGE:
             case RoomObjectWidgetRequestEvent.STICKIE:
             case RoomObjectWidgetRequestEvent.PRESENT:
             case RoomObjectWidgetRequestEvent.TROPHY:
@@ -781,6 +783,12 @@ export class RoomObjectEventHandler extends Disposable implements IRoomCanvasMou
             case RoomObjectWidgetRequestEvent.CREDITFURNI:
                 eventDispatcher.dispatchEvent(new RoomEngineTriggerWidgetEvent(RoomEngineTriggerWidgetEvent.REQUEST_CREDITFURNI, roomId, objectId, objectCategory));
                 return;
+            case RoomObjectWidgetRequestEvent.STACK_HEIGHT:
+                eventDispatcher.dispatchEvent(new RoomEngineTriggerWidgetEvent(RoomEngineTriggerWidgetEvent.REQUEST_STACK_HEIGHT, roomId, objectId, objectCategory));
+                return;
+            case RoomObjectWidgetRequestEvent.EXTERNAL_IMAGE:
+                eventDispatcher.dispatchEvent(new RoomEngineTriggerWidgetEvent(RoomEngineTriggerWidgetEvent.REQUEST_EXTERNAL_IMAGE, roomId, objectId, objectCategory));
+                return;
             case RoomObjectWidgetRequestEvent.STICKIE:
                 eventDispatcher.dispatchEvent(new RoomEngineTriggerWidgetEvent(RoomEngineTriggerWidgetEvent.REQUEST_STICKIE, roomId, objectId, objectCategory));
                 return;
diff --git a/src/nitro/room/events/RoomEngineTriggerWidgetEvent.ts b/src/nitro/room/events/RoomEngineTriggerWidgetEvent.ts
index 2c22fddb..1bca9f7f 100644
--- a/src/nitro/room/events/RoomEngineTriggerWidgetEvent.ts
+++ b/src/nitro/room/events/RoomEngineTriggerWidgetEvent.ts
@@ -8,6 +8,8 @@ export class RoomEngineTriggerWidgetEvent extends RoomEngineObjectEvent
     public static CLOSE_FURNI_CONTEXT_MENU: string = 'RETWE_CLOSE_FURNI_CONTEXT_MENU';
     public static REQUEST_PLACEHOLDER: string = 'RETWE_REQUEST_PLACEHOLDER';
     public static REQUEST_CREDITFURNI: string = 'RETWE_REQUEST_CREDITFURNI';
+    public static REQUEST_STACK_HEIGHT: string = 'RETWE_REQUEST_STACK_HEIGHT';
+    public static REQUEST_EXTERNAL_IMAGE: string = 'RETWE_REQUEST_EXTERNAL_IMAGE';
     public static REQUEST_STICKIE: string = 'RETWE_REQUEST_STICKIE';
     public static REQUEST_PRESENT: string = 'RETWE_REQUEST_PRESENT';
     public static REQUEST_TROPHY: string = 'RETWE_REQUEST_TROPHY';
diff --git a/src/nitro/room/events/RoomObjectWidgetRequestEvent.ts b/src/nitro/room/events/RoomObjectWidgetRequestEvent.ts
index 46a02cfd..ffc06d7a 100644
--- a/src/nitro/room/events/RoomObjectWidgetRequestEvent.ts
+++ b/src/nitro/room/events/RoomObjectWidgetRequestEvent.ts
@@ -9,6 +9,8 @@ export class RoomObjectWidgetRequestEvent extends RoomObjectEvent
     public static CLOSE_FURNI_CONTEXT_MENU: string = 'ROWRE_CLOSE_FURNI_CONTEXT_MENU';
     public static PLACEHOLDER: string = 'ROWRE_PLACEHOLDER';
     public static CREDITFURNI: string = 'ROWRE_CREDITFURNI';
+    public static STACK_HEIGHT: string = 'ROWRE_STACK_HEIGHT';
+    public static EXTERNAL_IMAGE: string = 'ROWRE_EXTERNAL_IMAGE';
     public static STICKIE: string = 'ROWRE_STICKIE';
     public static PRESENT: string = 'ROWRE_PRESENT';
     public static TROPHY: string = 'ROWRE_TROPHY';
diff --git a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts
index ea236a73..4bf87ad9 100644
--- a/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts
+++ b/src/nitro/room/object/logic/furniture/FurnitureCustomStackHeightLogic.ts
@@ -1,10 +1,19 @@
 import { IAssetData } from '../../../../../core/asset/interfaces';
-import { RoomWidgetEnum } from '../../../../ui';
+import { RoomObjectWidgetRequestEvent } from '../../../events/RoomObjectWidgetRequestEvent';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic';
 
 export class FurnitureCustomStackHeightLogic extends FurnitureMultiStateLogic
 {
+    public getEventTypes(): string[]
+    {
+        const types = [
+            RoomObjectWidgetRequestEvent.STACK_HEIGHT
+        ];
+
+        return this.mergeTypes(super.getEventTypes(), types);
+    }
+
     public initialize(asset: IAssetData): void
     {
         super.initialize(asset);
@@ -12,8 +21,12 @@ export class FurnitureCustomStackHeightLogic extends FurnitureMultiStateLogic
         if(this.object && this.object.model) this.object.model.setValue(RoomObjectVariable.FURNITURE_ALWAYS_STACKABLE, 1);
     }
 
-    public get widget(): string
+    public useObject(): void
     {
-        return RoomWidgetEnum.CUSTOM_STACK_HEIGHT;
+        if(!this.object || !this.eventDispatcher) return;
+
+        this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.STACK_HEIGHT, this.object));
+
+        super.useObject();
     }
 }
diff --git a/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts
index 91ceb15b..09d2436b 100644
--- a/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts
+++ b/src/nitro/room/object/logic/furniture/FurnitureExternalImageLogic.ts
@@ -1,10 +1,19 @@
 import { IAssetData } from '../../../../../core/asset/interfaces';
-import { RoomWidgetEnum } from '../../../../ui/widget/enums/RoomWidgetEnum';
+import { RoomObjectWidgetRequestEvent } from '../../../events';
 import { RoomObjectVariable } from '../../RoomObjectVariable';
 import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic';
 
 export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic
 {
+    public getEventTypes(): string[]
+    {
+        const types = [
+            RoomObjectWidgetRequestEvent.EXTERNAL_IMAGE
+        ];
+
+        return this.mergeTypes(super.getEventTypes(), types);
+    }
+
     public initialize(asset: IAssetData): void
     {
         super.initialize(asset);
@@ -25,8 +34,12 @@ export class FurnitureExternalImageLogic extends FurnitureMultiStateLogic
         }
     }
 
-    public get widget(): string
+    public useObject(): void
     {
-        return RoomWidgetEnum.EXTERNAL_IMAGE;
+        if(!this.object || !this.eventDispatcher) return;
+
+        this.eventDispatcher.dispatchEvent(new RoomObjectWidgetRequestEvent(RoomObjectWidgetRequestEvent.EXTERNAL_IMAGE, this.object));
+
+        super.useObject();
     }
 }
diff --git a/src/nitro/room/object/visualization/pet/PetVisualization.ts b/src/nitro/room/object/visualization/pet/PetVisualization.ts
index 0d23c12f..78b98b60 100644
--- a/src/nitro/room/object/visualization/pet/PetVisualization.ts
+++ b/src/nitro/room/object/visualization/pet/PetVisualization.ts
@@ -262,6 +262,8 @@ export class PetVisualization extends FurnitureAnimatedVisualization
 
     protected setPostureAndGesture(posture: string, gesture: string): void
     {
+        if(!this._data) return;
+
         if(posture !== this._posture)
         {
             this._posture = posture;