From 8451540b3773093a41da19d6f43a76d2fa228542 Mon Sep 17 00:00:00 2001 From: Dank074 Date: Mon, 7 Jun 2021 03:42:27 -0500 Subject: [PATCH] cleaned HabboClubLevelEnum --- src/nitro/room/object/visualization/room/RoomPlane.ts | 2 +- .../room/object/visualization/room/RoomVisualization.ts | 2 +- .../room/rasterizer/animated/AnimationItem.ts | 4 ++-- .../animated/PlaneVisualizationAnimationLayer.ts | 2 +- .../visualization/room/rasterizer/basic/PlaneMaterial.ts | 6 +++--- .../room/rasterizer/basic/PlaneRasterizer.ts | 2 +- src/nitro/room/utils/SpriteDataCollector.ts | 2 +- src/nitro/session/HabboClubLevelEnum.ts | 8 ++++---- src/nitro/session/RoomUserData.ts | 8 ++++---- src/room/object/visualization/IPlaneVisualization.ts | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/nitro/room/object/visualization/room/RoomPlane.ts b/src/nitro/room/object/visualization/room/RoomPlane.ts index ca9aaf41..b5d4c5c8 100644 --- a/src/nitro/room/object/visualization/room/RoomPlane.ts +++ b/src/nitro/room/object/visualization/room/RoomPlane.ts @@ -508,7 +508,7 @@ export class RoomPlane implements IRoomPlane if(this._hasTexture && layer.getMaterial()) { const normal = geometry.getCoordinatePosition(this._normal); - const cm = layer.getMaterial()._Str_21968(normal); + const cm = layer.getMaterial().getMaterialCellMatrix(normal); //const data = new PlaneDrawingData(maskData, blend(this._color, layer.getColor()), cm.isBottomAligned()); const data = new PlaneDrawingData(maskData, this._color, cm.isBottomAligned()); diff --git a/src/nitro/room/object/visualization/room/RoomVisualization.ts b/src/nitro/room/object/visualization/room/RoomVisualization.ts index 23ace882..26009171 100644 --- a/src/nitro/room/object/visualization/room/RoomVisualization.ts +++ b/src/nitro/room/object/visualization/room/RoomVisualization.ts @@ -994,7 +994,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements return new Rectangle(this._boundingRectangle.x, this._boundingRectangle.y, this._boundingRectangle.width, this._boundingRectangle.height); } - public get _Str_19113(): IRoomPlane[] + public get planes(): IRoomPlane[] { const planes: IRoomPlane[] = []; diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts index fdc92022..57c128b8 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/animated/AnimationItem.ts @@ -36,7 +36,7 @@ export class AnimationItem this._bitmapData = null; } - public _Str_6729(k: number, _arg_2: number, _arg_3: number, _arg_4: number, _arg_5: number): Point + public getPosition(k: number, _arg_2: number, _arg_3: number, _arg_4: number, _arg_5: number): Point { let _local_6 = this._x; let _local_7 = this._y; @@ -50,4 +50,4 @@ export class AnimationItem return new Point(_local_8, _local_9); } -} \ No newline at end of file +} diff --git a/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts b/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts index 9c4455a1..62b2e598 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/animated/PlaneVisualizationAnimationLayer.ts @@ -105,7 +105,7 @@ export class PlaneVisualizationAnimationLayer implements IDisposable const _local_13 = (this._items[_local_12] as AnimationItem); if(_local_13 != null) { - const _local_14 = _local_13._Str_6729(_arg_7, _arg_8, _arg_9, _arg_10, _arg_11); + const _local_14 = _local_13.getPosition(_arg_7, _arg_8, _arg_9, _arg_10, _arg_11); _local_14.x = (_local_14.x - _arg_5); _local_14.y = (_local_14.y - _arg_6); diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterial.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterial.ts index 76ae6a0d..70a02762 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterial.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneMaterial.ts @@ -50,7 +50,7 @@ export class PlaneMaterial this._isCached = false; } - public _Str_24503(k: number, _arg_2: number, _arg_3: number, _arg_4: number = -1, _arg_5: number = 1, _arg_6: number = -1, _arg_7: number = 1): PlaneMaterialCellMatrix + public addMaterialCellMatrix(k: number, _arg_2: number, _arg_3: number, _arg_4: number = -1, _arg_5: number = 1, _arg_6: number = -1, _arg_7: number = 1): PlaneMaterialCellMatrix { const cellMatrix = new PlaneMaterialCellMatrix(k, _arg_2, _arg_3, _arg_4, _arg_5, _arg_6, _arg_7); @@ -59,7 +59,7 @@ export class PlaneMaterial return cellMatrix; } - public _Str_21968(k: IVector3D): PlaneMaterialCellMatrix + public getMaterialCellMatrix(k: IVector3D): PlaneMaterialCellMatrix { if(!k) return null; @@ -82,7 +82,7 @@ export class PlaneMaterial if(_arg_3 < 1) _arg_3 = 1; - const cellMatrix = this._Str_21968(_arg_4); + const cellMatrix = this.getMaterialCellMatrix(_arg_4); if(!cellMatrix) return null; diff --git a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts index 6073043e..2a7759cb 100644 --- a/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts +++ b/src/nitro/room/object/visualization/room/rasterizer/basic/PlaneRasterizer.ts @@ -332,7 +332,7 @@ export class PlaneRasterizer implements IPlaneRasterizer if(matrix.columns && matrix.columns.length) { - const cellMatrix = newMaterial._Str_24503(matrix.columns.length, repeatMode, align, normalMinX, normalMaxX, normalMinY, normalMaxY); + const cellMatrix = newMaterial.addMaterialCellMatrix(matrix.columns.length, repeatMode, align, normalMinX, normalMaxX, normalMinY, normalMaxY); let index = 0; diff --git a/src/nitro/room/utils/SpriteDataCollector.ts b/src/nitro/room/utils/SpriteDataCollector.ts index 39a56000..1aebf619 100644 --- a/src/nitro/room/utils/SpriteDataCollector.ts +++ b/src/nitro/room/utils/SpriteDataCollector.ts @@ -395,7 +395,7 @@ export class SpriteDataCollector if(visualization) { const _local_8 = _arg_2.geometry; - const _local_9 = this._Str_25623(visualization._Str_19113, _arg_2, _arg_3); + const _local_9 = this._Str_25623(visualization.planes, _arg_2, _arg_3); const _local_10 = Nitro.instance.stage; for(const _local_11 of _local_9) diff --git a/src/nitro/session/HabboClubLevelEnum.ts b/src/nitro/session/HabboClubLevelEnum.ts index e52a706c..3986c8e8 100644 --- a/src/nitro/session/HabboClubLevelEnum.ts +++ b/src/nitro/session/HabboClubLevelEnum.ts @@ -1,6 +1,6 @@ export class HabboClubLevelEnum { - public static _Str_3159: number = 0; - public static _Str_2964: number = 1; - public static _Str_2575: number = 2; -} \ No newline at end of file + public static NO_CLUB: number = 0; + public static CLUB: number = 1; + public static VIP: number = 2; +} diff --git a/src/nitro/session/RoomUserData.ts b/src/nitro/session/RoomUserData.ts index 1e854420..5bd4648f 100644 --- a/src/nitro/session/RoomUserData.ts +++ b/src/nitro/session/RoomUserData.ts @@ -22,7 +22,7 @@ export class RoomUserData private _canRevive: boolean; private _hasBreedingPermission: boolean; private _botSkills: number[]; - private _Str_9831: boolean; + private _isModerator: boolean; constructor(k: number) { @@ -246,11 +246,11 @@ export class RoomUserData public get isModerator(): boolean { - return this._Str_9831; + return this._isModerator; } public set isModerator(k: boolean) { - this._Str_9831 = k; + this._isModerator = k; } -} \ No newline at end of file +} diff --git a/src/room/object/visualization/IPlaneVisualization.ts b/src/room/object/visualization/IPlaneVisualization.ts index f0602772..65b5de2b 100644 --- a/src/room/object/visualization/IPlaneVisualization.ts +++ b/src/room/object/visualization/IPlaneVisualization.ts @@ -2,5 +2,5 @@ export interface IPlaneVisualization { - _Str_19113: IRoomPlane[]; -} \ No newline at end of file + planes: IRoomPlane[]; +}