diff --git a/src/nitro/communication/messages/parser/modtool/utils/ModtoolRoomVisitedData.ts b/src/nitro/communication/messages/parser/modtool/utils/ModtoolRoomVisitedData.ts index a86fe581..e08fdd03 100644 --- a/src/nitro/communication/messages/parser/modtool/utils/ModtoolRoomVisitedData.ts +++ b/src/nitro/communication/messages/parser/modtool/utils/ModtoolRoomVisitedData.ts @@ -1,12 +1,12 @@ import { IMessageDataWrapper } from '../../../../../../core/communication/messages/IMessageDataWrapper'; -import { ModtoolUserVisitedRoomsRoom } from './ModtoolUserVisitedRoomsRoom'; +import { RoomVisitData } from './RoomVisitData'; export class ModtoolRoomVisitedData { private _userId:number; private _userName:string; - private _rooms:ModtoolUserVisitedRoomsRoom[]; + private _rooms:RoomVisitData[]; constructor(k:IMessageDataWrapper) { @@ -17,7 +17,7 @@ export class ModtoolRoomVisitedData let _local_3 = 0; while(_local_3 < _local_2) { - this._rooms.push(new ModtoolUserVisitedRoomsRoom(k)); + this._rooms.push(new RoomVisitData(k)); _local_3++; } } @@ -32,7 +32,7 @@ export class ModtoolRoomVisitedData return this._userName; } - public get rooms():ModtoolUserVisitedRoomsRoom[] + public get rooms():RoomVisitData[] { return this._rooms; } diff --git a/src/nitro/communication/messages/parser/modtool/utils/ModtoolUserVisitedRoomsRoom.ts b/src/nitro/communication/messages/parser/modtool/utils/RoomVisitData.ts similarity index 60% rename from src/nitro/communication/messages/parser/modtool/utils/ModtoolUserVisitedRoomsRoom.ts rename to src/nitro/communication/messages/parser/modtool/utils/RoomVisitData.ts index 7c9d7a59..53e3e279 100644 --- a/src/nitro/communication/messages/parser/modtool/utils/ModtoolUserVisitedRoomsRoom.ts +++ b/src/nitro/communication/messages/parser/modtool/utils/RoomVisitData.ts @@ -1,18 +1,18 @@ import { IMessageDataWrapper } from '../../../../../../core/communication/messages/IMessageDataWrapper'; -export class ModtoolUserVisitedRoomsRoom +export class RoomVisitData { private _roomId:number; private _roomName:string; - private _Str_20266:number; - private _Str_20472:number; + private _enterHour:number; + private _enterMinute:number; constructor(k:IMessageDataWrapper) { this._roomId = k.readInt(); this._roomName = k.readString(); - this._Str_20266 = k.readInt(); - this._Str_20472 = k.readInt(); + this._enterHour = k.readInt(); + this._enterMinute = k.readInt(); } public get roomId():number @@ -25,13 +25,13 @@ export class ModtoolUserVisitedRoomsRoom return this._roomName; } - public get _Str_22929():number + public get enterHour():number { - return this._Str_20266; + return this._enterHour; } - public get _Str_25550():number + public get enterMinute():number { - return this._Str_20472; + return this._enterMinute; } } diff --git a/src/nitro/communication/messages/parser/modtool/utils/index.ts b/src/nitro/communication/messages/parser/modtool/utils/index.ts index 9b7176cc..180c8620 100644 --- a/src/nitro/communication/messages/parser/modtool/utils/index.ts +++ b/src/nitro/communication/messages/parser/modtool/utils/index.ts @@ -8,5 +8,5 @@ export * from './ModtoolRoomChatlogLine'; export * from './ModtoolRoomVisitedData'; export * from './ModtoolUserChatlogParserChatlog'; export * from './ModtoolUserChatlogParserVisit'; -export * from './ModtoolUserVisitedRoomsRoom'; export * from './PatternMatchData'; +export * from './RoomVisitData'; diff --git a/src/nitro/communication/messages/parser/room/data/RoomInfoParser.ts b/src/nitro/communication/messages/parser/room/data/RoomInfoParser.ts index ea790e81..9ff7aca6 100644 --- a/src/nitro/communication/messages/parser/room/data/RoomInfoParser.ts +++ b/src/nitro/communication/messages/parser/room/data/RoomInfoParser.ts @@ -2,7 +2,7 @@ import { IMessageDataWrapper } from '../../../../../../core/communication/messag import { IMessageParser } from '../../../../../../core/communication/messages/IMessageParser'; import { RoomChatSettings } from './RoomChatSettings'; import { RoomDataParser } from './RoomDataParser'; -import { RoomModerationParser } from './RoomModerationParser'; +import { RoomModerationSettings } from './RoomModerationSettings'; export class RoomInfoParser implements IMessageParser { @@ -11,7 +11,7 @@ export class RoomInfoParser implements IMessageParser private _staffPick: boolean; private _data: RoomDataParser; private _isGroupMember: boolean; - private _moderation: RoomModerationParser; + private _moderation: RoomModerationSettings; private _chat: RoomChatSettings; public flush(): boolean @@ -37,7 +37,7 @@ export class RoomInfoParser implements IMessageParser this.data.roomPicker = wrapper.readBoolean(); this._isGroupMember = wrapper.readBoolean(); this.data.allInRoomMuted = wrapper.readBoolean(); - this._moderation = new RoomModerationParser(wrapper); + this._moderation = new RoomModerationSettings(wrapper); this.data.canMute = wrapper.readBoolean(); this._chat = new RoomChatSettings(wrapper); @@ -64,7 +64,7 @@ export class RoomInfoParser implements IMessageParser return this._isGroupMember; } - public get moderation(): RoomModerationParser + public get moderation(): RoomModerationSettings { return this._moderation; } diff --git a/src/nitro/communication/messages/parser/room/data/RoomModerationParser.ts b/src/nitro/communication/messages/parser/room/data/RoomModerationSettings.ts similarity index 80% rename from src/nitro/communication/messages/parser/room/data/RoomModerationParser.ts rename to src/nitro/communication/messages/parser/room/data/RoomModerationSettings.ts index 4e321b86..2509de1c 100644 --- a/src/nitro/communication/messages/parser/room/data/RoomModerationParser.ts +++ b/src/nitro/communication/messages/parser/room/data/RoomModerationSettings.ts @@ -1,10 +1,10 @@ import { IMessageDataWrapper } from '../../../../../../core/communication/messages/IMessageDataWrapper'; -export class RoomModerationParser +export class RoomModerationSettings { - public static _Str_10707: number = 0; - public static _Str_5047: number = 1; - public static _Str_11537: number = 2; + public static MODERATION_LEVEL_NONE: number = 0; + public static MODERATION_LEVEL_USER_WITH_RIGHTS: number = 1; + public static MODERATION_LEVEL_ALL: number = 2; private _allowMute: number; private _allowKick: number; @@ -44,4 +44,4 @@ export class RoomModerationParser { return this._allowBan; } -} \ No newline at end of file +} diff --git a/src/nitro/communication/messages/parser/room/data/RoomSettingsParser.ts b/src/nitro/communication/messages/parser/room/data/RoomSettingsParser.ts index c237f445..322a4222 100644 --- a/src/nitro/communication/messages/parser/room/data/RoomSettingsParser.ts +++ b/src/nitro/communication/messages/parser/room/data/RoomSettingsParser.ts @@ -1,7 +1,7 @@ import { IMessageDataWrapper } from '../../../../../../core/communication/messages/IMessageDataWrapper'; import { IMessageParser } from '../../../../../../core/communication/messages/IMessageParser'; import { RoomChatSettings } from './RoomChatSettings'; -import { RoomModerationParser } from './RoomModerationParser'; +import { RoomModerationSettings } from './RoomModerationSettings'; export class RoomSettingsParser implements IMessageParser { @@ -21,7 +21,7 @@ export class RoomSettingsParser implements IMessageParser private _thicknessWall: number; private _thicknessFloor: number; private _chat: RoomChatSettings; - private _moderation: RoomModerationParser; + private _moderation: RoomModerationSettings; public flush(): boolean { @@ -53,7 +53,7 @@ export class RoomSettingsParser implements IMessageParser this._thicknessFloor = wrapper.readInt(); this._chat = new RoomChatSettings(wrapper); wrapper.readBoolean(); - this._moderation = new RoomModerationParser(wrapper); + this._moderation = new RoomModerationSettings(wrapper); return true; } @@ -156,7 +156,7 @@ export class RoomSettingsParser implements IMessageParser return this._chat; } - public get moderationSettings(): RoomModerationParser + public get moderationSettings(): RoomModerationSettings { return this._moderation; } diff --git a/src/nitro/communication/messages/parser/room/data/index.ts b/src/nitro/communication/messages/parser/room/data/index.ts index c11bdf57..f509c354 100644 --- a/src/nitro/communication/messages/parser/room/data/index.ts +++ b/src/nitro/communication/messages/parser/room/data/index.ts @@ -3,7 +3,7 @@ export * from './RoomChatSettingsParser'; export * from './RoomDataParser'; export * from './RoomInfoOwnerParser'; export * from './RoomInfoParser'; -export * from './RoomModerationParser'; +export * from './RoomModerationSettings'; export * from './RoomScoreParser'; export * from './RoomSettingsErrorParser'; export * from './RoomSettingsParser'; diff --git a/src/nitro/communication/messages/parser/room/furniture/wall/FurnitureWallDataParser.ts b/src/nitro/communication/messages/parser/room/furniture/wall/FurnitureWallDataParser.ts index cbcf5a0b..2d4439ef 100644 --- a/src/nitro/communication/messages/parser/room/furniture/wall/FurnitureWallDataParser.ts +++ b/src/nitro/communication/messages/parser/room/furniture/wall/FurnitureWallDataParser.ts @@ -19,7 +19,7 @@ export class FurnitureWallDataParser private _y: number; private _z: number; private _direction: string; - private _Str_19875: boolean; + private _isOldFormat: boolean; constructor(wrapper: IMessageDataWrapper) { @@ -48,7 +48,7 @@ export class FurnitureWallDataParser this._y = 0; this._z = 0; this._direction = null; - this._Str_19875 = false; + this._isOldFormat = false; return true; } @@ -72,7 +72,7 @@ export class FurnitureWallDataParser if(this._location.indexOf(':') === 0) { - this._Str_19875 = false; + this._isOldFormat = false; let parts = this._location.split(' '); @@ -113,7 +113,7 @@ export class FurnitureWallDataParser } else { - this._Str_19875 = true; + this._isOldFormat = true; // _local_12 = _local_4.split(" "); // if (_local_12.length >= 2) @@ -221,8 +221,8 @@ export class FurnitureWallDataParser return this._direction; } - public get _Str_22379(): boolean + public get isOldFormat(): boolean { - return this._Str_19875; + return this._isOldFormat; } -} \ No newline at end of file +} diff --git a/src/nitro/communication/messages/parser/user/inventory/subscription/UserSubscriptionParser.ts b/src/nitro/communication/messages/parser/user/inventory/subscription/UserSubscriptionParser.ts index f47ab7af..6231e6a5 100644 --- a/src/nitro/communication/messages/parser/user/inventory/subscription/UserSubscriptionParser.ts +++ b/src/nitro/communication/messages/parser/user/inventory/subscription/UserSubscriptionParser.ts @@ -3,7 +3,10 @@ import { IMessageParser } from '../../../../../../../core/communication/messages export class UserSubscriptionParser implements IMessageParser { - public static _Str_14729: number = 3; + public static readonly RESPONSE_TYPE_LOGIN:number = 1; + public static readonly RESPONSE_TYPE_PURCHASE:number = 2; + public static readonly RESPONSE_TYPE_DISCOUNT_AVAILABLE:number = 3; + public static readonly RESPONSE_TYPE_CITIZENSHIP_DISCOUNT:number = 4; private _name: string; private _days: number; diff --git a/src/nitro/room/RoomMessageHandler.ts b/src/nitro/room/RoomMessageHandler.ts index 5c72ef59..d7484d56 100644 --- a/src/nitro/room/RoomMessageHandler.ts +++ b/src/nitro/room/RoomMessageHandler.ts @@ -897,7 +897,7 @@ export class RoomMessageHandler extends Disposable let location: IVector3D = null; - if(!data._Str_22379) + if(!data.isOldFormat) { location = wallGeometry.getLocation(data.width, data.height, data.localX, data.localY, data.direction); } diff --git a/src/nitro/session/IRoomSession.ts b/src/nitro/session/IRoomSession.ts index 954131ba..fa87c9a1 100644 --- a/src/nitro/session/IRoomSession.ts +++ b/src/nitro/session/IRoomSession.ts @@ -1,6 +1,6 @@ import { IDisposable } from '../../core/common/disposable/IDisposable'; import { IConnection } from '../../core/communication/connections/IConnection'; -import { RoomModerationParser } from '../communication/messages/parser/room/data/RoomModerationParser'; +import { RoomModerationSettings } from '../communication/messages/parser/room/data/RoomModerationSettings'; import { UserDataManager } from './UserDataManager'; export interface IRoomSession extends IDisposable @@ -47,5 +47,5 @@ export interface IRoomSession extends IDisposable isRoomOwner: boolean; isDecorating: boolean; isSpectator: boolean; - moderationSettings: RoomModerationParser; + moderationSettings: RoomModerationSettings; } diff --git a/src/nitro/session/RoomSession.ts b/src/nitro/session/RoomSession.ts index a6c4e031..ef87fe8c 100644 --- a/src/nitro/session/RoomSession.ts +++ b/src/nitro/session/RoomSession.ts @@ -24,7 +24,7 @@ import { RoomUnitDanceComposer } from '../communication/messages/outgoing/room/u import { RoomUnitPostureComposer } from '../communication/messages/outgoing/room/unit/RoomUnitPostureComposer'; import { RoomUnitSignComposer } from '../communication/messages/outgoing/room/unit/RoomUnitSignComposer'; import { UserMottoComposer } from '../communication/messages/outgoing/user/data/UserMottoComposer'; -import { RoomModerationParser } from '../communication/messages/parser/room/data/RoomModerationParser'; +import { RoomModerationSettings } from '../communication/messages/parser/room/data/RoomModerationSettings'; import { RoomControllerLevel } from './enum/RoomControllerLevel'; import { RoomTradingLevelEnum } from './enum/RoomTradingLevelEnum'; import { RoomSessionEvent } from './events/RoomSessionEvent'; @@ -49,7 +49,7 @@ export class RoomSession extends Disposable implements IRoomSession private _isDecorating: boolean; private _isSpectator: boolean; - private _moderationSettings: RoomModerationParser; + private _moderationSettings: RoomModerationSettings; constructor() { @@ -377,12 +377,12 @@ export class RoomSession extends Disposable implements IRoomSession this._isSpectator = flag; } - public get moderationSettings(): RoomModerationParser + public get moderationSettings(): RoomModerationSettings { return this._moderationSettings; } - public set moderationSettings(parser: RoomModerationParser) + public set moderationSettings(parser: RoomModerationSettings) { this._moderationSettings = parser; } diff --git a/src/nitro/session/events/MysteryBoxKeysUpdateEvent.ts b/src/nitro/session/events/MysteryBoxKeysUpdateEvent.ts index fd7e5bc6..459c946c 100644 --- a/src/nitro/session/events/MysteryBoxKeysUpdateEvent.ts +++ b/src/nitro/session/events/MysteryBoxKeysUpdateEvent.ts @@ -2,26 +2,26 @@ export class MysteryBoxKeysUpdateEvent extends NitroEvent { - public static MBKE_UPDATE: string = 'mbke_update'; + public static MYSTERY_BOX_KEYS_UPDATE: string = 'mbke_update'; private _boxColor: string; private _keyColor: string; constructor(k: string, _arg_2: string) { - super(MysteryBoxKeysUpdateEvent.MBKE_UPDATE); + super(MysteryBoxKeysUpdateEvent.MYSTERY_BOX_KEYS_UPDATE); this._boxColor = k; this._keyColor = _arg_2; } - public get _Str_18286(): string + public get boxColor(): string { return this._boxColor; } - public get _Str_17811(): string + public get keyColor(): string { return this._keyColor; } -} \ No newline at end of file +} diff --git a/src/nitro/session/events/RoomSessionFavouriteGroupUpdateEvent.ts b/src/nitro/session/events/RoomSessionFavouriteGroupUpdateEvent.ts index acdf21cd..ee54bcf8 100644 --- a/src/nitro/session/events/RoomSessionFavouriteGroupUpdateEvent.ts +++ b/src/nitro/session/events/RoomSessionFavouriteGroupUpdateEvent.ts @@ -3,7 +3,7 @@ import { RoomSessionEvent } from './RoomSessionEvent'; export class RoomSessionFavouriteGroupUpdateEvent extends RoomSessionEvent { - public static RSFGUE_FAVOURITE_GROUP_UPDATE: string = 'RSFGUE_FAVOURITE_GROUP_UPDATE'; + public static FAVOURITE_GROUP_UPDATE: string = 'RSFGUE_FAVOURITE_GROUP_UPDATE'; private _roomIndex: number; private _habboGroupId: number; @@ -12,7 +12,7 @@ export class RoomSessionFavouriteGroupUpdateEvent extends RoomSessionEvent constructor(k: IRoomSession, _arg_2: number, _arg_3: number, _arg_4: number, _arg_5: string) { - super(RoomSessionFavouriteGroupUpdateEvent.RSFGUE_FAVOURITE_GROUP_UPDATE, k); + super(RoomSessionFavouriteGroupUpdateEvent.FAVOURITE_GROUP_UPDATE, k); this._roomIndex = _arg_2; this._habboGroupId = _arg_3; @@ -20,17 +20,17 @@ export class RoomSessionFavouriteGroupUpdateEvent extends RoomSessionEvent this._status = _arg_4; } - public get _Str_2707(): number + public get roomIndex(): number { return this._roomIndex; } - public get _Str_3094(): number + public get habboGroupId(): number { return this._habboGroupId; } - public get _Str_14525(): string + public get habboGroupName(): string { return this._habboGroupName; } @@ -39,4 +39,4 @@ export class RoomSessionFavouriteGroupUpdateEvent extends RoomSessionEvent { return this._status; } -} \ No newline at end of file +}