From 99c4acea38509047f75afb81322fb6c2fa050adb Mon Sep 17 00:00:00 2001 From: Lorenzune Date: Fri, 27 Mar 2026 09:37:14 +0100 Subject: [PATCH] Expose room, user and furni metadata for wired tools - parse extra room snapshot data such as hotel time, room item limit and group context - expose richer furni metadata including flags, dimensions and teleport targets - expose richer user metadata including room-entry fields and ids needed by inspection tools - keep session and room engine models aligned with the new wired monitor/inspection flow --- packages/api/src/nitro/room/IRoomCreator.ts | 6 +- packages/api/src/nitro/room/IRoomEngine.ts | 6 +- .../api/src/nitro/room/IRoomEngineServices.ts | 6 +- .../nitro/room/object/RoomObjectVariable.ts | 7 +++ .../api/src/nitro/session/IFurnitureData.ts | 1 + .../api/src/nitro/session/IRoomSession.ts | 5 ++ .../api/src/nitro/session/IRoomUserData.ts | 2 + .../GetGuestRoomResultMessageParser.ts | 28 ++++++++++ .../floor/FurnitureFloorDataParser.ts | 56 +++++++++++++++++++ .../furniture/wall/FurnitureWallDataParser.ts | 56 +++++++++++++++++++ .../parser/room/unit/RoomUnitParser.ts | 3 + .../parser/room/unit/UserMessageData.ts | 28 ++++++++++ packages/room/src/RoomEngine.ts | 26 +++++++-- packages/room/src/RoomMessageHandler.ts | 6 +- packages/room/src/utils/RoomFurnitureData.ts | 51 ++++++++++++++++- packages/session/src/RoomSession.ts | 55 ++++++++++++++++++ packages/session/src/RoomUserData.ts | 22 ++++++++ .../session/src/furniture/FurnitureData.ts | 9 ++- .../src/furniture/FurnitureDataLoader.ts | 28 +++++++++- .../session/src/handler/RoomDataHandler.ts | 5 ++ .../session/src/handler/RoomUsersHandler.ts | 2 + 21 files changed, 386 insertions(+), 22 deletions(-) diff --git a/packages/api/src/nitro/room/IRoomCreator.ts b/packages/api/src/nitro/room/IRoomCreator.ts index b4efabc..e03ac68 100644 --- a/packages/api/src/nitro/room/IRoomCreator.ts +++ b/packages/api/src/nitro/room/IRoomCreator.ts @@ -24,9 +24,9 @@ export interface IRoomCreator getRoomObjectUser(roomId: number, objectId: number): IRoomObjectController; removeRoomObjectUser(roomId: number, objectId: number): void; getRoomObjectFloor(roomId: number, objectId: number): IRoomObjectController; - addFurnitureFloor(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number): boolean; - addFurnitureFloorByTypeName(roomId: number, id: number, typeName: string, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number): boolean; - addFurnitureWall(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, extra: string, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, realRoomObject?: boolean): boolean; + addFurnitureFloor(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number, allowStack?: boolean, allowSit?: boolean, allowLay?: boolean, allowWalk?: boolean, dimensionsX?: number, dimensionsY?: number, teleportTargetId?: number): boolean; + addFurnitureFloorByTypeName(roomId: number, id: number, typeName: string, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number, allowStack?: boolean, allowSit?: boolean, allowLay?: boolean, allowWalk?: boolean, dimensionsX?: number, dimensionsY?: number, teleportTargetId?: number): boolean; + addFurnitureWall(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, extra: string, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, realRoomObject?: boolean, allowStack?: boolean, allowSit?: boolean, allowLay?: boolean, allowWalk?: boolean, dimensionsX?: number, dimensionsY?: number, teleportTargetId?: number): boolean; removeRoomObjectFloor(roomId: number, objectId: number, userId?: number, _arg_4?: boolean): void; removeRoomObjectWall(roomId: number, objectId: number, userId?: number): void; updateRoomObjectFloor(roomId: number, objectId: number, location: IVector3D, direction: IVector3D, state: number, data: IObjectData, extra?: number): boolean; diff --git a/packages/api/src/nitro/room/IRoomEngine.ts b/packages/api/src/nitro/room/IRoomEngine.ts index 01916c9..78fcc4b 100644 --- a/packages/api/src/nitro/room/IRoomEngine.ts +++ b/packages/api/src/nitro/room/IRoomEngine.ts @@ -46,9 +46,9 @@ export interface IRoomEngine updateRoomObjectWallLocation(roomId: number, objectId: number, location: IVector3D): boolean; addRoomObjectUser(roomId: number, objectId: number, location: IVector3D, direction: IVector3D, headDirection: number, type: number, figure: string): boolean; updateRoomObjectUserLocation(roomId: number, objectId: number, location: IVector3D, targetLocation: IVector3D, canStandUp?: boolean, baseY?: number, direction?: IVector3D, headDirection?: number, skipLocationFix?: boolean, isSlide?: boolean, duration?: number): boolean; - addFurnitureFloor(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number): boolean; - addFurnitureFloorByTypeName(roomId: number, id: number, typeName: string, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number): boolean; - addFurnitureWall(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, extra: string, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, realRoomObject?: boolean): boolean; + addFurnitureFloor(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number, allowStack?: boolean, allowSit?: boolean, allowLay?: boolean, allowWalk?: boolean, dimensionsX?: number, dimensionsY?: number, teleportTargetId?: number): boolean; + addFurnitureFloorByTypeName(roomId: number, id: number, typeName: string, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number, allowStack?: boolean, allowSit?: boolean, allowLay?: boolean, allowWalk?: boolean, dimensionsX?: number, dimensionsY?: number, teleportTargetId?: number): boolean; + addFurnitureWall(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, extra: string, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, realRoomObject?: boolean, allowStack?: boolean, allowSit?: boolean, allowLay?: boolean, allowWalk?: boolean, dimensionsX?: number, dimensionsY?: number, teleportTargetId?: number): boolean; initalizeTemporaryObjectsByType(type: string, _arg_2: boolean): void; updateRoomObjectFloor(roomId: number, objectId: number, location: IVector3D, direction: IVector3D, state: number, data: IObjectData, extra?: number): boolean; updateRoomObjectWall(roomId: number, objectId: number, location: IVector3D, direction: IVector3D, state: number, extra?: string): boolean; diff --git a/packages/api/src/nitro/room/IRoomEngineServices.ts b/packages/api/src/nitro/room/IRoomEngineServices.ts index 40df0ac..4acb50c 100644 --- a/packages/api/src/nitro/room/IRoomEngineServices.ts +++ b/packages/api/src/nitro/room/IRoomEngineServices.ts @@ -22,9 +22,9 @@ export interface IRoomEngineServices getRoomObjectCursor(roomId: number): IRoomObjectController; getRoomObjectSelectionArrow(roomId: number): IRoomObjectController; addRoomObjectUser(roomId: number, objectId: number, location: IVector3D, direction: IVector3D, headDirection: number, type: number, figure: string): boolean; - addFurnitureFloor(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number): boolean; - addFurnitureFloorByTypeName(roomId: number, id: number, typeName: string, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number): boolean; - addFurnitureWall(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, extra: string, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, realRoomObject?: boolean): boolean; + addFurnitureFloor(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number, allowStack?: boolean, allowSit?: boolean, allowLay?: boolean, allowWalk?: boolean, dimensionsX?: number, dimensionsY?: number, teleportTargetId?: number): boolean; + addFurnitureFloorByTypeName(roomId: number, id: number, typeName: string, location: IVector3D, direction: IVector3D, state: number, objectData: IObjectData, extra?: number, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, synchronized?: boolean, realRoomObject?: boolean, sizeZ?: number, allowStack?: boolean, allowSit?: boolean, allowLay?: boolean, allowWalk?: boolean, dimensionsX?: number, dimensionsY?: number, teleportTargetId?: number): boolean; + addFurnitureWall(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, extra: string, expires?: number, usagePolicy?: number, ownerId?: number, ownerName?: string, realRoomObject?: boolean, allowStack?: boolean, allowSit?: boolean, allowLay?: boolean, allowWalk?: boolean, dimensionsX?: number, dimensionsY?: number, teleportTargetId?: number): boolean; removeRoomObjectFloor(roomId: number, objectId: number, userId?: number, _arg_4?: boolean): void; removeRoomObjectWall(roomId: number, objectId: number, userId?: number): void; removeRoomObjectUser(roomId: number, objectId: number): void; diff --git a/packages/api/src/nitro/room/object/RoomObjectVariable.ts b/packages/api/src/nitro/room/object/RoomObjectVariable.ts index 229de7a..8b8950d 100644 --- a/packages/api/src/nitro/room/object/RoomObjectVariable.ts +++ b/packages/api/src/nitro/room/object/RoomObjectVariable.ts @@ -83,6 +83,13 @@ export class RoomObjectVariable public static FURNITURE_USAGE_POLICY: string = 'furniture_usage_policy'; public static FURNITURE_OWNER_ID: string = 'furniture_owner_id'; public static FURNITURE_OWNER_NAME: string = 'furniture_owner_name'; + public static FURNITURE_ALLOW_STACK: string = 'furniture_allow_stack'; + public static FURNITURE_ALLOW_SIT: string = 'furniture_allow_sit'; + public static FURNITURE_ALLOW_LAY: string = 'furniture_allow_lay'; + public static FURNITURE_ALLOW_WALK: string = 'furniture_allow_walk'; + public static FURNITURE_DIMENSIONS_X: string = 'furniture_dimensions_x'; + public static FURNITURE_DIMENSIONS_Y: string = 'furniture_dimensions_y'; + public static FURNITURE_TELEPORT_TARGET_ID: string = 'furniture_teleport_target_id'; public static FURNITURE_ROOM_BACKGROUND_COLOR_HUE: string = 'furniture_room_background_color_hue'; public static FURNITURE_ROOM_BACKGROUND_COLOR_SATURATION: string = 'furniture_room_background_color_saturation'; public static FURNITURE_ROOM_BACKGROUND_COLOR_LIGHTNESS: string = 'furniture_room_background_color_lightness'; diff --git a/packages/api/src/nitro/session/IFurnitureData.ts b/packages/api/src/nitro/session/IFurnitureData.ts index e70dae0..ac77f64 100644 --- a/packages/api/src/nitro/session/IFurnitureData.ts +++ b/packages/api/src/nitro/session/IFurnitureData.ts @@ -24,6 +24,7 @@ export interface IFurnitureData purchaseCouldBeUsedForBuyout: boolean; rentCouldBeUsedForBuyout: boolean; availableForBuildersClub: boolean; + allowStack: boolean; canStandOn: boolean; canSitOn: boolean; canLayOn: boolean; diff --git a/packages/api/src/nitro/session/IRoomSession.ts b/packages/api/src/nitro/session/IRoomSession.ts index 097623f..02a905e 100644 --- a/packages/api/src/nitro/session/IRoomSession.ts +++ b/packages/api/src/nitro/session/IRoomSession.ts @@ -57,6 +57,11 @@ export interface IRoomSession allowPets: boolean; controllerLevel: number; ownRoomIndex: number; + groupId: number; + hotelTimeZone: string; + hotelTimeSnapshotMs: number; + hotelTimeSyncMs: number; + roomItemLimit: number; isGuildRoom: boolean; isRoomOwner: boolean; isDecorating: boolean; diff --git a/packages/api/src/nitro/session/IRoomUserData.ts b/packages/api/src/nitro/session/IRoomUserData.ts index 09eaa57..4407449 100644 --- a/packages/api/src/nitro/session/IRoomUserData.ts +++ b/packages/api/src/nitro/session/IRoomUserData.ts @@ -23,4 +23,6 @@ export interface IRoomUserData petLevel: number; botSkills: number[]; isModerator: boolean; + roomEntryMethod: string; + roomEntryTeleportId: number; } diff --git a/packages/communication/src/messages/parser/navigator/GetGuestRoomResultMessageParser.ts b/packages/communication/src/messages/parser/navigator/GetGuestRoomResultMessageParser.ts index ebebe41..0595de2 100644 --- a/packages/communication/src/messages/parser/navigator/GetGuestRoomResultMessageParser.ts +++ b/packages/communication/src/messages/parser/navigator/GetGuestRoomResultMessageParser.ts @@ -11,6 +11,9 @@ export class GetGuestRoomResultMessageParser implements IMessageParser private _isGroupMember: boolean; private _moderation: RoomModerationSettings; private _chat: RoomChatSettings; + private _hotelTimeZoneId: string; + private _hotelCurrentTimeMs: number; + private _roomItemLimit: number; public flush(): boolean { @@ -21,6 +24,9 @@ export class GetGuestRoomResultMessageParser implements IMessageParser this._isGroupMember = false; this._moderation = null; this._chat = null; + this._hotelTimeZoneId = null; + this._hotelCurrentTimeMs = 0; + this._roomItemLimit = 0; return true; } @@ -39,6 +45,13 @@ export class GetGuestRoomResultMessageParser implements IMessageParser this.data.canMute = wrapper.readBoolean(); this._chat = new RoomChatSettings(wrapper); + if(wrapper.bytesAvailable) + { + this._hotelTimeZoneId = wrapper.readString(); + this._hotelCurrentTimeMs = Number(wrapper.readString()) || 0; + if(wrapper.bytesAvailable) this._roomItemLimit = wrapper.readInt(); + } + return true; } @@ -76,4 +89,19 @@ export class GetGuestRoomResultMessageParser implements IMessageParser { return this._chat; } + + public get hotelTimeZoneId(): string + { + return this._hotelTimeZoneId; + } + + public get hotelCurrentTimeMs(): number + { + return this._hotelCurrentTimeMs; + } + + public get roomItemLimit(): number + { + return this._roomItemLimit; + } } diff --git a/packages/communication/src/messages/parser/room/furniture/floor/FurnitureFloorDataParser.ts b/packages/communication/src/messages/parser/room/furniture/floor/FurnitureFloorDataParser.ts index fb4ac09..ffff026 100644 --- a/packages/communication/src/messages/parser/room/furniture/floor/FurnitureFloorDataParser.ts +++ b/packages/communication/src/messages/parser/room/furniture/floor/FurnitureFloorDataParser.ts @@ -25,6 +25,13 @@ export class FurnitureFloorDataParser private _usagePolicy: number; private _userId: number; private _username: string; + private _allowStack: boolean; + private _allowSit: boolean; + private _allowLay: boolean; + private _allowWalk: boolean; + private _dimensionsX: number; + private _dimensionsY: number; + private _teleportTargetId: number; constructor(wrapper: IMessageDataWrapper) { @@ -51,6 +58,13 @@ export class FurnitureFloorDataParser this._usagePolicy = 0; this._userId = 0; this._username = null; + this._allowStack = false; + this._allowSit = false; + this._allowLay = false; + this._allowWalk = false; + this._dimensionsX = 0; + this._dimensionsY = 0; + this._teleportTargetId = 0; return true; } @@ -72,6 +86,13 @@ export class FurnitureFloorDataParser this._expires = wrapper.readInt(); this._usagePolicy = wrapper.readInt(); this._userId = wrapper.readInt(); + this._allowStack = (wrapper.readInt() === 1); + this._allowSit = (wrapper.readInt() === 1); + this._allowLay = (wrapper.readInt() === 1); + this._allowWalk = (wrapper.readInt() === 1); + this._dimensionsX = wrapper.readInt(); + this._dimensionsY = wrapper.readInt(); + this._teleportTargetId = wrapper.readInt(); this._username = null; if(this._spriteId < 0) this._spriteName = wrapper.readString(); @@ -149,6 +170,41 @@ export class FurnitureFloorDataParser return this._username; } + public get allowStack(): boolean + { + return this._allowStack; + } + + public get allowSit(): boolean + { + return this._allowSit; + } + + public get allowLay(): boolean + { + return this._allowLay; + } + + public get allowWalk(): boolean + { + return this._allowWalk; + } + + public get dimensionsX(): number + { + return this._dimensionsX; + } + + public get dimensionsY(): number + { + return this._dimensionsY; + } + + public get teleportTargetId(): number + { + return this._teleportTargetId; + } + public set username(username: string) { this._username = username; diff --git a/packages/communication/src/messages/parser/room/furniture/wall/FurnitureWallDataParser.ts b/packages/communication/src/messages/parser/room/furniture/wall/FurnitureWallDataParser.ts index a716e74..db7b5fb 100644 --- a/packages/communication/src/messages/parser/room/furniture/wall/FurnitureWallDataParser.ts +++ b/packages/communication/src/messages/parser/room/furniture/wall/FurnitureWallDataParser.ts @@ -11,6 +11,13 @@ export class FurnitureWallDataParser private _usagePolicy: number; private _userId: number; private _username: string; + private _allowStack: boolean; + private _allowSit: boolean; + private _allowLay: boolean; + private _allowWalk: boolean; + private _dimensionsX: number; + private _dimensionsY: number; + private _teleportTargetId: number; private _width: number; private _height: number; @@ -40,6 +47,13 @@ export class FurnitureWallDataParser this._usagePolicy = -1; this._userId = 0; this._username = null; + this._allowStack = false; + this._allowSit = false; + this._allowLay = false; + this._allowWalk = false; + this._dimensionsX = 0; + this._dimensionsY = 0; + this._teleportTargetId = 0; this._width = 0; this._height = 0; @@ -64,6 +78,13 @@ export class FurnitureWallDataParser this._secondsToExpiration = wrapper.readInt(); this._usagePolicy = wrapper.readInt(); this._userId = wrapper.readInt(); + this._allowStack = (wrapper.readInt() === 1); + this._allowSit = (wrapper.readInt() === 1); + this._allowLay = (wrapper.readInt() === 1); + this._allowWalk = (wrapper.readInt() === 1); + this._dimensionsX = wrapper.readInt(); + this._dimensionsY = wrapper.readInt(); + this._teleportTargetId = wrapper.readInt(); this._username = null; const state = parseFloat(this._stuffData); @@ -191,6 +212,41 @@ export class FurnitureWallDataParser return this._username; } + public get allowStack(): boolean + { + return this._allowStack; + } + + public get allowSit(): boolean + { + return this._allowSit; + } + + public get allowLay(): boolean + { + return this._allowLay; + } + + public get allowWalk(): boolean + { + return this._allowWalk; + } + + public get dimensionsX(): number + { + return this._dimensionsX; + } + + public get dimensionsY(): number + { + return this._dimensionsY; + } + + public get teleportTargetId(): number + { + return this._teleportTargetId; + } + public set username(username: string) { this._username = username; diff --git a/packages/communication/src/messages/parser/room/unit/RoomUnitParser.ts b/packages/communication/src/messages/parser/room/unit/RoomUnitParser.ts index eb2f96d..21a50a5 100644 --- a/packages/communication/src/messages/parser/room/unit/RoomUnitParser.ts +++ b/packages/communication/src/messages/parser/room/unit/RoomUnitParser.ts @@ -135,6 +135,9 @@ export class RoomUnitParser implements IMessageParser } } + user.roomEntryMethod = wrapper.readString(); + user.roomEntryTeleportId = wrapper.readInt(); + i++; } diff --git a/packages/communication/src/messages/parser/room/unit/UserMessageData.ts b/packages/communication/src/messages/parser/room/unit/UserMessageData.ts index ef4c5d9..e4e2270 100644 --- a/packages/communication/src/messages/parser/room/unit/UserMessageData.ts +++ b/packages/communication/src/messages/parser/room/unit/UserMessageData.ts @@ -35,6 +35,8 @@ export class UserMessageData private _petPosture: string = ''; private _botSkills: number[] = []; private _isModerator: boolean = false; + private _roomEntryMethod: string = 'unknown'; + private _roomEntryTeleportId: number = 0; private _isReadOnly: boolean = false; constructor(k: number) @@ -442,4 +444,30 @@ export class UserMessageData this._isModerator = k; } } + + public get roomEntryMethod(): string + { + return this._roomEntryMethod; + } + + public set roomEntryMethod(k: string) + { + if(!this._isReadOnly) + { + this._roomEntryMethod = k; + } + } + + public get roomEntryTeleportId(): number + { + return this._roomEntryTeleportId; + } + + public set roomEntryTeleportId(k: number) + { + if(!this._isReadOnly) + { + this._roomEntryTeleportId = k; + } + } } diff --git a/packages/room/src/RoomEngine.ts b/packages/room/src/RoomEngine.ts index 587d351..ae6781c 100644 --- a/packages/room/src/RoomEngine.ts +++ b/packages/room/src/RoomEngine.ts @@ -819,6 +819,13 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService model.setValue(RoomObjectVariable.FURNITURE_USAGE_POLICY, data.usagePolicy); model.setValue(RoomObjectVariable.FURNITURE_OWNER_ID, data.ownerId); model.setValue(RoomObjectVariable.FURNITURE_OWNER_NAME, data.ownerName); + model.setValue(RoomObjectVariable.FURNITURE_ALLOW_STACK, data.allowStack ? 1 : 0); + model.setValue(RoomObjectVariable.FURNITURE_ALLOW_SIT, data.allowSit ? 1 : 0); + model.setValue(RoomObjectVariable.FURNITURE_ALLOW_LAY, data.allowLay ? 1 : 0); + model.setValue(RoomObjectVariable.FURNITURE_ALLOW_WALK, data.allowWalk ? 1 : 0); + model.setValue(RoomObjectVariable.FURNITURE_DIMENSIONS_X, data.dimensionsX); + model.setValue(RoomObjectVariable.FURNITURE_DIMENSIONS_Y, data.dimensionsY); + model.setValue(RoomObjectVariable.FURNITURE_TELEPORT_TARGET_ID, data.teleportTargetId); } if(!this.updateRoomObjectFloor(roomId, id, data.location, data.direction, data.state, data.data, data.extra)) return false; @@ -879,6 +886,13 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService model.setValue(RoomObjectVariable.FURNITURE_USAGE_POLICY, data.usagePolicy); model.setValue(RoomObjectVariable.FURNITURE_OWNER_ID, data.ownerId); model.setValue(RoomObjectVariable.FURNITURE_OWNER_NAME, data.ownerName); + model.setValue(RoomObjectVariable.FURNITURE_ALLOW_STACK, data.allowStack ? 1 : 0); + model.setValue(RoomObjectVariable.FURNITURE_ALLOW_SIT, data.allowSit ? 1 : 0); + model.setValue(RoomObjectVariable.FURNITURE_ALLOW_LAY, data.allowLay ? 1 : 0); + model.setValue(RoomObjectVariable.FURNITURE_ALLOW_WALK, data.allowWalk ? 1 : 0); + model.setValue(RoomObjectVariable.FURNITURE_DIMENSIONS_X, data.dimensionsX); + model.setValue(RoomObjectVariable.FURNITURE_DIMENSIONS_Y, data.dimensionsY); + model.setValue(RoomObjectVariable.FURNITURE_TELEPORT_TARGET_ID, data.teleportTargetId); } if(!this.updateRoomObjectWall(roomId, id, data.location, data.direction, data.state, extra)) return false; @@ -1667,33 +1681,33 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService if(GetEventDispatcher()) GetEventDispatcher().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 + 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, allowStack: boolean = false, allowSit: boolean = false, allowLay: boolean = false, allowWalk: boolean = false, dimensionsX: number = 0, dimensionsY: number = 0, teleportTargetId: number = 0): boolean { const instanceData = this.getRoomInstanceData(roomId); if(!instanceData) return false; - const furnitureData = new RoomFurnitureData(id, typeId, null, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ); + const furnitureData = new RoomFurnitureData(id, typeId, null, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ, allowStack, allowSit, allowLay, allowWalk, dimensionsX, dimensionsY, teleportTargetId); instanceData.addPendingFurnitureFloor(furnitureData); return true; } - public addFurnitureFloorByTypeName(roomId: number, id: number, typeName: string, 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 + public addFurnitureFloorByTypeName(roomId: number, id: number, typeName: string, 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, allowStack: boolean = false, allowSit: boolean = false, allowLay: boolean = false, allowWalk: boolean = false, dimensionsX: number = 0, dimensionsY: number = 0, teleportTargetId: number = 0): boolean { const instanceData = this.getRoomInstanceData(roomId); if(!instanceData) return false; - const furnitureData = new RoomFurnitureData(id, 0, typeName, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ); + const furnitureData = new RoomFurnitureData(id, 0, typeName, location, direction, state, objectData, extra, expires, usagePolicy, ownerId, ownerName, synchronized, realRoomObject, sizeZ, allowStack, allowSit, allowLay, allowWalk, dimensionsX, dimensionsY, teleportTargetId); instanceData.addPendingFurnitureFloor(furnitureData); return true; } - public addFurnitureWall(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, extra: string, expires: number = -1, usagePolicy: number = 0, ownerId: number = 0, ownerName: string = '', realRoomObject: boolean = true): boolean + public addFurnitureWall(roomId: number, id: number, typeId: number, location: IVector3D, direction: IVector3D, state: number, extra: string, expires: number = -1, usagePolicy: number = 0, ownerId: number = 0, ownerName: string = '', realRoomObject: boolean = true, allowStack: boolean = false, allowSit: boolean = false, allowLay: boolean = false, allowWalk: boolean = false, dimensionsX: number = 0, dimensionsY: number = 0, teleportTargetId: number = 0): boolean { const instanceData = this.getRoomInstanceData(roomId); @@ -1703,7 +1717,7 @@ export class RoomEngine implements IRoomEngine, IRoomCreator, IRoomEngineService objectData.setString(extra); - const furnitureData = new RoomFurnitureData(id, typeId, null, location, direction, state, objectData, NaN, expires, usagePolicy, ownerId, ownerName, true, realRoomObject); + const furnitureData = new RoomFurnitureData(id, typeId, null, location, direction, state, objectData, NaN, expires, usagePolicy, ownerId, ownerName, true, realRoomObject, -1, allowStack, allowSit, allowLay, allowWalk, dimensionsX, dimensionsY, teleportTargetId); instanceData.addPendingFurnitureWall(furnitureData); diff --git a/packages/room/src/RoomMessageHandler.ts b/packages/room/src/RoomMessageHandler.ts index a6eefa9..706b3d8 100644 --- a/packages/room/src/RoomMessageHandler.ts +++ b/packages/room/src/RoomMessageHandler.ts @@ -1167,11 +1167,11 @@ export class RoomMessageHandler if(data.spriteName) { - this._roomEngine.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); + this._roomEngine.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, data.allowStack, data.allowSit, data.allowLay, data.allowWalk, data.dimensionsX, data.dimensionsY, data.teleportTargetId); } else { - this._roomEngine.addFurnitureFloor(roomId, data.itemId, data.spriteId, location, direction, data.state, data.data, data.extra, data.expires, data.usagePolicy, data.userId, data.username, true, true, data.stackHeight); + this._roomEngine.addFurnitureFloor(roomId, data.itemId, data.spriteId, location, direction, data.state, data.data, data.extra, data.expires, data.usagePolicy, data.userId, data.username, true, true, data.stackHeight, data.allowStack, data.allowSit, data.allowLay, data.allowWalk, data.dimensionsX, data.dimensionsY, data.teleportTargetId); } } @@ -1196,7 +1196,7 @@ export class RoomMessageHandler const direction = new Vector3d(wallGeometry.getDirection(data.direction)); - this._roomEngine.addFurnitureWall(roomId, data.itemId, data.spriteId, location, direction, data.state, data.stuffData, data.secondsToExpiration, data.usagePolicy, data.userId, data.username); + this._roomEngine.addFurnitureWall(roomId, data.itemId, data.spriteId, location, direction, data.state, data.stuffData, data.secondsToExpiration, data.usagePolicy, data.userId, data.username, true, data.allowStack, data.allowSit, data.allowLay, data.allowWalk, data.dimensionsX, data.dimensionsY, data.teleportTargetId); } private onIgnoreResultEvent(event: IgnoreResultEvent): void diff --git a/packages/room/src/utils/RoomFurnitureData.ts b/packages/room/src/utils/RoomFurnitureData.ts index 3475406..356d00b 100644 --- a/packages/room/src/utils/RoomFurnitureData.ts +++ b/packages/room/src/utils/RoomFurnitureData.ts @@ -18,8 +18,15 @@ export class RoomFurnitureData private _synchronized: boolean; private _realRoomObject: boolean; private _sizeZ: number; + private _allowStack: boolean; + private _allowSit: boolean; + private _allowLay: boolean; + private _allowWalk: boolean; + private _dimensionsX: number; + private _dimensionsY: number; + private _teleportTargetId: number; - constructor(id: number, typeId: number, type: string, 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) + constructor(id: number, typeId: number, type: string, 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, allowStack: boolean = false, allowSit: boolean = false, allowLay: boolean = false, allowWalk: boolean = false, dimensionsX: number = 0, dimensionsY: number = 0, teleportTargetId: number = 0) { this._id = id; this._typeId = typeId; @@ -34,6 +41,13 @@ export class RoomFurnitureData this._synchronized = synchronized; this._realRoomObject = realRoomObject; this._sizeZ = sizeZ; + this._allowStack = allowStack; + this._allowSit = allowSit; + this._allowLay = allowLay; + this._allowWalk = allowWalk; + this._dimensionsX = dimensionsX; + this._dimensionsY = dimensionsY; + this._teleportTargetId = teleportTargetId; this._location = new Vector3d(); this._direction = new Vector3d(); @@ -116,4 +130,39 @@ export class RoomFurnitureData { return this._sizeZ; } + + public get allowStack(): boolean + { + return this._allowStack; + } + + public get allowSit(): boolean + { + return this._allowSit; + } + + public get allowLay(): boolean + { + return this._allowLay; + } + + public get allowWalk(): boolean + { + return this._allowWalk; + } + + public get dimensionsX(): number + { + return this._dimensionsX; + } + + public get dimensionsY(): number + { + return this._dimensionsY; + } + + public get teleportTargetId(): number + { + return this._teleportTargetId; + } } diff --git a/packages/session/src/RoomSession.ts b/packages/session/src/RoomSession.ts index 500cc57..853bd41 100644 --- a/packages/session/src/RoomSession.ts +++ b/packages/session/src/RoomSession.ts @@ -17,6 +17,11 @@ export class RoomSession implements IRoomSession private _allowPets: boolean = false; private _controllerLevel: number = RoomControllerLevel.NONE; private _ownRoomIndex: number = -1; + private _groupId: number = 0; + private _hotelTimeZone: string = 'UTC'; + private _hotelTimeSnapshotMs: number = 0; + private _hotelTimeSyncMs: number = 0; + private _roomItemLimit: number = 0; private _isGuildRoom: boolean = false; private _isRoomOwner: boolean = false; private _isDecorating: boolean = false; @@ -398,6 +403,56 @@ export class RoomSession implements IRoomSession return this._ownRoomIndex; } + public get groupId(): number + { + return this._groupId; + } + + public set groupId(groupId: number) + { + this._groupId = groupId; + } + + public get hotelTimeZone(): string + { + return this._hotelTimeZone; + } + + public set hotelTimeZone(timeZone: string) + { + this._hotelTimeZone = (timeZone || 'UTC'); + } + + public get hotelTimeSnapshotMs(): number + { + return this._hotelTimeSnapshotMs; + } + + public set hotelTimeSnapshotMs(value: number) + { + this._hotelTimeSnapshotMs = value; + } + + public get hotelTimeSyncMs(): number + { + return this._hotelTimeSyncMs; + } + + public set hotelTimeSyncMs(value: number) + { + this._hotelTimeSyncMs = value; + } + + public get roomItemLimit(): number + { + return this._roomItemLimit; + } + + public set roomItemLimit(value: number) + { + this._roomItemLimit = value; + } + public get isGuildRoom(): boolean { return this._isGuildRoom; diff --git a/packages/session/src/RoomUserData.ts b/packages/session/src/RoomUserData.ts index 02e8d67..201cca3 100644 --- a/packages/session/src/RoomUserData.ts +++ b/packages/session/src/RoomUserData.ts @@ -28,6 +28,8 @@ export class RoomUserData implements IRoomUserData private _hasBreedingPermission: boolean; private _botSkills: number[]; private _isModerator: boolean; + private _roomEntryMethod: string = 'unknown'; + private _roomEntryTeleportId: number = 0; constructor(k: number) { @@ -288,4 +290,24 @@ export class RoomUserData implements IRoomUserData { this._isModerator = k; } + + public get roomEntryMethod(): string + { + return this._roomEntryMethod; + } + + public set roomEntryMethod(k: string) + { + this._roomEntryMethod = k; + } + + public get roomEntryTeleportId(): number + { + return this._roomEntryTeleportId; + } + + public set roomEntryTeleportId(k: number) + { + this._roomEntryTeleportId = k; + } } diff --git a/packages/session/src/furniture/FurnitureData.ts b/packages/session/src/furniture/FurnitureData.ts index b27e29e..ed2dffd 100644 --- a/packages/session/src/furniture/FurnitureData.ts +++ b/packages/session/src/furniture/FurnitureData.ts @@ -24,6 +24,7 @@ export class FurnitureData implements IFurnitureData private _purchaseCouldBeUsedForBuyout: boolean; private _rentCouldBeUsedForBuyout: boolean; private _availableForBuildersClub: boolean; + private _allowStack: boolean; private _canStandOn: boolean; private _canSitOn: boolean; private _canLayOn: boolean; @@ -32,7 +33,7 @@ export class FurnitureData implements IFurnitureData private _environment: string; private _rare: boolean; - constructor(type: FurnitureType, id: number, fullName: string, className: string, category: string, localizedName: string, description: string, revision: number, tileSizeX: number, tileSizeY: number, tileSizeZ: number, colors: number[], hadIndexedColor: boolean, colorIndex: number, adUrl: string, purchaseOfferId: number, purchaseCouldBeUsedForBuyout: boolean, rentOfferId: number, rentCouldBeUsedForBuyout: boolean, availableForBuildersClub: boolean, customParams: string, specialType: number, canStandOn: boolean, canSitOn: boolean, canLayOn: boolean, excludedfromDynamic: boolean, furniLine: string, environment: string, rare: boolean) + constructor(type: FurnitureType, id: number, fullName: string, className: string, category: string, localizedName: string, description: string, revision: number, tileSizeX: number, tileSizeY: number, tileSizeZ: number, colors: number[], hadIndexedColor: boolean, colorIndex: number, adUrl: string, purchaseOfferId: number, purchaseCouldBeUsedForBuyout: boolean, rentOfferId: number, rentCouldBeUsedForBuyout: boolean, availableForBuildersClub: boolean, customParams: string, specialType: number, allowStack: boolean, canStandOn: boolean, canSitOn: boolean, canLayOn: boolean, excludedfromDynamic: boolean, furniLine: string, environment: string, rare: boolean) { this._type = type; this._id = id; @@ -56,6 +57,7 @@ export class FurnitureData implements IFurnitureData this._customParams = customParams; this._specialType = specialType; this._availableForBuildersClub = availableForBuildersClub; + this._allowStack = allowStack; this._canStandOn = canStandOn; this._canSitOn = canSitOn; this._canLayOn = canLayOn; @@ -180,6 +182,11 @@ export class FurnitureData implements IFurnitureData return this._availableForBuildersClub; } + public get allowStack(): boolean + { + return this._allowStack; + } + public get canStandOn(): boolean { return this._canStandOn; diff --git a/packages/session/src/furniture/FurnitureDataLoader.ts b/packages/session/src/furniture/FurnitureDataLoader.ts index 1d407c3..9505fe0 100644 --- a/packages/session/src/furniture/FurnitureDataLoader.ts +++ b/packages/session/src/furniture/FurnitureDataLoader.ts @@ -82,8 +82,9 @@ export class FurnitureDataLoader const className = classSplit[0]; const colorIndex = ((classSplit.length > 1) ? parseInt(classSplit[1]) : 0); const hasColorIndex = (classSplit.length > 1); + const allowStack = this.resolveBooleanFlag(furniture.allowstack, furniture.allow_stack, furniture.allowStack); - const furnitureData = new FurnitureData(FurnitureType.FLOOR, furniture.id, furniture.classname, className, furniture.category, furniture.name, furniture.description, furniture.revision, furniture.xdim, furniture.ydim, 0, colors, hasColorIndex, colorIndex, furniture.adurl, furniture.offerid, furniture.buyout, furniture.rentofferid, furniture.rentbuyout, furniture.bc, furniture.customparams, furniture.specialtype, furniture.canstandon, furniture.cansiton, furniture.canlayon, furniture.excludeddynamic, furniture.furniline, furniture.environment, furniture.rare); + const furnitureData = new FurnitureData(FurnitureType.FLOOR, furniture.id, furniture.classname, className, furniture.category, furniture.name, furniture.description, furniture.revision, furniture.xdim, furniture.ydim, 0, colors, hasColorIndex, colorIndex, furniture.adurl, furniture.offerid, furniture.buyout, furniture.rentofferid, furniture.rentbuyout, furniture.bc, furniture.customparams, furniture.specialtype, allowStack, furniture.canstandon, furniture.cansiton, furniture.canlayon, furniture.excludeddynamic, furniture.furniline, furniture.environment, furniture.rare); this._floorItems.set(furnitureData.id, furnitureData); @@ -99,7 +100,8 @@ export class FurnitureDataLoader { 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); + const allowStack = this.resolveBooleanFlag(furniture.allowstack, furniture.allow_stack, furniture.allowStack); + 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, allowStack, false, false, false, furniture.excludeddynamic, furniture.furniline, furniture.environment, furniture.rare); this._wallItems.set(furnitureData.id, furnitureData); @@ -121,4 +123,26 @@ export class FurnitureDataLoader return; } } + + private resolveBooleanFlag(...values: any[]): boolean + { + for(const value of values) + { + if(value === undefined || value === null) continue; + + if(typeof value === 'string') + { + const normalized = value.trim().toLowerCase(); + + if(!normalized.length) continue; + + if([ '1', 'true', 'yes' ].includes(normalized)) return true; + if([ '0', 'false', 'no' ].includes(normalized)) return false; + } + + return !!value; + } + + return false; + } } diff --git a/packages/session/src/handler/RoomDataHandler.ts b/packages/session/src/handler/RoomDataHandler.ts index 67aa7d3..0cd169e 100644 --- a/packages/session/src/handler/RoomDataHandler.ts +++ b/packages/session/src/handler/RoomDataHandler.ts @@ -29,6 +29,11 @@ export class RoomDataHandler extends BaseHandler const roomData = parser.data; roomSession.tradeMode = roomData.tradeMode; + roomSession.groupId = roomData.habboGroupId; + roomSession.hotelTimeZone = (parser.hotelTimeZoneId || 'UTC'); + roomSession.hotelTimeSnapshotMs = parser.hotelCurrentTimeMs; + roomSession.hotelTimeSyncMs = Date.now(); + roomSession.roomItemLimit = parser.roomItemLimit; roomSession.isGuildRoom = (roomData.habboGroupId !== 0); roomSession.doorMode = roomData.doorMode; roomSession.allowPets = roomData.allowPets; diff --git a/packages/session/src/handler/RoomUsersHandler.ts b/packages/session/src/handler/RoomUsersHandler.ts index 9e5648d..9d04153 100644 --- a/packages/session/src/handler/RoomUsersHandler.ts +++ b/packages/session/src/handler/RoomUsersHandler.ts @@ -78,6 +78,8 @@ export class RoomUsersHandler extends BaseHandler userData.petLevel = user.petLevel; userData.botSkills = user.botSkills; userData.isModerator = user.isModerator; + userData.roomEntryMethod = user.roomEntryMethod; + userData.roomEntryTeleportId = user.roomEntryTeleportId; if(!session.userDataManager.getUserData(user.roomIndex)) usersToAdd.push(userData);