From 3584040d7867e4c0218f1610f4684e99eafc9275 Mon Sep 17 00:00:00 2001 From: Dank074 Date: Sat, 15 May 2021 05:25:38 -0500 Subject: [PATCH] cleaned RoomObjectSpriteType --- .../object/visualization/avatar/AvatarVisualization.ts | 4 ++-- .../room/object/visualization/room/RoomVisualization.ts | 2 +- src/room/object/enum/RoomObjectSpriteType.ts | 8 ++++---- src/room/renderer/RoomSpriteCanvas.ts | 8 ++++---- src/room/renderer/cache/RoomObjectCache.ts | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts index 76bb3bde..1e5337a1 100644 --- a/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts +++ b/src/nitro/room/object/visualization/avatar/AvatarVisualization.ts @@ -334,11 +334,11 @@ export class AvatarVisualization extends RoomObjectSpriteVisualization implement if(this._ownUser) { sprite.relativeDepth -= AvatarVisualization._Str_17708; - sprite.spriteType = RoomObjectSpriteType._Str_10494; + sprite.spriteType = RoomObjectSpriteType.AVATAR_OWN; } else { - sprite.spriteType = RoomObjectSpriteType._Str_11629; + sprite.spriteType = RoomObjectSpriteType.AVATAR; } } diff --git a/src/nitro/room/object/visualization/room/RoomVisualization.ts b/src/nitro/room/object/visualization/room/RoomVisualization.ts index 9085f6d4..db865ca0 100644 --- a/src/nitro/room/object/visualization/room/RoomVisualization.ts +++ b/src/nitro/room/object/visualization/room/RoomVisualization.ts @@ -669,7 +669,7 @@ export class RoomVisualization extends RoomObjectSpriteVisualization implements sprite.tag = 'plane@' + (planeIndex + 1); } - sprite.spriteType = RoomObjectSpriteType._Str_8616; + sprite.spriteType = RoomObjectSpriteType.ROOM_PLANE; } planeIndex++; diff --git a/src/room/object/enum/RoomObjectSpriteType.ts b/src/room/object/enum/RoomObjectSpriteType.ts index 92bbbb1f..eda5e353 100644 --- a/src/room/object/enum/RoomObjectSpriteType.ts +++ b/src/room/object/enum/RoomObjectSpriteType.ts @@ -1,7 +1,7 @@ export class RoomObjectSpriteType { public static DEFAULT: number = 1; - public static _Str_8616: number = 2; - public static _Str_11629: number = 3; - public static _Str_10494: number = 4; -} \ No newline at end of file + public static ROOM_PLANE: number = 2; + public static AVATAR: number = 3; + public static AVATAR_OWN: number = 4; +} diff --git a/src/room/renderer/RoomSpriteCanvas.ts b/src/room/renderer/RoomSpriteCanvas.ts index 4aabceb9..beff1f6e 100644 --- a/src/room/renderer/RoomSpriteCanvas.ts +++ b/src/room/renderer/RoomSpriteCanvas.ts @@ -510,7 +510,7 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas sortableSprite.sprite = sprite; - if((sprite.spriteType === RoomObjectSpriteType._Str_11629) || (sprite.spriteType === RoomObjectSpriteType._Str_10494)) + if((sprite.spriteType === RoomObjectSpriteType.AVATAR) || (sprite.spriteType === RoomObjectSpriteType.AVATAR_OWN)) { sortableSprite.sprite.libraryAssetName = 'avatar_' + object.id; } @@ -724,12 +724,12 @@ export class RoomSpriteCanvas implements IRoomRenderingCanvas switch(_arg_2.spriteType) { - case RoomObjectSpriteType._Str_10494: + case RoomObjectSpriteType.AVATAR_OWN: return; - case RoomObjectSpriteType._Str_8616: + case RoomObjectSpriteType.ROOM_PLANE: sprite.alpha = RoomEnterEffect.getDelta(0.9); return; - case RoomObjectSpriteType._Str_11629: + case RoomObjectSpriteType.AVATAR: sprite.alpha = RoomEnterEffect.getDelta(0.5); return; default: diff --git a/src/room/renderer/cache/RoomObjectCache.ts b/src/room/renderer/cache/RoomObjectCache.ts index 8c39578d..ba320ca8 100644 --- a/src/room/renderer/cache/RoomObjectCache.ts +++ b/src/room/renderer/cache/RoomObjectCache.ts @@ -75,7 +75,7 @@ export class RoomObjectCache { if(!sprite) continue; - if((sprite.sprite.spriteType !== RoomObjectSpriteType._Str_8616) && (sprite.sprite.name !== '')) + if((sprite.sprite.spriteType !== RoomObjectSpriteType.ROOM_PLANE) && (sprite.sprite.name !== '')) { const data = new RoomObjectSpriteData(); @@ -139,7 +139,7 @@ export class RoomObjectCache { for(const sprite of item.sprites.sprites) { - if(sprite.sprite.spriteType === RoomObjectSpriteType._Str_8616) sprites.push(sprite); + if(sprite.sprite.spriteType === RoomObjectSpriteType.ROOM_PLANE) sprites.push(sprite); } }