diff --git a/src/nitro/avatar/geometry/Vector3D.ts b/src/nitro/avatar/geometry/Vector3D.ts index 1f9cfb39..4bdc821d 100644 --- a/src/nitro/avatar/geometry/Vector3D.ts +++ b/src/nitro/avatar/geometry/Vector3D.ts @@ -11,12 +11,12 @@ this._z = _arg_3; } - public static _Str_2224(k: Vector3D, _arg_2: Vector3D): number + public static dot(k: Vector3D, _arg_2: Vector3D): number { return ((k.x * _arg_2.x) + (k.y * _arg_2.y)) + (k.z * _arg_2.z); } - public static _Str_1645(k: Vector3D, _arg_2: Vector3D): Vector3D + public static cross(k: Vector3D, _arg_2: Vector3D): Vector3D { const _local_3 = new Vector3D(); @@ -32,12 +32,12 @@ return new Vector3D((k.x - _arg_2.x), (k.y - _arg_2.y), (k.z - _arg_2.z)); } - public _Str_2224(k: Vector3D): number + public dot(k: Vector3D): number { return ((this._x * k.x) + (this._y * k.y)) + (this._z * k.z); } - public _Str_1645(k: Vector3D): Vector3D + public cross(k: Vector3D): Vector3D { const _local_2 = new Vector3D(); @@ -110,4 +110,4 @@ { this._z = k; } -} \ No newline at end of file +} diff --git a/src/nitro/room/PetColorResult.ts b/src/nitro/room/PetColorResult.ts index 6a471b26..71710a02 100644 --- a/src/nitro/room/PetColorResult.ts +++ b/src/nitro/room/PetColorResult.ts @@ -1,6 +1,6 @@ export class PetColorResult { - private static _Str_12950: string[] = ['Null', 'Black', 'White', 'Grey', 'Red', 'Orange', 'Pink', 'Green', 'Lime', 'Blue', 'Light-Blue', 'Dark-Blue', 'Yellow', 'Brown', 'Dark-Brown', 'Beige', 'Cyan', 'Purple', 'Gold']; + private static COLOR_TAGS: string[] = ['Null', 'Black', 'White', 'Grey', 'Red', 'Orange', 'Pink', 'Green', 'Lime', 'Blue', 'Light-Blue', 'Dark-Blue', 'Yellow', 'Brown', 'Dark-Brown', 'Beige', 'Cyan', 'Purple', 'Gold']; private _breed: number; private _tag: string; @@ -16,18 +16,18 @@ export class PetColorResult this._primaryColor = (k & 0xFFFFFF); this._secondaryColor = (_arg_2 & 0xFFFFFF); this._breed = _arg_3; - this._tag = (((_arg_4 > -1) && (_arg_4 < PetColorResult._Str_12950.length)) ? PetColorResult._Str_12950[_arg_4] : ''); + this._tag = (((_arg_4 > -1) && (_arg_4 < PetColorResult.COLOR_TAGS.length)) ? PetColorResult.COLOR_TAGS[_arg_4] : ''); this._id = _arg_5; this._isMaster = _arg_6; this._layerTags = _arg_7; } - public get _Str_5845(): number + public get primaryColor(): number { return this._primaryColor; } - public get _Str_6659(): number + public get secondaryColor(): number { return this._secondaryColor; } @@ -47,13 +47,13 @@ export class PetColorResult return this._id; } - public get _Str_11964(): boolean + public get isMaster(): boolean { return this._isMaster; } - public get _Str_24801(): string[] + public get layerTags(): string[] { return this._layerTags; } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts b/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts index 1da4f465..7ed86b9c 100644 --- a/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts +++ b/src/nitro/room/object/logic/furniture/FurnitureFloorHoleLogic.ts @@ -7,7 +7,7 @@ import { FurnitureMultiStateLogic } from './FurnitureMultiStateLogic'; export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic { - private static _Str_9306: number = 0; + private static STATE_HOLE: number = 0; private _currentState: number; private _currentLocation: Vector3d; @@ -29,7 +29,7 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic public dispose(): void { - if(this._currentState === FurnitureFloorHoleLogic._Str_9306) + if(this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) { this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.REMOVE_HOLE, this.object)); } @@ -41,7 +41,7 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic { super.update(time); - this._Str_25016(); + this.handleAutomaticStateUpdate(); } public processUpdateMessage(message: RoomObjectUpdateMessage): void @@ -52,7 +52,7 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic if(message instanceof ObjectDataUpdateMessage) { - this._Str_21445(this.object.getState(0)); + this.handleStateUpdate(this.object.getState(0)); } const location = this.object.getLocation(); @@ -65,7 +65,7 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic { if((location.x !== this._currentLocation.x) || (location.y !== this._currentLocation.y)) { - if(this._currentState === FurnitureFloorHoleLogic._Str_9306) + if(this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) { if(this.eventDispatcher) this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.ADD_HOLE, this.object)); } @@ -75,18 +75,18 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic this._currentLocation.assign(location); } - private _Str_21445(state: number): void + private handleStateUpdate(state: number): void { if(state === this._currentState) return; if(this.eventDispatcher) { - if(state === FurnitureFloorHoleLogic._Str_9306) + if(state === FurnitureFloorHoleLogic.STATE_HOLE) { this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.ADD_HOLE, this.object)); } - else if(this._currentState === FurnitureFloorHoleLogic._Str_9306) + else if(this._currentState === FurnitureFloorHoleLogic.STATE_HOLE) { this.eventDispatcher.dispatchEvent(new RoomObjectFloorHoleEvent(RoomObjectFloorHoleEvent.REMOVE_HOLE, this.object)); } @@ -95,7 +95,7 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic this._currentState = state; } - private _Str_25016(): void + private handleAutomaticStateUpdate(): void { if(!this.object) return; @@ -105,6 +105,6 @@ export class FurnitureFloorHoleLogic extends FurnitureMultiStateLogic const stateIndex = model.getValue(RoomObjectVariable.FURNITURE_AUTOMATIC_STATE_INDEX); - if(!isNaN(stateIndex)) this._Str_21445((stateIndex % 2)); + if(!isNaN(stateIndex)) this.handleStateUpdate((stateIndex % 2)); } -} \ No newline at end of file +} diff --git a/src/nitro/session/events/RoomSessionPollEvent.ts b/src/nitro/session/events/RoomSessionPollEvent.ts index 87ea2e98..704af576 100644 --- a/src/nitro/session/events/RoomSessionPollEvent.ts +++ b/src/nitro/session/events/RoomSessionPollEvent.ts @@ -1,49 +1,100 @@ -import { IRoomSession } from '../IRoomSession'; -import { RoomSessionEvent } from './RoomSessionEvent'; +import { RoomSessionEvent } from 'nitro-renderer/src/nitro/session/events/RoomSessionEvent'; +import { IRoomSession } from 'nitro-renderer/src/nitro/session/IRoomSession'; export class RoomSessionPollEvent extends RoomSessionEvent { - public static VOTE_QUESTION: string = 'RSPE_VOTE_QUESTION'; - public static VOTE_RESULT: string = 'RSPE_VOTE_RESULT'; + public static OFFER: string = 'RSPE_POLL_OFFER'; + public static ERROR: string = 'RSPE_POLL_ERROR'; + public static CONTENT: string = 'RSPE_POLL_CONTENT'; - private _question: string = ''; - private _choices: string[]; - private _SafeStr_7651: string[]; - private _SafeStr_7654: number = 0; + private _id: number = -1; + private _headline: string; + private _summary: string; + private _numQuestions: number = 0; + private _startMessage: string = ''; + private _endMessage: string = ''; + private _questionArray: string[] = null; + private _npsPoll: boolean = false; - constructor(_arg_1: string, _arg_2: IRoomSession, _arg_3: string, _arg_4: string[], _arg_5: string[]=null, _arg_6: number=0) + constructor(k: string, _arg_2: IRoomSession, _arg_3: number) { - super(_arg_1, _arg_2); + super(k, _arg_2); - this._choices = []; - this._SafeStr_7651 = []; - this._question = _arg_3; - this._choices = _arg_4; - this._SafeStr_7651 = _arg_5; - if(this._SafeStr_7651 == null) - { - this._SafeStr_7651 = []; - } - this._SafeStr_7654 = _arg_6; + this._id = _arg_3; } - public get question(): string + public get id(): number { - return this._question; + return this._id; } - public get choices(): string[] + public get headline(): string { - return this._choices.slice(); + return this._headline; } - public get _SafeStr_4173(): string[] + public set headline(k: string) { - return this._SafeStr_7651.slice(); + this._headline = k; } - public get _SafeStr_4174(): number + public get summary(): string { - return this._SafeStr_7654; + return this._summary; } -} \ No newline at end of file + + public set summary(k: string) + { + this._summary = k; + } + + public get numQuestions(): number + { + return this._numQuestions; + } + + public set numQuestions(k: number) + { + this._numQuestions = k; + } + + public get startMessage(): string + { + return this._startMessage; + } + + public set startMessage(k: string) + { + this._startMessage = k; + } + + public get endMessage(): string + { + return this._endMessage; + } + + public set endMessage(k: string) + { + this._endMessage = k; + } + + public get questionArray(): string[] + { + return this._questionArray; + } + + public set questionArray(k: string[]) + { + this._questionArray = k; + } + + public get npsPoll(): boolean + { + return this._npsPoll; + } + + public set npsPoll(k: boolean) + { + this._npsPoll = k; + } +} diff --git a/src/nitro/session/events/RoomSessionVoteEvent.ts b/src/nitro/session/events/RoomSessionVoteEvent.ts new file mode 100644 index 00000000..c0f59bc1 --- /dev/null +++ b/src/nitro/session/events/RoomSessionVoteEvent.ts @@ -0,0 +1,49 @@ +import { RoomSessionEvent } from 'nitro-renderer/src/nitro/session/events/RoomSessionEvent'; +import { IRoomSession } from 'nitro-renderer/src/nitro/session/IRoomSession'; + +export class RoomSessionVoteEvent extends RoomSessionEvent +{ + public static VOTE_QUESTION: string = 'RSPE_VOTE_QUESTION'; + public static VOTE_RESULT: string = 'RSPE_VOTE_RESULT'; + + private _question: string = ''; + private _choices: string[]; + private _SafeStr_7651: string[]; + private _SafeStr_7654: number = 0; + + constructor(_arg_1: string, _arg_2: IRoomSession, _arg_3: string, _arg_4: string[], _arg_5: string[]=null, _arg_6: number=0) + { + super(_arg_1, _arg_2); + + this._choices = []; + this._SafeStr_7651 = []; + this._question = _arg_3; + this._choices = _arg_4; + this._SafeStr_7651 = _arg_5; + if(this._SafeStr_7651 == null) + { + this._SafeStr_7651 = []; + } + this._SafeStr_7654 = _arg_6; + } + + public get question(): string + { + return this._question; + } + + public get choices(): string[] + { + return this._choices.slice(); + } + + public get _SafeStr_4173(): string[] + { + return this._SafeStr_7651.slice(); + } + + public get _SafeStr_4174(): number + { + return this._SafeStr_7654; + } +} diff --git a/src/nitro/session/events/_Str_3051.ts b/src/nitro/session/events/_Str_3051.ts deleted file mode 100644 index 673870b8..00000000 --- a/src/nitro/session/events/_Str_3051.ts +++ /dev/null @@ -1,100 +0,0 @@ -import { IRoomSession } from '../IRoomSession'; -import { RoomSessionEvent } from './RoomSessionEvent'; - -export class _Str_3051 extends RoomSessionEvent -{ - public static RSPE_POLL_OFFER: string = 'RSPE_POLL_OFFER'; - public static ERROR: string = 'RSPE_POLL_ERROR'; - public static RSPE_POLL_CONTENT: string = 'RSPE_POLL_CONTENT'; - - private _id: number = -1; - private _headline: string; - private _summary: string; - private _Str_5366: number = 0; - private _Str_5879: string = ''; - private _Str_4781: string = ''; - private _Str_5432: string[] = null; - private _Str_4353: boolean = false; - - constructor(k: string, _arg_2: IRoomSession, _arg_3: number) - { - super(k, _arg_2); - - this._id = _arg_3; - } - - public get id(): number - { - return this._id; - } - - public get headline(): string - { - return this._headline; - } - - public set headline(k: string) - { - this._headline = k; - } - - public get summary(): string - { - return this._summary; - } - - public set summary(k: string) - { - this._summary = k; - } - - public get _Str_6760(): number - { - return this._Str_5366; - } - - public set _Str_6760(k: number) - { - this._Str_5366 = k; - } - - public get _Str_6013(): string - { - return this._Str_5879; - } - - public set _Str_6013(k: string) - { - this._Str_5879 = k; - } - - public get _Str_5838(): string - { - return this._Str_4781; - } - - public set _Str_5838(k: string) - { - this._Str_4781 = k; - } - - public get _Str_5643(): string[] - { - return this._Str_5432; - } - - public set _Str_5643(k: string[]) - { - this._Str_5432 = k; - } - - public get _Str_6196(): boolean - { - return this._Str_4353; - } - - public set _Str_6196(k: boolean) - { - this._Str_4353 = k; - } -} \ No newline at end of file diff --git a/src/nitro/session/events/index.ts b/src/nitro/session/events/index.ts index 913d6040..304e2245 100644 --- a/src/nitro/session/events/index.ts +++ b/src/nitro/session/events/index.ts @@ -29,7 +29,7 @@ export * from './RoomSessionUserBadgesEvent'; export * from './RoomSessionUserDataUpdateEvent'; export * from './RoomSessionUserFigureUpdateEvent'; export * from './RoomSessionUserTagsEvent'; +export * from './RoomSessionVoteEvent'; export * from './RoomSessionWordQuizEvent'; export * from './SessionDataPreferencesEvent'; export * from './UserNameUpdateEvent'; -export * from './_Str_3051';