diff --git a/TRDataControl/Helpers/TRModelExtensions.cs b/TRDataControl/Helpers/TRModelExtensions.cs index 01422f3a2..406148596 100644 --- a/TRDataControl/Helpers/TRModelExtensions.cs +++ b/TRDataControl/Helpers/TRModelExtensions.cs @@ -7,180 +7,28 @@ namespace TRDataControl; public static class TRModelExtensions { - // This should be handled by TRTextureRemapper - - public static void ResetUnusedTextures(this TR1Level level) - { - ResetUnusedObjectTextures(level.ObjectTextures); - ResetUnusedSpriteTextures(level.Sprites.SelectMany(s => s.Value.Textures)); - } - - public static void ResetUnusedTextures(this TR2Level level) - { - ResetUnusedObjectTextures(level.ObjectTextures); - ResetUnusedSpriteTextures(level.Sprites.SelectMany(s => s.Value.Textures)); - } - - public static void ResetUnusedTextures(this TR3Level level) - { - ResetUnusedObjectTextures(level.ObjectTextures); - ResetUnusedSpriteTextures(level.Sprites.SelectMany(s => s.Value.Textures)); - } - - private static void ResetUnusedObjectTextures(IEnumerable objectTextures) - { - foreach (TRObjectTexture texture in objectTextures) - { - if (texture.Atlas == ushort.MaxValue) - { - texture.Invalidate(); - } + public static void ResetUnusedTextures(this TRLevelBase level) + { + switch (level.Version.Game) + { + case TRGameVersion.TR1: + new TR1TextureRemapper(level as TR1Level).ResetUnusedTextures(); + break; + case TRGameVersion.TR2: + new TR2TextureRemapper(level as TR2Level).ResetUnusedTextures(); + break; + case TRGameVersion.TR3: + new TR3TextureRemapper(level as TR3Level).ResetUnusedTextures(); + break; + case TRGameVersion.TR4: + new TR4TextureRemapper(level as TR4Level).ResetUnusedTextures(); + break; + case TRGameVersion.TR5: + new TR5TextureRemapper(level as TR5Level).ResetUnusedTextures(); + break; } } - private static void ResetUnusedSpriteTextures(IEnumerable spriteTextures) - { - foreach (TRSpriteTexture texture in spriteTextures) - { - if (texture.Atlas == ushort.MaxValue) - { - texture.Invalidate(); - } - } - } - - // See TextureTransportHandler.ResetUnusedTextures - public static bool IsValid(this TRObjectTexture texture) - { - if (texture.Atlas == 0) - { - return texture.Size.Width == 0 && texture.Size.Height == 0; - } - - return texture.Atlas != ushort.MaxValue; - } - - public static void Invalidate(this TRObjectTexture texture) - { - texture.Atlas = 0; - texture.Size = new(0, 0); - } - - // See TextureTransportHandler.ResetUnusedTextures - public static bool IsValid(this TRSpriteTexture texture) - { - if (texture.Atlas == 0) - { - if (texture.X == 0 && texture.Y == 0 && texture.Width == 1 && texture.Height == 1) - { - return false; - } - } - - return texture.Atlas != ushort.MaxValue; - } - - public static void Invalidate(this TRSpriteTexture texture) - { - texture.Atlas = 0; - texture.X = texture.Y = 0; - texture.Width = texture.Height = 1; - } - - public static List GetInvalidObjectTextureIndices(this TR1Level level) - { - return GetInvalidObjectTextureIndices(level.ObjectTextures); - } - - public static List GetInvalidObjectTextureIndices(this TR2Level level) - { - return GetInvalidObjectTextureIndices(level.ObjectTextures); - } - - public static List GetInvalidObjectTextureIndices(this TR3Level level) - { - return GetInvalidObjectTextureIndices(level.ObjectTextures); - } - - private static List GetInvalidObjectTextureIndices(List objectTextures) - { - List reusableIndices = new(); - for (int i = 0; i < objectTextures.Count; i++) - { - if (!objectTextures[i].IsValid()) - { - reusableIndices.Add(i); - } - } - return reusableIndices; - } - - // Given a precompiled dictionary of old texture index to new, this will ensure that - // all Meshes, RoomData and AnimatedTextures point to the new correct index. - public static void ReindexTextures(this TR2Level level, Dictionary indexMap, bool defaultToOriginal = true) - { - if (indexMap.Count == 0) - { - return; - } - - foreach (TRMesh mesh in level.DistinctMeshes) - { - foreach (TRMeshFace face in mesh.TexturedFaces) - { - face.Texture = ConvertTextureReference(face.Texture, indexMap, defaultToOriginal); - } - } - - foreach (TR2Room room in level.Rooms) - { - foreach (TRFace face in room.Mesh.Faces) - { - face.Texture = ConvertTextureReference(face.Texture, indexMap, defaultToOriginal); - } - } - - // #137 Ensure animated textures are reindexed too (these are just groups of texture indices) - // They have to remain unique it seems, otherwise the animation speed is too fast, so while we - // have removed the duplicated textures, we can re-add duplicate texture objects while there is - // enough space in that array. - List textures = level.ObjectTextures.ToList(); - foreach (TRAnimatedTexture anim in level.AnimatedTextures) - { - for (int i = 0; i < anim.Textures.Count; i++) - { - anim.Textures[i] = ConvertTextureReference(anim.Textures[i], indexMap, defaultToOriginal); - } - - ushort previousIndex = anim.Textures[0]; - for (int i = 1; i < anim.Textures.Count; i++) - { - if (anim.Textures[i] == previousIndex && textures.Count < 2048) - { - textures.Add(textures[anim.Textures[i]]); - anim.Textures[i] = (ushort)(textures.Count - 1); - } - previousIndex = anim.Textures[i]; - } - } - - if (textures.Count > level.ObjectTextures.Count) - { - level.ObjectTextures.Clear(); - level.ObjectTextures.AddRange(textures); - } - } - - private static ushort ConvertTextureReference(ushort textureReference, Dictionary indexMap, bool defaultToOriginal) - { - if (indexMap.ContainsKey(textureReference)) - { - return (ushort)indexMap[textureReference]; - } - - return defaultToOriginal ? textureReference : (ushort)0; - } - public static string ComputeSkeletonHash(this IEnumerable meshes) { using MemoryStream ms = new(); diff --git a/TRDataControl/Transport/TR1/TR1DataExporter.cs b/TRDataControl/Transport/TR1/TR1DataExporter.cs index cffe24542..dd32531d6 100644 --- a/TRDataControl/Transport/TR1/TR1DataExporter.cs +++ b/TRDataControl/Transport/TR1/TR1DataExporter.cs @@ -25,8 +25,8 @@ protected override TR1Blob CreateBlob(TR1Level level, TR1Type id, TRBlobType blo }; } - protected override TRTextureRemapper CreateRemapper() - => new TR1TextureRemapper(); + protected override TRTextureRemapper CreateRemapper(TR1Level level) + => new TR1TextureRemapper(level); protected override bool IsMasterType(TR1Type type) => type == TR1Type.Lara; @@ -77,7 +77,7 @@ protected override void PreCreation(TR1Level level, TR1Type type, TRBlobType blo AmendSkaterBoyDeath(level); break; case TR1Type.CowboyHeadless: - //AmendDXtre3DTextures(definition); + AmendHeadlessCowboySFX(level); break; case TR1Type.Natla: AmendNatlaDeath(level); @@ -151,6 +151,21 @@ public static void AmendSkaterBoyDeath(TR1Level level) } } + public static void AmendHeadlessCowboySFX(TR1Level level) + { + // Originally silent in the Folklorist's Diary, but achieved using ID 15, which has been repurposed + // in TR1X as LaraWetFeet. Restore the gunshots and just remove the fake death sound. + foreach (TRAnimCommand cmd in level.Models[TR1Type.Cowboy].Animations[4].Commands) + { + if (cmd is TRSFXCommand sfxCmd && sfxCmd.SoundID == 15) + { + sfxCmd.SoundID = (short)TR1SFX.LaraMagnums; + } + } + + level.Models[TR1Type.Cowboy].Animations[7].Commands.RemoveAll(a => a is TRSFXCommand); + } + public static void AmendNatlaDeath(TR1Level level) { level.Models[TR1Type.Natla].Animations[13].Commands.Add(new TRSFXCommand @@ -164,7 +179,6 @@ public static void AddMovingBlockSFX(TR1Level level, string baseLevelDirectory) { // ToQ moving blocks are silent but we want them to scrape along the floor when they move. // Import the trapdoor closing SFX from Vilcabamba and adjust the animations accordingly. - if (!level.SoundEffects.ContainsKey(TR1SFX.TrapdoorClose)) { TR1Level vilcabamba = new TR1LevelControl().Read(Path.Combine(baseLevelDirectory, TR1LevelNames.VILCABAMBA)); diff --git a/TRDataControl/Transport/TR1/TR1DataImporter.cs b/TRDataControl/Transport/TR1/TR1DataImporter.cs index e0554300e..5b6c8744a 100644 --- a/TRDataControl/Transport/TR1/TR1DataImporter.cs +++ b/TRDataControl/Transport/TR1/TR1DataImporter.cs @@ -1,4 +1,5 @@ -using TRImageControl; +using Newtonsoft.Json; +using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Model; @@ -28,8 +29,11 @@ protected override List GetExistingTypes() return new(Level.Models.Keys.Concat(Level.Sprites.Keys)); } - protected override TRTextureRemapper CreateRemapper() - => new TR1TextureRemapper(); + protected override TRTextureRemapper CreateRemapper(TR1Level level) + => new TR1TextureRemapper(level); + + protected override AbstractTextureRemapGroup GetRemapGroup() + => JsonConvert.DeserializeObject(File.ReadAllText(TextureRemapPath)); protected override bool IsMasterType(TR1Type type) => type == TR1Type.Lara; @@ -59,9 +63,6 @@ protected override TRDictionary SpriteSequences protected override List CinematicFrames => Level.CinematicFrames; - protected override List ObjectTextures - => Level.ObjectTextures; - protected override ushort ImportColour(TR1Blob blob, ushort currentIndex) { return blob.Palette8.ContainsKey(currentIndex) diff --git a/TRDataControl/Transport/TR1/TR1TextureRemapper.cs b/TRDataControl/Transport/TR1/TR1TextureRemapper.cs index c8be64550..cafcd7d35 100644 --- a/TRDataControl/Transport/TR1/TR1TextureRemapper.cs +++ b/TRDataControl/Transport/TR1/TR1TextureRemapper.cs @@ -5,17 +5,12 @@ namespace TRDataControl; public class TR1TextureRemapper : TRTextureRemapper { - public override List AnimatedTextures - => _level.AnimatedTextures; - - public override List ObjectTextures - => _level.ObjectTextures; - - public override IEnumerable Faces - => _level.Rooms.Select(r => r.Mesh) - .SelectMany(m => m.Faces) - .Concat(_level.DistinctMeshes.SelectMany(m => m.TexturedFaces)); + public override IEnumerable RoomFaces + => _level.Rooms.Select(r => r.Mesh).SelectMany(m => m.Faces); protected override TRTexturePacker CreatePacker() => new TR1TexturePacker(_level, 32); + + public TR1TextureRemapper(TR1Level level) + : base(level) { } } diff --git a/TRDataControl/Transport/TR2/TR2DataExporter.cs b/TRDataControl/Transport/TR2/TR2DataExporter.cs index 027161ef7..84effd345 100644 --- a/TRDataControl/Transport/TR2/TR2DataExporter.cs +++ b/TRDataControl/Transport/TR2/TR2DataExporter.cs @@ -25,8 +25,8 @@ protected override TR2Blob CreateBlob(TR2Level level, TR2Type id, TRBlobType blo }; } - protected override TRTextureRemapper CreateRemapper() - => new TR2TextureRemapper(); + protected override TRTextureRemapper CreateRemapper(TR2Level level) + => new TR2TextureRemapper(level); protected override bool IsMasterType(TR2Type type) => type == TR2Type.Lara; diff --git a/TRDataControl/Transport/TR2/TR2DataImporter.cs b/TRDataControl/Transport/TR2/TR2DataImporter.cs index 56ab4b6c3..7a952d57b 100644 --- a/TRDataControl/Transport/TR2/TR2DataImporter.cs +++ b/TRDataControl/Transport/TR2/TR2DataImporter.cs @@ -1,4 +1,5 @@ -using TRImageControl; +using Newtonsoft.Json; +using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Model; @@ -21,8 +22,11 @@ public TR2DataImporter(bool isCommunityPatch = false) protected override List GetExistingTypes() => new(Level.Models.Keys.Concat(Level.Sprites.Keys)); - protected override TRTextureRemapper CreateRemapper() - => new TR2TextureRemapper(); + protected override TRTextureRemapper CreateRemapper(TR2Level level) + => new TR2TextureRemapper(level); + + protected override AbstractTextureRemapGroup GetRemapGroup() + => JsonConvert.DeserializeObject(File.ReadAllText(TextureRemapPath)); protected override bool IsMasterType(TR2Type type) => type == TR2Type.Lara; @@ -45,9 +49,6 @@ protected override TRDictionary SpriteSequences protected override List CinematicFrames => Level.CinematicFrames; - protected override List ObjectTextures - => Level.ObjectTextures; - protected override ushort ImportColour(TR2Blob blob, ushort currentIndex) { if (!blob.Palette16.ContainsKey(currentIndex)) diff --git a/TRDataControl/Transport/TR2/TR2TextureRemapper.cs b/TRDataControl/Transport/TR2/TR2TextureRemapper.cs index 637ac0f70..cf3239cd6 100644 --- a/TRDataControl/Transport/TR2/TR2TextureRemapper.cs +++ b/TRDataControl/Transport/TR2/TR2TextureRemapper.cs @@ -5,17 +5,12 @@ namespace TRDataControl; public class TR2TextureRemapper : TRTextureRemapper { - public override List AnimatedTextures - => _level.AnimatedTextures; - - public override List ObjectTextures - => _level.ObjectTextures; - - public override IEnumerable Faces - => _level.Rooms.Select(r => r.Mesh) - .SelectMany(m => m.Faces) - .Concat(_level.DistinctMeshes.SelectMany(m => m.TexturedFaces)); + public override IEnumerable RoomFaces + => _level.Rooms.Select(r => r.Mesh).SelectMany(m => m.Faces); protected override TRTexturePacker CreatePacker() => new TR2TexturePacker(_level, 32); + + public TR2TextureRemapper(TR2Level level) + : base(level) { } } diff --git a/TRDataControl/Transport/TR3/TR3DataExporter.cs b/TRDataControl/Transport/TR3/TR3DataExporter.cs index d00314670..0021abcc9 100644 --- a/TRDataControl/Transport/TR3/TR3DataExporter.cs +++ b/TRDataControl/Transport/TR3/TR3DataExporter.cs @@ -23,8 +23,8 @@ protected override TR3Blob CreateBlob(TR3Level level, TR3Type id, TRBlobType blo }; } - protected override TRTextureRemapper CreateRemapper() - => new TR3TextureRemapper(); + protected override TRTextureRemapper CreateRemapper(TR3Level level) + => new TR3TextureRemapper(level); protected override bool IsMasterType(TR3Type type) => type == TR3Type.Lara; diff --git a/TRDataControl/Transport/TR3/TR3DataImporter.cs b/TRDataControl/Transport/TR3/TR3DataImporter.cs index 8c5167d4b..6a0be31db 100644 --- a/TRDataControl/Transport/TR3/TR3DataImporter.cs +++ b/TRDataControl/Transport/TR3/TR3DataImporter.cs @@ -1,4 +1,5 @@ -using TRImageControl; +using Newtonsoft.Json; +using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Model; @@ -21,8 +22,11 @@ public TR3DataImporter(bool isCommunityPatch = false) protected override List GetExistingTypes() => new(Level.Models.Keys.Concat(Level.Sprites.Keys)); - protected override TRTextureRemapper CreateRemapper() - => new TR3TextureRemapper(); + protected override TRTextureRemapper CreateRemapper(TR3Level level) + => new TR3TextureRemapper(level); + + protected override AbstractTextureRemapGroup GetRemapGroup() + => JsonConvert.DeserializeObject(File.ReadAllText(TextureRemapPath)); protected override bool IsMasterType(TR3Type type) => type == TR3Type.Lara; @@ -45,9 +49,6 @@ protected override TRDictionary SpriteSequences protected override List CinematicFrames => Level.CinematicFrames; - protected override List ObjectTextures - => Level.ObjectTextures; - protected override ushort ImportColour(TR3Blob blob, ushort currentIndex) { if (!blob.Palette16.ContainsKey(currentIndex)) diff --git a/TRDataControl/Transport/TR3/TR3TextureRemapper.cs b/TRDataControl/Transport/TR3/TR3TextureRemapper.cs index 37a9cf13a..fc22af610 100644 --- a/TRDataControl/Transport/TR3/TR3TextureRemapper.cs +++ b/TRDataControl/Transport/TR3/TR3TextureRemapper.cs @@ -5,17 +5,12 @@ namespace TRDataControl; public class TR3TextureRemapper : TRTextureRemapper { - public override List AnimatedTextures - => _level.AnimatedTextures; - - public override List ObjectTextures - => _level.ObjectTextures; - - public override IEnumerable Faces - => _level.Rooms.Select(r => r.Mesh) - .SelectMany(m => m.Faces) - .Concat(_level.DistinctMeshes.SelectMany(m => m.TexturedFaces)); + public override IEnumerable RoomFaces + => _level.Rooms.Select(r => r.Mesh).SelectMany(m => m.Faces); protected override TRTexturePacker CreatePacker() => new TR3TexturePacker(_level, 32); + + public TR3TextureRemapper(TR3Level level) + : base(level) { } } diff --git a/TRDataControl/Transport/TR4/TR4DataExporter.cs b/TRDataControl/Transport/TR4/TR4DataExporter.cs index 37e569580..56c6cec15 100644 --- a/TRDataControl/Transport/TR4/TR4DataExporter.cs +++ b/TRDataControl/Transport/TR4/TR4DataExporter.cs @@ -22,8 +22,8 @@ protected override TR4Blob CreateBlob(TR4Level level, TR4Type id, TRBlobType blo }; } - protected override TRTextureRemapper CreateRemapper() - => new TR4TextureRemapper(); + protected override TRTextureRemapper CreateRemapper(TR4Level level) + => new TR4TextureRemapper(level); protected override bool IsMasterType(TR4Type type) => type == TR4Type.Lara; diff --git a/TRDataControl/Transport/TR4/TR4DataImporter.cs b/TRDataControl/Transport/TR4/TR4DataImporter.cs index f5d1ac2e1..e239f58fb 100644 --- a/TRDataControl/Transport/TR4/TR4DataImporter.cs +++ b/TRDataControl/Transport/TR4/TR4DataImporter.cs @@ -1,4 +1,5 @@ -using TRImageControl.Packing; +using Newtonsoft.Json; +using TRImageControl.Packing; using TRLevelControl.Model; namespace TRDataControl; @@ -13,8 +14,11 @@ public TR4DataImporter() protected override List GetExistingTypes() => new(Level.Models.Keys.Concat(Level.Sprites.Keys)); - protected override TRTextureRemapper CreateRemapper() - => new TR4TextureRemapper(); + protected override TRTextureRemapper CreateRemapper(TR4Level level) + => new TR4TextureRemapper(level); + + protected override AbstractTextureRemapGroup GetRemapGroup() + => JsonConvert.DeserializeObject(File.ReadAllText(TextureRemapPath)); protected override bool IsMasterType(TR4Type type) => type == TR4Type.Lara; @@ -37,9 +41,6 @@ protected override TRDictionary SpriteSequences protected override List CinematicFrames => null; - protected override List ObjectTextures - => Level.ObjectTextures; - protected override ushort ImportColour(TR4Blob blob, ushort currentIndex) => 0; diff --git a/TRDataControl/Transport/TR4/TR4TextureRemapper.cs b/TRDataControl/Transport/TR4/TR4TextureRemapper.cs index 213939052..d007e5258 100644 --- a/TRDataControl/Transport/TR4/TR4TextureRemapper.cs +++ b/TRDataControl/Transport/TR4/TR4TextureRemapper.cs @@ -5,17 +5,12 @@ namespace TRDataControl; public class TR4TextureRemapper : TRTextureRemapper { - public override List AnimatedTextures - => _level.AnimatedTextures; - - public override List ObjectTextures - => _level.ObjectTextures; - - public override IEnumerable Faces - => _level.Rooms.Select(r => r.Mesh) - .SelectMany(m => m.Faces) - .Concat(_level.DistinctMeshes.SelectMany(m => m.TexturedFaces)); + public override IEnumerable RoomFaces + => _level.Rooms.Select(r => r.Mesh).SelectMany(m => m.Faces); protected override TRTexturePacker CreatePacker() => new TR4TexturePacker(_level, TRGroupPackingMode.Object, 32); + + public TR4TextureRemapper(TR4Level level) + : base(level) { } } diff --git a/TRDataControl/Transport/TR5/TR5DataExporter.cs b/TRDataControl/Transport/TR5/TR5DataExporter.cs index ca3329530..4ae51ac3e 100644 --- a/TRDataControl/Transport/TR5/TR5DataExporter.cs +++ b/TRDataControl/Transport/TR5/TR5DataExporter.cs @@ -22,8 +22,8 @@ protected override TR5Blob CreateBlob(TR5Level level, TR5Type id, TRBlobType blo }; } - protected override TRTextureRemapper CreateRemapper() - => new TR5TextureRemapper(); + protected override TRTextureRemapper CreateRemapper(TR5Level level) + => new TR5TextureRemapper(level); protected override bool IsMasterType(TR5Type type) => type == TR5Type.Lara; diff --git a/TRDataControl/Transport/TR5/TR5DataImporter.cs b/TRDataControl/Transport/TR5/TR5DataImporter.cs index f4077dbb6..f60ab3e3e 100644 --- a/TRDataControl/Transport/TR5/TR5DataImporter.cs +++ b/TRDataControl/Transport/TR5/TR5DataImporter.cs @@ -1,4 +1,5 @@ -using TRImageControl.Packing; +using Newtonsoft.Json; +using TRImageControl.Packing; using TRLevelControl.Model; namespace TRDataControl; @@ -13,8 +14,11 @@ public TR5DataImporter() protected override List GetExistingTypes() => new(Level.Models.Keys.Concat(Level.Sprites.Keys)); - protected override TRTextureRemapper CreateRemapper() - => new TR5TextureRemapper(); + protected override TRTextureRemapper CreateRemapper(TR5Level level) + => new TR5TextureRemapper(level); + + protected override AbstractTextureRemapGroup GetRemapGroup() + => JsonConvert.DeserializeObject(File.ReadAllText(TextureRemapPath)); protected override bool IsMasterType(TR5Type type) => type == TR5Type.Lara; @@ -37,9 +41,6 @@ protected override TRDictionary SpriteSequences protected override List CinematicFrames => null; - protected override List ObjectTextures - => Level.ObjectTextures; - protected override ushort ImportColour(TR5Blob blob, ushort currentIndex) => 0; diff --git a/TRDataControl/Transport/TR5/TR5TextureRemapper.cs b/TRDataControl/Transport/TR5/TR5TextureRemapper.cs index 14b4aebc3..4bbf53cbb 100644 --- a/TRDataControl/Transport/TR5/TR5TextureRemapper.cs +++ b/TRDataControl/Transport/TR5/TR5TextureRemapper.cs @@ -5,17 +5,12 @@ namespace TRDataControl; public class TR5TextureRemapper : TRTextureRemapper { - public override List AnimatedTextures - => _level.AnimatedTextures; - - public override List ObjectTextures - => _level.ObjectTextures; - - public override IEnumerable Faces - => _level.Rooms.Select(r => r.Mesh) - .SelectMany(m => m.Faces) - .Concat(_level.DistinctMeshes.SelectMany(m => m.TexturedFaces)); + public override IEnumerable RoomFaces + => _level.Rooms.Select(r => r.Mesh).SelectMany(m => m.Faces); protected override TRTexturePacker CreatePacker() => new TR5TexturePacker(_level, TRGroupPackingMode.Object, 32); + + public TR5TextureRemapper(TR5Level level) + : base(level) { } } diff --git a/TRDataControl/Transport/TRDataExporter.cs b/TRDataControl/Transport/TRDataExporter.cs index a38ebf47b..38226d993 100644 --- a/TRDataControl/Transport/TRDataExporter.cs +++ b/TRDataControl/Transport/TRDataExporter.cs @@ -16,7 +16,7 @@ public B Export(L level, T type, TRBlobType blobType) { Level = level; - CreateRemapper()?.Remap(level); + CreateRemapper(Level)?.Remap(); PreCreation(level, type, blobType); diff --git a/TRDataControl/Transport/TRDataImporter.cs b/TRDataControl/Transport/TRDataImporter.cs index dee84435c..e5746e416 100644 --- a/TRDataControl/Transport/TRDataImporter.cs +++ b/TRDataControl/Transport/TRDataImporter.cs @@ -94,6 +94,10 @@ private void CleanRemovalList() { entityClean = false; } + + // And similarly for cyclic dependencies + IEnumerable cyclics = Data.GetCyclicDependencies(type); + entityClean = cyclics.All(TypesToRemove.Contains); } if (entityClean) @@ -266,7 +270,7 @@ private void BuildBlobList(List standardBlobs, List modelTypes, T nextType protected void RemoveData() { - bool removed = false; + List staleTextures = new(); foreach (T type in TypesToRemove) { T id = Data.TranslateAlias(type); @@ -274,21 +278,28 @@ protected void RemoveData() switch (blobType) { case TRBlobType.Model: - removed |= Models.Remove(id); + staleTextures.AddRange(Models[type].Meshes + .SelectMany(m => m.TexturedFaces.Select(t => (int)t.Texture))); + Models.Remove(id); break; + case TRBlobType.StaticMesh: - removed |= StaticMeshes.Remove(id); + staleTextures.AddRange(StaticMeshes[type].Mesh.TexturedFaces.Select(t => (int)t.Texture)); + StaticMeshes.Remove(id); break; + case TRBlobType.Sprite: - removed |= SpriteSequences.Remove(id); + SpriteSequences.Remove(id); break; } } - if (removed) + staleTextures = new(staleTextures.Distinct()); + if (staleTextures.Count > 0) { - // Clear unused textures - CreateRemapper()?.Remap(Level); + AbstractTextureRemapGroup remapGroup = TextureRemapPath == null ? null : GetRemapGroup(); + CreateRemapper(Level)?.RemoveUnusedTextures(staleTextures, + (tile, bounds) => remapGroup?.CanRemoveRectangle(tile, bounds, TypesToRemove) ?? true); } } @@ -336,13 +347,13 @@ protected void ImportTextures(List blobs) if (globalRemap[region.ID].ContainsKey(segment.Index)) continue; - if (ObjectTextures.Count >= Data.TextureObjectLimit) + if (Level.ObjectTextures.Count >= Data.TextureObjectLimit) { throw new TransportException($"Limit of {Data.TextureObjectLimit} textures reached."); } - globalRemap[region.ID][segment.Index] = ObjectTextures.Count; - ObjectTextures.Add(segment.Texture as TRObjectTexture); + globalRemap[region.ID][segment.Index] = Level.ObjectTextures.Count; + Level.ObjectTextures.Add(segment.Texture as TRObjectTexture); } } @@ -502,5 +513,5 @@ protected virtual void BlobImported(B blob) { } protected abstract void ImportSound(B blob); protected abstract List GetExistingTypes(); - protected abstract List ObjectTextures { get; } + protected abstract AbstractTextureRemapGroup GetRemapGroup(); } diff --git a/TRDataControl/Transport/TRDataTransport.cs b/TRDataControl/Transport/TRDataTransport.cs index 4b27b3529..e4a12f8ee 100644 --- a/TRDataControl/Transport/TRDataTransport.cs +++ b/TRDataControl/Transport/TRDataTransport.cs @@ -29,7 +29,7 @@ public B LoadBlob(T type) } protected abstract TRTexturePacker CreatePacker(); - protected abstract TRTextureRemapper CreateRemapper(); + protected abstract TRTextureRemapper CreateRemapper(L level); protected abstract bool IsMasterType(T type); protected abstract TRMesh GetDummyMesh(); protected abstract TRDictionary Models { get; } diff --git a/TRDataControl/Transport/TRTextureRemapper.cs b/TRDataControl/Transport/TRTextureRemapper.cs index 5d9f0a580..4d7261b05 100644 --- a/TRDataControl/Transport/TRTextureRemapper.cs +++ b/TRDataControl/Transport/TRTextureRemapper.cs @@ -1,4 +1,5 @@ -using TRImageControl.Packing; +using System.Drawing; +using TRImageControl.Packing; using TRLevelControl.Model; namespace TRDataControl; @@ -6,16 +7,29 @@ namespace TRDataControl; public abstract class TRTextureRemapper where L : TRLevelBase { - protected L _level; + protected readonly L _level; + + public abstract IEnumerable RoomFaces { get; } + + public IEnumerable AllFaces + => RoomFaces.Concat(_level.DistinctMeshes.SelectMany(m => m.TexturedFaces)); + + public TRTextureRemapper(L level) + => _level = level; protected abstract TRTexturePacker CreatePacker(); - public abstract List AnimatedTextures { get; } - public abstract List ObjectTextures { get; } - public abstract IEnumerable Faces { get; } - public void Remap(L level) + public void RemoveUnusedTextures(List textures, Func removalCheck = null) + { + TRTexturePacker packer = CreatePacker(); + packer.RemoveObjectRegions(textures, removalCheck); + packer.Pack(true); + + ResetUnusedTextures(); + } + + public void Remap() { - _level = level; TRTexturePacker packer = CreatePacker(); Dictionary regionToTileMap = new(); @@ -62,7 +76,7 @@ static string Hash(TRObjectTexture t) } // Group each object texture - IEnumerable> groupedTextures = ObjectTextures.GroupBy(t => Hash(t)) + IEnumerable> groupedTextures = _level.ObjectTextures.GroupBy(t => Hash(t)) .Where(g => g.Count() > 1) .Select(g => g.ToList()); @@ -70,45 +84,52 @@ static string Hash(TRObjectTexture t) Dictionary remap = new(); foreach (List copies in groupedTextures) { - int rootIndex = ObjectTextures.IndexOf(copies[0]); + int rootIndex = _level.ObjectTextures.IndexOf(copies[0]); for (int i = 1; i < copies.Count; i++) { - int j = ObjectTextures.IndexOf(copies[i]); + int j = _level.ObjectTextures.IndexOf(copies[i]); remap[j] = rootIndex; - ObjectTextures[j] = null; + _level.ObjectTextures[j].Atlas = ushort.MaxValue; } } // Update all faces RemapTextures(remap); + ResetUnusedTextures(); + } + + public void ResetUnusedTextures() + { // Find every unused object texture and null it - List allIndices = Enumerable.Range(0, ObjectTextures.Count).ToList(); - List usedIndices = Faces.Select(f => (int)f.Texture).Distinct().ToList(); + IEnumerable allIndices = Enumerable.Range(0, _level.ObjectTextures.Count); + IEnumerable usedIndices = AllFaces.Select(f => (int)f.Texture) + .Concat(_level.AnimatedTextures.SelectMany(a => a.Textures.Select(t => (int)t))) + .Distinct(); foreach (int unused in allIndices.Except(usedIndices)) { - ObjectTextures[unused] = null; + _level.ObjectTextures[unused].Atlas = ushort.MaxValue; } - // Remap all indices again after deleting the nulls - remap.Clear(); - List oldTextures = new(ObjectTextures); - ObjectTextures.RemoveAll(o => o == null); + // Remap all indices after deleting the nulls + Dictionary remap = new(); + List oldTextures = new(_level.ObjectTextures); + _level.ObjectTextures.RemoveAll(o => o.Atlas == ushort.MaxValue); for (int i = 0; i < oldTextures.Count; i++) { - if (oldTextures[i] != null) + if (oldTextures[i].Atlas != ushort.MaxValue) { - remap[i] = ObjectTextures.IndexOf(oldTextures[i]); + remap[i] = _level.ObjectTextures.IndexOf(oldTextures[i]); } } - // Final face update + // Update all faces RemapTextures(remap); } private void RemapTextures(Dictionary remap) { - foreach (TRFace face in Faces) + foreach (TRFace face in AllFaces) { if (remap.ContainsKey(face.Texture)) { @@ -116,7 +137,7 @@ private void RemapTextures(Dictionary remap) } } - foreach (TRAnimatedTexture t in AnimatedTextures) + foreach (TRAnimatedTexture t in _level.AnimatedTextures) { for (int i = 0; i < t.Textures.Count; i++) { diff --git a/TRDataControl/Utilities/AbstractMassTRTextureDeduplicator.cs b/TRDataControl/Utilities/AbstractMassTRTextureDeduplicator.cs deleted file mode 100644 index 92b3ef266..000000000 --- a/TRDataControl/Utilities/AbstractMassTRTextureDeduplicator.cs +++ /dev/null @@ -1,144 +0,0 @@ -using Newtonsoft.Json; -using System.Diagnostics; -using System.Drawing.Imaging; -using TRImageControl.Packing; -using TRLevelControl.Model; - -namespace TRModelTransporter.Utilities; - -public abstract class AbstractMassTRTextureDeduplicator - where E : Enum - where L : TRLevelBase -{ - public abstract List LevelNames { get; } - - public string LevelFileDirectory { get; set; } - public string OutputDirectory { get; set; } - public bool OutputTileImages { get; set; } - - private readonly TRTextureDeduplicator _deduplicator; - private readonly Dictionary> _levelRemap; - private string _currentLevel; - private int _currentSave; - - public AbstractMassTRTextureDeduplicator() - { - _deduplicator = new TRTextureDeduplicator - { - UpdateGraphics = true - }; - - _levelRemap = new Dictionary>(); - } - - - public void Export() - { - Directory.CreateDirectory(OutputDirectory); - _deduplicator.SegmentRemapped += SegmentRepositioned; - - try - { - foreach (string lvlName in LevelNames) - { - _currentLevel = lvlName; - _currentSave = 0; - string lvlPath = Path.Combine(LevelFileDirectory, lvlName); - if (File.Exists(lvlPath)) - { - ExportDuplicateLevelTextures(lvlPath); - } - } - - if (_levelRemap.Count > 0) - { - File.WriteAllText(Path.Combine(OutputDirectory, "Full-TextureRemap.json"), JsonConvert.SerializeObject(_levelRemap, Formatting.Indented)); - } - } - finally - { - _deduplicator.SegmentRemapped -= SegmentRepositioned; - } - } - - private void ExportDuplicateLevelTextures(string lvlPath) - { - TRTexturePacker levelPacker = CreatePacker(ReadLevel(lvlPath)); - Dictionary> allTextures = new(); - foreach (TRTextile tile in levelPacker.Tiles) - { - allTextures[tile] = new List(tile.Rectangles); - } - - _deduplicator.SegmentMap = allTextures; - _deduplicator.Deduplicate(); - - if (_levelRemap.ContainsKey(_currentLevel)) - { - if (OutputTileImages) - { - string dir = Path.Combine(OutputDirectory, _currentLevel); - Directory.CreateDirectory(dir); - foreach (TRTextile tile in allTextures.Keys) - { - tile.Image.Save(Path.Combine(dir, tile.Index.ToString() + ".png"), ImageFormat.Png); - } - } - - File.WriteAllText(Path.Combine(OutputDirectory, _currentLevel + "-TextureRemap.json"), JsonConvert.SerializeObject(_levelRemap[_currentLevel], Formatting.Indented)); - } - } - - public void Import() - { - foreach (string lvlName in LevelNames) - { - string lvlPath = Path.Combine(LevelFileDirectory, lvlName); - string mapPath = Path.Combine(OutputDirectory, lvlName + "-TextureRemap.json"); - if (File.Exists(lvlPath) && File.Exists(mapPath)) - { - _currentLevel = lvlName; - ImportDeduplication(lvlPath, mapPath); - } - } - } - - private void ImportDeduplication(string lvlPath, string mapPath) - { - L level = ReadLevel(lvlPath); - AbstractTRLevelTextureDeduplicator deduplicator = CreateDeduplicator(); - deduplicator.Level = level; - deduplicator.Deduplicate(mapPath); - - WriteLevel(level, Path.Combine(OutputDirectory, _currentLevel, _currentLevel)); - } - - private void SegmentRepositioned(object sender, TRTextureRemapEventArgs e) - { - if (!_levelRemap.ContainsKey(_currentLevel)) - { - _levelRemap[_currentLevel] = CreateRemapGroup(); - } - - _levelRemap[_currentLevel].Remapping.Add(new TextureRemap - { - OriginalTile = e.OldTile.Index, - OriginalIndex = e.OldFirstTextureIndex, - OriginalBounds = e.OldBounds, - NewBounds = e.NewBounds, - NewTile = e.NewTile.Index, - NewIndex = e.NewSegment.Segments.First().Index, - AdjustmentPoint = e.AdjustmentPoint - }); - - _currentSave += e.OldArea; - - Debug.WriteLine(_currentLevel + ": " + _currentSave); - } - - protected abstract AbstractTextureRemapGroup CreateRemapGroup(); - protected abstract TRTexturePacker CreatePacker(L level); - protected abstract AbstractTRLevelTextureDeduplicator CreateDeduplicator(); - protected abstract L ReadLevel(string path); - protected abstract void WriteLevel(L level, string path); -} diff --git a/TRDataControl/Utilities/AbstractTRLevelTextureDeduplicator.cs b/TRDataControl/Utilities/AbstractTRLevelTextureDeduplicator.cs index b795d9d55..bba8fecda 100644 --- a/TRDataControl/Utilities/AbstractTRLevelTextureDeduplicator.cs +++ b/TRDataControl/Utilities/AbstractTRLevelTextureDeduplicator.cs @@ -1,19 +1,20 @@ -using TRImageControl.Packing; +using TRDataControl; +using TRImageControl.Packing; using TRLevelControl.Model; namespace TRModelTransporter.Utilities; -public abstract class AbstractTRLevelTextureDeduplicator - where E : Enum +public abstract class AbstractTRLevelTextureDeduplicator + where T : Enum where L : TRLevelBase { public L Level { get; set; } - private readonly TRTextureDeduplicator _deduplicator; + private readonly TRTextureDeduplicator _deduplicator; public AbstractTRLevelTextureDeduplicator() { - _deduplicator = new TRTextureDeduplicator + _deduplicator = new() { UpdateGraphics = true }; @@ -28,7 +29,7 @@ public void Deduplicate(string remappingPath) allTextures[tile] = new List(tile.Rectangles); } - AbstractTextureRemapGroup remapGroup = GetRemapGroup(remappingPath); + AbstractTextureRemapGroup remapGroup = GetRemapGroup(remappingPath); _deduplicator.SegmentMap = allTextures; _deduplicator.PrecompiledRemapping = remapGroup.Remapping; @@ -37,52 +38,10 @@ public void Deduplicate(string remappingPath) levelPacker.AllowEmptyPacking = true; levelPacker.Pack(true); - // Now we want to go through every IndexedTexture and see if it's - // pointing to the same thing - so tile, position, and point direction - // have to be equal. See IndexedTRObjectTexture - Dictionary indexMap = new(); - foreach (TRTextile tile in allTextures.Keys) - { - foreach (TRTextileRegion segment in allTextures[tile]) - { - TidySegment(segment, indexMap); - } - } - - ReindexTextures(indexMap); + CreateRemapper(Level).Remap(); } protected abstract TRTexturePacker CreatePacker(L level); - protected abstract AbstractTextureRemapGroup GetRemapGroup(string path); - protected abstract void ReindexTextures(Dictionary indexMap); - - private static void TidySegment(TRTextileRegion region, Dictionary reindexMap) - { - for (int i = region.Segments.Count - 1; i > 0; i--) //ignore the first = the largest - { - TRTextileSegment segment = region.Segments[i]; - TRTextileSegment candidateTexture = null; - for (int j = 0; j < region.Segments.Count; j++) - { - if (i == j) - { - continue; - } - - TRTextileSegment texture2 = region.Segments[j]; - if (segment.Equals(texture2)) - { - candidateTexture = texture2; - break; - } - } - - if (candidateTexture != null) - { - reindexMap[segment.Index] = candidateTexture.Index; - segment.Invalidate(); - region.Segments.RemoveAt(i); - } - } - } + protected abstract TRTextureRemapper CreateRemapper(L level); + protected abstract AbstractTextureRemapGroup GetRemapGroup(string path); } diff --git a/TRDataControl/Utilities/Deduplication/MassTR2TextureDeduplicator.cs b/TRDataControl/Utilities/Deduplication/MassTR2TextureDeduplicator.cs deleted file mode 100644 index 0dadfa294..000000000 --- a/TRDataControl/Utilities/Deduplication/MassTR2TextureDeduplicator.cs +++ /dev/null @@ -1,43 +0,0 @@ -using TRImageControl.Packing; -using TRLevelControl; -using TRLevelControl.Helpers; -using TRLevelControl.Model; - -namespace TRModelTransporter.Utilities; - -public class MassTR2TextureDeduplicator : AbstractMassTRTextureDeduplicator -{ - public override List LevelNames => TR2LevelNames.AsList; - - private readonly TR2LevelControl _control; - - public MassTR2TextureDeduplicator() - { - _control = new(); - } - - protected override TRTexturePacker CreatePacker(TR2Level level) - { - return new TR2TexturePacker(level); - } - - protected override AbstractTextureRemapGroup CreateRemapGroup() - { - return new TR2TextureRemapGroup(); - } - - protected override AbstractTRLevelTextureDeduplicator CreateDeduplicator() - { - return new TR2LevelTextureDeduplicator(); - } - - protected override TR2Level ReadLevel(string path) - { - return _control.Read(path); - } - - protected override void WriteLevel(TR2Level level, string path) - { - _control.Write(level, path); - } -} diff --git a/TRDataControl/Utilities/Deduplication/TR2LevelTextureDeduplicator.cs b/TRDataControl/Utilities/Deduplication/TR2LevelTextureDeduplicator.cs index 855a49d29..db92bc41f 100644 --- a/TRDataControl/Utilities/Deduplication/TR2LevelTextureDeduplicator.cs +++ b/TRDataControl/Utilities/Deduplication/TR2LevelTextureDeduplicator.cs @@ -8,18 +8,11 @@ namespace TRModelTransporter.Utilities; public class TR2LevelTextureDeduplicator : AbstractTRLevelTextureDeduplicator { protected override TRTexturePacker CreatePacker(TR2Level level) - { - return new TR2TexturePacker(level); - } + => new TR2TexturePacker(level); - protected override AbstractTextureRemapGroup GetRemapGroup(string path) - { - return JsonConvert.DeserializeObject(File.ReadAllText(path)); - } + protected override TRTextureRemapper CreateRemapper(TR2Level level) + => new TR2TextureRemapper(level); - protected override void ReindexTextures(Dictionary indexMap) - { - Level.ReindexTextures(indexMap); - Level.ResetUnusedTextures(); - } + protected override AbstractTextureRemapGroup GetRemapGroup(string path) + => JsonConvert.DeserializeObject(File.ReadAllText(path)); } diff --git a/TRDataControlTests/Remapping/RemappingTests.cs b/TRDataControlTests/Remapping/RemappingTests.cs new file mode 100644 index 000000000..268bba7b9 --- /dev/null +++ b/TRDataControlTests/Remapping/RemappingTests.cs @@ -0,0 +1,100 @@ +using TRDataControl; +using TRImageControl; +using TRImageControl.Packing; +using TRLevelControl.Helpers; +using TRLevelControl.Model; +using TRLevelControlTests; + +namespace TRDataControlTests.IO; + +[TestClass] +[TestCategory("OriginalIO")] +public class RemappingTests : TestBase +{ + [TestMethod] + [Description("Test that object textures are correct after removing data.")] + public void TestTextureRemoval() + { + TR1Level level = GetTR1Level(TR1LevelNames.CAVES); + IEnumerable allFaces = level.Rooms.Select(r => r.Mesh).SelectMany(m => m.Faces) + .Concat(level.DistinctMeshes.SelectMany(m => m.TexturedFaces)); + + string GetFaceID(TRFace face) + { + TRObjectTexture texInfo = level.ObjectTextures[face.Texture]; + TRImage tile = new(level.Images8[texInfo.Atlas].Pixels, level.Palette); + return tile.Export(texInfo.Bounds).GenerateID(); + } + + Dictionary originalIDs = new(); + foreach (TRFace face in allFaces) + { + originalIDs[face] = GetFaceID(face); + } + + List staleTextures = new(level.Models[TR1Type.Bear].Meshes + .SelectMany(m => m.TexturedFaces.Select(t => (int)t.Texture)).Distinct()); + level.Models.Remove(TR1Type.Bear); + + TR1TextureRemapper remapper = new(level); + remapper.RemoveUnusedTextures(staleTextures); + + foreach (TRFace face in allFaces) + { + Assert.AreEqual(originalIDs[face], GetFaceID(face)); + } + } + + [TestMethod] + [Description("As above, but with an added dependency on a different model.")] + public void TestDependencies() + { + TR1Level level = GetTR1Level(TR1LevelNames.CAVES); + + // Simulate a shared texture + ushort sharedTexture = level.Models[TR1Type.Bear].Meshes[0].TexturedRectangles[0].Texture; + level.Models[TR1Type.Wolf].Meshes[0].TexturedRectangles[0].Texture = sharedTexture; + + IEnumerable allFaces = level.Rooms.Select(r => r.Mesh).SelectMany(m => m.Faces) + .Concat(level.DistinctMeshes.SelectMany(m => m.TexturedFaces)); + + string GetFaceID(TRFace face) + { + TRObjectTexture texInfo = level.ObjectTextures[face.Texture]; + TRImage tile = new(level.Images8[texInfo.Atlas].Pixels, level.Palette); + return tile.Export(texInfo.Bounds).GenerateID(); + } + + Dictionary originalIDs = new(); + foreach (TRFace face in allFaces) + { + originalIDs[face] = GetFaceID(face); + } + + List staleTextures = new(level.Models[TR1Type.Bear].Meshes + .SelectMany(m => m.TexturedFaces.Select(t => (int)t.Texture)).Distinct()); + level.Models.Remove(TR1Type.Bear); + + TR1TextureRemapGroup remapGroup = new() + { + Dependencies = new() + { + new() + { + TileIndex = level.ObjectTextures[sharedTexture].Atlas, + Bounds = level.ObjectTextures[sharedTexture].Bounds, + Types = new() { TR1Type.Bear, TR1Type.Wolf } + } + } + }; + + TR1TextureRemapper remapper = new(level); + remapper.RemoveUnusedTextures(staleTextures, + (tile, bounds) => remapGroup.CanRemoveRectangle(tile, bounds, new List() { TR1Type.Bear })); + + foreach (TRFace face in allFaces) + { + Assert.AreEqual(originalIDs[face], GetFaceID(face)); + } + } +} diff --git a/TRImageControl/Packing/TRTexturePacker.cs b/TRImageControl/Packing/TRTexturePacker.cs index 1af944c41..2fa1819a7 100644 --- a/TRImageControl/Packing/TRTexturePacker.cs +++ b/TRImageControl/Packing/TRTexturePacker.cs @@ -1,6 +1,7 @@ using RectanglePacker; using RectanglePacker.Events; using RectanglePacker.Organisation; +using System.Drawing; using TRLevelControl; using TRLevelControl.Model; @@ -117,14 +118,17 @@ public Dictionary> GetSpriteRegions(IEnumerable return regionMap; } - public void RemoveObjectRegions(IEnumerable indices) + public void RemoveObjectRegions(IEnumerable indices, Func removalCheck = null) { foreach (TRTextile tile in _tiles) { List regions = tile.GetObjectRegions(indices); for (int i = 0; i < regions.Count; i++) { - tile.Remove(regions[i]); + if (removalCheck?.Invoke(tile.Index, regions[i].Bounds) ?? true) + { + tile.Remove(regions[i]); + } } } } diff --git a/TRImageControl/Packing/Textures/AbstractTextureRemapGroup.cs b/TRImageControl/Packing/Textures/AbstractTextureRemapGroup.cs index cfaa087f3..dddb1c706 100644 --- a/TRImageControl/Packing/Textures/AbstractTextureRemapGroup.cs +++ b/TRImageControl/Packing/Textures/AbstractTextureRemapGroup.cs @@ -66,37 +66,13 @@ public void CalculateDependencies(L level) public TextureDependency GetDependency(int tileIndex, Rectangle rectangle) { - foreach (TextureDependency dependency in Dependencies) - { - if (dependency.TileIndex == tileIndex && dependency.Bounds == rectangle) - { - return dependency; - } - } - return null; + return Dependencies.Find(d => d.TileIndex == tileIndex && d.Bounds == rectangle); } - public TextureDependency GetDependency(int tileIndex, Rectangle rectangle, IEnumerable entities) + public bool CanRemoveRectangle(int tileIndex, Rectangle rectangle, IEnumerable types) { - foreach (TextureDependency dependency in Dependencies) - { - if (dependency.TileIndex == tileIndex && dependency.Bounds == rectangle && dependency.Types.All(e => entities.Contains(e))) - { - return dependency; - } - } - return null; - } - - public bool CanRemoveRectangle(int tileIndex, Rectangle rectangle, IEnumerable entities) - { - // Is there a dependency for the given rectangle? + // The rectangle can be removed if all of the types that use it are being removed TextureDependency dependency = GetDependency(tileIndex, rectangle); - if (dependency != null) - { - // The rectangle can be removed if all of the entities match the dependency - return dependency.Types.All(e => entities.Contains(e)); - } - return true; + return dependency?.Types.All(types.Contains) ?? true; } } diff --git a/TRImageControl/Palette/TRPalette8Control.cs b/TRImageControl/Palette/TRPalette8Control.cs index 97c215636..7c9ea24cd 100644 --- a/TRImageControl/Palette/TRPalette8Control.cs +++ b/TRImageControl/Palette/TRPalette8Control.cs @@ -25,9 +25,11 @@ public TRImage GetOriginalTile(int tileIndex) public void MergeTiles() { + // Reuse the original transparency colour even though the RGB is redundant + Color transparency = Level.Palette[0].ToTR1Color(); _palette = new() { - Color.FromArgb(0, 0, 0, 0) // Placeholder for transparency + Color.FromArgb(0, transparency.R, transparency.G, transparency.B) }; // Scan over replacement and original images, the idea being they will have been diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/CAT.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/CAT.PHD-TextureRemap.json index c3797d37c..7bc181f9e 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/CAT.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/CAT.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 60, 61 ], @@ -10,7 +10,7 @@ "Bounds": "144, 0, 64, 128" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -18,7 +18,7 @@ "Bounds": "144, 128, 24, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -26,7 +26,7 @@ "Bounds": "168, 192, 40, 8" }, { - "Entities": [ + "Types": [ 57, 59 ], @@ -34,7 +34,7 @@ "Bounds": "64, 192, 64, 64" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -42,7 +42,7 @@ "Bounds": "0, 96, 56, 56" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -50,7 +50,7 @@ "Bounds": "56, 128, 112, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -58,7 +58,7 @@ "Bounds": "64, 184, 56, 32" }, { - "Entities": [ + "Types": [ 68, 69, 70 @@ -67,7 +67,7 @@ "Bounds": "144, 0, 64, 64" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -75,7 +75,7 @@ "Bounds": "152, 152, 16, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -88,7 +88,7 @@ "Bounds": "216, 176, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -101,7 +101,7 @@ "Bounds": "232, 0, 24, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -112,7 +112,7 @@ "Bounds": "232, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -125,7 +125,7 @@ "Bounds": "0, 104, 40, 16" }, { - "Entities": [ + "Types": [ 55, 56 ], @@ -133,7 +133,7 @@ "Bounds": "32, 144, 64, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -146,7 +146,7 @@ "Bounds": "40, 0, 48, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -159,7 +159,7 @@ "Bounds": "40, 32, 56, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -172,7 +172,7 @@ "Bounds": "64, 224, 40, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -180,7 +180,7 @@ "Bounds": "80, 56, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -188,7 +188,7 @@ "Bounds": "96, 144, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -201,7 +201,7 @@ "Bounds": "120, 64, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -209,7 +209,7 @@ "Bounds": "136, 48, 40, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -217,7 +217,7 @@ "Bounds": "152, 128, 8, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -225,7 +225,7 @@ "Bounds": "216, 48, 32, 40" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -233,7 +233,7 @@ "Bounds": "0, 0, 24, 40" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -241,7 +241,7 @@ "Bounds": "0, 40, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -252,7 +252,7 @@ "Bounds": "0, 56, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -260,7 +260,7 @@ "Bounds": "0, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -268,7 +268,7 @@ "Bounds": "16, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -279,7 +279,7 @@ "Bounds": "24, 56, 24, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -287,7 +287,7 @@ "Bounds": "32, 200, 16, 8" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -295,7 +295,7 @@ "Bounds": "32, 224, 24, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -303,7 +303,7 @@ "Bounds": "56, 40, 56, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -311,7 +311,7 @@ "Bounds": "56, 224, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -324,7 +324,7 @@ "Bounds": "72, 56, 48, 16" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -332,7 +332,7 @@ "Bounds": "72, 128, 16, 40" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -340,7 +340,7 @@ "Bounds": "72, 232, 16, 24" }, { - "Entities": [ + "Types": [ 68, 69, 70 @@ -349,7 +349,7 @@ "Bounds": "80, 168, 8, 64" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -357,7 +357,7 @@ "Bounds": "96, 128, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -370,7 +370,7 @@ "Bounds": "96, 152, 24, 24" }, { - "Entities": [ + "Types": [ 60, 61 ], @@ -378,7 +378,7 @@ "Bounds": "96, 200, 64, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -386,7 +386,7 @@ "Bounds": "104, 224, 16, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -394,7 +394,7 @@ "Bounds": "112, 40, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -402,7 +402,7 @@ "Bounds": "120, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -410,7 +410,7 @@ "Bounds": "136, 216, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -419,7 +419,7 @@ "Bounds": "144, 144, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -427,7 +427,7 @@ "Bounds": "152, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -438,7 +438,7 @@ "Bounds": "160, 40, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -446,7 +446,7 @@ "Bounds": "168, 216, 16, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -454,7 +454,7 @@ "Bounds": "184, 56, 48, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -466,7 +466,7 @@ "Bounds": "192, 240, 8, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -474,7 +474,7 @@ "Bounds": "200, 232, 24, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -482,7 +482,7 @@ "Bounds": "208, 192, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -495,7 +495,7 @@ "Bounds": "216, 0, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -506,7 +506,7 @@ "Bounds": "216, 24, 24, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -514,7 +514,7 @@ "Bounds": "224, 96, 8, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -522,7 +522,7 @@ "Bounds": "224, 232, 24, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -530,7 +530,7 @@ "Bounds": "232, 208, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -538,7 +538,7 @@ "Bounds": "0, 72, 16, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -547,7 +547,7 @@ "Bounds": "8, 0, 8, 56" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -555,7 +555,7 @@ "Bounds": "16, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -563,7 +563,7 @@ "Bounds": "32, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -571,7 +571,7 @@ "Bounds": "48, 80, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -579,7 +579,7 @@ "Bounds": "48, 128, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -587,7 +587,7 @@ "Bounds": "48, 160, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -595,7 +595,7 @@ "Bounds": "64, 160, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -603,7 +603,7 @@ "Bounds": "80, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -611,7 +611,7 @@ "Bounds": "96, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -619,7 +619,7 @@ "Bounds": "112, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -627,7 +627,7 @@ "Bounds": "184, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -635,7 +635,7 @@ "Bounds": "200, 72, 16, 16" }, { - "Entities": [ + "Types": [ 118, 119, 120, @@ -647,7 +647,7 @@ "Bounds": "208, 120, 8, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/EGYPT.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/EGYPT.PHD-TextureRemap.json index c3797d37c..7bc181f9e 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/EGYPT.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/EGYPT.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 60, 61 ], @@ -10,7 +10,7 @@ "Bounds": "144, 0, 64, 128" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -18,7 +18,7 @@ "Bounds": "144, 128, 24, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -26,7 +26,7 @@ "Bounds": "168, 192, 40, 8" }, { - "Entities": [ + "Types": [ 57, 59 ], @@ -34,7 +34,7 @@ "Bounds": "64, 192, 64, 64" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -42,7 +42,7 @@ "Bounds": "0, 96, 56, 56" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -50,7 +50,7 @@ "Bounds": "56, 128, 112, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -58,7 +58,7 @@ "Bounds": "64, 184, 56, 32" }, { - "Entities": [ + "Types": [ 68, 69, 70 @@ -67,7 +67,7 @@ "Bounds": "144, 0, 64, 64" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -75,7 +75,7 @@ "Bounds": "152, 152, 16, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -88,7 +88,7 @@ "Bounds": "216, 176, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -101,7 +101,7 @@ "Bounds": "232, 0, 24, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -112,7 +112,7 @@ "Bounds": "232, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -125,7 +125,7 @@ "Bounds": "0, 104, 40, 16" }, { - "Entities": [ + "Types": [ 55, 56 ], @@ -133,7 +133,7 @@ "Bounds": "32, 144, 64, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -146,7 +146,7 @@ "Bounds": "40, 0, 48, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -159,7 +159,7 @@ "Bounds": "40, 32, 56, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -172,7 +172,7 @@ "Bounds": "64, 224, 40, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -180,7 +180,7 @@ "Bounds": "80, 56, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -188,7 +188,7 @@ "Bounds": "96, 144, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -201,7 +201,7 @@ "Bounds": "120, 64, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -209,7 +209,7 @@ "Bounds": "136, 48, 40, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -217,7 +217,7 @@ "Bounds": "152, 128, 8, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -225,7 +225,7 @@ "Bounds": "216, 48, 32, 40" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -233,7 +233,7 @@ "Bounds": "0, 0, 24, 40" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -241,7 +241,7 @@ "Bounds": "0, 40, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -252,7 +252,7 @@ "Bounds": "0, 56, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -260,7 +260,7 @@ "Bounds": "0, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -268,7 +268,7 @@ "Bounds": "16, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -279,7 +279,7 @@ "Bounds": "24, 56, 24, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -287,7 +287,7 @@ "Bounds": "32, 200, 16, 8" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -295,7 +295,7 @@ "Bounds": "32, 224, 24, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -303,7 +303,7 @@ "Bounds": "56, 40, 56, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -311,7 +311,7 @@ "Bounds": "56, 224, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -324,7 +324,7 @@ "Bounds": "72, 56, 48, 16" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -332,7 +332,7 @@ "Bounds": "72, 128, 16, 40" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -340,7 +340,7 @@ "Bounds": "72, 232, 16, 24" }, { - "Entities": [ + "Types": [ 68, 69, 70 @@ -349,7 +349,7 @@ "Bounds": "80, 168, 8, 64" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -357,7 +357,7 @@ "Bounds": "96, 128, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -370,7 +370,7 @@ "Bounds": "96, 152, 24, 24" }, { - "Entities": [ + "Types": [ 60, 61 ], @@ -378,7 +378,7 @@ "Bounds": "96, 200, 64, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -386,7 +386,7 @@ "Bounds": "104, 224, 16, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -394,7 +394,7 @@ "Bounds": "112, 40, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -402,7 +402,7 @@ "Bounds": "120, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -410,7 +410,7 @@ "Bounds": "136, 216, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -419,7 +419,7 @@ "Bounds": "144, 144, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -427,7 +427,7 @@ "Bounds": "152, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -438,7 +438,7 @@ "Bounds": "160, 40, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -446,7 +446,7 @@ "Bounds": "168, 216, 16, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -454,7 +454,7 @@ "Bounds": "184, 56, 48, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -466,7 +466,7 @@ "Bounds": "192, 240, 8, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -474,7 +474,7 @@ "Bounds": "200, 232, 24, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -482,7 +482,7 @@ "Bounds": "208, 192, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -495,7 +495,7 @@ "Bounds": "216, 0, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -506,7 +506,7 @@ "Bounds": "216, 24, 24, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -514,7 +514,7 @@ "Bounds": "224, 96, 8, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -522,7 +522,7 @@ "Bounds": "224, 232, 24, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -530,7 +530,7 @@ "Bounds": "232, 208, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -538,7 +538,7 @@ "Bounds": "0, 72, 16, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -547,7 +547,7 @@ "Bounds": "8, 0, 8, 56" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -555,7 +555,7 @@ "Bounds": "16, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -563,7 +563,7 @@ "Bounds": "32, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -571,7 +571,7 @@ "Bounds": "48, 80, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -579,7 +579,7 @@ "Bounds": "48, 128, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -587,7 +587,7 @@ "Bounds": "48, 160, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -595,7 +595,7 @@ "Bounds": "64, 160, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -603,7 +603,7 @@ "Bounds": "80, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -611,7 +611,7 @@ "Bounds": "96, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -619,7 +619,7 @@ "Bounds": "112, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -627,7 +627,7 @@ "Bounds": "184, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -635,7 +635,7 @@ "Bounds": "200, 72, 16, 16" }, { - "Entities": [ + "Types": [ 118, 119, 120, @@ -647,7 +647,7 @@ "Bounds": "208, 120, 8, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/END.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/END.PHD-TextureRemap.json index 2e42b3914..c1642f3c8 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/END.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/END.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 5 ], @@ -10,7 +10,7 @@ "Bounds": "72, 56, 56, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -19,7 +19,7 @@ "Bounds": "200, 0, 56, 56" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -27,7 +27,7 @@ "Bounds": "200, 56, 16, 40" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -35,7 +35,7 @@ "Bounds": "216, 56, 40, 64" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -43,7 +43,7 @@ "Bounds": "0, 224, 112, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -52,7 +52,7 @@ "Bounds": "72, 248, 40, 8" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -61,7 +61,7 @@ "Bounds": "192, 224, 56, 32" }, { - "Entities": [ + "Types": [ 147, 163, 181 @@ -70,7 +70,7 @@ "Bounds": "216, 0, 24, 80" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -86,7 +86,7 @@ "Bounds": "216, 80, 40, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -102,7 +102,7 @@ "Bounds": "240, 64, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -111,7 +111,7 @@ "Bounds": "0, 216, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -127,7 +127,7 @@ "Bounds": "40, 200, 56, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -143,7 +143,7 @@ "Bounds": "96, 168, 16, 8" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -151,7 +151,7 @@ "Bounds": "96, 216, 40, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -159,7 +159,7 @@ "Bounds": "112, 120, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -175,7 +175,7 @@ "Bounds": "136, 176, 48, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -183,7 +183,7 @@ "Bounds": "136, 208, 40, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -193,7 +193,7 @@ "Bounds": "176, 208, 8, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -209,7 +209,7 @@ "Bounds": "184, 176, 24, 64" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -219,7 +219,7 @@ "Bounds": "208, 176, 48, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -227,7 +227,7 @@ "Bounds": "208, 208, 40, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -236,7 +236,7 @@ "Bounds": "208, 240, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -245,7 +245,7 @@ "Bounds": "240, 160, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -255,7 +255,7 @@ "Bounds": "248, 208, 8, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -263,7 +263,7 @@ "Bounds": "0, 120, 40, 24" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -271,7 +271,7 @@ "Bounds": "0, 144, 16, 56" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -287,7 +287,7 @@ "Bounds": "0, 200, 48, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -297,7 +297,7 @@ "Bounds": "0, 216, 48, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -305,7 +305,7 @@ "Bounds": "16, 144, 24, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -313,7 +313,7 @@ "Bounds": "16, 160, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -329,7 +329,7 @@ "Bounds": "16, 176, 32, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -338,7 +338,7 @@ "Bounds": "40, 120, 24, 40" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -347,7 +347,7 @@ "Bounds": "48, 0, 32, 40" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -358,7 +358,7 @@ "Bounds": "48, 40, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -370,7 +370,7 @@ "Bounds": "48, 176, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -380,7 +380,7 @@ "Bounds": "72, 152, 32, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -388,7 +388,7 @@ "Bounds": "72, 168, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -400,7 +400,7 @@ "Bounds": "72, 184, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -410,7 +410,7 @@ "Bounds": "96, 88, 32, 8" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -418,7 +418,7 @@ "Bounds": "96, 184, 24, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -426,7 +426,7 @@ "Bounds": "120, 200, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -435,7 +435,7 @@ "Bounds": "128, 168, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -445,7 +445,7 @@ "Bounds": "152, 128, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -457,7 +457,7 @@ "Bounds": "152, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -465,7 +465,7 @@ "Bounds": "160, 0, 24, 48" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -473,7 +473,7 @@ "Bounds": "160, 224, 32, 24" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -481,7 +481,7 @@ "Bounds": "176, 128, 16, 56" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -489,7 +489,7 @@ "Bounds": "176, 184, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -501,7 +501,7 @@ "Bounds": "192, 176, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -511,7 +511,7 @@ "Bounds": "200, 48, 32, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -527,7 +527,7 @@ "Bounds": "208, 112, 40, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -537,7 +537,7 @@ "Bounds": "208, 136, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -549,7 +549,7 @@ "Bounds": "216, 176, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -559,7 +559,7 @@ "Bounds": "216, 208, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -569,7 +569,7 @@ "Bounds": "240, 176, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -579,7 +579,7 @@ "Bounds": "240, 216, 16, 40" }, { - "Entities": [ + "Types": [ 60, 62, 63 @@ -588,7 +588,7 @@ "Bounds": "248, 0, 8, 64" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -596,7 +596,7 @@ "Bounds": "248, 112, 8, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -606,7 +606,7 @@ "Bounds": "0, 0, 40, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -616,7 +616,7 @@ "Bounds": "0, 64, 32, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -625,7 +625,7 @@ "Bounds": "0, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -635,7 +635,7 @@ "Bounds": "0, 128, 24, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -644,7 +644,7 @@ "Bounds": "16, 88, 16, 24" }, { - "Entities": [ + "Types": [ 99, 100, 102 @@ -653,7 +653,7 @@ "Bounds": "16, 216, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -663,7 +663,7 @@ "Bounds": "24, 136, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -673,7 +673,7 @@ "Bounds": "32, 64, 32, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -682,7 +682,7 @@ "Bounds": "32, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -692,7 +692,7 @@ "Bounds": "32, 160, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -702,7 +702,7 @@ "Bounds": "40, 0, 16, 40" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -711,7 +711,7 @@ "Bounds": "48, 88, 16, 24" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -719,7 +719,7 @@ "Bounds": "48, 232, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -729,7 +729,7 @@ "Bounds": "56, 0, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -739,7 +739,7 @@ "Bounds": "56, 144, 8, 8" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -748,7 +748,7 @@ "Bounds": "56, 176, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -757,7 +757,7 @@ "Bounds": "64, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -767,7 +767,7 @@ "Bounds": "64, 128, 16, 24" }, { - "Entities": [ + "Types": [ 147, 163, 181 @@ -776,7 +776,7 @@ "Bounds": "64, 192, 24, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -785,7 +785,7 @@ "Bounds": "80, 88, 16, 24" }, { - "Entities": [ + "Types": [ 6, 172 ], @@ -793,7 +793,7 @@ "Bounds": "88, 112, 8, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -801,7 +801,7 @@ "Bounds": "96, 96, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -811,7 +811,7 @@ "Bounds": "104, 120, 16, 24" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -820,7 +820,7 @@ "Bounds": "144, 80, 8, 56" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -828,7 +828,7 @@ "Bounds": "152, 56, 16, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -836,7 +836,7 @@ "Bounds": "152, 208, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -852,7 +852,7 @@ "Bounds": "168, 16, 24, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -860,7 +860,7 @@ "Bounds": "168, 208, 16, 16" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -871,7 +871,7 @@ "Bounds": "192, 96, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -881,7 +881,7 @@ "Bounds": "192, 120, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -891,7 +891,7 @@ "Bounds": "208, 48, 16, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -901,7 +901,7 @@ "Bounds": "208, 120, 24, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -909,7 +909,7 @@ "Bounds": "216, 16, 16, 24" }, { - "Entities": [ + "Types": [ 6, 23 ], @@ -917,7 +917,7 @@ "Bounds": "216, 208, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -927,7 +927,7 @@ "Bounds": "224, 48, 16, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -936,7 +936,7 @@ "Bounds": "224, 80, 16, 24" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -944,7 +944,7 @@ "Bounds": "232, 0, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -954,7 +954,7 @@ "Bounds": "248, 0, 8, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -962,7 +962,7 @@ "Bounds": "248, 48, 8, 56" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -972,7 +972,7 @@ "Bounds": "248, 104, 8, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -982,7 +982,7 @@ "Bounds": "248, 168, 8, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -990,7 +990,7 @@ "Bounds": "0, 80, 8, 24" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1001,7 +1001,7 @@ "Bounds": "16, 0, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1011,7 +1011,7 @@ "Bounds": "16, 16, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1021,7 +1021,7 @@ "Bounds": "16, 80, 8, 24" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1032,7 +1032,7 @@ "Bounds": "32, 0, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1042,7 +1042,7 @@ "Bounds": "32, 16, 16, 16" }, { - "Entities": [ + "Types": [ 6, 23 ], @@ -1050,7 +1050,7 @@ "Bounds": "40, 88, 16, 8" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1061,7 +1061,7 @@ "Bounds": "48, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1072,7 +1072,7 @@ "Bounds": "64, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1083,7 +1083,7 @@ "Bounds": "80, 0, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1093,7 +1093,7 @@ "Bounds": "80, 88, 16, 8" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1104,7 +1104,7 @@ "Bounds": "96, 0, 16, 16" }, { - "Entities": [ + "Types": [ 146, 150 ], @@ -1112,7 +1112,7 @@ "Bounds": "128, 64, 16, 16" }, { - "Entities": [ + "Types": [ 146, 150 ], @@ -1120,7 +1120,7 @@ "Bounds": "136, 80, 24, 8" }, { - "Entities": [ + "Types": [ 6, 23, 173 @@ -1129,7 +1129,7 @@ "Bounds": "144, 0, 16, 16" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -1137,7 +1137,7 @@ "Bounds": "144, 64, 16, 16" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -1145,7 +1145,7 @@ "Bounds": "168, 80, 24, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1155,7 +1155,7 @@ "Bounds": "208, 0, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1165,7 +1165,7 @@ "Bounds": "240, 0, 16, 16" }, { - "Entities": [ + "Types": [ 163, 181 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/END2.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/END2.PHD-TextureRemap.json index 2e42b3914..c1642f3c8 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/END2.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/END2.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 5 ], @@ -10,7 +10,7 @@ "Bounds": "72, 56, 56, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -19,7 +19,7 @@ "Bounds": "200, 0, 56, 56" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -27,7 +27,7 @@ "Bounds": "200, 56, 16, 40" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -35,7 +35,7 @@ "Bounds": "216, 56, 40, 64" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -43,7 +43,7 @@ "Bounds": "0, 224, 112, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -52,7 +52,7 @@ "Bounds": "72, 248, 40, 8" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -61,7 +61,7 @@ "Bounds": "192, 224, 56, 32" }, { - "Entities": [ + "Types": [ 147, 163, 181 @@ -70,7 +70,7 @@ "Bounds": "216, 0, 24, 80" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -86,7 +86,7 @@ "Bounds": "216, 80, 40, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -102,7 +102,7 @@ "Bounds": "240, 64, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -111,7 +111,7 @@ "Bounds": "0, 216, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -127,7 +127,7 @@ "Bounds": "40, 200, 56, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -143,7 +143,7 @@ "Bounds": "96, 168, 16, 8" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -151,7 +151,7 @@ "Bounds": "96, 216, 40, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -159,7 +159,7 @@ "Bounds": "112, 120, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -175,7 +175,7 @@ "Bounds": "136, 176, 48, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -183,7 +183,7 @@ "Bounds": "136, 208, 40, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -193,7 +193,7 @@ "Bounds": "176, 208, 8, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -209,7 +209,7 @@ "Bounds": "184, 176, 24, 64" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -219,7 +219,7 @@ "Bounds": "208, 176, 48, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -227,7 +227,7 @@ "Bounds": "208, 208, 40, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -236,7 +236,7 @@ "Bounds": "208, 240, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -245,7 +245,7 @@ "Bounds": "240, 160, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -255,7 +255,7 @@ "Bounds": "248, 208, 8, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -263,7 +263,7 @@ "Bounds": "0, 120, 40, 24" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -271,7 +271,7 @@ "Bounds": "0, 144, 16, 56" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -287,7 +287,7 @@ "Bounds": "0, 200, 48, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -297,7 +297,7 @@ "Bounds": "0, 216, 48, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -305,7 +305,7 @@ "Bounds": "16, 144, 24, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -313,7 +313,7 @@ "Bounds": "16, 160, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -329,7 +329,7 @@ "Bounds": "16, 176, 32, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -338,7 +338,7 @@ "Bounds": "40, 120, 24, 40" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -347,7 +347,7 @@ "Bounds": "48, 0, 32, 40" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -358,7 +358,7 @@ "Bounds": "48, 40, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -370,7 +370,7 @@ "Bounds": "48, 176, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -380,7 +380,7 @@ "Bounds": "72, 152, 32, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -388,7 +388,7 @@ "Bounds": "72, 168, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -400,7 +400,7 @@ "Bounds": "72, 184, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -410,7 +410,7 @@ "Bounds": "96, 88, 32, 8" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -418,7 +418,7 @@ "Bounds": "96, 184, 24, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -426,7 +426,7 @@ "Bounds": "120, 200, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -435,7 +435,7 @@ "Bounds": "128, 168, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -445,7 +445,7 @@ "Bounds": "152, 128, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -457,7 +457,7 @@ "Bounds": "152, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -465,7 +465,7 @@ "Bounds": "160, 0, 24, 48" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -473,7 +473,7 @@ "Bounds": "160, 224, 32, 24" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -481,7 +481,7 @@ "Bounds": "176, 128, 16, 56" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -489,7 +489,7 @@ "Bounds": "176, 184, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -501,7 +501,7 @@ "Bounds": "192, 176, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -511,7 +511,7 @@ "Bounds": "200, 48, 32, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -527,7 +527,7 @@ "Bounds": "208, 112, 40, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -537,7 +537,7 @@ "Bounds": "208, 136, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -549,7 +549,7 @@ "Bounds": "216, 176, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -559,7 +559,7 @@ "Bounds": "216, 208, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -569,7 +569,7 @@ "Bounds": "240, 176, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -579,7 +579,7 @@ "Bounds": "240, 216, 16, 40" }, { - "Entities": [ + "Types": [ 60, 62, 63 @@ -588,7 +588,7 @@ "Bounds": "248, 0, 8, 64" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -596,7 +596,7 @@ "Bounds": "248, 112, 8, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -606,7 +606,7 @@ "Bounds": "0, 0, 40, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -616,7 +616,7 @@ "Bounds": "0, 64, 32, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -625,7 +625,7 @@ "Bounds": "0, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -635,7 +635,7 @@ "Bounds": "0, 128, 24, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -644,7 +644,7 @@ "Bounds": "16, 88, 16, 24" }, { - "Entities": [ + "Types": [ 99, 100, 102 @@ -653,7 +653,7 @@ "Bounds": "16, 216, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -663,7 +663,7 @@ "Bounds": "24, 136, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -673,7 +673,7 @@ "Bounds": "32, 64, 32, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -682,7 +682,7 @@ "Bounds": "32, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -692,7 +692,7 @@ "Bounds": "32, 160, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -702,7 +702,7 @@ "Bounds": "40, 0, 16, 40" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -711,7 +711,7 @@ "Bounds": "48, 88, 16, 24" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -719,7 +719,7 @@ "Bounds": "48, 232, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -729,7 +729,7 @@ "Bounds": "56, 0, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -739,7 +739,7 @@ "Bounds": "56, 144, 8, 8" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -748,7 +748,7 @@ "Bounds": "56, 176, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -757,7 +757,7 @@ "Bounds": "64, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -767,7 +767,7 @@ "Bounds": "64, 128, 16, 24" }, { - "Entities": [ + "Types": [ 147, 163, 181 @@ -776,7 +776,7 @@ "Bounds": "64, 192, 24, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -785,7 +785,7 @@ "Bounds": "80, 88, 16, 24" }, { - "Entities": [ + "Types": [ 6, 172 ], @@ -793,7 +793,7 @@ "Bounds": "88, 112, 8, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -801,7 +801,7 @@ "Bounds": "96, 96, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -811,7 +811,7 @@ "Bounds": "104, 120, 16, 24" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -820,7 +820,7 @@ "Bounds": "144, 80, 8, 56" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -828,7 +828,7 @@ "Bounds": "152, 56, 16, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -836,7 +836,7 @@ "Bounds": "152, 208, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -852,7 +852,7 @@ "Bounds": "168, 16, 24, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -860,7 +860,7 @@ "Bounds": "168, 208, 16, 16" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -871,7 +871,7 @@ "Bounds": "192, 96, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -881,7 +881,7 @@ "Bounds": "192, 120, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -891,7 +891,7 @@ "Bounds": "208, 48, 16, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -901,7 +901,7 @@ "Bounds": "208, 120, 24, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -909,7 +909,7 @@ "Bounds": "216, 16, 16, 24" }, { - "Entities": [ + "Types": [ 6, 23 ], @@ -917,7 +917,7 @@ "Bounds": "216, 208, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -927,7 +927,7 @@ "Bounds": "224, 48, 16, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -936,7 +936,7 @@ "Bounds": "224, 80, 16, 24" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -944,7 +944,7 @@ "Bounds": "232, 0, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -954,7 +954,7 @@ "Bounds": "248, 0, 8, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -962,7 +962,7 @@ "Bounds": "248, 48, 8, 56" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -972,7 +972,7 @@ "Bounds": "248, 104, 8, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -982,7 +982,7 @@ "Bounds": "248, 168, 8, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -990,7 +990,7 @@ "Bounds": "0, 80, 8, 24" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1001,7 +1001,7 @@ "Bounds": "16, 0, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1011,7 +1011,7 @@ "Bounds": "16, 16, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1021,7 +1021,7 @@ "Bounds": "16, 80, 8, 24" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1032,7 +1032,7 @@ "Bounds": "32, 0, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1042,7 +1042,7 @@ "Bounds": "32, 16, 16, 16" }, { - "Entities": [ + "Types": [ 6, 23 ], @@ -1050,7 +1050,7 @@ "Bounds": "40, 88, 16, 8" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1061,7 +1061,7 @@ "Bounds": "48, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1072,7 +1072,7 @@ "Bounds": "64, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1083,7 +1083,7 @@ "Bounds": "80, 0, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1093,7 +1093,7 @@ "Bounds": "80, 88, 16, 8" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1104,7 +1104,7 @@ "Bounds": "96, 0, 16, 16" }, { - "Entities": [ + "Types": [ 146, 150 ], @@ -1112,7 +1112,7 @@ "Bounds": "128, 64, 16, 16" }, { - "Entities": [ + "Types": [ 146, 150 ], @@ -1120,7 +1120,7 @@ "Bounds": "136, 80, 24, 8" }, { - "Entities": [ + "Types": [ 6, 23, 173 @@ -1129,7 +1129,7 @@ "Bounds": "144, 0, 16, 16" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -1137,7 +1137,7 @@ "Bounds": "144, 64, 16, 16" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -1145,7 +1145,7 @@ "Bounds": "168, 80, 24, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1155,7 +1155,7 @@ "Bounds": "208, 0, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1165,7 +1165,7 @@ "Bounds": "240, 0, 16, 16" }, { - "Entities": [ + "Types": [ 163, 181 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL1.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL1.PHD-TextureRemap.json index 5dde9e964..2f7e765e4 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL1.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL1.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 1, 99 ], @@ -10,7 +10,7 @@ "Bounds": "64, 224, 8, 24" }, { - "Entities": [ + "Types": [ 39, 40 ], @@ -18,7 +18,7 @@ "Bounds": "72, 184, 48, 8" }, { - "Entities": [ + "Types": [ 71, 81 ], @@ -26,7 +26,7 @@ "Bounds": "128, 96, 72, 96" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -34,7 +34,7 @@ "Bounds": "200, 96, 56, 56" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -47,7 +47,7 @@ "Bounds": "240, 208, 16, 8" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -55,7 +55,7 @@ "Bounds": "128, 224, 112, 24" }, { - "Entities": [ + "Types": [ 57, 58, 60 @@ -64,7 +64,7 @@ "Bounds": "144, 96, 64, 64" }, { - "Entities": [ + "Types": [ 68, 69, 70 @@ -73,7 +73,7 @@ "Bounds": "144, 160, 64, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -86,7 +86,7 @@ "Bounds": "208, 192, 48, 32" }, { - "Entities": [ + "Types": [ 68, 69, 70 @@ -95,7 +95,7 @@ "Bounds": "240, 128, 8, 64" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -103,7 +103,7 @@ "Bounds": "0, 176, 40, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -116,7 +116,7 @@ "Bounds": "0, 216, 40, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -124,7 +124,7 @@ "Bounds": "0, 240, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -137,7 +137,7 @@ "Bounds": "48, 64, 56, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -145,7 +145,7 @@ "Bounds": "48, 152, 56, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -153,7 +153,7 @@ "Bounds": "56, 240, 24, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -161,7 +161,7 @@ "Bounds": "80, 216, 24, 40" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -169,7 +169,7 @@ "Bounds": "104, 88, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -182,7 +182,7 @@ "Bounds": "104, 184, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -195,7 +195,7 @@ "Bounds": "104, 240, 40, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -208,7 +208,7 @@ "Bounds": "120, 32, 24, 64" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -216,7 +216,7 @@ "Bounds": "144, 104, 32, 40" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -224,7 +224,7 @@ "Bounds": "176, 104, 8, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -232,7 +232,7 @@ "Bounds": "192, 0, 56, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -240,7 +240,7 @@ "Bounds": "192, 88, 40, 32" }, { - "Entities": [ + "Types": [ 57, 58 ], @@ -248,7 +248,7 @@ "Bounds": "248, 0, 8, 88" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -256,7 +256,7 @@ "Bounds": "0, 144, 16, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -264,7 +264,7 @@ "Bounds": "24, 24, 16, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -272,7 +272,7 @@ "Bounds": "24, 48, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -283,7 +283,7 @@ "Bounds": "64, 16, 24, 32" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -291,7 +291,7 @@ "Bounds": "80, 88, 16, 40" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -299,7 +299,7 @@ "Bounds": "80, 232, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -310,7 +310,7 @@ "Bounds": "88, 16, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -318,7 +318,7 @@ "Bounds": "96, 88, 16, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -326,7 +326,7 @@ "Bounds": "96, 232, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -339,7 +339,7 @@ "Bounds": "112, 32, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -347,7 +347,7 @@ "Bounds": "120, 0, 24, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -356,7 +356,7 @@ "Bounds": "128, 136, 8, 56" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -369,7 +369,7 @@ "Bounds": "144, 0, 32, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -377,7 +377,7 @@ "Bounds": "144, 136, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -385,7 +385,7 @@ "Bounds": "160, 24, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -393,7 +393,7 @@ "Bounds": "160, 136, 16, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -401,7 +401,7 @@ "Bounds": "176, 0, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -412,7 +412,7 @@ "Bounds": "176, 16, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -420,7 +420,7 @@ "Bounds": "176, 136, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -428,7 +428,7 @@ "Bounds": "192, 136, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -439,7 +439,7 @@ "Bounds": "200, 16, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -447,7 +447,7 @@ "Bounds": "208, 136, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -458,7 +458,7 @@ "Bounds": "224, 0, 24, 32" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -467,7 +467,7 @@ "Bounds": "224, 96, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -480,7 +480,7 @@ "Bounds": "224, 104, 24, 24" }, { - "Entities": [ + "Types": [ 99, 100, 102 diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10A.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10A.PHD-TextureRemap.json index 73e1c4192..e09296c06 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10A.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10A.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 35, 162 ], @@ -10,7 +10,7 @@ "Bounds": "72, 192, 64, 64" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -18,7 +18,7 @@ "Bounds": "200, 192, 56, 56" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -26,7 +26,7 @@ "Bounds": "200, 248, 40, 8" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -34,7 +34,7 @@ "Bounds": "40, 184, 24, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -42,7 +42,7 @@ "Bounds": "64, 176, 112, 24" }, { - "Entities": [ + "Types": [ 58, 59, 60 @@ -51,7 +51,7 @@ "Bounds": "128, 0, 64, 64" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -59,7 +59,7 @@ "Bounds": "192, 208, 56, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -67,7 +67,7 @@ "Bounds": "200, 240, 56, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -75,7 +75,7 @@ "Bounds": "224, 128, 32, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -89,7 +89,7 @@ "Bounds": "0, 64, 56, 24" }, { - "Entities": [ + "Types": [ 49, 50 ], @@ -97,7 +97,7 @@ "Bounds": "0, 224, 32, 32" }, { - "Entities": [ + "Types": [ 49, 50 ], @@ -105,7 +105,7 @@ "Bounds": "32, 192, 32, 32" }, { - "Entities": [ + "Types": [ 31, 32 ], @@ -113,7 +113,7 @@ "Bounds": "40, 88, 16, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -127,7 +127,7 @@ "Bounds": "64, 32, 48, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -141,7 +141,7 @@ "Bounds": "64, 232, 32, 24" }, { - "Entities": [ + "Types": [ 118, 122 ], @@ -149,7 +149,7 @@ "Bounds": "88, 152, 24, 48" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -157,7 +157,7 @@ "Bounds": "96, 200, 16, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -165,7 +165,7 @@ "Bounds": "112, 32, 8, 24" }, { - "Entities": [ + "Types": [ 49, 50 ], @@ -173,7 +173,7 @@ "Bounds": "112, 192, 32, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -181,7 +181,7 @@ "Bounds": "128, 224, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -189,7 +189,7 @@ "Bounds": "136, 104, 40, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -197,7 +197,7 @@ "Bounds": "144, 192, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -211,7 +211,7 @@ "Bounds": "176, 104, 24, 24" }, { - "Entities": [ + "Types": [ 49, 50 ], @@ -219,7 +219,7 @@ "Bounds": "208, 216, 32, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -233,7 +233,7 @@ "Bounds": "232, 0, 24, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -247,7 +247,7 @@ "Bounds": "0, 112, 40, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -255,7 +255,7 @@ "Bounds": "0, 160, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -266,7 +266,7 @@ "Bounds": "0, 176, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -277,7 +277,7 @@ "Bounds": "24, 176, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -285,7 +285,7 @@ "Bounds": "32, 208, 16, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -293,7 +293,7 @@ "Bounds": "40, 112, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -307,7 +307,7 @@ "Bounds": "48, 184, 48, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -315,7 +315,7 @@ "Bounds": "56, 168, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -329,7 +329,7 @@ "Bounds": "64, 232, 40, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -340,7 +340,7 @@ "Bounds": "104, 176, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -354,7 +354,7 @@ "Bounds": "152, 176, 16, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -362,7 +362,7 @@ "Bounds": "152, 192, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -373,7 +373,7 @@ "Bounds": "168, 160, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -381,7 +381,7 @@ "Bounds": "224, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -392,7 +392,7 @@ "Bounds": "224, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -406,7 +406,7 @@ "Bounds": "240, 104, 16, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -414,7 +414,7 @@ "Bounds": "240, 248, 16, 8" }, { - "Entities": [ + "Types": [ 118, 122 ], @@ -422,7 +422,7 @@ "Bounds": "0, 16, 40, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -430,7 +430,7 @@ "Bounds": "0, 72, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -438,7 +438,7 @@ "Bounds": "16, 72, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -446,7 +446,7 @@ "Bounds": "32, 72, 16, 24" }, { - "Entities": [ + "Types": [ 58, 60 ], @@ -454,7 +454,7 @@ "Bounds": "48, 48, 64, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -462,7 +462,7 @@ "Bounds": "80, 72, 16, 24" }, { - "Entities": [ + "Types": [ 30, 31 ], @@ -470,7 +470,7 @@ "Bounds": "112, 136, 8, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -478,7 +478,7 @@ "Bounds": "128, 152, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -486,7 +486,7 @@ "Bounds": "144, 16, 16, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -494,7 +494,7 @@ "Bounds": "144, 152, 16, 16" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -502,7 +502,7 @@ "Bounds": "160, 0, 16, 40" }, { - "Entities": [ + "Types": [ 48, 49, 50, @@ -512,7 +512,7 @@ "Bounds": "160, 192, 16, 16" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -521,7 +521,7 @@ "Bounds": "160, 240, 16, 8" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -530,7 +530,7 @@ "Bounds": "200, 56, 8, 56" }, { - "Entities": [ + "Types": [ 118, 122 ], @@ -538,7 +538,7 @@ "Bounds": "216, 0, 40, 16" }, { - "Entities": [ + "Types": [ 115, 123 ], @@ -546,7 +546,7 @@ "Bounds": "240, 128, 8, 32" }, { - "Entities": [ + "Types": [ 31, 32 ], @@ -554,7 +554,7 @@ "Bounds": "240, 248, 16, 8" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -562,7 +562,7 @@ "Bounds": "248, 16, 8, 24" }, { - "Entities": [ + "Types": [ 99, 100, 102 @@ -571,7 +571,7 @@ "Bounds": "48, 24, 8, 8" }, { - "Entities": [ + "Types": [ 30, 31 ], @@ -579,7 +579,7 @@ "Bounds": "152, 16, 8, 8" }, { - "Entities": [ + "Types": [ 31, 32 ], @@ -587,7 +587,7 @@ "Bounds": "184, 16, 8, 8" }, { - "Entities": [ + "Types": [ 31, 32 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10B.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10B.PHD-TextureRemap.json index b4382e2e0..37599a0d5 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10B.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10B.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 5 ], @@ -10,7 +10,7 @@ "Bounds": "72, 56, 56, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -19,7 +19,7 @@ "Bounds": "200, 0, 56, 56" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -27,7 +27,7 @@ "Bounds": "200, 56, 16, 40" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -35,7 +35,7 @@ "Bounds": "216, 56, 40, 64" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -43,7 +43,7 @@ "Bounds": "0, 224, 112, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -52,7 +52,7 @@ "Bounds": "72, 248, 40, 8" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -61,7 +61,7 @@ "Bounds": "192, 224, 56, 32" }, { - "Entities": [ + "Types": [ 147, 163, 181 @@ -70,7 +70,7 @@ "Bounds": "216, 0, 24, 80" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -86,7 +86,7 @@ "Bounds": "216, 80, 40, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -102,7 +102,7 @@ "Bounds": "240, 64, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -111,7 +111,7 @@ "Bounds": "0, 216, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -127,7 +127,7 @@ "Bounds": "40, 200, 56, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -143,7 +143,7 @@ "Bounds": "96, 168, 16, 8" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -151,7 +151,7 @@ "Bounds": "96, 216, 40, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -159,7 +159,7 @@ "Bounds": "112, 120, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -175,7 +175,7 @@ "Bounds": "136, 176, 48, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -183,7 +183,7 @@ "Bounds": "136, 208, 40, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -193,7 +193,7 @@ "Bounds": "176, 208, 8, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -209,7 +209,7 @@ "Bounds": "184, 176, 24, 64" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -219,7 +219,7 @@ "Bounds": "208, 176, 48, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -227,7 +227,7 @@ "Bounds": "208, 208, 40, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -236,7 +236,7 @@ "Bounds": "208, 240, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -245,7 +245,7 @@ "Bounds": "240, 160, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -255,7 +255,7 @@ "Bounds": "248, 208, 8, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -263,7 +263,7 @@ "Bounds": "0, 120, 40, 24" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -271,7 +271,7 @@ "Bounds": "0, 144, 16, 56" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -287,7 +287,7 @@ "Bounds": "0, 200, 48, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -297,7 +297,7 @@ "Bounds": "0, 216, 48, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -305,7 +305,7 @@ "Bounds": "16, 144, 24, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -313,7 +313,7 @@ "Bounds": "16, 160, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -329,7 +329,7 @@ "Bounds": "16, 176, 32, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -338,7 +338,7 @@ "Bounds": "40, 120, 24, 40" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -347,7 +347,7 @@ "Bounds": "48, 0, 32, 40" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -358,7 +358,7 @@ "Bounds": "48, 40, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -370,7 +370,7 @@ "Bounds": "48, 176, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -380,7 +380,7 @@ "Bounds": "72, 152, 32, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -388,7 +388,7 @@ "Bounds": "72, 168, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -400,7 +400,7 @@ "Bounds": "72, 184, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -410,7 +410,7 @@ "Bounds": "96, 88, 32, 8" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -418,7 +418,7 @@ "Bounds": "96, 184, 24, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -426,7 +426,7 @@ "Bounds": "120, 200, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -435,7 +435,7 @@ "Bounds": "128, 168, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -445,7 +445,7 @@ "Bounds": "152, 128, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -457,7 +457,7 @@ "Bounds": "152, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -465,7 +465,7 @@ "Bounds": "160, 0, 24, 48" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -473,7 +473,7 @@ "Bounds": "176, 128, 16, 56" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -481,7 +481,7 @@ "Bounds": "176, 184, 16, 24" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -489,7 +489,7 @@ "Bounds": "184, 224, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -501,7 +501,7 @@ "Bounds": "192, 176, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -511,7 +511,7 @@ "Bounds": "200, 48, 32, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -527,7 +527,7 @@ "Bounds": "208, 112, 40, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -537,7 +537,7 @@ "Bounds": "208, 136, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -549,7 +549,7 @@ "Bounds": "216, 176, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -559,7 +559,7 @@ "Bounds": "216, 208, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -569,7 +569,7 @@ "Bounds": "240, 176, 16, 40" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -577,7 +577,7 @@ "Bounds": "240, 216, 16, 24" }, { - "Entities": [ + "Types": [ 60, 62, 63 @@ -586,7 +586,7 @@ "Bounds": "248, 0, 8, 64" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -594,7 +594,7 @@ "Bounds": "248, 112, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -610,7 +610,7 @@ "Bounds": "0, 32, 24, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -618,7 +618,7 @@ "Bounds": "0, 96, 16, 24" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -627,7 +627,7 @@ "Bounds": "32, 64, 8, 56" }, { - "Entities": [ + "Types": [ 6, 172 ], @@ -635,7 +635,7 @@ "Bounds": "32, 120, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -645,7 +645,7 @@ "Bounds": "32, 128, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -655,7 +655,7 @@ "Bounds": "40, 0, 40, 16" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -663,7 +663,7 @@ "Bounds": "40, 16, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -673,7 +673,7 @@ "Bounds": "40, 56, 16, 32" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -682,7 +682,7 @@ "Bounds": "40, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -692,7 +692,7 @@ "Bounds": "48, 128, 24, 16" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -700,7 +700,7 @@ "Bounds": "56, 56, 16, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -710,7 +710,7 @@ "Bounds": "56, 64, 32, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -719,7 +719,7 @@ "Bounds": "56, 88, 16, 24" }, { - "Entities": [ + "Types": [ 147, 163, 181 @@ -728,7 +728,7 @@ "Bounds": "64, 192, 24, 16" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -737,7 +737,7 @@ "Bounds": "64, 248, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -746,7 +746,7 @@ "Bounds": "72, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -756,7 +756,7 @@ "Bounds": "72, 128, 24, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -766,7 +766,7 @@ "Bounds": "80, 0, 16, 40" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -774,7 +774,7 @@ "Bounds": "80, 208, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -783,7 +783,7 @@ "Bounds": "88, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -793,7 +793,7 @@ "Bounds": "96, 0, 16, 40" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -801,7 +801,7 @@ "Bounds": "96, 208, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -810,7 +810,7 @@ "Bounds": "104, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -820,7 +820,7 @@ "Bounds": "112, 0, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -830,7 +830,7 @@ "Bounds": "112, 144, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -840,7 +840,7 @@ "Bounds": "120, 128, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -850,7 +850,7 @@ "Bounds": "136, 128, 16, 24" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -861,7 +861,7 @@ "Bounds": "144, 104, 16, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -870,7 +870,7 @@ "Bounds": "152, 80, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -879,7 +879,7 @@ "Bounds": "168, 80, 16, 24" }, { - "Entities": [ + "Types": [ 99, 100, 102 @@ -888,7 +888,7 @@ "Bounds": "184, 248, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -898,7 +898,7 @@ "Bounds": "192, 40, 16, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -908,7 +908,7 @@ "Bounds": "208, 56, 32, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -918,7 +918,7 @@ "Bounds": "208, 136, 8, 8" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -929,7 +929,7 @@ "Bounds": "208, 240, 16, 16" }, { - "Entities": [ + "Types": [ 6, 23 ], @@ -937,7 +937,7 @@ "Bounds": "216, 208, 16, 16" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -948,7 +948,7 @@ "Bounds": "224, 240, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -958,7 +958,7 @@ "Bounds": "240, 120, 16, 24" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -969,7 +969,7 @@ "Bounds": "240, 240, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -979,7 +979,7 @@ "Bounds": "248, 0, 8, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -987,7 +987,7 @@ "Bounds": "248, 56, 8, 56" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -995,7 +995,7 @@ "Bounds": "248, 144, 8, 24" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1006,7 +1006,7 @@ "Bounds": "0, 0, 16, 16" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -1014,7 +1014,7 @@ "Bounds": "0, 64, 16, 16" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1025,7 +1025,7 @@ "Bounds": "16, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 20, 21, @@ -1036,7 +1036,7 @@ "Bounds": "32, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 23, 173 @@ -1045,7 +1045,7 @@ "Bounds": "80, 0, 16, 16" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -1053,7 +1053,7 @@ "Bounds": "96, 96, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1063,7 +1063,7 @@ "Bounds": "112, 64, 8, 24" }, { - "Entities": [ + "Types": [ 6, 23 ], @@ -1071,7 +1071,7 @@ "Bounds": "136, 80, 16, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1081,7 +1081,7 @@ "Bounds": "144, 0, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1091,7 +1091,7 @@ "Bounds": "176, 0, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1101,7 +1101,7 @@ "Bounds": "176, 80, 16, 8" }, { - "Entities": [ + "Types": [ 146, 150 ], @@ -1109,7 +1109,7 @@ "Bounds": "184, 72, 24, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1119,7 +1119,7 @@ "Bounds": "208, 0, 16, 16" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -1127,7 +1127,7 @@ "Bounds": "208, 72, 24, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1137,7 +1137,7 @@ "Bounds": "224, 0, 16, 16" }, { - "Entities": [ + "Types": [ 146, 150 ], @@ -1145,7 +1145,7 @@ "Bounds": "224, 48, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1155,7 +1155,7 @@ "Bounds": "240, 0, 8, 32" }, { - "Entities": [ + "Types": [ 163, 181 ], @@ -1163,7 +1163,7 @@ "Bounds": "240, 48, 8, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10C.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10C.PHD-TextureRemap.json index 3dfb36abf..4c3df023e 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10C.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL10C.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 5 ], @@ -10,7 +10,7 @@ "Bounds": "72, 56, 56, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -19,7 +19,7 @@ "Bounds": "200, 0, 56, 56" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -27,7 +27,7 @@ "Bounds": "200, 56, 16, 40" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -35,7 +35,7 @@ "Bounds": "216, 56, 40, 64" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -45,7 +45,7 @@ "Bounds": "216, 184, 32, 8" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -53,7 +53,7 @@ "Bounds": "0, 224, 112, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -62,7 +62,7 @@ "Bounds": "72, 248, 40, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -72,7 +72,7 @@ "Bounds": "216, 56, 40, 40" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -80,7 +80,7 @@ "Bounds": "0, 240, 56, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -89,7 +89,7 @@ "Bounds": "96, 112, 32, 40" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -98,7 +98,7 @@ "Bounds": "184, 200, 56, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -116,7 +116,7 @@ "Bounds": "184, 232, 56, 24" }, { - "Entities": [ + "Types": [ 147, 181 ], @@ -124,7 +124,7 @@ "Bounds": "224, 56, 24, 80" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -142,7 +142,7 @@ "Bounds": "224, 136, 16, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -150,7 +150,7 @@ "Bounds": "240, 200, 16, 56" }, { - "Entities": [ + "Types": [ 57, 58 ], @@ -158,7 +158,7 @@ "Bounds": "248, 56, 8, 64" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -166,7 +166,7 @@ "Bounds": "0, 56, 40, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -174,7 +174,7 @@ "Bounds": "0, 240, 56, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -183,7 +183,7 @@ "Bounds": "40, 56, 40, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -192,7 +192,7 @@ "Bounds": "48, 144, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -210,7 +210,7 @@ "Bounds": "56, 240, 48, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -220,7 +220,7 @@ "Bounds": "64, 208, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -238,7 +238,7 @@ "Bounds": "80, 16, 48, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -246,7 +246,7 @@ "Bounds": "80, 48, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -264,7 +264,7 @@ "Bounds": "80, 112, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -282,7 +282,7 @@ "Bounds": "96, 112, 24, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -290,7 +290,7 @@ "Bounds": "104, 240, 24, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -298,7 +298,7 @@ "Bounds": "120, 48, 8, 56" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -316,7 +316,7 @@ "Bounds": "128, 40, 24, 64" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -324,7 +324,7 @@ "Bounds": "128, 192, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -342,7 +342,7 @@ "Bounds": "128, 232, 40, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -351,7 +351,7 @@ "Bounds": "144, 136, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -361,7 +361,7 @@ "Bounds": "152, 40, 48, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -369,7 +369,7 @@ "Bounds": "152, 72, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -387,7 +387,7 @@ "Bounds": "160, 104, 32, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -395,7 +395,7 @@ "Bounds": "168, 240, 48, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -403,7 +403,7 @@ "Bounds": "192, 72, 8, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -413,7 +413,7 @@ "Bounds": "216, 144, 32, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -431,7 +431,7 @@ "Bounds": "216, 240, 40, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -439,7 +439,7 @@ "Bounds": "232, 96, 24, 48" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -450,7 +450,7 @@ "Bounds": "240, 176, 16, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -461,7 +461,7 @@ "Bounds": "248, 64, 8, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -472,7 +472,7 @@ "Bounds": "248, 144, 8, 32" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -481,7 +481,7 @@ "Bounds": "0, 32, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -491,7 +491,7 @@ "Bounds": "0, 64, 48, 16" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -499,7 +499,7 @@ "Bounds": "0, 216, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -510,7 +510,7 @@ "Bounds": "24, 32, 8, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -518,7 +518,7 @@ "Bounds": "32, 0, 40, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -528,7 +528,7 @@ "Bounds": "32, 184, 16, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -538,7 +538,7 @@ "Bounds": "32, 216, 16, 24" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -546,7 +546,7 @@ "Bounds": "48, 120, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -556,7 +556,7 @@ "Bounds": "48, 160, 32, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -566,7 +566,7 @@ "Bounds": "48, 216, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -574,7 +574,7 @@ "Bounds": "48, 240, 16, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -582,7 +582,7 @@ "Bounds": "56, 24, 16, 56" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -590,7 +590,7 @@ "Bounds": "64, 120, 16, 24" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -599,7 +599,7 @@ "Bounds": "64, 200, 8, 56" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -608,7 +608,7 @@ "Bounds": "72, 0, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -620,7 +620,7 @@ "Bounds": "72, 40, 24, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -628,7 +628,7 @@ "Bounds": "72, 200, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -638,7 +638,7 @@ "Bounds": "72, 224, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -649,7 +649,7 @@ "Bounds": "80, 104, 16, 40" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -658,7 +658,7 @@ "Bounds": "88, 208, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -668,7 +668,7 @@ "Bounds": "96, 64, 24, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -676,7 +676,7 @@ "Bounds": "96, 96, 16, 40" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -685,7 +685,7 @@ "Bounds": "96, 136, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -694,7 +694,7 @@ "Bounds": "104, 208, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -706,7 +706,7 @@ "Bounds": "120, 40, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -716,7 +716,7 @@ "Bounds": "120, 224, 24, 16" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -725,7 +725,7 @@ "Bounds": "128, 200, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -737,7 +737,7 @@ "Bounds": "144, 40, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -746,7 +746,7 @@ "Bounds": "144, 200, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -756,7 +756,7 @@ "Bounds": "144, 224, 24, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -767,7 +767,7 @@ "Bounds": "152, 104, 40, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -776,7 +776,7 @@ "Bounds": "160, 200, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -788,7 +788,7 @@ "Bounds": "168, 40, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -798,7 +798,7 @@ "Bounds": "176, 168, 32, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -807,7 +807,7 @@ "Bounds": "176, 200, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -818,7 +818,7 @@ "Bounds": "184, 0, 24, 40" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -826,7 +826,7 @@ "Bounds": "184, 120, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -838,7 +838,7 @@ "Bounds": "192, 40, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -849,7 +849,7 @@ "Bounds": "192, 104, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -860,7 +860,7 @@ "Bounds": "208, 0, 24, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -870,7 +870,7 @@ "Bounds": "208, 104, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -880,7 +880,7 @@ "Bounds": "208, 168, 32, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -888,7 +888,7 @@ "Bounds": "216, 40, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -899,7 +899,7 @@ "Bounds": "224, 104, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -909,7 +909,7 @@ "Bounds": "224, 216, 16, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -917,7 +917,7 @@ "Bounds": "224, 240, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -927,7 +927,7 @@ "Bounds": "240, 40, 16, 32" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -936,7 +936,7 @@ "Bounds": "240, 200, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -946,7 +946,7 @@ "Bounds": "240, 224, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -957,7 +957,7 @@ "Bounds": "248, 72, 8, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -967,7 +967,7 @@ "Bounds": "0, 72, 16, 16" }, { - "Entities": [ + "Types": [ 145, 150 ], @@ -975,7 +975,7 @@ "Bounds": "0, 192, 24, 8" }, { - "Entities": [ + "Types": [ 145, 150 ], @@ -983,7 +983,7 @@ "Bounds": "32, 168, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -994,7 +994,7 @@ "Bounds": "48, 64, 16, 16" }, { - "Entities": [ + "Types": [ 23, 173 ], @@ -1002,7 +1002,7 @@ "Bounds": "64, 80, 16, 16" }, { - "Entities": [ + "Types": [ 99, 100, 102 @@ -1011,7 +1011,7 @@ "Bounds": "72, 208, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1021,7 +1021,7 @@ "Bounds": "80, 64, 16, 16" }, { - "Entities": [ + "Types": [ 23, 33 ], @@ -1029,7 +1029,7 @@ "Bounds": "80, 80, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1039,7 +1039,7 @@ "Bounds": "112, 40, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1049,7 +1049,7 @@ "Bounds": "112, 64, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1059,7 +1059,7 @@ "Bounds": "120, 176, 8, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1069,7 +1069,7 @@ "Bounds": "128, 64, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1079,7 +1079,7 @@ "Bounds": "128, 176, 8, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1089,7 +1089,7 @@ "Bounds": "144, 64, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1099,7 +1099,7 @@ "Bounds": "160, 64, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1109,7 +1109,7 @@ "Bounds": "176, 64, 16, 16" }, { - "Entities": [ + "Types": [ 23, 33 ], @@ -1117,7 +1117,7 @@ "Bounds": "176, 176, 16, 8" }, { - "Entities": [ + "Types": [ 147, 181 ], @@ -1125,7 +1125,7 @@ "Bounds": "184, 40, 24, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1135,7 +1135,7 @@ "Bounds": "192, 64, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1145,7 +1145,7 @@ "Bounds": "208, 72, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1155,7 +1155,7 @@ "Bounds": "216, 56, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1165,7 +1165,7 @@ "Bounds": "232, 40, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL2.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL2.PHD-TextureRemap.json index d4559b6cd..7f54b61d7 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL2.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL2.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 71, 81 ], @@ -10,7 +10,7 @@ "Bounds": "152, 96, 72, 96" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -18,7 +18,7 @@ "Bounds": "200, 0, 56, 56" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -31,7 +31,7 @@ "Bounds": "224, 96, 24, 64" }, { - "Entities": [ + "Types": [ 61, 62 ], @@ -39,7 +39,7 @@ "Bounds": "64, 192, 64, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -52,7 +52,7 @@ "Bounds": "216, 176, 40, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -65,7 +65,7 @@ "Bounds": "56, 224, 48, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -73,7 +73,7 @@ "Bounds": "80, 144, 40, 8" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -81,7 +81,7 @@ "Bounds": "120, 72, 112, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -89,7 +89,7 @@ "Bounds": "120, 192, 8, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -97,7 +97,7 @@ "Bounds": "120, 216, 56, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -110,7 +110,7 @@ "Bounds": "32, 104, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -123,7 +123,7 @@ "Bounds": "80, 0, 56, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -131,7 +131,7 @@ "Bounds": "80, 24, 40, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -139,7 +139,7 @@ "Bounds": "80, 232, 56, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -147,7 +147,7 @@ "Bounds": "96, 160, 24, 16" }, { - "Entities": [ + "Types": [ 39, 40 ], @@ -155,7 +155,7 @@ "Bounds": "112, 56, 48, 8" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -163,7 +163,7 @@ "Bounds": "136, 232, 56, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -171,7 +171,7 @@ "Bounds": "160, 24, 32, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -184,7 +184,7 @@ "Bounds": "160, 184, 40, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -192,7 +192,7 @@ "Bounds": "200, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -200,7 +200,7 @@ "Bounds": "232, 48, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -213,7 +213,7 @@ "Bounds": "0, 0, 32, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -221,7 +221,7 @@ "Bounds": "0, 32, 48, 16" }, { - "Entities": [ + "Types": [ 60, 65 ], @@ -229,7 +229,7 @@ "Bounds": "0, 136, 64, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -237,7 +237,7 @@ "Bounds": "0, 144, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -246,7 +246,7 @@ "Bounds": "0, 240, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -254,7 +254,7 @@ "Bounds": "16, 144, 16, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -262,7 +262,7 @@ "Bounds": "32, 0, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -275,7 +275,7 @@ "Bounds": "32, 16, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -283,7 +283,7 @@ "Bounds": "32, 144, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -291,7 +291,7 @@ "Bounds": "48, 144, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -302,7 +302,7 @@ "Bounds": "80, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -315,7 +315,7 @@ "Bounds": "88, 240, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -326,7 +326,7 @@ "Bounds": "104, 0, 24, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -335,7 +335,7 @@ "Bounds": "104, 128, 8, 56" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -346,7 +346,7 @@ "Bounds": "128, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -359,7 +359,7 @@ "Bounds": "128, 88, 24, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -367,7 +367,7 @@ "Bounds": "128, 144, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -375,7 +375,7 @@ "Bounds": "144, 240, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -386,7 +386,7 @@ "Bounds": "152, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -397,7 +397,7 @@ "Bounds": "176, 0, 24, 32" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -405,7 +405,7 @@ "Bounds": "176, 144, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -413,7 +413,7 @@ "Bounds": "192, 136, 16, 24" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -421,7 +421,7 @@ "Bounds": "224, 64, 16, 40" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -429,7 +429,7 @@ "Bounds": "224, 128, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -437,7 +437,7 @@ "Bounds": "224, 200, 16, 8" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -445,7 +445,7 @@ "Bounds": "40, 96, 8, 24" }, { - "Entities": [ + "Types": [ 133, 137 ], @@ -453,7 +453,7 @@ "Bounds": "40, 120, 8, 16" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -461,7 +461,7 @@ "Bounds": "80, 0, 16, 16" }, { - "Entities": [ + "Types": [ 99, 100, 102 @@ -470,7 +470,7 @@ "Bounds": "80, 120, 8, 8" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -478,7 +478,7 @@ "Bounds": "96, 0, 16, 16" }, { - "Entities": [ + "Types": [ 118, 122 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL3A.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL3A.PHD-TextureRemap.json index f379dcedb..8ab3ae05d 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL3A.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL3A.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 1, 2, @@ -15,7 +15,7 @@ "Bounds": "0, 232, 56, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -28,7 +28,7 @@ "Bounds": "56, 232, 16, 16" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -37,7 +37,7 @@ "Bounds": "72, 136, 56, 56" }, { - "Entities": [ + "Types": [ 71, 81 ], @@ -45,7 +45,7 @@ "Bounds": "128, 0, 72, 96" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -54,7 +54,7 @@ "Bounds": "200, 248, 40, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -67,7 +67,7 @@ "Bounds": "200, 152, 16, 8" }, { - "Entities": [ + "Types": [ 68, 70 ], @@ -75,7 +75,7 @@ "Bounds": "0, 0, 64, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -88,7 +88,7 @@ "Bounds": "40, 128, 24, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -96,7 +96,7 @@ "Bounds": "64, 64, 112, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -104,7 +104,7 @@ "Bounds": "104, 88, 56, 32" }, { - "Entities": [ + "Types": [ 74, 75, 76, @@ -114,7 +114,7 @@ "Bounds": "128, 0, 64, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -127,7 +127,7 @@ "Bounds": "152, 232, 32, 24" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -135,7 +135,7 @@ "Bounds": "160, 88, 16, 40" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -143,7 +143,7 @@ "Bounds": "56, 56, 16, 40" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -153,7 +153,7 @@ "Bounds": "64, 96, 8, 56" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -161,7 +161,7 @@ "Bounds": "104, 128, 32, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -174,7 +174,7 @@ "Bounds": "112, 32, 24, 64" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -182,7 +182,7 @@ "Bounds": "144, 96, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -195,7 +195,7 @@ "Bounds": "168, 32, 48, 32" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -204,7 +204,7 @@ "Bounds": "208, 112, 40, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -212,7 +212,7 @@ "Bounds": "216, 32, 8, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -220,7 +220,7 @@ "Bounds": "224, 248, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -229,7 +229,7 @@ "Bounds": "232, 200, 24, 32" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -237,7 +237,7 @@ "Bounds": "240, 56, 16, 40" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -246,7 +246,7 @@ "Bounds": "240, 96, 16, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -254,7 +254,7 @@ "Bounds": "240, 232, 16, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -262,7 +262,7 @@ "Bounds": "248, 176, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -274,7 +274,7 @@ "Bounds": "0, 104, 24, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -282,7 +282,7 @@ "Bounds": "0, 240, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -294,7 +294,7 @@ "Bounds": "24, 120, 24, 32" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -303,7 +303,7 @@ "Bounds": "48, 120, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -316,7 +316,7 @@ "Bounds": "48, 128, 48, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -324,7 +324,7 @@ "Bounds": "48, 144, 48, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -332,7 +332,7 @@ "Bounds": "64, 96, 56, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -340,7 +340,7 @@ "Bounds": "64, 112, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -352,7 +352,7 @@ "Bounds": "120, 112, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -365,7 +365,7 @@ "Bounds": "128, 64, 40, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -377,7 +377,7 @@ "Bounds": "144, 112, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -389,7 +389,7 @@ "Bounds": "168, 112, 24, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -397,7 +397,7 @@ "Bounds": "192, 120, 24, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -406,7 +406,7 @@ "Bounds": "208, 64, 24, 40" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -415,7 +415,7 @@ "Bounds": "208, 104, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -429,7 +429,7 @@ "Bounds": "216, 176, 40, 16" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -437,7 +437,7 @@ "Bounds": "240, 240, 16, 16" }, { - "Entities": [ + "Types": [ 68, 69, 70 @@ -446,7 +446,7 @@ "Bounds": "16, 0, 8, 64" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -454,7 +454,7 @@ "Bounds": "32, 0, 16, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -463,7 +463,7 @@ "Bounds": "48, 0, 16, 24" }, { - "Entities": [ + "Types": [ 75, 76, 122 @@ -472,7 +472,7 @@ "Bounds": "48, 192, 8, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -481,7 +481,7 @@ "Bounds": "64, 0, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -490,7 +490,7 @@ "Bounds": "80, 0, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -499,7 +499,7 @@ "Bounds": "96, 0, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -508,7 +508,7 @@ "Bounds": "112, 0, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -517,7 +517,7 @@ "Bounds": "128, 0, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -526,7 +526,7 @@ "Bounds": "144, 0, 16, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -534,7 +534,7 @@ "Bounds": "152, 80, 16, 16" }, { - "Entities": [ + "Types": [ 74, 75, 76, @@ -546,7 +546,7 @@ "Bounds": "176, 120, 8, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL3B.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL3B.PHD-TextureRemap.json index 83deb5953..bf7fe755e 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL3B.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL3B.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 71, 81 ], @@ -10,7 +10,7 @@ "Bounds": "72, 0, 72, 96" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -23,7 +23,7 @@ "Bounds": "216, 176, 16, 8" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -32,7 +32,7 @@ "Bounds": "216, 184, 40, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -45,7 +45,7 @@ "Bounds": "232, 0, 24, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -58,7 +58,7 @@ "Bounds": "0, 232, 56, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -66,7 +66,7 @@ "Bounds": "64, 224, 112, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -75,7 +75,7 @@ "Bounds": "0, 64, 56, 56" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -84,7 +84,7 @@ "Bounds": "0, 208, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -98,7 +98,7 @@ "Bounds": "0, 240, 40, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -106,7 +106,7 @@ "Bounds": "40, 208, 16, 24" }, { - "Entities": [ + "Types": [ 39, 40 ], @@ -114,7 +114,7 @@ "Bounds": "56, 120, 48, 8" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -122,7 +122,7 @@ "Bounds": "56, 128, 56, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -130,7 +130,7 @@ "Bounds": "56, 200, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -143,7 +143,7 @@ "Bounds": "96, 160, 48, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -151,7 +151,7 @@ "Bounds": "120, 192, 24, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -159,7 +159,7 @@ "Bounds": "160, 208, 32, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -172,7 +172,7 @@ "Bounds": "168, 128, 16, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -180,7 +180,7 @@ "Bounds": "240, 168, 16, 40" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -189,7 +189,7 @@ "Bounds": "16, 200, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -202,7 +202,7 @@ "Bounds": "16, 232, 24, 24" }, { - "Entities": [ + "Types": [ 57, 58, 59 @@ -211,7 +211,7 @@ "Bounds": "40, 56, 48, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -223,7 +223,7 @@ "Bounds": "40, 216, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -236,7 +236,7 @@ "Bounds": "64, 232, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -245,7 +245,7 @@ "Bounds": "80, 176, 16, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -253,7 +253,7 @@ "Bounds": "80, 192, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -266,7 +266,7 @@ "Bounds": "80, 208, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -279,7 +279,7 @@ "Bounds": "96, 144, 40, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -288,7 +288,7 @@ "Bounds": "112, 208, 48, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -296,7 +296,7 @@ "Bounds": "112, 224, 24, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -304,7 +304,7 @@ "Bounds": "136, 192, 56, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -312,7 +312,7 @@ "Bounds": "136, 240, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -324,7 +324,7 @@ "Bounds": "160, 208, 24, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -333,7 +333,7 @@ "Bounds": "176, 144, 24, 40" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -341,7 +341,7 @@ "Bounds": "176, 184, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -353,7 +353,7 @@ "Bounds": "184, 208, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -365,7 +365,7 @@ "Bounds": "208, 208, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -377,7 +377,7 @@ "Bounds": "232, 208, 24, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -385,7 +385,7 @@ "Bounds": "240, 144, 8, 24" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -393,7 +393,7 @@ "Bounds": "0, 88, 16, 40" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -402,7 +402,7 @@ "Bounds": "16, 88, 16, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -410,7 +410,7 @@ "Bounds": "32, 176, 16, 24" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -419,7 +419,7 @@ "Bounds": "96, 168, 16, 24" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -427,7 +427,7 @@ "Bounds": "112, 32, 16, 40" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -436,7 +436,7 @@ "Bounds": "112, 168, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -445,7 +445,7 @@ "Bounds": "128, 168, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -454,7 +454,7 @@ "Bounds": "144, 168, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -463,7 +463,7 @@ "Bounds": "176, 168, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -472,7 +472,7 @@ "Bounds": "192, 168, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -481,7 +481,7 @@ "Bounds": "208, 168, 16, 24" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -491,7 +491,7 @@ "Bounds": "224, 160, 8, 56" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -499,7 +499,7 @@ "Bounds": "232, 160, 16, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -507,7 +507,7 @@ "Bounds": "248, 120, 8, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -515,7 +515,7 @@ "Bounds": "0, 24, 16, 16" }, { - "Entities": [ + "Types": [ 24, 99, 100, @@ -525,7 +525,7 @@ "Bounds": "144, 208, 8, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL4.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL4.PHD-TextureRemap.json index f3bd71cf2..c41fee044 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL4.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL4.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 1, 99 ], @@ -10,7 +10,7 @@ "Bounds": "0, 224, 112, 24" }, { - "Entities": [ + "Types": [ 61, 62 ], @@ -18,7 +18,7 @@ "Bounds": "64, 96, 64, 128" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -26,7 +26,7 @@ "Bounds": "184, 96, 8, 32" }, { - "Entities": [ + "Types": [ 71, 81 ], @@ -34,7 +34,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -42,7 +42,7 @@ "Bounds": "216, 152, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -56,7 +56,7 @@ "Bounds": "0, 96, 48, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -70,7 +70,7 @@ "Bounds": "0, 160, 56, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -84,7 +84,7 @@ "Bounds": "0, 240, 40, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -98,7 +98,7 @@ "Bounds": "48, 96, 24, 64" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -106,7 +106,7 @@ "Bounds": "56, 200, 40, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -114,7 +114,7 @@ "Bounds": "136, 0, 56, 56" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -122,7 +122,7 @@ "Bounds": "136, 56, 56, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -130,7 +130,7 @@ "Bounds": "224, 184, 32, 40" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -138,7 +138,7 @@ "Bounds": "240, 160, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -152,7 +152,7 @@ "Bounds": "0, 80, 40, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -160,7 +160,7 @@ "Bounds": "24, 240, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -171,7 +171,7 @@ "Bounds": "32, 176, 24, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -179,7 +179,7 @@ "Bounds": "56, 144, 56, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -187,7 +187,7 @@ "Bounds": "56, 160, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -201,7 +201,7 @@ "Bounds": "72, 72, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -215,7 +215,7 @@ "Bounds": "80, 176, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -226,7 +226,7 @@ "Bounds": "104, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -234,7 +234,7 @@ "Bounds": "112, 216, 16, 16" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -242,7 +242,7 @@ "Bounds": "112, 232, 40, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -256,7 +256,7 @@ "Bounds": "120, 24, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -267,7 +267,7 @@ "Bounds": "128, 168, 24, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -275,7 +275,7 @@ "Bounds": "144, 136, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -289,7 +289,7 @@ "Bounds": "152, 176, 48, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -297,7 +297,7 @@ "Bounds": "152, 192, 48, 16" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -305,7 +305,7 @@ "Bounds": "152, 232, 40, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -313,7 +313,7 @@ "Bounds": "152, 248, 40, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -327,7 +327,7 @@ "Bounds": "168, 152, 32, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -335,7 +335,7 @@ "Bounds": "184, 208, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -343,7 +343,7 @@ "Bounds": "200, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -354,7 +354,7 @@ "Bounds": "200, 168, 24, 32" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -362,7 +362,7 @@ "Bounds": "216, 248, 40, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -373,7 +373,7 @@ "Bounds": "224, 152, 24, 32" }, { - "Entities": [ + "Types": [ 61, 62 ], @@ -381,7 +381,7 @@ "Bounds": "0, 88, 64, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -389,7 +389,7 @@ "Bounds": "0, 160, 24, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -397,7 +397,7 @@ "Bounds": "16, 176, 8, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -405,7 +405,7 @@ "Bounds": "24, 32, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -413,7 +413,7 @@ "Bounds": "24, 160, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -421,7 +421,7 @@ "Bounds": "24, 248, 16, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -429,7 +429,7 @@ "Bounds": "32, 136, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -437,7 +437,7 @@ "Bounds": "40, 160, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -445,7 +445,7 @@ "Bounds": "40, 224, 8, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -453,7 +453,7 @@ "Bounds": "48, 40, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -461,7 +461,7 @@ "Bounds": "56, 160, 24, 16" }, { - "Entities": [ + "Types": [ 43, 54 ], @@ -469,7 +469,7 @@ "Bounds": "64, 0, 16, 40" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -477,7 +477,7 @@ "Bounds": "64, 104, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -485,7 +485,7 @@ "Bounds": "72, 40, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -493,7 +493,7 @@ "Bounds": "72, 224, 8, 8" }, { - "Entities": [ + "Types": [ 43, 54 ], @@ -501,7 +501,7 @@ "Bounds": "80, 0, 16, 40" }, { - "Entities": [ + "Types": [ 43, 54 ], @@ -509,7 +509,7 @@ "Bounds": "80, 72, 32, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -517,7 +517,7 @@ "Bounds": "80, 104, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -525,7 +525,7 @@ "Bounds": "80, 152, 24, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -533,7 +533,7 @@ "Bounds": "96, 32, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -541,7 +541,7 @@ "Bounds": "96, 56, 24, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -549,7 +549,7 @@ "Bounds": "104, 152, 24, 16" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -558,7 +558,7 @@ "Bounds": "120, 32, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -566,7 +566,7 @@ "Bounds": "120, 40, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -574,7 +574,7 @@ "Bounds": "120, 192, 8, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -582,7 +582,7 @@ "Bounds": "120, 208, 8, 8" }, { - "Entities": [ + "Types": [ 137, 138, 139, @@ -592,7 +592,7 @@ "Bounds": "120, 232, 24, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -600,7 +600,7 @@ "Bounds": "128, 160, 24, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -608,7 +608,7 @@ "Bounds": "152, 160, 24, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -616,7 +616,7 @@ "Bounds": "160, 16, 16, 24" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -624,7 +624,7 @@ "Bounds": "176, 0, 16, 40" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -632,7 +632,7 @@ "Bounds": "176, 128, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -640,7 +640,7 @@ "Bounds": "176, 152, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -648,7 +648,7 @@ "Bounds": "192, 16, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -656,7 +656,7 @@ "Bounds": "192, 160, 24, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -664,7 +664,7 @@ "Bounds": "200, 112, 16, 24" }, { - "Entities": [ + "Types": [ 3, 28, 101 @@ -673,7 +673,7 @@ "Bounds": "216, 16, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -681,7 +681,7 @@ "Bounds": "216, 24, 24, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -689,7 +689,7 @@ "Bounds": "216, 112, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -697,7 +697,7 @@ "Bounds": "224, 152, 16, 24" }, { - "Entities": [ + "Types": [ 133, 135, 136 @@ -706,7 +706,7 @@ "Bounds": "232, 96, 8, 56" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -714,7 +714,7 @@ "Bounds": "240, 24, 16, 32" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -722,7 +722,7 @@ "Bounds": "240, 152, 16, 24" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -731,7 +731,7 @@ "Bounds": "248, 88, 8, 56" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -739,7 +739,7 @@ "Bounds": "0, 24, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -747,7 +747,7 @@ "Bounds": "0, 40, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -755,7 +755,7 @@ "Bounds": "16, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -763,7 +763,7 @@ "Bounds": "16, 48, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -771,7 +771,7 @@ "Bounds": "16, 176, 16, 8" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -779,7 +779,7 @@ "Bounds": "32, 0, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -787,7 +787,7 @@ "Bounds": "32, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -795,7 +795,7 @@ "Bounds": "32, 48, 16, 16" }, { - "Entities": [ + "Types": [ 3, 28, 101 @@ -804,7 +804,7 @@ "Bounds": "48, 0, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -812,7 +812,7 @@ "Bounds": "48, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -820,7 +820,7 @@ "Bounds": "48, 48, 16, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -828,7 +828,7 @@ "Bounds": "64, 0, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -836,7 +836,7 @@ "Bounds": "64, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -844,7 +844,7 @@ "Bounds": "64, 48, 16, 16" }, { - "Entities": [ + "Types": [ 133, 134, 135, @@ -854,7 +854,7 @@ "Bounds": "64, 208, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -862,7 +862,7 @@ "Bounds": "72, 184, 8, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -870,7 +870,7 @@ "Bounds": "80, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -878,7 +878,7 @@ "Bounds": "80, 48, 16, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -886,7 +886,7 @@ "Bounds": "80, 168, 8, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -894,7 +894,7 @@ "Bounds": "96, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -902,7 +902,7 @@ "Bounds": "96, 48, 16, 16" }, { - "Entities": [ + "Types": [ 135, 136 ], @@ -910,7 +910,7 @@ "Bounds": "96, 160, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -918,7 +918,7 @@ "Bounds": "104, 176, 8, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -926,7 +926,7 @@ "Bounds": "112, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -934,7 +934,7 @@ "Bounds": "112, 48, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -942,7 +942,7 @@ "Bounds": "128, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -950,7 +950,7 @@ "Bounds": "128, 48, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -958,7 +958,7 @@ "Bounds": "128, 64, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -966,7 +966,7 @@ "Bounds": "128, 168, 8, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -974,7 +974,7 @@ "Bounds": "136, 184, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -982,7 +982,7 @@ "Bounds": "144, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -990,7 +990,7 @@ "Bounds": "144, 48, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -998,7 +998,7 @@ "Bounds": "152, 184, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -1006,7 +1006,7 @@ "Bounds": "160, 16, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1014,7 +1014,7 @@ "Bounds": "160, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1022,7 +1022,7 @@ "Bounds": "160, 64, 16, 16" }, { - "Entities": [ + "Types": [ 99, 100, 102 @@ -1031,7 +1031,7 @@ "Bounds": "160, 216, 8, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -1039,7 +1039,7 @@ "Bounds": "168, 184, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -1047,7 +1047,7 @@ "Bounds": "176, 16, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1055,7 +1055,7 @@ "Bounds": "176, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1063,7 +1063,7 @@ "Bounds": "176, 64, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1071,7 +1071,7 @@ "Bounds": "184, 184, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -1079,7 +1079,7 @@ "Bounds": "192, 16, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1087,7 +1087,7 @@ "Bounds": "192, 32, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1095,7 +1095,7 @@ "Bounds": "192, 64, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1103,7 +1103,7 @@ "Bounds": "200, 184, 8, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -1111,7 +1111,7 @@ "Bounds": "208, 16, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1119,7 +1119,7 @@ "Bounds": "208, 32, 16, 16" }, { - "Entities": [ + "Types": [ 43, 54 ], @@ -1127,7 +1127,7 @@ "Bounds": "208, 96, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1135,7 +1135,7 @@ "Bounds": "208, 184, 8, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -1143,7 +1143,7 @@ "Bounds": "224, 16, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1151,7 +1151,7 @@ "Bounds": "224, 32, 16, 16" }, { - "Entities": [ + "Types": [ 43, 54 ], @@ -1159,7 +1159,7 @@ "Bounds": "224, 96, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -1167,7 +1167,7 @@ "Bounds": "240, 16, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL5.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL5.PHD-TextureRemap.json index 544f2ad28..f5970f51a 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL5.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL5.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 2 ], @@ -10,7 +10,7 @@ "Bounds": "0, 224, 56, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -18,7 +18,7 @@ "Bounds": "56, 224, 16, 32" }, { - "Entities": [ + "Types": [ 71, 81 ], @@ -26,7 +26,7 @@ "Bounds": "128, 64, 72, 96" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -34,7 +34,7 @@ "Bounds": "200, 64, 56, 56" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -42,7 +42,7 @@ "Bounds": "216, 248, 40, 8" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -50,7 +50,7 @@ "Bounds": "0, 216, 112, 24" }, { - "Entities": [ + "Types": [ 59, 60 ], @@ -58,7 +58,7 @@ "Bounds": "128, 160, 64, 48" }, { - "Entities": [ + "Types": [ 62, 64 ], @@ -66,7 +66,7 @@ "Bounds": "192, 96, 64, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -79,7 +79,7 @@ "Bounds": "224, 192, 24, 64" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -87,7 +87,7 @@ "Bounds": "0, 88, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -100,7 +100,7 @@ "Bounds": "48, 32, 48, 32" }, { - "Entities": [ + "Types": [ 3, 28, 101 @@ -109,7 +109,7 @@ "Bounds": "96, 176, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -122,7 +122,7 @@ "Bounds": "112, 144, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -135,7 +135,7 @@ "Bounds": "160, 184, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -148,7 +148,7 @@ "Bounds": "192, 40, 56, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -156,7 +156,7 @@ "Bounds": "224, 64, 32, 40" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -164,7 +164,7 @@ "Bounds": "248, 40, 8, 24" }, { - "Entities": [ + "Types": [ 59, 60 ], @@ -172,7 +172,7 @@ "Bounds": "0, 64, 16, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -180,7 +180,7 @@ "Bounds": "0, 96, 16, 24" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -188,7 +188,7 @@ "Bounds": "0, 160, 40, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -196,7 +196,7 @@ "Bounds": "0, 192, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -204,7 +204,7 @@ "Bounds": "0, 216, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -217,7 +217,7 @@ "Bounds": "24, 56, 40, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -225,7 +225,7 @@ "Bounds": "24, 72, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -238,7 +238,7 @@ "Bounds": "24, 88, 32, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -246,7 +246,7 @@ "Bounds": "24, 200, 24, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -254,7 +254,7 @@ "Bounds": "48, 112, 8, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -262,7 +262,7 @@ "Bounds": "48, 200, 24, 24" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -270,7 +270,7 @@ "Bounds": "48, 248, 40, 8" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -278,7 +278,7 @@ "Bounds": "56, 88, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -289,7 +289,7 @@ "Bounds": "56, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -300,7 +300,7 @@ "Bounds": "80, 104, 24, 32" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -309,7 +309,7 @@ "Bounds": "80, 168, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -317,7 +317,7 @@ "Bounds": "80, 192, 24, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -325,7 +325,7 @@ "Bounds": "88, 56, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -336,7 +336,7 @@ "Bounds": "104, 88, 24, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -344,7 +344,7 @@ "Bounds": "104, 120, 48, 16" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -352,7 +352,7 @@ "Bounds": "104, 192, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -360,7 +360,7 @@ "Bounds": "104, 208, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -373,7 +373,7 @@ "Bounds": "120, 8, 40, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -386,7 +386,7 @@ "Bounds": "120, 184, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -397,7 +397,7 @@ "Bounds": "128, 88, 24, 32" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -405,7 +405,7 @@ "Bounds": "128, 208, 24, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -413,7 +413,7 @@ "Bounds": "144, 56, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -421,7 +421,7 @@ "Bounds": "152, 88, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -432,7 +432,7 @@ "Bounds": "168, 72, 24, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -440,7 +440,7 @@ "Bounds": "168, 240, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -453,7 +453,7 @@ "Bounds": "176, 104, 48, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -461,7 +461,7 @@ "Bounds": "200, 8, 24, 40" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -469,7 +469,7 @@ "Bounds": "200, 232, 16, 24" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -477,7 +477,7 @@ "Bounds": "216, 152, 40, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -485,7 +485,7 @@ "Bounds": "216, 184, 24, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -493,7 +493,7 @@ "Bounds": "216, 232, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -501,7 +501,7 @@ "Bounds": "232, 232, 16, 24" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -509,7 +509,7 @@ "Bounds": "240, 48, 16, 40" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -517,7 +517,7 @@ "Bounds": "248, 104, 8, 32" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -525,7 +525,7 @@ "Bounds": "0, 64, 8, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -533,7 +533,7 @@ "Bounds": "0, 128, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -541,7 +541,7 @@ "Bounds": "0, 144, 16, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -550,7 +550,7 @@ "Bounds": "16, 0, 8, 56" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -558,7 +558,7 @@ "Bounds": "16, 120, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -566,7 +566,7 @@ "Bounds": "16, 136, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -574,7 +574,7 @@ "Bounds": "16, 168, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -582,7 +582,7 @@ "Bounds": "24, 0, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -590,7 +590,7 @@ "Bounds": "24, 24, 24, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -598,7 +598,7 @@ "Bounds": "24, 40, 24, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -606,7 +606,7 @@ "Bounds": "32, 120, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -614,7 +614,7 @@ "Bounds": "32, 136, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -622,7 +622,7 @@ "Bounds": "32, 168, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -630,7 +630,7 @@ "Bounds": "40, 0, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -638,7 +638,7 @@ "Bounds": "48, 24, 24, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -646,7 +646,7 @@ "Bounds": "48, 40, 24, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -654,7 +654,7 @@ "Bounds": "48, 120, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -662,7 +662,7 @@ "Bounds": "48, 136, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -670,7 +670,7 @@ "Bounds": "48, 168, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -678,7 +678,7 @@ "Bounds": "56, 0, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -686,7 +686,7 @@ "Bounds": "64, 120, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -694,7 +694,7 @@ "Bounds": "64, 136, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -702,7 +702,7 @@ "Bounds": "72, 24, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -710,7 +710,7 @@ "Bounds": "80, 120, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -718,7 +718,7 @@ "Bounds": "80, 136, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -726,7 +726,7 @@ "Bounds": "88, 24, 24, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -734,7 +734,7 @@ "Bounds": "88, 40, 24, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -742,7 +742,7 @@ "Bounds": "88, 248, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -750,7 +750,7 @@ "Bounds": "96, 128, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -758,7 +758,7 @@ "Bounds": "96, 144, 16, 16" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -766,7 +766,7 @@ "Bounds": "104, 0, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -774,7 +774,7 @@ "Bounds": "104, 248, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -782,7 +782,7 @@ "Bounds": "112, 24, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -790,7 +790,7 @@ "Bounds": "112, 128, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -798,7 +798,7 @@ "Bounds": "112, 144, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -806,7 +806,7 @@ "Bounds": "120, 248, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -814,7 +814,7 @@ "Bounds": "128, 40, 24, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -822,7 +822,7 @@ "Bounds": "128, 128, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -830,7 +830,7 @@ "Bounds": "128, 144, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -838,7 +838,7 @@ "Bounds": "136, 248, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -846,7 +846,7 @@ "Bounds": "144, 128, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -854,7 +854,7 @@ "Bounds": "144, 144, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -862,7 +862,7 @@ "Bounds": "152, 24, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -870,7 +870,7 @@ "Bounds": "152, 248, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -878,7 +878,7 @@ "Bounds": "160, 112, 8, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -886,7 +886,7 @@ "Bounds": "160, 120, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -894,7 +894,7 @@ "Bounds": "160, 136, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -902,7 +902,7 @@ "Bounds": "168, 248, 16, 8" }, { - "Entities": [ + "Types": [ 3, 28, 101 @@ -911,7 +911,7 @@ "Bounds": "176, 88, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -919,7 +919,7 @@ "Bounds": "176, 120, 8, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -927,7 +927,7 @@ "Bounds": "176, 128, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -935,7 +935,7 @@ "Bounds": "176, 144, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -943,7 +943,7 @@ "Bounds": "184, 104, 8, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -951,7 +951,7 @@ "Bounds": "192, 128, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -959,7 +959,7 @@ "Bounds": "192, 144, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -967,7 +967,7 @@ "Bounds": "192, 160, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -975,7 +975,7 @@ "Bounds": "208, 16, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -983,7 +983,7 @@ "Bounds": "208, 128, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -991,7 +991,7 @@ "Bounds": "208, 144, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -999,7 +999,7 @@ "Bounds": "216, 112, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1007,7 +1007,7 @@ "Bounds": "224, 24, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1015,7 +1015,7 @@ "Bounds": "224, 128, 8, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1023,7 +1023,7 @@ "Bounds": "224, 136, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1031,7 +1031,7 @@ "Bounds": "232, 112, 8, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -1039,7 +1039,7 @@ "Bounds": "232, 120, 16, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -1047,7 +1047,7 @@ "Bounds": "240, 88, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1055,7 +1055,7 @@ "Bounds": "240, 136, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1063,7 +1063,7 @@ "Bounds": "248, 48, 8, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1071,7 +1071,7 @@ "Bounds": "248, 120, 8, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1079,7 +1079,7 @@ "Bounds": "8, 0, 8, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1087,7 +1087,7 @@ "Bounds": "32, 0, 8, 16" }, { - "Entities": [ + "Types": [ 99, 100, 102 diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL6.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL6.PHD-TextureRemap.json index d09be0330..90617adc2 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL6.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL6.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 2 ], @@ -10,7 +10,7 @@ "Bounds": "200, 0, 56, 56" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -18,7 +18,7 @@ "Bounds": "128, 224, 112, 24" }, { - "Entities": [ + "Types": [ 61, 63 ], @@ -26,7 +26,7 @@ "Bounds": "192, 96, 64, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -40,7 +40,7 @@ "Bounds": "48, 128, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -54,7 +54,7 @@ "Bounds": "56, 224, 48, 32" }, { - "Entities": [ + "Types": [ 57, 58, 59, @@ -64,7 +64,7 @@ "Bounds": "64, 64, 64, 48" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -72,7 +72,7 @@ "Bounds": "144, 240, 16, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -80,7 +80,7 @@ "Bounds": "160, 112, 24, 40" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -88,7 +88,7 @@ "Bounds": "160, 200, 56, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -96,7 +96,7 @@ "Bounds": "216, 200, 16, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -110,7 +110,7 @@ "Bounds": "224, 232, 32, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -118,7 +118,7 @@ "Bounds": "0, 240, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -132,7 +132,7 @@ "Bounds": "40, 0, 24, 64" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -140,7 +140,7 @@ "Bounds": "56, 240, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -154,7 +154,7 @@ "Bounds": "64, 0, 56, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -162,7 +162,7 @@ "Bounds": "64, 24, 40, 32" }, { - "Entities": [ + "Types": [ 58, 59, 60 @@ -171,7 +171,7 @@ "Bounds": "104, 24, 16, 32" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -179,7 +179,7 @@ "Bounds": "112, 240, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -187,7 +187,7 @@ "Bounds": "128, 112, 24, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -195,7 +195,7 @@ "Bounds": "160, 144, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -209,7 +209,7 @@ "Bounds": "160, 232, 40, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -217,7 +217,7 @@ "Bounds": "168, 72, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -231,7 +231,7 @@ "Bounds": "168, 96, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -239,7 +239,7 @@ "Bounds": "224, 0, 32, 40" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -247,7 +247,7 @@ "Bounds": "240, 232, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -255,7 +255,7 @@ "Bounds": "248, 96, 8, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -266,7 +266,7 @@ "Bounds": "0, 24, 24, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -274,7 +274,7 @@ "Bounds": "24, 24, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -282,7 +282,7 @@ "Bounds": "32, 168, 24, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -290,7 +290,7 @@ "Bounds": "48, 240, 40, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -298,7 +298,7 @@ "Bounds": "56, 160, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -309,7 +309,7 @@ "Bounds": "64, 24, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -317,7 +317,7 @@ "Bounds": "72, 160, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -328,7 +328,7 @@ "Bounds": "88, 24, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -336,7 +336,7 @@ "Bounds": "88, 160, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -344,7 +344,7 @@ "Bounds": "96, 120, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -352,7 +352,7 @@ "Bounds": "104, 160, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -363,7 +363,7 @@ "Bounds": "112, 24, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -377,7 +377,7 @@ "Bounds": "112, 104, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -391,7 +391,7 @@ "Bounds": "128, 56, 40, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -399,7 +399,7 @@ "Bounds": "136, 160, 24, 16" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -407,7 +407,7 @@ "Bounds": "160, 80, 16, 40" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -415,7 +415,7 @@ "Bounds": "160, 120, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -423,7 +423,7 @@ "Bounds": "160, 168, 24, 16" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -432,7 +432,7 @@ "Bounds": "160, 224, 16, 8" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -440,7 +440,7 @@ "Bounds": "176, 16, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -448,7 +448,7 @@ "Bounds": "192, 152, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -462,7 +462,7 @@ "Bounds": "200, 32, 48, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -470,7 +470,7 @@ "Bounds": "200, 48, 48, 16" }, { - "Entities": [ + "Types": [ 118, 122 ], @@ -478,7 +478,7 @@ "Bounds": "216, 80, 40, 16" }, { - "Entities": [ + "Types": [ 99, 100, 102 @@ -487,7 +487,7 @@ "Bounds": "216, 248, 8, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -495,7 +495,7 @@ "Bounds": "224, 160, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -503,7 +503,7 @@ "Bounds": "224, 240, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -514,7 +514,7 @@ "Bounds": "232, 0, 24, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -522,7 +522,7 @@ "Bounds": "240, 136, 8, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -530,7 +530,7 @@ "Bounds": "240, 160, 8, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -538,7 +538,7 @@ "Bounds": "240, 168, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -546,7 +546,7 @@ "Bounds": "240, 240, 16, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -555,7 +555,7 @@ "Bounds": "248, 112, 8, 56" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -563,7 +563,7 @@ "Bounds": "0, 0, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -571,7 +571,7 @@ "Bounds": "0, 96, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -579,7 +579,7 @@ "Bounds": "16, 0, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -587,7 +587,7 @@ "Bounds": "16, 96, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -595,7 +595,7 @@ "Bounds": "32, 0, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -603,7 +603,7 @@ "Bounds": "32, 96, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -611,7 +611,7 @@ "Bounds": "48, 0, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -619,7 +619,7 @@ "Bounds": "64, 0, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -627,7 +627,7 @@ "Bounds": "216, 88, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL7A.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL7A.PHD-TextureRemap.json index 7a5425f88..7dc64e1d1 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL7A.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL7A.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 1, 2, @@ -15,7 +15,7 @@ "Bounds": "216, 176, 40, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -23,7 +23,7 @@ "Bounds": "0, 96, 112, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -36,7 +36,7 @@ "Bounds": "0, 216, 56, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -44,7 +44,7 @@ "Bounds": "0, 240, 56, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -52,7 +52,7 @@ "Bounds": "56, 160, 56, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -65,7 +65,7 @@ "Bounds": "112, 96, 32, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -73,7 +73,7 @@ "Bounds": "144, 64, 56, 56" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -86,7 +86,7 @@ "Bounds": "168, 160, 40, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -99,7 +99,7 @@ "Bounds": "168, 184, 48, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -107,7 +107,7 @@ "Bounds": "208, 216, 8, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -120,7 +120,7 @@ "Bounds": "216, 184, 24, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -133,7 +133,7 @@ "Bounds": "240, 248, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -146,7 +146,7 @@ "Bounds": "0, 232, 48, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -154,7 +154,7 @@ "Bounds": "48, 232, 48, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -162,7 +162,7 @@ "Bounds": "56, 216, 48, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -170,7 +170,7 @@ "Bounds": "64, 24, 16, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -178,7 +178,7 @@ "Bounds": "104, 0, 40, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -186,7 +186,7 @@ "Bounds": "136, 208, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -197,7 +197,7 @@ "Bounds": "136, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -205,7 +205,7 @@ "Bounds": "160, 200, 40, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -216,7 +216,7 @@ "Bounds": "160, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -224,7 +224,7 @@ "Bounds": "184, 0, 32, 40" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -232,7 +232,7 @@ "Bounds": "224, 160, 24, 40" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -240,7 +240,7 @@ "Bounds": "232, 64, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -253,7 +253,7 @@ "Bounds": "232, 232, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -264,7 +264,7 @@ "Bounds": "0, 0, 24, 32" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -272,7 +272,7 @@ "Bounds": "0, 80, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -280,7 +280,7 @@ "Bounds": "0, 200, 16, 24" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -288,7 +288,7 @@ "Bounds": "0, 248, 40, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -296,7 +296,7 @@ "Bounds": "16, 168, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -304,7 +304,7 @@ "Bounds": "16, 192, 24, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -312,7 +312,7 @@ "Bounds": "16, 208, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -323,7 +323,7 @@ "Bounds": "24, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -331,7 +331,7 @@ "Bounds": "24, 80, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -339,7 +339,7 @@ "Bounds": "24, 96, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -347,7 +347,7 @@ "Bounds": "40, 192, 8, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -355,7 +355,7 @@ "Bounds": "40, 200, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -366,7 +366,7 @@ "Bounds": "48, 0, 24, 32" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -374,7 +374,7 @@ "Bounds": "48, 96, 24, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -382,7 +382,7 @@ "Bounds": "48, 168, 24, 16" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -391,7 +391,7 @@ "Bounds": "56, 200, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -399,7 +399,7 @@ "Bounds": "56, 208, 24, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -407,7 +407,7 @@ "Bounds": "72, 96, 16, 24" }, { - "Entities": [ + "Types": [ 3, 28, 101 @@ -416,7 +416,7 @@ "Bounds": "72, 128, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -424,7 +424,7 @@ "Bounds": "72, 160, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -432,7 +432,7 @@ "Bounds": "80, 208, 24, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -440,7 +440,7 @@ "Bounds": "88, 160, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -448,7 +448,7 @@ "Bounds": "104, 120, 24, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -456,7 +456,7 @@ "Bounds": "104, 160, 8, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -464,7 +464,7 @@ "Bounds": "104, 192, 24, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -472,7 +472,7 @@ "Bounds": "104, 208, 24, 16" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -480,7 +480,7 @@ "Bounds": "120, 168, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -488,7 +488,7 @@ "Bounds": "128, 80, 24, 24" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -496,7 +496,7 @@ "Bounds": "144, 32, 40, 16" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -504,7 +504,7 @@ "Bounds": "144, 48, 40, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -512,7 +512,7 @@ "Bounds": "152, 80, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -520,7 +520,7 @@ "Bounds": "152, 184, 8, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -528,7 +528,7 @@ "Bounds": "152, 192, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -536,7 +536,7 @@ "Bounds": "160, 152, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -544,7 +544,7 @@ "Bounds": "168, 192, 16, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -552,7 +552,7 @@ "Bounds": "176, 88, 24, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -560,7 +560,7 @@ "Bounds": "176, 152, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -573,7 +573,7 @@ "Bounds": "184, 64, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -581,7 +581,7 @@ "Bounds": "200, 88, 24, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -589,7 +589,7 @@ "Bounds": "200, 192, 24, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -598,7 +598,7 @@ "Bounds": "216, 112, 8, 56" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -606,7 +606,7 @@ "Bounds": "216, 168, 8, 8" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -614,7 +614,7 @@ "Bounds": "224, 48, 16, 40" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -622,7 +622,7 @@ "Bounds": "224, 160, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -630,7 +630,7 @@ "Bounds": "232, 152, 8, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -638,7 +638,7 @@ "Bounds": "240, 184, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -646,7 +646,7 @@ "Bounds": "0, 48, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -654,7 +654,7 @@ "Bounds": "0, 64, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -662,7 +662,7 @@ "Bounds": "0, 96, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -670,7 +670,7 @@ "Bounds": "16, 48, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -678,7 +678,7 @@ "Bounds": "16, 64, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -686,7 +686,7 @@ "Bounds": "16, 96, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -694,7 +694,7 @@ "Bounds": "16, 192, 8, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -702,7 +702,7 @@ "Bounds": "32, 56, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -710,7 +710,7 @@ "Bounds": "32, 72, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -718,7 +718,7 @@ "Bounds": "32, 104, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -726,7 +726,7 @@ "Bounds": "48, 56, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -734,7 +734,7 @@ "Bounds": "48, 72, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -742,7 +742,7 @@ "Bounds": "48, 104, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -750,7 +750,7 @@ "Bounds": "56, 176, 8, 24" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -758,7 +758,7 @@ "Bounds": "64, 56, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -766,7 +766,7 @@ "Bounds": "64, 72, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -774,7 +774,7 @@ "Bounds": "64, 104, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -782,7 +782,7 @@ "Bounds": "64, 192, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -790,7 +790,7 @@ "Bounds": "80, 56, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -798,7 +798,7 @@ "Bounds": "80, 72, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -806,7 +806,7 @@ "Bounds": "80, 104, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -814,7 +814,7 @@ "Bounds": "80, 192, 16, 8" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -822,7 +822,7 @@ "Bounds": "88, 200, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -830,7 +830,7 @@ "Bounds": "96, 64, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -838,7 +838,7 @@ "Bounds": "96, 192, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -846,7 +846,7 @@ "Bounds": "104, 48, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -854,7 +854,7 @@ "Bounds": "112, 72, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -862,7 +862,7 @@ "Bounds": "112, 104, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -870,7 +870,7 @@ "Bounds": "120, 56, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -878,7 +878,7 @@ "Bounds": "128, 72, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -886,7 +886,7 @@ "Bounds": "128, 104, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -894,7 +894,7 @@ "Bounds": "128, 192, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -902,7 +902,7 @@ "Bounds": "136, 40, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -910,7 +910,7 @@ "Bounds": "136, 56, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -918,7 +918,7 @@ "Bounds": "144, 192, 8, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -926,7 +926,7 @@ "Bounds": "152, 48, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -934,7 +934,7 @@ "Bounds": "152, 64, 16, 16" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -942,7 +942,7 @@ "Bounds": "160, 16, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -950,7 +950,7 @@ "Bounds": "160, 192, 16, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -958,7 +958,7 @@ "Bounds": "168, 48, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -966,7 +966,7 @@ "Bounds": "168, 64, 16, 16" }, { - "Entities": [ + "Types": [ 3, 28, 101 @@ -975,7 +975,7 @@ "Bounds": "176, 16, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -983,7 +983,7 @@ "Bounds": "176, 88, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -991,7 +991,7 @@ "Bounds": "176, 104, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -999,7 +999,7 @@ "Bounds": "176, 192, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -1007,7 +1007,7 @@ "Bounds": "184, 40, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1015,7 +1015,7 @@ "Bounds": "184, 56, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1023,7 +1023,7 @@ "Bounds": "184, 72, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -1031,7 +1031,7 @@ "Bounds": "192, 104, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -1039,7 +1039,7 @@ "Bounds": "200, 40, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1047,7 +1047,7 @@ "Bounds": "200, 56, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1055,7 +1055,7 @@ "Bounds": "208, 88, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -1063,7 +1063,7 @@ "Bounds": "216, 40, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1071,7 +1071,7 @@ "Bounds": "216, 56, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1079,7 +1079,7 @@ "Bounds": "216, 192, 8, 16" }, { - "Entities": [ + "Types": [ 99, 100, 102 @@ -1088,7 +1088,7 @@ "Bounds": "224, 88, 8, 8" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1096,7 +1096,7 @@ "Bounds": "224, 192, 8, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1104,7 +1104,7 @@ "Bounds": "232, 48, 16, 16" }, { - "Entities": [ + "Types": [ 12, 13 ], @@ -1112,7 +1112,7 @@ "Bounds": "232, 64, 16, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -1120,7 +1120,7 @@ "Bounds": "232, 168, 8, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -1128,7 +1128,7 @@ "Bounds": "240, 16, 16, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL7B.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL7B.PHD-TextureRemap.json index 111a8f6b0..d385091d0 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL7B.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL7B.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 39, 40 ], @@ -10,7 +10,7 @@ "Bounds": "208, 184, 48, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -18,7 +18,7 @@ "Bounds": "248, 152, 8, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -31,7 +31,7 @@ "Bounds": "120, 224, 16, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -39,7 +39,7 @@ "Bounds": "136, 216, 112, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -47,7 +47,7 @@ "Bounds": "200, 96, 56, 56" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -55,7 +55,7 @@ "Bounds": "200, 208, 40, 8" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -63,7 +63,7 @@ "Bounds": "248, 216, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -76,7 +76,7 @@ "Bounds": "0, 104, 24, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -89,7 +89,7 @@ "Bounds": "0, 176, 56, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -97,7 +97,7 @@ "Bounds": "24, 200, 32, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -110,7 +110,7 @@ "Bounds": "64, 32, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -123,7 +123,7 @@ "Bounds": "64, 120, 48, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -131,7 +131,7 @@ "Bounds": "80, 176, 8, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -139,7 +139,7 @@ "Bounds": "120, 200, 40, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -147,7 +147,7 @@ "Bounds": "184, 40, 24, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -155,7 +155,7 @@ "Bounds": "184, 72, 56, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -168,7 +168,7 @@ "Bounds": "224, 232, 32, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -176,7 +176,7 @@ "Bounds": "0, 160, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -189,7 +189,7 @@ "Bounds": "0, 192, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -200,7 +200,7 @@ "Bounds": "56, 176, 24, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -208,7 +208,7 @@ "Bounds": "80, 200, 48, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -216,7 +216,7 @@ "Bounds": "88, 152, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -227,7 +227,7 @@ "Bounds": "88, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -240,7 +240,7 @@ "Bounds": "96, 104, 40, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -251,7 +251,7 @@ "Bounds": "112, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -264,7 +264,7 @@ "Bounds": "120, 240, 40, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -272,7 +272,7 @@ "Bounds": "136, 104, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -283,7 +283,7 @@ "Bounds": "136, 184, 24, 32" }, { - "Entities": [ + "Types": [ 3, 28, 101 @@ -292,7 +292,7 @@ "Bounds": "160, 40, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -303,7 +303,7 @@ "Bounds": "160, 176, 24, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -311,7 +311,7 @@ "Bounds": "184, 192, 16, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -319,7 +319,7 @@ "Bounds": "200, 152, 56, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -327,7 +327,7 @@ "Bounds": "216, 232, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -335,7 +335,7 @@ "Bounds": "0, 136, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -343,7 +343,7 @@ "Bounds": "0, 176, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -356,7 +356,7 @@ "Bounds": "16, 40, 24, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -364,7 +364,7 @@ "Bounds": "16, 136, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -372,7 +372,7 @@ "Bounds": "16, 240, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -380,7 +380,7 @@ "Bounds": "40, 40, 16, 24" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -388,7 +388,7 @@ "Bounds": "56, 32, 16, 40" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -397,7 +397,7 @@ "Bounds": "72, 32, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -405,7 +405,7 @@ "Bounds": "72, 168, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -413,7 +413,7 @@ "Bounds": "80, 192, 8, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -421,7 +421,7 @@ "Bounds": "104, 168, 24, 16" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -429,7 +429,7 @@ "Bounds": "160, 0, 40, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -437,7 +437,7 @@ "Bounds": "168, 72, 24, 16" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -445,7 +445,7 @@ "Bounds": "192, 248, 40, 8" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -453,7 +453,7 @@ "Bounds": "200, 0, 40, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -462,7 +462,7 @@ "Bounds": "200, 128, 8, 56" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -470,7 +470,7 @@ "Bounds": "216, 128, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -478,7 +478,7 @@ "Bounds": "216, 152, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -486,7 +486,7 @@ "Bounds": "232, 128, 16, 24" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -494,7 +494,7 @@ "Bounds": "240, 64, 16, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -502,7 +502,7 @@ "Bounds": "0, 24, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -510,7 +510,7 @@ "Bounds": "0, 56, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -518,7 +518,7 @@ "Bounds": "0, 224, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -526,7 +526,7 @@ "Bounds": "16, 56, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -534,7 +534,7 @@ "Bounds": "32, 56, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -542,7 +542,7 @@ "Bounds": "40, 24, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -550,7 +550,7 @@ "Bounds": "48, 56, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -558,7 +558,7 @@ "Bounds": "48, 216, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -566,7 +566,7 @@ "Bounds": "64, 56, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -574,7 +574,7 @@ "Bounds": "80, 96, 16, 16" }, { - "Entities": [ + "Types": [ 3, 28 ], @@ -582,7 +582,7 @@ "Bounds": "96, 32, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -590,7 +590,7 @@ "Bounds": "96, 96, 16, 16" }, { - "Entities": [ + "Types": [ 3, 28, 101 @@ -599,7 +599,7 @@ "Bounds": "112, 32, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -607,7 +607,7 @@ "Bounds": "112, 96, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -615,7 +615,7 @@ "Bounds": "128, 56, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -623,7 +623,7 @@ "Bounds": "128, 184, 16, 8" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -631,7 +631,7 @@ "Bounds": "144, 88, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -639,7 +639,7 @@ "Bounds": "160, 88, 16, 16" }, { - "Entities": [ + "Types": [ 99, 100, 102 @@ -648,7 +648,7 @@ "Bounds": "168, 240, 8, 8" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -656,7 +656,7 @@ "Bounds": "176, 32, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -664,7 +664,7 @@ "Bounds": "176, 96, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -672,7 +672,7 @@ "Bounds": "176, 184, 16, 8" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -680,7 +680,7 @@ "Bounds": "192, 96, 16, 16" }, { - "Entities": [ + "Types": [ 16, 17 ], @@ -688,7 +688,7 @@ "Bounds": "208, 96, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -696,7 +696,7 @@ "Bounds": "224, 48, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8A.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8A.PHD-TextureRemap.json index 584233402..f5a49c8d8 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8A.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8A.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 60, 61 ], @@ -10,7 +10,7 @@ "Bounds": "144, 0, 64, 128" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -18,7 +18,7 @@ "Bounds": "144, 128, 24, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -26,7 +26,7 @@ "Bounds": "168, 192, 40, 8" }, { - "Entities": [ + "Types": [ 57, 59 ], @@ -34,7 +34,7 @@ "Bounds": "64, 192, 64, 64" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -42,7 +42,7 @@ "Bounds": "0, 96, 56, 56" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -50,7 +50,7 @@ "Bounds": "56, 128, 112, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -58,7 +58,7 @@ "Bounds": "64, 184, 56, 32" }, { - "Entities": [ + "Types": [ 68, 69, 70 @@ -67,7 +67,7 @@ "Bounds": "144, 0, 64, 64" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -75,7 +75,7 @@ "Bounds": "152, 152, 16, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -88,7 +88,7 @@ "Bounds": "216, 176, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -101,7 +101,7 @@ "Bounds": "232, 0, 24, 64" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -112,7 +112,7 @@ "Bounds": "232, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -125,7 +125,7 @@ "Bounds": "0, 104, 40, 16" }, { - "Entities": [ + "Types": [ 55, 56 ], @@ -133,7 +133,7 @@ "Bounds": "32, 144, 64, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -146,7 +146,7 @@ "Bounds": "40, 0, 48, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -159,7 +159,7 @@ "Bounds": "40, 32, 56, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -172,7 +172,7 @@ "Bounds": "64, 224, 40, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -180,7 +180,7 @@ "Bounds": "80, 56, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -188,7 +188,7 @@ "Bounds": "96, 144, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -201,7 +201,7 @@ "Bounds": "120, 64, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -209,7 +209,7 @@ "Bounds": "136, 48, 40, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -217,7 +217,7 @@ "Bounds": "152, 128, 8, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -225,7 +225,7 @@ "Bounds": "216, 48, 32, 40" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -233,7 +233,7 @@ "Bounds": "0, 0, 24, 40" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -241,7 +241,7 @@ "Bounds": "0, 40, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -252,7 +252,7 @@ "Bounds": "0, 56, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -260,7 +260,7 @@ "Bounds": "0, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -268,7 +268,7 @@ "Bounds": "16, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -279,7 +279,7 @@ "Bounds": "24, 56, 24, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -287,7 +287,7 @@ "Bounds": "32, 200, 16, 8" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -295,7 +295,7 @@ "Bounds": "32, 224, 24, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -303,7 +303,7 @@ "Bounds": "56, 40, 56, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -311,7 +311,7 @@ "Bounds": "56, 224, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -324,7 +324,7 @@ "Bounds": "72, 56, 48, 16" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -332,7 +332,7 @@ "Bounds": "72, 128, 16, 40" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -340,7 +340,7 @@ "Bounds": "72, 232, 16, 24" }, { - "Entities": [ + "Types": [ 68, 69, 70 @@ -349,7 +349,7 @@ "Bounds": "80, 168, 8, 64" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -357,7 +357,7 @@ "Bounds": "96, 128, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -370,7 +370,7 @@ "Bounds": "96, 152, 24, 24" }, { - "Entities": [ + "Types": [ 60, 61 ], @@ -378,7 +378,7 @@ "Bounds": "96, 200, 64, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -386,7 +386,7 @@ "Bounds": "104, 224, 16, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -394,7 +394,7 @@ "Bounds": "112, 40, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -402,7 +402,7 @@ "Bounds": "120, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -410,7 +410,7 @@ "Bounds": "136, 216, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -419,7 +419,7 @@ "Bounds": "144, 144, 16, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -427,7 +427,7 @@ "Bounds": "152, 216, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -438,7 +438,7 @@ "Bounds": "160, 40, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -446,7 +446,7 @@ "Bounds": "168, 216, 16, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -454,7 +454,7 @@ "Bounds": "184, 56, 48, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -466,7 +466,7 @@ "Bounds": "192, 240, 8, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -474,7 +474,7 @@ "Bounds": "200, 232, 24, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -482,7 +482,7 @@ "Bounds": "208, 192, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -495,7 +495,7 @@ "Bounds": "216, 0, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -506,7 +506,7 @@ "Bounds": "216, 24, 24, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -514,7 +514,7 @@ "Bounds": "224, 96, 8, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -522,7 +522,7 @@ "Bounds": "224, 232, 24, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -530,7 +530,7 @@ "Bounds": "232, 208, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -538,7 +538,7 @@ "Bounds": "0, 72, 16, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -547,7 +547,7 @@ "Bounds": "8, 0, 8, 56" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -555,7 +555,7 @@ "Bounds": "16, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -563,7 +563,7 @@ "Bounds": "32, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -571,7 +571,7 @@ "Bounds": "48, 80, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -579,7 +579,7 @@ "Bounds": "48, 128, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -587,7 +587,7 @@ "Bounds": "48, 160, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -595,7 +595,7 @@ "Bounds": "64, 160, 16, 8" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -603,7 +603,7 @@ "Bounds": "80, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -611,7 +611,7 @@ "Bounds": "96, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -619,7 +619,7 @@ "Bounds": "112, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -627,7 +627,7 @@ "Bounds": "184, 72, 16, 16" }, { - "Entities": [ + "Types": [ 10, 11 ], @@ -635,7 +635,7 @@ "Bounds": "200, 72, 16, 16" }, { - "Entities": [ + "Types": [ 118, 119, 120, @@ -647,7 +647,7 @@ "Bounds": "208, 120, 8, 32" }, { - "Entities": [ + "Types": [ 10, 11 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8B.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8B.PHD-TextureRemap.json index 66305301b..0da69f5e5 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8B.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8B.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 61, 62 ], @@ -10,7 +10,7 @@ "Bounds": "144, 0, 64, 128" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -18,7 +18,7 @@ "Bounds": "144, 128, 24, 32" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -26,7 +26,7 @@ "Bounds": "168, 192, 40, 8" }, { - "Entities": [ + "Types": [ 41, 58 ], @@ -34,7 +34,7 @@ "Bounds": "0, 192, 64, 64" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -42,7 +42,7 @@ "Bounds": "192, 192, 56, 56" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -50,7 +50,7 @@ "Bounds": "0, 128, 112, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -58,7 +58,7 @@ "Bounds": "40, 240, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -72,7 +72,7 @@ "Bounds": "56, 184, 16, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -80,7 +80,7 @@ "Bounds": "88, 96, 56, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -94,7 +94,7 @@ "Bounds": "96, 232, 56, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -108,7 +108,7 @@ "Bounds": "168, 160, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -122,7 +122,7 @@ "Bounds": "224, 56, 24, 64" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -131,7 +131,7 @@ "Bounds": "248, 56, 8, 56" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -145,7 +145,7 @@ "Bounds": "16, 72, 40, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -159,7 +159,7 @@ "Bounds": "48, 120, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -173,7 +173,7 @@ "Bounds": "56, 0, 48, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -181,7 +181,7 @@ "Bounds": "56, 32, 40, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -189,7 +189,7 @@ "Bounds": "112, 128, 16, 24" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -197,7 +197,7 @@ "Bounds": "136, 32, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -205,7 +205,7 @@ "Bounds": "176, 56, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -213,7 +213,7 @@ "Bounds": "192, 32, 32, 40" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -221,7 +221,7 @@ "Bounds": "232, 80, 24, 40" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -229,7 +229,7 @@ "Bounds": "232, 232, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -240,7 +240,7 @@ "Bounds": "0, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -254,7 +254,7 @@ "Bounds": "24, 40, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -268,7 +268,7 @@ "Bounds": "56, 88, 40, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -276,7 +276,7 @@ "Bounds": "56, 200, 16, 24" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -284,7 +284,7 @@ "Bounds": "72, 40, 48, 16" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -292,7 +292,7 @@ "Bounds": "72, 200, 16, 24" }, { - "Entities": [ + "Types": [ 61, 62 ], @@ -300,7 +300,7 @@ "Bounds": "88, 184, 64, 8" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -308,7 +308,7 @@ "Bounds": "88, 200, 16, 24" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -316,7 +316,7 @@ "Bounds": "104, 200, 16, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -324,7 +324,7 @@ "Bounds": "128, 0, 56, 16" }, { - "Entities": [ + "Types": [ 0, 2 ], @@ -332,7 +332,7 @@ "Bounds": "128, 16, 48, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -343,7 +343,7 @@ "Bounds": "128, 32, 24, 32" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -351,7 +351,7 @@ "Bounds": "136, 200, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -362,7 +362,7 @@ "Bounds": "152, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4 ], @@ -370,7 +370,7 @@ "Bounds": "168, 192, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -381,7 +381,7 @@ "Bounds": "176, 24, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -395,7 +395,7 @@ "Bounds": "184, 0, 32, 24" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -404,7 +404,7 @@ "Bounds": "184, 248, 16, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -412,7 +412,7 @@ "Bounds": "200, 200, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -423,7 +423,7 @@ "Bounds": "216, 0, 24, 32" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -431,7 +431,7 @@ "Bounds": "224, 104, 16, 40" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -439,7 +439,7 @@ "Bounds": "224, 176, 16, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -451,7 +451,7 @@ "Bounds": "64, 48, 8, 8" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -459,7 +459,7 @@ "Bounds": "72, 40, 16, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -467,7 +467,7 @@ "Bounds": "88, 40, 16, 16" }, { - "Entities": [ + "Types": [ 118, 119, 120, @@ -483,7 +483,7 @@ "Bounds": "208, 96, 8, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -491,7 +491,7 @@ "Bounds": "224, 112, 8, 24" }, { - "Entities": [ + "Types": [ 114, 115 ], @@ -499,7 +499,7 @@ "Bounds": "240, 112, 8, 24" }, { - "Entities": [ + "Types": [ 116, 117 ], diff --git a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8C.PHD-TextureRemap.json b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8C.PHD-TextureRemap.json index e4b8393aa..53fb702c8 100644 --- a/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8C.PHD-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR1/Textures/Deduplication/LEVEL8C.PHD-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 61, 62 ], @@ -10,7 +10,7 @@ "Bounds": "144, 128, 64, 128" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -18,7 +18,7 @@ "Bounds": "208, 184, 40, 64" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -26,7 +26,7 @@ "Bounds": "248, 184, 8, 56" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -35,7 +35,7 @@ "Bounds": "0, 64, 56, 56" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -50,7 +50,7 @@ "Bounds": "0, 152, 56, 24" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -58,7 +58,7 @@ "Bounds": "0, 176, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -73,7 +73,7 @@ "Bounds": "40, 176, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -88,7 +88,7 @@ "Bounds": "40, 224, 40, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -96,7 +96,7 @@ "Bounds": "56, 64, 112, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -106,7 +106,7 @@ "Bounds": "72, 240, 32, 8" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -114,7 +114,7 @@ "Bounds": "80, 192, 24, 48" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -122,7 +122,7 @@ "Bounds": "104, 88, 56, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -137,7 +137,7 @@ "Bounds": "104, 120, 48, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -145,7 +145,7 @@ "Bounds": "104, 152, 40, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -154,7 +154,7 @@ "Bounds": "104, 216, 40, 8" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -162,7 +162,7 @@ "Bounds": "144, 160, 40, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -172,7 +172,7 @@ "Bounds": "152, 128, 48, 32" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -181,7 +181,7 @@ "Bounds": "160, 96, 56, 32" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -190,7 +190,7 @@ "Bounds": "184, 160, 40, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -200,7 +200,7 @@ "Bounds": "200, 128, 16, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -215,7 +215,7 @@ "Bounds": "200, 232, 40, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -230,7 +230,7 @@ "Bounds": "216, 96, 24, 64" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -239,7 +239,7 @@ "Bounds": "224, 160, 32, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -249,7 +249,7 @@ "Bounds": "224, 200, 32, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -259,7 +259,7 @@ "Bounds": "240, 96, 8, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -269,7 +269,7 @@ "Bounds": "240, 128, 16, 32" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -277,7 +277,7 @@ "Bounds": "240, 232, 16, 24" }, { - "Entities": [ + "Types": [ 55, 56 ], @@ -285,7 +285,7 @@ "Bounds": "0, 16, 64, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -295,7 +295,7 @@ "Bounds": "0, 192, 16, 40" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -304,7 +304,7 @@ "Bounds": "16, 80, 24, 40" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -312,7 +312,7 @@ "Bounds": "16, 120, 56, 16" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -321,7 +321,7 @@ "Bounds": "16, 136, 48, 16" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -329,7 +329,7 @@ "Bounds": "16, 152, 48, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -339,7 +339,7 @@ "Bounds": "16, 192, 16, 40" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -347,7 +347,7 @@ "Bounds": "32, 184, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -357,7 +357,7 @@ "Bounds": "32, 224, 8, 8" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -365,7 +365,7 @@ "Bounds": "48, 184, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -377,7 +377,7 @@ "Bounds": "64, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -386,7 +386,7 @@ "Bounds": "64, 184, 16, 16" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -394,7 +394,7 @@ "Bounds": "72, 120, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -409,7 +409,7 @@ "Bounds": "80, 216, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -421,7 +421,7 @@ "Bounds": "88, 136, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -431,7 +431,7 @@ "Bounds": "104, 200, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -446,7 +446,7 @@ "Bounds": "112, 136, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -458,7 +458,7 @@ "Bounds": "112, 144, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -468,7 +468,7 @@ "Bounds": "128, 80, 24, 40" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -483,7 +483,7 @@ "Bounds": "128, 120, 32, 24" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -491,7 +491,7 @@ "Bounds": "136, 144, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -501,7 +501,7 @@ "Bounds": "152, 80, 24, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -511,7 +511,7 @@ "Bounds": "152, 208, 40, 16" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -523,7 +523,7 @@ "Bounds": "160, 120, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -533,7 +533,7 @@ "Bounds": "160, 160, 48, 16" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -541,7 +541,7 @@ "Bounds": "160, 240, 16, 8" }, { - "Entities": [ + "Types": [ 0, 2, 5 @@ -550,7 +550,7 @@ "Bounds": "176, 224, 16, 24" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -558,7 +558,7 @@ "Bounds": "184, 120, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -573,7 +573,7 @@ "Bounds": "184, 144, 48, 16" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -581,7 +581,7 @@ "Bounds": "200, 88, 16, 56" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -589,7 +589,7 @@ "Bounds": "208, 64, 40, 24" }, { - "Entities": [ + "Types": [ 0, 5 ], @@ -597,7 +597,7 @@ "Bounds": "216, 88, 16, 56" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -606,7 +606,7 @@ "Bounds": "232, 88, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 2, @@ -618,7 +618,7 @@ "Bounds": "232, 120, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -628,7 +628,7 @@ "Bounds": "232, 152, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -638,7 +638,7 @@ "Bounds": "232, 248, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -648,7 +648,7 @@ "Bounds": "240, 184, 16, 40" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -656,7 +656,7 @@ "Bounds": "248, 64, 8, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -666,7 +666,7 @@ "Bounds": "0, 48, 32, 16" }, { - "Entities": [ + "Types": [ 61, 62 ], @@ -674,7 +674,7 @@ "Bounds": "0, 64, 64, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -684,7 +684,7 @@ "Bounds": "0, 208, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -694,7 +694,7 @@ "Bounds": "16, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -704,7 +704,7 @@ "Bounds": "16, 192, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -713,7 +713,7 @@ "Bounds": "24, 16, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -723,7 +723,7 @@ "Bounds": "32, 48, 32, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -733,7 +733,7 @@ "Bounds": "32, 88, 24, 16" }, { - "Entities": [ + "Types": [ 102, 106 ], @@ -741,7 +741,7 @@ "Bounds": "40, 0, 16, 40" }, { - "Entities": [ + "Types": [ 1, 99 ], @@ -749,7 +749,7 @@ "Bounds": "40, 72, 24, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -759,7 +759,7 @@ "Bounds": "48, 192, 8, 32" }, { - "Entities": [ + "Types": [ 3, 101, 105 @@ -768,7 +768,7 @@ "Bounds": "48, 248, 16, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -778,7 +778,7 @@ "Bounds": "56, 200, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -788,7 +788,7 @@ "Bounds": "64, 40, 32, 16" }, { - "Entities": [ + "Types": [ 99, 100, 102 @@ -797,7 +797,7 @@ "Bounds": "72, 176, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -807,7 +807,7 @@ "Bounds": "72, 192, 16, 16" }, { - "Entities": [ + "Types": [ 23, 173 ], @@ -815,7 +815,7 @@ "Bounds": "72, 208, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -824,7 +824,7 @@ "Bounds": "80, 16, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -832,7 +832,7 @@ "Bounds": "80, 72, 16, 24" }, { - "Entities": [ + "Types": [ 118, 122 ], @@ -840,7 +840,7 @@ "Bounds": "96, 0, 16, 40" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -850,7 +850,7 @@ "Bounds": "104, 192, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -860,7 +860,7 @@ "Bounds": "112, 80, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -870,7 +870,7 @@ "Bounds": "120, 192, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -880,7 +880,7 @@ "Bounds": "128, 80, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -890,7 +890,7 @@ "Bounds": "136, 192, 8, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -900,7 +900,7 @@ "Bounds": "144, 48, 32, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -910,7 +910,7 @@ "Bounds": "144, 192, 8, 32" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -920,7 +920,7 @@ "Bounds": "152, 192, 8, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4 @@ -929,7 +929,7 @@ "Bounds": "160, 64, 8, 56" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -939,7 +939,7 @@ "Bounds": "160, 192, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -948,7 +948,7 @@ "Bounds": "168, 64, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -958,7 +958,7 @@ "Bounds": "168, 88, 24, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -968,7 +968,7 @@ "Bounds": "176, 192, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -977,7 +977,7 @@ "Bounds": "184, 64, 16, 24" }, { - "Entities": [ + "Types": [ 3, 101 ], @@ -985,7 +985,7 @@ "Bounds": "192, 184, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -994,7 +994,7 @@ "Bounds": "200, 64, 16, 24" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -1002,7 +1002,7 @@ "Bounds": "208, 184, 16, 16" }, { - "Entities": [ + "Types": [ 0, 4, 5 @@ -1011,7 +1011,7 @@ "Bounds": "216, 64, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1021,7 +1021,7 @@ "Bounds": "216, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1031,7 +1031,7 @@ "Bounds": "224, 192, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1041,7 +1041,7 @@ "Bounds": "232, 88, 16, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1051,7 +1051,7 @@ "Bounds": "240, 192, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21, 22, @@ -1061,7 +1061,7 @@ "Bounds": "40, 48, 16, 8" }, { - "Entities": [ + "Types": [ 119, 123, 133, @@ -1071,7 +1071,7 @@ "Bounds": "64, 24, 8, 32" }, { - "Entities": [ + "Types": [ 4, 102 ], @@ -1079,7 +1079,7 @@ "Bounds": "128, 32, 8, 24" }, { - "Entities": [ + "Types": [ 20, 21, 22, diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/BOAT.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/BOAT.TR2-TextureRemap.json index 7b4fc187c..37904c5f0 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/BOAT.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/BOAT.TR2-TextureRemap.json @@ -2145,7 +2145,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 17, 121, 154, @@ -2155,7 +2155,7 @@ "Bounds": "248, 112, 8, 24" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2163,7 +2163,7 @@ "Bounds": "16, 16, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2171,7 +2171,7 @@ "Bounds": "40, 16, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2179,7 +2179,7 @@ "Bounds": "144, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2187,7 +2187,7 @@ "Bounds": "216, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/CATACOMB.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/CATACOMB.TR2-TextureRemap.json index 7a49fd1c7..ab7394d4a 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/CATACOMB.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/CATACOMB.TR2-TextureRemap.json @@ -1812,7 +1812,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 154 ], @@ -1820,7 +1820,7 @@ "Bounds": "160, 80, 16, 16" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1828,7 +1828,7 @@ "Bounds": "48, 72, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1836,7 +1836,7 @@ "Bounds": "112, 64, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1844,7 +1844,7 @@ "Bounds": "136, 80, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1852,7 +1852,7 @@ "Bounds": "160, 80, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/DECK.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/DECK.TR2-TextureRemap.json index a22084856..f86857f63 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/DECK.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/DECK.TR2-TextureRemap.json @@ -3360,7 +3360,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 32, 34 ], @@ -3368,7 +3368,7 @@ "Bounds": "152, 96, 32, 48" }, { - "Entities": [ + "Types": [ 34, 30 ], @@ -3376,7 +3376,7 @@ "Bounds": "40, 224, 40, 16" }, { - "Entities": [ + "Types": [ 34, 121, 154 @@ -3385,7 +3385,7 @@ "Bounds": "216, 72, 24, 24" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3393,7 +3393,7 @@ "Bounds": "232, 96, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3401,7 +3401,7 @@ "Bounds": "72, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3409,7 +3409,7 @@ "Bounds": "72, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3417,7 +3417,7 @@ "Bounds": "96, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3425,7 +3425,7 @@ "Bounds": "120, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/EMPRTOMB.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/EMPRTOMB.TR2-TextureRemap.json index 9a97b41b2..68e2351e6 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/EMPRTOMB.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/EMPRTOMB.TR2-TextureRemap.json @@ -2055,7 +2055,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 154 ], @@ -2063,7 +2063,7 @@ "Bounds": "240, 80, 16, 16" }, { - "Entities": [ + "Types": [ 36, 37 ], @@ -2071,7 +2071,7 @@ "Bounds": "136, 176, 32, 48" }, { - "Entities": [ + "Types": [ 36, 37 ], @@ -2079,7 +2079,7 @@ "Bounds": "152, 0, 40, 32" }, { - "Entities": [ + "Types": [ 36, 37 ], @@ -2087,7 +2087,7 @@ "Bounds": "216, 96, 32, 32" }, { - "Entities": [ + "Types": [ 36, 37 ], @@ -2095,7 +2095,7 @@ "Bounds": "200, 64, 40, 8" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2103,7 +2103,7 @@ "Bounds": "232, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2111,7 +2111,7 @@ "Bounds": "224, 56, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2119,7 +2119,7 @@ "Bounds": "224, 88, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2127,7 +2127,7 @@ "Bounds": "0, 96, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/FLOATING.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/FLOATING.TR2-TextureRemap.json index 811de1eb0..c9e6fc5f2 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/FLOATING.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/FLOATING.TR2-TextureRemap.json @@ -1947,7 +1947,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 43, 19 ], @@ -1955,7 +1955,7 @@ "Bounds": "200, 240, 32, 16" }, { - "Entities": [ + "Types": [ 43, 121, 154, @@ -1965,7 +1965,7 @@ "Bounds": "208, 16, 16, 16" }, { - "Entities": [ + "Types": [ 19, 40 ], @@ -1973,7 +1973,7 @@ "Bounds": "64, 192, 32, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1981,7 +1981,7 @@ "Bounds": "48, 120, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1989,7 +1989,7 @@ "Bounds": "80, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1997,7 +1997,7 @@ "Bounds": "104, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2005,7 +2005,7 @@ "Bounds": "152, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2013,7 +2013,7 @@ "Bounds": "224, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2021,7 +2021,7 @@ "Bounds": "96, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2029,7 +2029,7 @@ "Bounds": "120, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2037,7 +2037,7 @@ "Bounds": "144, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2045,7 +2045,7 @@ "Bounds": "168, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/FLOATING.TR2-UKBox-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/FLOATING.TR2-UKBox-TextureRemap.json index 39e25fd9f..fc3830a7b 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/FLOATING.TR2-UKBox-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/FLOATING.TR2-UKBox-TextureRemap.json @@ -1948,7 +1948,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 154 ], @@ -1956,7 +1956,7 @@ "Bounds": "216, 192, 16, 16" }, { - "Entities": [ + "Types": [ 43, 19 ], @@ -1964,7 +1964,7 @@ "Bounds": "32, 0, 32, 16" }, { - "Entities": [ + "Types": [ 19, 40 ], @@ -1972,7 +1972,7 @@ "Bounds": "64, 192, 32, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1980,7 +1980,7 @@ "Bounds": "0, 128, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1988,7 +1988,7 @@ "Bounds": "24, 120, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1996,7 +1996,7 @@ "Bounds": "96, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2004,7 +2004,7 @@ "Bounds": "120, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2012,7 +2012,7 @@ "Bounds": "144, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2020,7 +2020,7 @@ "Bounds": "128, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2028,7 +2028,7 @@ "Bounds": "168, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2036,7 +2036,7 @@ "Bounds": "192, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2044,7 +2044,7 @@ "Bounds": "200, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/HOUSE.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/HOUSE.TR2-TextureRemap.json index 52f4c4c5b..badd5c1e3 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/HOUSE.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/HOUSE.TR2-TextureRemap.json @@ -1975,7 +1975,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 16, 3, 12, @@ -1998,7 +1998,7 @@ "Bounds": "142, 104, 75, 3" }, { - "Entities": [ + "Types": [ 32, 20 ], @@ -2006,7 +2006,7 @@ "Bounds": "64, 72, 32, 24" }, { - "Entities": [ + "Types": [ 20, 0, 3, @@ -2032,28 +2032,28 @@ "Bounds": "240, 16, 16, 16" }, { - "Entities": [ + "Types": [ 12 ], "TileIndex": 14, "Bounds": "32, 144, 16, 16" }, { - "Entities": [ + "Types": [ 12 ], "TileIndex": 14, "Bounds": "64, 144, 16, 16" }, { - "Entities": [ + "Types": [ 12 ], "TileIndex": 15, "Bounds": "248, 120, 8, 8" }, { - "Entities": [ + "Types": [ 20, 159 ], @@ -2061,7 +2061,7 @@ "Bounds": "96, 144, 24, 8" }, { - "Entities": [ + "Types": [ 134, 173, 248 @@ -2071,7 +2071,7 @@ }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2079,7 +2079,7 @@ "Bounds": "96, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2087,7 +2087,7 @@ "Bounds": "168, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2095,7 +2095,7 @@ "Bounds": "216, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2103,7 +2103,7 @@ "Bounds": "96, 64, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2112,7 +2112,7 @@ }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2120,7 +2120,7 @@ "Bounds": "120, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2128,7 +2128,7 @@ "Bounds": "144, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2136,7 +2136,7 @@ "Bounds": "24, 64, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2144,7 +2144,7 @@ "Bounds": "48, 64, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2152,7 +2152,7 @@ "Bounds": "216, 64, 24, 32" }, { - "Entities": [ + "Types": [ 0, 12 ], @@ -2160,7 +2160,7 @@ "Bounds": "96, 120, 48, 16" }, { - "Entities": [ + "Types": [ 0, 12 ], @@ -2168,7 +2168,7 @@ "Bounds": "160, 144, 16, 16" }, { - "Entities": [ + "Types": [ 0, 12 ], @@ -2176,7 +2176,7 @@ "Bounds": "48, 144, 16, 16" }, { - "Entities": [ + "Types": [ 0, 12 ], @@ -2184,7 +2184,7 @@ "Bounds": "64, 144, 16, 16" }, { - "Entities": [ + "Types": [ 0, 12 ], @@ -2192,7 +2192,7 @@ "Bounds": "248, 88, 8, 8" }, { - "Entities": [ + "Types": [ 0, 12 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/ICECAVE.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/ICECAVE.TR2-TextureRemap.json index 8edf0e471..422aa99e4 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/ICECAVE.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/ICECAVE.TR2-TextureRemap.json @@ -2028,7 +2028,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 46, 121, 154, @@ -2038,7 +2038,7 @@ "Bounds": "232, 136, 24, 8" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2046,7 +2046,7 @@ "Bounds": "104, 208, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2054,7 +2054,7 @@ "Bounds": "128, 208, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2062,7 +2062,7 @@ "Bounds": "152, 208, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2070,7 +2070,7 @@ "Bounds": "176, 208, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/KEEL.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/KEEL.TR2-TextureRemap.json index ad7516e1c..76b6fbb33 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/KEEL.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/KEEL.TR2-TextureRemap.json @@ -3612,7 +3612,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 32, 31 ], @@ -3620,7 +3620,7 @@ "Bounds": "144, 104, 32, 48" }, { - "Entities": [ + "Types": [ 32, 31 ], @@ -3628,7 +3628,7 @@ "Bounds": "112, 0, 32, 40" }, { - "Entities": [ + "Types": [ 32, 31 ], @@ -3636,7 +3636,7 @@ "Bounds": "192, 48, 16, 32" }, { - "Entities": [ + "Types": [ 31, 121, 154 @@ -3645,7 +3645,7 @@ "Bounds": "64, 96, 8, 48" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3653,7 +3653,7 @@ "Bounds": "0, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3661,7 +3661,7 @@ "Bounds": "24, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3669,7 +3669,7 @@ "Bounds": "168, 112, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3677,7 +3677,7 @@ "Bounds": "192, 120, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/LIVING.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/LIVING.TR2-TextureRemap.json index e552c914f..9a277ee8a 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/LIVING.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/LIVING.TR2-TextureRemap.json @@ -3144,7 +3144,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 33, 27, 32 @@ -3153,7 +3153,7 @@ "Bounds": "192, 128, 32, 48" }, { - "Entities": [ + "Types": [ 27, 121, 154 @@ -3162,7 +3162,7 @@ "Bounds": "64, 96, 32, 16" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3170,7 +3170,7 @@ "Bounds": "56, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3178,7 +3178,7 @@ "Bounds": "80, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3186,7 +3186,7 @@ "Bounds": "224, 216, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3194,7 +3194,7 @@ "Bounds": "24, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/MONASTRY.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/MONASTRY.TR2-TextureRemap.json index 18c411fb7..b842b59ab 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/MONASTRY.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/MONASTRY.TR2-TextureRemap.json @@ -1704,7 +1704,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 154 ], @@ -1712,7 +1712,7 @@ "Bounds": "64, 96, 16, 16" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1720,7 +1720,7 @@ "Bounds": "24, 72, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1728,7 +1728,7 @@ "Bounds": "168, 72, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1736,7 +1736,7 @@ "Bounds": "200, 56, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1744,7 +1744,7 @@ "Bounds": "192, 88, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/OPERA.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/OPERA.TR2-TextureRemap.json index 9f599591c..f24eb8538 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/OPERA.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/OPERA.TR2-TextureRemap.json @@ -2838,7 +2838,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 17, 121, 154, @@ -2848,7 +2848,7 @@ "Bounds": "104, 24, 8, 24" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2856,7 +2856,7 @@ "Bounds": "40, 200, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2864,7 +2864,7 @@ "Bounds": "56, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2872,7 +2872,7 @@ "Bounds": "104, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2880,7 +2880,7 @@ "Bounds": "192, 128, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/PLATFORM.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/PLATFORM.TR2-TextureRemap.json index 618fb97ad..3a481b468 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/PLATFORM.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/PLATFORM.TR2-TextureRemap.json @@ -3621,7 +3621,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 154 ], @@ -3629,7 +3629,7 @@ "Bounds": "0, 24, 16, 16" }, { - "Entities": [ + "Types": [ 34, 0, 31 @@ -3638,7 +3638,7 @@ "Bounds": "96, 160, 16, 24" }, { - "Entities": [ + "Types": [ 34, 30 ], @@ -3646,7 +3646,7 @@ "Bounds": "192, 232, 40, 16" }, { - "Entities": [ + "Types": [ 34, 31, 32 @@ -3655,7 +3655,7 @@ "Bounds": "112, 144, 32, 40" }, { - "Entities": [ + "Types": [ 32, 31 ], @@ -3663,7 +3663,7 @@ "Bounds": "200, 120, 32, 40" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3671,7 +3671,7 @@ "Bounds": "200, 88, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3679,7 +3679,7 @@ "Bounds": "224, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3687,7 +3687,7 @@ "Bounds": "0, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3695,7 +3695,7 @@ "Bounds": "24, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/RIG.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/RIG.TR2-TextureRemap.json index 30aa60476..807f05a16 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/RIG.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/RIG.TR2-TextureRemap.json @@ -3108,7 +3108,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 154 ], @@ -3116,7 +3116,7 @@ "Bounds": "0, 48, 16, 16" }, { - "Entities": [ + "Types": [ 31, 0 ], @@ -3124,7 +3124,7 @@ "Bounds": "96, 112, 16, 24" }, { - "Entities": [ + "Types": [ 31, 32 ], @@ -3132,7 +3132,7 @@ "Bounds": "24, 40, 32, 40" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3140,7 +3140,7 @@ "Bounds": "216, 40, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3148,7 +3148,7 @@ "Bounds": "0, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3156,7 +3156,7 @@ "Bounds": "24, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -3164,7 +3164,7 @@ "Bounds": "0, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/SKIDOO.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/SKIDOO.TR2-TextureRemap.json index d5a191a0a..295d5f243 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/SKIDOO.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/SKIDOO.TR2-TextureRemap.json @@ -1560,7 +1560,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 154 ], @@ -1568,7 +1568,7 @@ "Bounds": "200, 32, 16, 16" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1576,7 +1576,7 @@ "Bounds": "120, 128, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1584,7 +1584,7 @@ "Bounds": "176, 120, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1592,7 +1592,7 @@ "Bounds": "0, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1600,7 +1600,7 @@ "Bounds": "24, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/UNWATER.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/UNWATER.TR2-TextureRemap.json index b33341350..58d6bba35 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/UNWATER.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/UNWATER.TR2-TextureRemap.json @@ -2838,7 +2838,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 3 ], @@ -2846,7 +2846,7 @@ "Bounds": "208, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2854,7 +2854,7 @@ "Bounds": "232, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2862,7 +2862,7 @@ "Bounds": "224, 200, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2870,7 +2870,7 @@ "Bounds": "168, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/VENICE.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/VENICE.TR2-TextureRemap.json index f29f4aef3..1c278790e 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/VENICE.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/VENICE.TR2-TextureRemap.json @@ -2343,7 +2343,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 17, 121, 154, @@ -2353,7 +2353,7 @@ "Bounds": "144, 128, 8, 24" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2361,7 +2361,7 @@ "Bounds": "0, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2369,7 +2369,7 @@ "Bounds": "56, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2377,7 +2377,7 @@ "Bounds": "104, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2385,7 +2385,7 @@ "Bounds": "152, 104, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/WALL.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/WALL.TR2-TextureRemap.json index 925b25e1d..d1533cd87 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/WALL.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/WALL.TR2-TextureRemap.json @@ -1668,7 +1668,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 154 ], @@ -1676,7 +1676,7 @@ "Bounds": "88, 208, 16, 16" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1684,7 +1684,7 @@ "Bounds": "0, 40, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1692,7 +1692,7 @@ "Bounds": "24, 48, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1700,7 +1700,7 @@ "Bounds": "48, 48, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1708,7 +1708,7 @@ "Bounds": "72, 56, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1717,7 +1717,7 @@ }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1725,7 +1725,7 @@ "Bounds": "112, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1733,7 +1733,7 @@ "Bounds": "136, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1741,7 +1741,7 @@ "Bounds": "160, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1749,7 +1749,7 @@ "Bounds": "184, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1757,7 +1757,7 @@ "Bounds": "96, 64, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/XIAN.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/XIAN.TR2-TextureRemap.json index 05477fd73..fe5b256a2 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/Deduplication/XIAN.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR2/Textures/Deduplication/XIAN.TR2-TextureRemap.json @@ -1974,7 +1974,7 @@ ], "Dependencies": [ { - "Entities": [ + "Types": [ 0, 154 ], @@ -1982,7 +1982,7 @@ "Bounds": "80, 200, 16, 16" }, { - "Entities": [ + "Types": [ 19, 40 ], @@ -1990,7 +1990,7 @@ "Bounds": "96, 32, 32, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -1998,7 +1998,7 @@ "Bounds": "224, 96, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2006,7 +2006,7 @@ "Bounds": "224, 128, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2014,7 +2014,7 @@ "Bounds": "112, 152, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2022,7 +2022,7 @@ "Bounds": "24, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2030,7 +2030,7 @@ "Bounds": "0, 200, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2038,7 +2038,7 @@ "Bounds": "24, 200, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2046,7 +2046,7 @@ "Bounds": "168, 184, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2054,7 +2054,7 @@ "Bounds": "192, 192, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], @@ -2062,7 +2062,7 @@ "Bounds": "216, 192, 24, 32" }, { - "Entities": [ + "Types": [ 0, 3 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/ANTARC.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/ANTARC.TR2-TextureRemap.json index f8673e6a2..1ddcda75c 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/ANTARC.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/ANTARC.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -19,7 +19,7 @@ "Bounds": "200, 120, 48, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -38,7 +38,7 @@ "Bounds": "240, 240, 8, 16" }, { - "Entities": [ + "Types": [ 94, 131 ], @@ -46,7 +46,7 @@ "Bounds": "0, 0, 32, 64" }, { - "Entities": [ + "Types": [ 130, 350 ], @@ -54,7 +54,7 @@ "Bounds": "32, 0, 32, 64" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -62,7 +62,7 @@ "Bounds": "54, 200, 6, 14" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -70,7 +70,7 @@ "Bounds": "64, 136, 6, 14" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -88,7 +88,7 @@ "Bounds": "72, 88, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -97,7 +97,7 @@ "Bounds": "72, 134, 64, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -106,7 +106,7 @@ "Bounds": "116, 86, 48, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -125,7 +125,7 @@ "Bounds": "128, 150, 8, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -133,7 +133,7 @@ "Bounds": "164, 86, 4, 4" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -141,7 +141,7 @@ "Bounds": "164, 98, 4, 3" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -149,7 +149,7 @@ "Bounds": "170, 64, 20, 20" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -158,7 +158,7 @@ "Bounds": "176, 166, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -177,7 +177,7 @@ "Bounds": "208, 176, 8, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -185,7 +185,7 @@ "Bounds": "208, 196, 28, 36" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -193,7 +193,7 @@ "Bounds": "216, 152, 20, 12" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -211,7 +211,7 @@ "Bounds": "236, 224, 16, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -220,7 +220,7 @@ "Bounds": "0, 32, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -229,7 +229,7 @@ "Bounds": "0, 248, 64, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -238,7 +238,7 @@ "Bounds": "24, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -257,7 +257,7 @@ "Bounds": "40, 216, 8, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -266,7 +266,7 @@ "Bounds": "40, 232, 32, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -275,7 +275,7 @@ "Bounds": "48, 32, 24, 32" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -283,7 +283,7 @@ "Bounds": "56, 96, 32, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -292,7 +292,7 @@ "Bounds": "72, 32, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -300,7 +300,7 @@ "Bounds": "72, 223, 44, 12" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -308,7 +308,7 @@ "Bounds": "104, 235, 12, 12" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -317,7 +317,7 @@ "Bounds": "104, 248, 32, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -325,7 +325,7 @@ "Bounds": "112, 0, 56, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -336,7 +336,7 @@ "Bounds": "120, 32, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -344,7 +344,7 @@ "Bounds": "120, 144, 28, 12" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -352,7 +352,7 @@ "Bounds": "124, 212, 28, 20" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -361,7 +361,7 @@ "Bounds": "136, 120, 32, 8" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -372,7 +372,7 @@ "Bounds": "144, 32, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -380,7 +380,7 @@ "Bounds": "148, 144, 12, 12" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -389,7 +389,7 @@ "Bounds": "148, 239, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -398,7 +398,7 @@ "Bounds": "148, 247, 64, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -406,7 +406,7 @@ "Bounds": "152, 212, 20, 27" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -414,7 +414,7 @@ "Bounds": "168, 0, 56, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -422,7 +422,7 @@ "Bounds": "168, 16, 28, 28" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -433,7 +433,7 @@ "Bounds": "168, 44, 24, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -444,7 +444,7 @@ "Bounds": "192, 48, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -453,7 +453,7 @@ "Bounds": "192, 112, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -472,7 +472,7 @@ "Bounds": "192, 156, 8, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -481,7 +481,7 @@ "Bounds": "192, 228, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -499,7 +499,7 @@ "Bounds": "196, 16, 24, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -510,7 +510,7 @@ "Bounds": "216, 60, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -519,7 +519,7 @@ "Bounds": "216, 140, 24, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -528,7 +528,7 @@ "Bounds": "220, 28, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -536,7 +536,7 @@ "Bounds": "224, 0, 28, 28" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -555,7 +555,7 @@ "Bounds": "232, 124, 8, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -564,7 +564,7 @@ "Bounds": "240, 100, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -582,7 +582,7 @@ "Bounds": "240, 204, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -591,7 +591,7 @@ "Bounds": "0, 32, 32, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -599,7 +599,7 @@ "Bounds": "0, 56, 56, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -607,7 +607,7 @@ "Bounds": "0, 104, 24, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -615,7 +615,7 @@ "Bounds": "0, 120, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -633,7 +633,7 @@ "Bounds": "0, 152, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -641,7 +641,7 @@ "Bounds": "0, 216, 16, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -649,7 +649,7 @@ "Bounds": "0, 240, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -667,7 +667,7 @@ "Bounds": "16, 152, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -676,7 +676,7 @@ "Bounds": "16, 216, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -684,7 +684,7 @@ "Bounds": "24, 104, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -702,7 +702,7 @@ "Bounds": "32, 152, 16, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -710,7 +710,7 @@ "Bounds": "32, 240, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -718,7 +718,7 @@ "Bounds": "48, 104, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -736,7 +736,7 @@ "Bounds": "48, 152, 16, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -744,7 +744,7 @@ "Bounds": "48, 240, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -752,7 +752,7 @@ "Bounds": "56, 48, 56, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -760,7 +760,7 @@ "Bounds": "56, 56, 56, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -769,7 +769,7 @@ "Bounds": "56, 64, 48, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -777,7 +777,7 @@ "Bounds": "72, 104, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -796,7 +796,7 @@ "Bounds": "80, 160, 8, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -804,7 +804,7 @@ "Bounds": "80, 216, 16, 16" }, { - "Entities": [ + "Types": [ 244, 245, 246, @@ -814,7 +814,7 @@ "Bounds": "80, 240, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -823,7 +823,7 @@ "Bounds": "96, 32, 16, 8" }, { - "Entities": [ + "Types": [ 205, 209 ], @@ -831,7 +831,7 @@ "Bounds": "96, 120, 8, 48" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -839,7 +839,7 @@ "Bounds": "96, 216, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -858,7 +858,7 @@ "Bounds": "112, 32, 16, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -867,7 +867,7 @@ "Bounds": "128, 48, 32, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -875,7 +875,7 @@ "Bounds": "128, 104, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -884,7 +884,7 @@ "Bounds": "136, 156, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -893,7 +893,7 @@ "Bounds": "136, 244, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -901,7 +901,7 @@ "Bounds": "144, 212, 16, 16" }, { - "Entities": [ + "Types": [ 206, 210 ], @@ -909,7 +909,7 @@ "Bounds": "144, 236, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -917,7 +917,7 @@ "Bounds": "152, 104, 16, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -926,7 +926,7 @@ "Bounds": "152, 156, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -934,7 +934,7 @@ "Bounds": "160, 212, 16, 16" }, { - "Entities": [ + "Types": [ 206, 210 ], @@ -942,7 +942,7 @@ "Bounds": "160, 236, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -951,7 +951,7 @@ "Bounds": "168, 56, 24, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -959,7 +959,7 @@ "Bounds": "168, 88, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -967,7 +967,7 @@ "Bounds": "168, 104, 16, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -976,7 +976,7 @@ "Bounds": "168, 156, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -984,7 +984,7 @@ "Bounds": "184, 32, 16, 24" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -992,7 +992,7 @@ "Bounds": "192, 0, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1011,7 +1011,7 @@ "Bounds": "192, 56, 8, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1019,7 +1019,7 @@ "Bounds": "192, 96, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1028,7 +1028,7 @@ "Bounds": "200, 248, 8, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1036,7 +1036,7 @@ "Bounds": "208, 96, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1055,7 +1055,7 @@ "Bounds": "216, 16, 8, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1063,7 +1063,7 @@ "Bounds": "224, 0, 16, 32" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1071,7 +1071,7 @@ "Bounds": "224, 96, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1089,7 +1089,7 @@ "Bounds": "232, 48, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -1097,7 +1097,7 @@ "Bounds": "240, 96, 16, 24" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1105,7 +1105,7 @@ "Bounds": "0, 0, 8, 32" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1114,7 +1114,7 @@ "Bounds": "0, 80, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1122,7 +1122,7 @@ "Bounds": "0, 96, 16, 8" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1132,7 +1132,7 @@ "Bounds": "0, 104, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1141,7 +1141,7 @@ "Bounds": "8, 72, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1149,7 +1149,7 @@ "Bounds": "8, 148, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1158,7 +1158,7 @@ "Bounds": "12, 132, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1166,7 +1166,7 @@ "Bounds": "24, 44, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1175,7 +1175,7 @@ "Bounds": "24, 76, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1183,7 +1183,7 @@ "Bounds": "24, 124, 14, 6" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1192,7 +1192,7 @@ "Bounds": "24, 130, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1200,7 +1200,7 @@ "Bounds": "32, 16, 12, 20" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1208,7 +1208,7 @@ "Bounds": "32, 130, 6, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1217,7 +1217,7 @@ "Bounds": "40, 76, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1225,7 +1225,7 @@ "Bounds": "40, 92, 8, 16" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1233,7 +1233,7 @@ "Bounds": "48, 44, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1242,7 +1242,7 @@ "Bounds": "48, 68, 8, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1250,7 +1250,7 @@ "Bounds": "56, 48, 24, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1258,7 +1258,7 @@ "Bounds": "58, 128, 6, 6" }, { - "Entities": [ + "Types": [ 6, 7, 8, @@ -1268,7 +1268,7 @@ "Bounds": "70, 128, 8, 8" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1277,7 +1277,7 @@ "Bounds": "72, 96, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1286,7 +1286,7 @@ "Bounds": "78, 132, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1295,7 +1295,7 @@ "Bounds": "80, 76, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1303,7 +1303,7 @@ "Bounds": "80, 92, 8, 16" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1311,7 +1311,7 @@ "Bounds": "84, 148, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1320,7 +1320,7 @@ "Bounds": "86, 132, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1328,7 +1328,7 @@ "Bounds": "88, 92, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1347,7 +1347,7 @@ "Bounds": "92, 16, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1356,7 +1356,7 @@ "Bounds": "96, 76, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1364,7 +1364,7 @@ "Bounds": "96, 92, 8, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1372,7 +1372,7 @@ "Bounds": "96, 108, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1391,7 +1391,7 @@ "Bounds": "100, 16, 8, 24" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1399,7 +1399,7 @@ "Bounds": "100, 152, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1408,7 +1408,7 @@ "Bounds": "102, 128, 8, 8" }, { - "Entities": [ + "Types": [ 160, 185 ], @@ -1416,7 +1416,7 @@ "Bounds": "102, 144, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1435,7 +1435,7 @@ "Bounds": "108, 16, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1444,7 +1444,7 @@ "Bounds": "110, 128, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1452,7 +1452,7 @@ "Bounds": "110, 144, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1460,7 +1460,7 @@ "Bounds": "120, 120, 14, 6" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1469,7 +1469,7 @@ "Bounds": "124, 16, 8, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1477,7 +1477,7 @@ "Bounds": "126, 144, 8, 8" }, { - "Entities": [ + "Types": [ 244, 246 ], @@ -1485,7 +1485,7 @@ "Bounds": "126, 152, 8, 8" }, { - "Entities": [ + "Types": [ 131, 205, 209 @@ -1494,7 +1494,7 @@ "Bounds": "128, 88, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1503,7 +1503,7 @@ "Bounds": "132, 32, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1512,7 +1512,7 @@ "Bounds": "132, 128, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1520,7 +1520,7 @@ "Bounds": "134, 144, 8, 8" }, { - "Entities": [ + "Types": [ 244, 247 ], @@ -1528,7 +1528,7 @@ "Bounds": "134, 152, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1536,7 +1536,7 @@ "Bounds": "136, 96, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1545,7 +1545,7 @@ "Bounds": "140, 128, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1553,7 +1553,7 @@ "Bounds": "142, 144, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1562,7 +1562,7 @@ "Bounds": "148, 128, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1570,7 +1570,7 @@ "Bounds": "150, 144, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1579,7 +1579,7 @@ "Bounds": "152, 72, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1588,7 +1588,7 @@ "Bounds": "156, 128, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1596,7 +1596,7 @@ "Bounds": "158, 144, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1605,7 +1605,7 @@ "Bounds": "164, 128, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1614,7 +1614,7 @@ "Bounds": "168, 72, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1623,7 +1623,7 @@ "Bounds": "168, 96, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1632,7 +1632,7 @@ "Bounds": "172, 132, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1640,7 +1640,7 @@ "Bounds": "176, 92, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1649,7 +1649,7 @@ "Bounds": "180, 132, 8, 8" }, { - "Entities": [ + "Types": [ 185, 188 ], @@ -1657,7 +1657,7 @@ "Bounds": "182, 148, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1666,7 +1666,7 @@ "Bounds": "184, 16, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1675,7 +1675,7 @@ "Bounds": "184, 24, 24, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1684,7 +1684,7 @@ "Bounds": "184, 40, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1693,7 +1693,7 @@ "Bounds": "184, 76, 16, 8" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1701,7 +1701,7 @@ "Bounds": "184, 92, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1710,7 +1710,7 @@ "Bounds": "188, 132, 8, 8" }, { - "Entities": [ + "Types": [ 206, 210 ], @@ -1718,7 +1718,7 @@ "Bounds": "192, 108, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1727,7 +1727,7 @@ "Bounds": "200, 76, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1736,7 +1736,7 @@ "Bounds": "208, 16, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1745,7 +1745,7 @@ "Bounds": "208, 24, 24, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1753,7 +1753,7 @@ "Bounds": "208, 108, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1762,7 +1762,7 @@ "Bounds": "212, 132, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1771,7 +1771,7 @@ "Bounds": "216, 68, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1780,7 +1780,7 @@ "Bounds": "220, 132, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1789,7 +1789,7 @@ "Bounds": "224, 68, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1798,7 +1798,7 @@ "Bounds": "228, 132, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1806,7 +1806,7 @@ "Bounds": "228, 140, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1815,7 +1815,7 @@ "Bounds": "232, 68, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1824,7 +1824,7 @@ "Bounds": "238, 128, 8, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1832,7 +1832,7 @@ "Bounds": "240, 40, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1841,7 +1841,7 @@ "Bounds": "240, 64, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1850,7 +1850,7 @@ "Bounds": "240, 96, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1859,7 +1859,7 @@ "Bounds": "248, 72, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/AREA51.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/AREA51.TR2-TextureRemap.json index 5531403e8..207e40487 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/AREA51.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/AREA51.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 132, 133, 138 @@ -19,7 +19,7 @@ "Bounds": "0, 96, 64, 64" }, { - "Entities": [ + "Types": [ 224, 227, 228, @@ -29,7 +29,7 @@ "Bounds": "0, 224, 64, 32" }, { - "Entities": [ + "Types": [ 131, 134, 135 @@ -38,7 +38,7 @@ "Bounds": "136, 64, 64, 64" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -55,7 +55,7 @@ "Bounds": "232, 40, 8, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -64,7 +64,7 @@ "Bounds": "232, 64, 24, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -73,7 +73,7 @@ "Bounds": "0, 208, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -81,7 +81,7 @@ "Bounds": "24, 168, 30, 30" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -89,7 +89,7 @@ "Bounds": "40, 198, 14, 6" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -98,7 +98,7 @@ "Bounds": "40, 208, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -114,7 +114,7 @@ "Bounds": "48, 64, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -130,7 +130,7 @@ "Bounds": "54, 168, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -139,7 +139,7 @@ "Bounds": "64, 96, 64, 16" }, { - "Entities": [ + "Types": [ 207, 211 ], @@ -147,7 +147,7 @@ "Bounds": "64, 112, 32, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -161,7 +161,7 @@ "Bounds": "64, 208, 24, 32" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -171,7 +171,7 @@ "Bounds": "96, 112, 32, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -179,7 +179,7 @@ "Bounds": "104, 208, 6, 6" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -195,7 +195,7 @@ "Bounds": "110, 176, 16, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -203,7 +203,7 @@ "Bounds": "110, 200, 56, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -214,7 +214,7 @@ "Bounds": "112, 216, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -223,7 +223,7 @@ "Bounds": "128, 56, 48, 24" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -233,7 +233,7 @@ "Bounds": "128, 120, 32, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -244,7 +244,7 @@ "Bounds": "136, 216, 24, 32" }, { - "Entities": [ + "Types": [ 4, 315 ], @@ -252,7 +252,7 @@ "Bounds": "160, 216, 6, 22" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -260,7 +260,7 @@ "Bounds": "160, 238, 6, 6" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -268,7 +268,7 @@ "Bounds": "166, 184, 22, 14" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -276,7 +276,7 @@ "Bounds": "166, 198, 56, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -290,7 +290,7 @@ "Bounds": "166, 214, 24, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -304,7 +304,7 @@ "Bounds": "190, 214, 24, 32" }, { - "Entities": [ + "Types": [ 206, 210 ], @@ -312,7 +312,7 @@ "Bounds": "192, 104, 32, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -320,7 +320,7 @@ "Bounds": "192, 168, 30, 30" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -328,7 +328,7 @@ "Bounds": "208, 246, 6, 6" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -345,7 +345,7 @@ "Bounds": "214, 214, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -361,7 +361,7 @@ "Bounds": "222, 198, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -369,7 +369,7 @@ "Bounds": "224, 56, 30, 38" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -386,7 +386,7 @@ "Bounds": "248, 40, 8, 16" }, { - "Entities": [ + "Types": [ 131, 136 ], @@ -394,7 +394,7 @@ "Bounds": "248, 158, 8, 64" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -403,7 +403,7 @@ "Bounds": "0, 235, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -412,7 +412,7 @@ "Bounds": "0, 243, 64, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -422,7 +422,7 @@ "Bounds": "0, 251, 14, 5" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -430,7 +430,7 @@ "Bounds": "14, 251, 6, 5" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -438,7 +438,7 @@ "Bounds": "32, 136, 22, 29" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -455,7 +455,7 @@ "Bounds": "40, 64, 8, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -463,7 +463,7 @@ "Bounds": "54, 136, 14, 14" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -480,7 +480,7 @@ "Bounds": "64, 235, 8, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -489,7 +489,7 @@ "Bounds": "72, 118, 48, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -497,7 +497,7 @@ "Bounds": "96, 56, 32, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -505,7 +505,7 @@ "Bounds": "96, 233, 22, 22" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -522,7 +522,7 @@ "Bounds": "112, 32, 8, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -530,7 +530,7 @@ "Bounds": "126, 104, 30, 22" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -540,7 +540,7 @@ "Bounds": "146, 134, 6, 5" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -550,7 +550,7 @@ "Bounds": "152, 56, 32, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -558,7 +558,7 @@ "Bounds": "156, 104, 14, 6" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -566,7 +566,7 @@ "Bounds": "156, 110, 46, 14" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -575,7 +575,7 @@ "Bounds": "168, 24, 16, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -584,7 +584,7 @@ "Bounds": "168, 156, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -601,7 +601,7 @@ "Bounds": "168, 164, 14, 5" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -610,7 +610,7 @@ "Bounds": "168, 233, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -627,7 +627,7 @@ "Bounds": "168, 249, 14, 5" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -637,7 +637,7 @@ "Bounds": "182, 164, 6, 5" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -647,7 +647,7 @@ "Bounds": "182, 249, 14, 5" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -657,7 +657,7 @@ "Bounds": "196, 249, 14, 5" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -667,7 +667,7 @@ "Bounds": "210, 249, 14, 5" }, { - "Entities": [ + "Types": [ 4, 315 ], @@ -675,7 +675,7 @@ "Bounds": "224, 249, 6, 5" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -684,7 +684,7 @@ "Bounds": "236, 124, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -701,7 +701,7 @@ "Bounds": "240, 228, 14, 5" }, { - "Entities": [ + "Types": [ 134, 135 ], @@ -709,7 +709,7 @@ "Bounds": "248, 32, 8, 64" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -717,7 +717,7 @@ "Bounds": "248, 110, 6, 14" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -726,7 +726,7 @@ "Bounds": "0, 24, 64, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -736,7 +736,7 @@ "Bounds": "0, 96, 6, 13" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -744,7 +744,7 @@ "Bounds": "0, 166, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -753,7 +753,7 @@ "Bounds": "0, 236, 8, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -761,7 +761,7 @@ "Bounds": "8, 32, 32, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -769,7 +769,7 @@ "Bounds": "8, 80, 30, 14" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -778,7 +778,7 @@ "Bounds": "8, 94, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -787,7 +787,7 @@ "Bounds": "14, 232, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -795,7 +795,7 @@ "Bounds": "16, 160, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -804,7 +804,7 @@ "Bounds": "30, 224, 32, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -812,7 +812,7 @@ "Bounds": "32, 94, 6, 14" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -822,7 +822,7 @@ "Bounds": "40, 32, 16, 32" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -830,7 +830,7 @@ "Bounds": "40, 160, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -846,7 +846,7 @@ "Bounds": "56, 32, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -855,7 +855,7 @@ "Bounds": "62, 216, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -863,7 +863,7 @@ "Bounds": "64, 160, 24, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -872,7 +872,7 @@ "Bounds": "64, 248, 24, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -880,7 +880,7 @@ "Bounds": "72, 80, 56, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -889,7 +889,7 @@ "Bounds": "78, 216, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -897,7 +897,7 @@ "Bounds": "88, 152, 24, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -905,7 +905,7 @@ "Bounds": "88, 168, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -922,7 +922,7 @@ "Bounds": "94, 216, 8, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -930,7 +930,7 @@ "Bounds": "112, 152, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -938,7 +938,7 @@ "Bounds": "112, 208, 14, 22" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -954,7 +954,7 @@ "Bounds": "120, 112, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -963,7 +963,7 @@ "Bounds": "126, 216, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -972,7 +972,7 @@ "Bounds": "126, 224, 32, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -980,7 +980,7 @@ "Bounds": "128, 72, 56, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -988,7 +988,7 @@ "Bounds": "128, 80, 56, 8" }, { - "Entities": [ + "Types": [ 168, 170, 193, @@ -998,7 +998,7 @@ "Bounds": "128, 152, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1007,7 +1007,7 @@ "Bounds": "134, 88, 48, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1015,7 +1015,7 @@ "Bounds": "144, 152, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1032,7 +1032,7 @@ "Bounds": "152, 40, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -1040,7 +1040,7 @@ "Bounds": "160, 152, 16, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1048,7 +1048,7 @@ "Bounds": "176, 158, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1064,7 +1064,7 @@ "Bounds": "182, 214, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1073,7 +1073,7 @@ "Bounds": "182, 230, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1089,7 +1089,7 @@ "Bounds": "192, 64, 16, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -1099,7 +1099,7 @@ "Bounds": "198, 214, 8, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1107,7 +1107,7 @@ "Bounds": "200, 158, 24, 16" }, { - "Entities": [ + "Types": [ 4, 315 ], @@ -1115,7 +1115,7 @@ "Bounds": "208, 206, 14, 22" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1124,7 +1124,7 @@ "Bounds": "214, 230, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1140,7 +1140,7 @@ "Bounds": "222, 214, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1156,7 +1156,7 @@ "Bounds": "224, 48, 16, 16" }, { - "Entities": [ + "Types": [ 1, 6, 7, @@ -1167,7 +1167,7 @@ "Bounds": "224, 126, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1175,7 +1175,7 @@ "Bounds": "224, 166, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1184,7 +1184,7 @@ "Bounds": "246, 230, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1201,7 +1201,7 @@ "Bounds": "248, 94, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1218,7 +1218,7 @@ "Bounds": "248, 134, 8, 16" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -1228,7 +1228,7 @@ "Bounds": "0, 64, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1237,7 +1237,7 @@ "Bounds": "0, 112, 24, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1245,7 +1245,7 @@ "Bounds": "0, 216, 8, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1254,7 +1254,7 @@ "Bounds": "8, 136, 8, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1262,7 +1262,7 @@ "Bounds": "8, 216, 8, 16" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -1272,7 +1272,7 @@ "Bounds": "16, 64, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1280,7 +1280,7 @@ "Bounds": "16, 216, 16, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1289,7 +1289,7 @@ "Bounds": "16, 224, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1298,7 +1298,7 @@ "Bounds": "24, 176, 8, 16" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -1308,7 +1308,7 @@ "Bounds": "32, 64, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1317,7 +1317,7 @@ "Bounds": "32, 176, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1326,7 +1326,7 @@ "Bounds": "32, 248, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1335,7 +1335,7 @@ "Bounds": "40, 176, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1344,7 +1344,7 @@ "Bounds": "40, 248, 8, 8" }, { - "Entities": [ + "Types": [ 215, 219 ], @@ -1352,7 +1352,7 @@ "Bounds": "48, 64, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1361,7 +1361,7 @@ "Bounds": "48, 248, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1370,7 +1370,7 @@ "Bounds": "56, 152, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1379,7 +1379,7 @@ "Bounds": "56, 176, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1388,7 +1388,7 @@ "Bounds": "56, 248, 8, 8" }, { - "Entities": [ + "Types": [ 232, 235 ], @@ -1396,7 +1396,7 @@ "Bounds": "64, 64, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1404,7 +1404,7 @@ "Bounds": "64, 96, 14, 14" }, { - "Entities": [ + "Types": [ 168, 170, 193, @@ -1414,7 +1414,7 @@ "Bounds": "64, 136, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1423,7 +1423,7 @@ "Bounds": "64, 248, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1432,7 +1432,7 @@ "Bounds": "72, 176, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1440,7 +1440,7 @@ "Bounds": "72, 216, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1449,7 +1449,7 @@ "Bounds": "72, 248, 8, 8" }, { - "Entities": [ + "Types": [ 241, 244, 245, @@ -1460,7 +1460,7 @@ "Bounds": "80, 64, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1469,7 +1469,7 @@ "Bounds": "80, 248, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1478,7 +1478,7 @@ "Bounds": "88, 176, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1487,7 +1487,7 @@ "Bounds": "88, 248, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1496,7 +1496,7 @@ "Bounds": "96, 248, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1504,7 +1504,7 @@ "Bounds": "104, 136, 24, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1512,7 +1512,7 @@ "Bounds": "104, 208, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1521,7 +1521,7 @@ "Bounds": "104, 248, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1530,7 +1530,7 @@ "Bounds": "112, 176, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1539,7 +1539,7 @@ "Bounds": "112, 248, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1548,7 +1548,7 @@ "Bounds": "120, 248, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1556,7 +1556,7 @@ "Bounds": "136, 142, 24, 8" }, { - "Entities": [ + "Types": [ 205, 208, 209, @@ -1566,7 +1566,7 @@ "Bounds": "136, 230, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1575,7 +1575,7 @@ "Bounds": "142, 110, 24, 8" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -1585,7 +1585,7 @@ "Bounds": "144, 230, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1594,7 +1594,7 @@ "Bounds": "144, 246, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1602,7 +1602,7 @@ "Bounds": "152, 32, 16, 16" }, { - "Entities": [ + "Types": [ 205, 208, 209, @@ -1618,7 +1618,7 @@ "Bounds": "152, 56, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1627,7 +1627,7 @@ "Bounds": "152, 182, 8, 16" }, { - "Entities": [ + "Types": [ 132, 133 ], @@ -1635,7 +1635,7 @@ "Bounds": "152, 214, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1644,7 +1644,7 @@ "Bounds": "152, 246, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1653,7 +1653,7 @@ "Bounds": "160, 182, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1662,7 +1662,7 @@ "Bounds": "160, 222, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1671,7 +1671,7 @@ "Bounds": "166, 110, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1679,7 +1679,7 @@ "Bounds": "168, 32, 16, 16" }, { - "Entities": [ + "Types": [ 205, 208, 209, @@ -1689,7 +1689,7 @@ "Bounds": "168, 56, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1698,7 +1698,7 @@ "Bounds": "168, 182, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1706,7 +1706,7 @@ "Bounds": "168, 214, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1715,7 +1715,7 @@ "Bounds": "176, 182, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1723,7 +1723,7 @@ "Bounds": "176, 214, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1732,7 +1732,7 @@ "Bounds": "176, 246, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1740,7 +1740,7 @@ "Bounds": "184, 32, 16, 16" }, { - "Entities": [ + "Types": [ 213, 216, 217, @@ -1750,7 +1750,7 @@ "Bounds": "184, 56, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1759,7 +1759,7 @@ "Bounds": "184, 174, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1767,7 +1767,7 @@ "Bounds": "184, 214, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1776,7 +1776,7 @@ "Bounds": "184, 246, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1785,7 +1785,7 @@ "Bounds": "190, 110, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1794,7 +1794,7 @@ "Bounds": "192, 174, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1803,7 +1803,7 @@ "Bounds": "200, 32, 16, 16" }, { - "Entities": [ + "Types": [ 213, 216, 217, @@ -1813,7 +1813,7 @@ "Bounds": "200, 56, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1822,7 +1822,7 @@ "Bounds": "200, 246, 8, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -1832,7 +1832,7 @@ "Bounds": "214, 96, 8, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1840,7 +1840,7 @@ "Bounds": "216, 32, 16, 16" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -1850,7 +1850,7 @@ "Bounds": "216, 56, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1859,7 +1859,7 @@ "Bounds": "216, 176, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1868,7 +1868,7 @@ "Bounds": "222, 104, 8, 24" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1876,7 +1876,7 @@ "Bounds": "222, 136, 8, 24" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1884,7 +1884,7 @@ "Bounds": "224, 216, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1893,7 +1893,7 @@ "Bounds": "230, 104, 24, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -1901,7 +1901,7 @@ "Bounds": "232, 32, 16, 16" }, { - "Entities": [ + "Types": [ 214, 218 ], @@ -1909,7 +1909,7 @@ "Bounds": "232, 56, 16, 16" }, { - "Entities": [ + "Types": [ 168, 170, 173, @@ -1921,7 +1921,7 @@ "Bounds": "232, 216, 16, 8" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -1931,7 +1931,7 @@ "Bounds": "238, 136, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1940,7 +1940,7 @@ "Bounds": "240, 176, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1949,7 +1949,7 @@ "Bounds": "248, 64, 8, 8" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1958,7 +1958,7 @@ "Bounds": "248, 216, 8, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1966,7 +1966,7 @@ "Bounds": "16, 16, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1974,7 +1974,7 @@ "Bounds": "32, 16, 8, 8" }, { - "Entities": [ + "Types": [ 185, 188, 349 @@ -1983,7 +1983,7 @@ "Bounds": "64, 16, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1991,7 +1991,7 @@ "Bounds": "112, 8, 8, 8" }, { - "Entities": [ + "Types": [ 205, 209, 217 @@ -2000,7 +2000,7 @@ "Bounds": "144, 16, 8, 8" }, { - "Entities": [ + "Types": [ 208, 212, 220 @@ -2009,7 +2009,7 @@ "Bounds": "152, 16, 8, 8" }, { - "Entities": [ + "Types": [ 213, 216, 217, @@ -2019,7 +2019,7 @@ "Bounds": "160, 16, 8, 8" }, { - "Entities": [ + "Types": [ 160, 185 ], @@ -2027,7 +2027,7 @@ "Bounds": "168, 8, 8, 8" }, { - "Entities": [ + "Types": [ 213, 216, 217, @@ -2037,7 +2037,7 @@ "Bounds": "168, 16, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -2045,7 +2045,7 @@ "Bounds": "176, 8, 8, 8" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -2055,7 +2055,7 @@ "Bounds": "176, 16, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -2063,7 +2063,7 @@ "Bounds": "184, 8, 8, 8" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -2073,7 +2073,7 @@ "Bounds": "184, 16, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -2081,7 +2081,7 @@ "Bounds": "192, 8, 8, 8" }, { - "Entities": [ + "Types": [ 217, 220 ], @@ -2089,7 +2089,7 @@ "Bounds": "192, 16, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -2097,7 +2097,7 @@ "Bounds": "200, 8, 8, 8" }, { - "Entities": [ + "Types": [ 218, 219 ], @@ -2105,7 +2105,7 @@ "Bounds": "200, 16, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -2113,7 +2113,7 @@ "Bounds": "208, 8, 8, 8" }, { - "Entities": [ + "Types": [ 244, 246 ], @@ -2121,7 +2121,7 @@ "Bounds": "208, 16, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -2129,7 +2129,7 @@ "Bounds": "216, 8, 8, 8" }, { - "Entities": [ + "Types": [ 244, 247 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CHAMBER.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CHAMBER.TR2-TextureRemap.json index ed17b9251..ef4cd0193 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CHAMBER.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CHAMBER.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -19,7 +19,7 @@ "Bounds": "0, 184, 64, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -37,7 +37,7 @@ "Bounds": "56, 160, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -46,7 +46,7 @@ "Bounds": "144, 232, 64, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -55,7 +55,7 @@ "Bounds": "232, 104, 24, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -63,7 +63,7 @@ "Bounds": "0, 52, 28, 28" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -80,7 +80,7 @@ "Bounds": "0, 116, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -88,7 +88,7 @@ "Bounds": "0, 148, 44, 12" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -96,7 +96,7 @@ "Bounds": "0, 160, 56, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -105,7 +105,7 @@ "Bounds": "0, 176, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -113,7 +113,7 @@ "Bounds": "24, 80, 4, 4" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -122,7 +122,7 @@ "Bounds": "24, 176, 24, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -131,7 +131,7 @@ "Bounds": "48, 182, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -140,7 +140,7 @@ "Bounds": "52, 56, 64, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -151,7 +151,7 @@ "Bounds": "96, 182, 24, 32" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -159,7 +159,7 @@ "Bounds": "104, 144, 6, 6" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -167,7 +167,7 @@ "Bounds": "110, 144, 6, 6" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -178,7 +178,7 @@ "Bounds": "120, 182, 24, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -189,7 +189,7 @@ "Bounds": "144, 182, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -197,7 +197,7 @@ "Bounds": "148, 98, 4, 3" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -206,7 +206,7 @@ "Bounds": "160, 22, 48, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -214,7 +214,7 @@ "Bounds": "160, 150, 56, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -222,7 +222,7 @@ "Bounds": "168, 94, 28, 36" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -233,7 +233,7 @@ "Bounds": "168, 182, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -250,7 +250,7 @@ "Bounds": "168, 238, 16, 8" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -261,7 +261,7 @@ "Bounds": "192, 182, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -279,7 +279,7 @@ "Bounds": "208, 134, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -297,7 +297,7 @@ "Bounds": "208, 214, 8, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -305,7 +305,7 @@ "Bounds": "208, 234, 28, 12" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -313,7 +313,7 @@ "Bounds": "214, 16, 14, 6" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -331,7 +331,7 @@ "Bounds": "216, 138, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -349,7 +349,7 @@ "Bounds": "216, 182, 8, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -357,7 +357,7 @@ "Bounds": "220, 94, 12, 12" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -365,7 +365,7 @@ "Bounds": "220, 110, 28, 28" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -374,7 +374,7 @@ "Bounds": "224, 138, 24, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -383,7 +383,7 @@ "Bounds": "224, 170, 24, 32" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -391,7 +391,7 @@ "Bounds": "228, 16, 14, 6" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -409,7 +409,7 @@ "Bounds": "248, 174, 8, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -417,7 +417,7 @@ "Bounds": "0, 168, 28, 20" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -426,7 +426,7 @@ "Bounds": "0, 220, 16, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -434,7 +434,7 @@ "Bounds": "0, 228, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -451,7 +451,7 @@ "Bounds": "32, 228, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -469,7 +469,7 @@ "Bounds": "40, 64, 8, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -477,7 +477,7 @@ "Bounds": "56, 243, 20, 12" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -486,7 +486,7 @@ "Bounds": "72, 160, 48, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -495,7 +495,7 @@ "Bounds": "72, 179, 32, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -504,7 +504,7 @@ "Bounds": "80, 195, 64, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -512,7 +512,7 @@ "Bounds": "96, 24, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -529,7 +529,7 @@ "Bounds": "104, 179, 16, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -538,7 +538,7 @@ "Bounds": "120, 88, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -555,7 +555,7 @@ "Bounds": "120, 128, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -563,7 +563,7 @@ "Bounds": "124, 168, 20, 27" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -580,7 +580,7 @@ "Bounds": "128, 24, 16, 8" }, { - "Entities": [ + "Types": [ 240, 244 ], @@ -588,7 +588,7 @@ "Bounds": "144, 152, 24, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -597,7 +597,7 @@ "Bounds": "152, 104, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -615,7 +615,7 @@ "Bounds": "160, 32, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -632,7 +632,7 @@ "Bounds": "176, 235, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -649,7 +649,7 @@ "Bounds": "192, 24, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -667,7 +667,7 @@ "Bounds": "248, 0, 8, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -675,7 +675,7 @@ "Bounds": "0, 112, 24, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -684,7 +684,7 @@ "Bounds": "0, 160, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -693,7 +693,7 @@ "Bounds": "0, 180, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -702,7 +702,7 @@ "Bounds": "40, 168, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -711,7 +711,7 @@ "Bounds": "40, 192, 32, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -719,7 +719,7 @@ "Bounds": "56, 96, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -727,7 +727,7 @@ "Bounds": "56, 112, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -736,7 +736,7 @@ "Bounds": "64, 144, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -745,7 +745,7 @@ "Bounds": "64, 200, 8, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -754,7 +754,7 @@ "Bounds": "64, 240, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -763,7 +763,7 @@ "Bounds": "72, 128, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -772,7 +772,7 @@ "Bounds": "72, 184, 32, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -780,7 +780,7 @@ "Bounds": "80, 8, 56, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -789,7 +789,7 @@ "Bounds": "80, 24, 48, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -797,7 +797,7 @@ "Bounds": "80, 96, 16, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -805,7 +805,7 @@ "Bounds": "80, 240, 16, 16" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -813,7 +813,7 @@ "Bounds": "96, 96, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -822,7 +822,7 @@ "Bounds": "96, 136, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -831,7 +831,7 @@ "Bounds": "96, 208, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -840,7 +840,7 @@ "Bounds": "104, 184, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -849,7 +849,7 @@ "Bounds": "112, 96, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -858,7 +858,7 @@ "Bounds": "112, 216, 8, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -866,7 +866,7 @@ "Bounds": "112, 240, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -883,7 +883,7 @@ "Bounds": "120, 144, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -892,7 +892,7 @@ "Bounds": "120, 168, 8, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -900,7 +900,7 @@ "Bounds": "128, 96, 16, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -908,7 +908,7 @@ "Bounds": "136, 8, 56, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -926,7 +926,7 @@ "Bounds": "144, 48, 8, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -934,7 +934,7 @@ "Bounds": "144, 104, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -942,7 +942,7 @@ "Bounds": "152, 16, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -950,7 +950,7 @@ "Bounds": "152, 120, 12, 12" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -959,7 +959,7 @@ "Bounds": "152, 188, 32, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -967,7 +967,7 @@ "Bounds": "160, 236, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -975,7 +975,7 @@ "Bounds": "168, 100, 24, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -983,7 +983,7 @@ "Bounds": "168, 116, 24, 16" }, { - "Entities": [ + "Types": [ 6, 7, 8, @@ -993,7 +993,7 @@ "Bounds": "168, 148, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1002,7 +1002,7 @@ "Bounds": "176, 228, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1010,7 +1010,7 @@ "Bounds": "176, 239, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1019,7 +1019,7 @@ "Bounds": "184, 28, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1028,7 +1028,7 @@ "Bounds": "184, 191, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1036,7 +1036,7 @@ "Bounds": "192, 0, 56, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1044,7 +1044,7 @@ "Bounds": "192, 8, 20, 20" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1052,7 +1052,7 @@ "Bounds": "192, 100, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1061,7 +1061,7 @@ "Bounds": "200, 191, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1069,7 +1069,7 @@ "Bounds": "200, 236, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -1077,7 +1077,7 @@ "Bounds": "208, 96, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1095,7 +1095,7 @@ "Bounds": "212, 8, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1113,7 +1113,7 @@ "Bounds": "216, 120, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1122,7 +1122,7 @@ "Bounds": "216, 187, 32, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1130,7 +1130,7 @@ "Bounds": "224, 96, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1138,7 +1138,7 @@ "Bounds": "224, 112, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1146,7 +1146,7 @@ "Bounds": "244, 8, 12, 20" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1164,7 +1164,7 @@ "Bounds": "248, 96, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1173,7 +1173,7 @@ "Bounds": "0, 92, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1182,7 +1182,7 @@ "Bounds": "16, 92, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1191,7 +1191,7 @@ "Bounds": "16, 124, 8, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1199,7 +1199,7 @@ "Bounds": "16, 164, 8, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1208,7 +1208,7 @@ "Bounds": "24, 124, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1217,7 +1217,7 @@ "Bounds": "32, 92, 16, 8" }, { - "Entities": [ + "Types": [ 40, 50 ], @@ -1225,7 +1225,7 @@ "Bounds": "32, 100, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1233,7 +1233,7 @@ "Bounds": "32, 116, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1242,7 +1242,7 @@ "Bounds": "32, 148, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1250,7 +1250,7 @@ "Bounds": "32, 164, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1258,7 +1258,7 @@ "Bounds": "40, 116, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1267,7 +1267,7 @@ "Bounds": "40, 148, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1276,7 +1276,7 @@ "Bounds": "48, 92, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1285,7 +1285,7 @@ "Bounds": "48, 152, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1294,7 +1294,7 @@ "Bounds": "56, 152, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1303,7 +1303,7 @@ "Bounds": "62, 40, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1312,7 +1312,7 @@ "Bounds": "64, 72, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1320,7 +1320,7 @@ "Bounds": "64, 116, 8, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1329,7 +1329,7 @@ "Bounds": "72, 56, 8, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1337,7 +1337,7 @@ "Bounds": "72, 116, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1345,7 +1345,7 @@ "Bounds": "80, 120, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1354,7 +1354,7 @@ "Bounds": "80, 152, 8, 8" }, { - "Entities": [ + "Types": [ 160, 185 ], @@ -1362,7 +1362,7 @@ "Bounds": "80, 160, 8, 8" }, { - "Entities": [ + "Types": [ 240, 242, 244, @@ -1374,7 +1374,7 @@ "Bounds": "84, 168, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1383,7 +1383,7 @@ "Bounds": "88, 152, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1391,7 +1391,7 @@ "Bounds": "88, 160, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1399,7 +1399,7 @@ "Bounds": "96, 112, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1408,7 +1408,7 @@ "Bounds": "102, 148, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1416,7 +1416,7 @@ "Bounds": "104, 116, 8, 16" }, { - "Entities": [ + "Types": [ 185, 188 ], @@ -1424,7 +1424,7 @@ "Bounds": "104, 164, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1433,7 +1433,7 @@ "Bounds": "110, 32, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1441,7 +1441,7 @@ "Bounds": "112, 116, 16, 8" }, { - "Entities": [ + "Types": [ 240, 243, 244, @@ -1452,7 +1452,7 @@ "Bounds": "112, 168, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1460,7 +1460,7 @@ "Bounds": "118, 160, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1469,7 +1469,7 @@ "Bounds": "120, 84, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1478,7 +1478,7 @@ "Bounds": "120, 152, 8, 8" }, { - "Entities": [ + "Types": [ 240, 244 ], @@ -1486,7 +1486,7 @@ "Bounds": "120, 168, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1494,7 +1494,7 @@ "Bounds": "126, 160, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1502,7 +1502,7 @@ "Bounds": "128, 56, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1511,7 +1511,7 @@ "Bounds": "128, 88, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1520,7 +1520,7 @@ "Bounds": "128, 152, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1529,7 +1529,7 @@ "Bounds": "134, 32, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1538,7 +1538,7 @@ "Bounds": "144, 88, 8, 16" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1546,7 +1546,7 @@ "Bounds": "144, 158, 8, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1554,7 +1554,7 @@ "Bounds": "152, 56, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1563,7 +1563,7 @@ "Bounds": "158, 32, 24, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1571,7 +1571,7 @@ "Bounds": "160, 56, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1580,7 +1580,7 @@ "Bounds": "160, 80, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1588,7 +1588,7 @@ "Bounds": "160, 140, 6, 14" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1596,7 +1596,7 @@ "Bounds": "166, 140, 6, 14" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1605,7 +1605,7 @@ "Bounds": "168, 84, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1613,7 +1613,7 @@ "Bounds": "168, 160, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1622,7 +1622,7 @@ "Bounds": "176, 84, 16, 8" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1630,7 +1630,7 @@ "Bounds": "176, 120, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1638,7 +1638,7 @@ "Bounds": "176, 160, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1647,7 +1647,7 @@ "Bounds": "182, 32, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1655,7 +1655,7 @@ "Bounds": "184, 160, 8, 8" }, { - "Entities": [ + "Types": [ 240, 244 ], @@ -1663,7 +1663,7 @@ "Bounds": "192, 0, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1672,7 +1672,7 @@ "Bounds": "198, 88, 16, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1680,7 +1680,7 @@ "Bounds": "200, 56, 24, 8" }, { - "Entities": [ + "Types": [ 240, 241, 242, @@ -1698,7 +1698,7 @@ "Bounds": "208, 0, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1707,7 +1707,7 @@ "Bounds": "214, 32, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1716,7 +1716,7 @@ "Bounds": "214, 88, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1725,7 +1725,7 @@ "Bounds": "224, 80, 8, 16" }, { - "Entities": [ + "Types": [ 240, 244 ], @@ -1733,7 +1733,7 @@ "Bounds": "224, 128, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1742,7 +1742,7 @@ "Bounds": "232, 88, 16, 8" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1752,7 +1752,7 @@ "Bounds": "232, 120, 16, 8" }, { - "Entities": [ + "Types": [ 242, 246 ], @@ -1760,7 +1760,7 @@ "Bounds": "240, 128, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1769,7 +1769,7 @@ "Bounds": "246, 104, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1778,7 +1778,7 @@ "Bounds": "248, 88, 8, 16" }, { - "Entities": [ + "Types": [ 172, 197, 310 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CITY.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CITY.TR2-TextureRemap.json index 5a0467069..323733e47 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CITY.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CITY.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 349, 370 ], @@ -10,7 +10,7 @@ "Bounds": "0, 192, 64, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -19,7 +19,7 @@ "Bounds": "0, 248, 64, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -27,7 +27,7 @@ "Bounds": "64, 0, 72, 96" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -35,7 +35,7 @@ "Bounds": "100, 208, 12, 12" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -51,7 +51,7 @@ "Bounds": "144, 246, 8, 8" }, { - "Entities": [ + "Types": [ 131, 132 ], @@ -59,7 +59,7 @@ "Bounds": "200, 0, 48, 48" }, { - "Entities": [ + "Types": [ 131, 132 ], @@ -67,7 +67,7 @@ "Bounds": "200, 48, 48, 48" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -76,7 +76,7 @@ "Bounds": "232, 248, 24, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -84,7 +84,7 @@ "Bounds": "0, 52, 28, 12" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -93,7 +93,7 @@ "Bounds": "28, 48, 64, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -102,7 +102,7 @@ "Bounds": "64, 64, 24, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -110,7 +110,7 @@ "Bounds": "88, 64, 4, 4" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -127,7 +127,7 @@ "Bounds": "112, 216, 16, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -136,7 +136,7 @@ "Bounds": "140, 16, 48, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -153,7 +153,7 @@ "Bounds": "156, 56, 8, 24" }, { - "Entities": [ + "Types": [ 135, 205, 209 @@ -162,7 +162,7 @@ "Bounds": "156, 80, 32, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -170,7 +170,7 @@ "Bounds": "188, 80, 4, 3" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -178,7 +178,7 @@ "Bounds": "192, 212, 28, 36" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -194,7 +194,7 @@ "Bounds": "240, 240, 16, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -203,7 +203,7 @@ "Bounds": "0, 32, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -211,7 +211,7 @@ "Bounds": "0, 208, 20, 27" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -220,7 +220,7 @@ "Bounds": "24, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -237,7 +237,7 @@ "Bounds": "40, 128, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -246,7 +246,7 @@ "Bounds": "48, 32, 24, 32" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -254,7 +254,7 @@ "Bounds": "48, 96, 32, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -263,7 +263,7 @@ "Bounds": "72, 32, 24, 32" }, { - "Entities": [ + "Types": [ 205, 209 ], @@ -271,7 +271,7 @@ "Bounds": "72, 188, 24, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -279,7 +279,7 @@ "Bounds": "112, 0, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -295,7 +295,7 @@ "Bounds": "112, 247, 16, 8" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -306,7 +306,7 @@ "Bounds": "120, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -323,7 +323,7 @@ "Bounds": "120, 128, 8, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -332,7 +332,7 @@ "Bounds": "120, 212, 32, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -341,7 +341,7 @@ "Bounds": "120, 231, 64, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -349,7 +349,7 @@ "Bounds": "128, 100, 32, 24" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -357,7 +357,7 @@ "Bounds": "128, 239, 32, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -368,7 +368,7 @@ "Bounds": "144, 32, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -376,7 +376,7 @@ "Bounds": "144, 64, 20, 12" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -385,7 +385,7 @@ "Bounds": "144, 124, 16, 40" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -393,7 +393,7 @@ "Bounds": "168, 0, 56, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -401,7 +401,7 @@ "Bounds": "168, 16, 28, 28" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -412,7 +412,7 @@ "Bounds": "168, 44, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -420,7 +420,7 @@ "Bounds": "168, 188, 44, 12" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -437,7 +437,7 @@ "Bounds": "184, 136, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -446,7 +446,7 @@ "Bounds": "184, 224, 64, 8" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -457,7 +457,7 @@ "Bounds": "192, 48, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -473,7 +473,7 @@ "Bounds": "196, 16, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -481,7 +481,7 @@ "Bounds": "200, 80, 12, 12" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -492,7 +492,7 @@ "Bounds": "216, 60, 24, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -501,7 +501,7 @@ "Bounds": "220, 28, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -509,7 +509,7 @@ "Bounds": "220, 204, 28, 20" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -517,7 +517,7 @@ "Bounds": "224, 0, 28, 28" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -533,7 +533,7 @@ "Bounds": "224, 164, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -549,7 +549,7 @@ "Bounds": "240, 72, 16, 16" }, { - "Entities": [ + "Types": [ 205, 209, 213, @@ -559,7 +559,7 @@ "Bounds": "240, 156, 8, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -576,7 +576,7 @@ "Bounds": "240, 188, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -593,7 +593,7 @@ "Bounds": "248, 220, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -610,7 +610,7 @@ "Bounds": "0, 64, 8, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -618,7 +618,7 @@ "Bounds": "0, 80, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -627,7 +627,7 @@ "Bounds": "0, 152, 32, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -635,7 +635,7 @@ "Bounds": "0, 208, 16, 16" }, { - "Entities": [ + "Types": [ 205, 209 ], @@ -643,7 +643,7 @@ "Bounds": "8, 0, 16, 32" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -651,7 +651,7 @@ "Bounds": "8, 32, 56, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -659,7 +659,7 @@ "Bounds": "16, 112, 16, 24" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -667,7 +667,7 @@ "Bounds": "16, 208, 16, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -675,7 +675,7 @@ "Bounds": "24, 0, 16, 32" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -683,7 +683,7 @@ "Bounds": "24, 88, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -691,7 +691,7 @@ "Bounds": "32, 40, 16, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -700,7 +700,7 @@ "Bounds": "32, 152, 32, 8" }, { - "Entities": [ + "Types": [ 119, 121 ], @@ -708,7 +708,7 @@ "Bounds": "32, 168, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -716,7 +716,7 @@ "Bounds": "32, 184, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -724,7 +724,7 @@ "Bounds": "40, 80, 24, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -732,7 +732,7 @@ "Bounds": "48, 184, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -741,7 +741,7 @@ "Bounds": "56, 112, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -750,7 +750,7 @@ "Bounds": "56, 248, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -759,7 +759,7 @@ "Bounds": "64, 32, 48, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -768,7 +768,7 @@ "Bounds": "64, 40, 48, 8" }, { - "Entities": [ + "Types": [ 131, 132 ], @@ -776,7 +776,7 @@ "Bounds": "64, 64, 48, 8" }, { - "Entities": [ + "Types": [ 135, 213, 217 @@ -785,7 +785,7 @@ "Bounds": "64, 72, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -793,7 +793,7 @@ "Bounds": "64, 88, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -809,7 +809,7 @@ "Bounds": "68, 144, 16, 16" }, { - "Entities": [ + "Types": [ 119, 121 ], @@ -817,7 +817,7 @@ "Bounds": "80, 163, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -825,7 +825,7 @@ "Bounds": "88, 72, 24, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -833,7 +833,7 @@ "Bounds": "88, 88, 24, 16" }, { - "Entities": [ + "Types": [ 6, 7, 8, @@ -843,7 +843,7 @@ "Bounds": "100, 136, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -852,7 +852,7 @@ "Bounds": "104, 248, 24, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -861,7 +861,7 @@ "Bounds": "112, 88, 16, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -869,7 +869,7 @@ "Bounds": "128, 72, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -878,7 +878,7 @@ "Bounds": "132, 144, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -886,7 +886,7 @@ "Bounds": "144, 80, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -895,7 +895,7 @@ "Bounds": "148, 144, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -904,7 +904,7 @@ "Bounds": "148, 154, 32, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -912,7 +912,7 @@ "Bounds": "152, 16, 56, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -920,7 +920,7 @@ "Bounds": "152, 24, 56, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -929,7 +929,7 @@ "Bounds": "158, 244, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -938,7 +938,7 @@ "Bounds": "160, 40, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -947,7 +947,7 @@ "Bounds": "160, 96, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -963,7 +963,7 @@ "Bounds": "160, 136, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -971,7 +971,7 @@ "Bounds": "168, 80, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -980,7 +980,7 @@ "Bounds": "176, 136, 8, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -989,7 +989,7 @@ "Bounds": "176, 186, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -998,7 +998,7 @@ "Bounds": "180, 154, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1007,7 +1007,7 @@ "Bounds": "182, 244, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1015,7 +1015,7 @@ "Bounds": "184, 64, 16, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1023,7 +1023,7 @@ "Bounds": "192, 188, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -1031,7 +1031,7 @@ "Bounds": "200, 74, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1039,7 +1039,7 @@ "Bounds": "208, 30, 20, 20" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1047,7 +1047,7 @@ "Bounds": "208, 98, 6, 14" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1056,7 +1056,7 @@ "Bounds": "208, 148, 32, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -1064,7 +1064,7 @@ "Bounds": "208, 188, 16, 16" }, { - "Entities": [ + "Types": [ 205, 209, 217 @@ -1073,7 +1073,7 @@ "Bounds": "208, 204, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1081,7 +1081,7 @@ "Bounds": "216, 50, 6, 6" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1089,7 +1089,7 @@ "Bounds": "216, 72, 16, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1097,7 +1097,7 @@ "Bounds": "222, 50, 6, 6" }, { - "Entities": [ + "Types": [ 119, 121 ], @@ -1105,7 +1105,7 @@ "Bounds": "228, 163, 16, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1113,7 +1113,7 @@ "Bounds": "228, 179, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1122,7 +1122,7 @@ "Bounds": "232, 72, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1130,7 +1130,7 @@ "Bounds": "232, 80, 24, 16" }, { - "Entities": [ + "Types": [ 205, 209, 217 @@ -1139,7 +1139,7 @@ "Bounds": "240, 96, 16, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1148,7 +1148,7 @@ "Bounds": "240, 147, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1165,7 +1165,7 @@ "Bounds": "248, 0, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1174,7 +1174,7 @@ "Bounds": "0, 56, 8, 16" }, { - "Entities": [ + "Types": [ 205, 209 ], @@ -1182,7 +1182,7 @@ "Bounds": "0, 80, 8, 16" }, { - "Entities": [ + "Types": [ 160, 185 ], @@ -1190,7 +1190,7 @@ "Bounds": "0, 112, 8, 8" }, { - "Entities": [ + "Types": [ 205, 209 ], @@ -1198,7 +1198,7 @@ "Bounds": "0, 120, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1207,7 +1207,7 @@ "Bounds": "6, 96, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1216,7 +1216,7 @@ "Bounds": "8, 56, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1224,7 +1224,7 @@ "Bounds": "16, 20, 24, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1232,7 +1232,7 @@ "Bounds": "16, 116, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1248,7 +1248,7 @@ "Bounds": "22, 36, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1257,7 +1257,7 @@ "Bounds": "22, 52, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1266,7 +1266,7 @@ "Bounds": "22, 100, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1275,7 +1275,7 @@ "Bounds": "30, 100, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1283,7 +1283,7 @@ "Bounds": "32, 0, 12, 20" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1292,7 +1292,7 @@ "Bounds": "38, 52, 16, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1300,7 +1300,7 @@ "Bounds": "40, 20, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1309,7 +1309,7 @@ "Bounds": "46, 100, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1317,7 +1317,7 @@ "Bounds": "46, 116, 8, 8" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1325,7 +1325,7 @@ "Bounds": "48, 68, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1334,7 +1334,7 @@ "Bounds": "54, 52, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1343,7 +1343,7 @@ "Bounds": "54, 100, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1352,7 +1352,7 @@ "Bounds": "62, 100, 8, 8" }, { - "Entities": [ + "Types": [ 119, 121 ], @@ -1360,7 +1360,7 @@ "Bounds": "62, 108, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1368,7 +1368,7 @@ "Bounds": "70, 60, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1376,7 +1376,7 @@ "Bounds": "70, 113, 8, 8" }, { - "Entities": [ + "Types": [ 205, 209 ], @@ -1384,7 +1384,7 @@ "Bounds": "72, 20, 8, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1392,7 +1392,7 @@ "Bounds": "72, 76, 6, 14" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1400,7 +1400,7 @@ "Bounds": "72, 91, 14, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1409,7 +1409,7 @@ "Bounds": "72, 97, 8, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1418,7 +1418,7 @@ "Bounds": "78, 75, 8, 16" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1426,7 +1426,7 @@ "Bounds": "80, 19, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1443,7 +1443,7 @@ "Bounds": "92, 0, 8, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1451,7 +1451,7 @@ "Bounds": "94, 112, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1468,7 +1468,7 @@ "Bounds": "100, 0, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1477,7 +1477,7 @@ "Bounds": "100, 96, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1485,7 +1485,7 @@ "Bounds": "102, 112, 8, 8" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1495,7 +1495,7 @@ "Bounds": "104, 72, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1512,7 +1512,7 @@ "Bounds": "108, 0, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1521,7 +1521,7 @@ "Bounds": "108, 96, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1529,7 +1529,7 @@ "Bounds": "110, 112, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1538,7 +1538,7 @@ "Bounds": "112, 48, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1555,7 +1555,7 @@ "Bounds": "116, 0, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1564,7 +1564,7 @@ "Bounds": "116, 96, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1572,7 +1572,7 @@ "Bounds": "118, 112, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1581,7 +1581,7 @@ "Bounds": "124, 96, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1590,7 +1590,7 @@ "Bounds": "132, 0, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1599,7 +1599,7 @@ "Bounds": "132, 100, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1607,7 +1607,7 @@ "Bounds": "136, 68, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1616,7 +1616,7 @@ "Bounds": "140, 0, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1625,7 +1625,7 @@ "Bounds": "140, 100, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1634,7 +1634,7 @@ "Bounds": "152, 52, 16, 8" }, { - "Entities": [ + "Types": [ 134, 185, 188 @@ -1643,7 +1643,7 @@ "Bounds": "156, 108, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1652,7 +1652,7 @@ "Bounds": "162, 100, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1661,7 +1661,7 @@ "Bounds": "164, 0, 24, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1669,7 +1669,7 @@ "Bounds": "164, 108, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1678,7 +1678,7 @@ "Bounds": "168, 52, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1687,7 +1687,7 @@ "Bounds": "184, 44, 8, 16" }, { - "Entities": [ + "Types": [ 86, 119, 121 @@ -1696,7 +1696,7 @@ "Bounds": "184, 60, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1705,7 +1705,7 @@ "Bounds": "188, 0, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1714,7 +1714,7 @@ "Bounds": "192, 52, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1722,7 +1722,7 @@ "Bounds": "200, 60, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1731,7 +1731,7 @@ "Bounds": "208, 44, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1739,7 +1739,7 @@ "Bounds": "208, 60, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1748,7 +1748,7 @@ "Bounds": "212, 0, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1757,7 +1757,7 @@ "Bounds": "216, 44, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1765,7 +1765,7 @@ "Bounds": "216, 60, 8, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1774,7 +1774,7 @@ "Bounds": "220, 8, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1783,7 +1783,7 @@ "Bounds": "224, 44, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1791,7 +1791,7 @@ "Bounds": "224, 60, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1799,7 +1799,7 @@ "Bounds": "226, 112, 8, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1807,7 +1807,7 @@ "Bounds": "228, 8, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1816,7 +1816,7 @@ "Bounds": "232, 48, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1824,7 +1824,7 @@ "Bounds": "232, 64, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1833,7 +1833,7 @@ "Bounds": "232, 96, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1841,7 +1841,7 @@ "Bounds": "240, 64, 16, 8" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1850,7 +1850,7 @@ "Bounds": "240, 72, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1858,7 +1858,7 @@ "Bounds": "240, 88, 14, 6" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1867,7 +1867,7 @@ "Bounds": "248, 48, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199, 309 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/COMPOUND.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/COMPOUND.TR2-TextureRemap.json index 7db27682d..84e115f54 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/COMPOUND.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/COMPOUND.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 224, 225, 228, @@ -20,7 +20,7 @@ "Bounds": "64, 208, 64, 32" }, { - "Entities": [ + "Types": [ 132, 133 ], @@ -28,7 +28,7 @@ "Bounds": "72, 0, 64, 80" }, { - "Entities": [ + "Types": [ 136, 139 ], @@ -36,7 +36,7 @@ "Bounds": "72, 144, 64, 64" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -53,7 +53,7 @@ "Bounds": "240, 40, 8, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -62,7 +62,7 @@ "Bounds": "240, 152, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -79,7 +79,7 @@ "Bounds": "240, 192, 16, 8" }, { - "Entities": [ + "Types": [ 131, 134 ], @@ -87,7 +87,7 @@ "Bounds": "248, 40, 8, 64" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -104,7 +104,7 @@ "Bounds": "248, 104, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -112,7 +112,7 @@ "Bounds": "0, 216, 56, 16" }, { - "Entities": [ + "Types": [ 352, 354 ], @@ -120,7 +120,7 @@ "Bounds": "32, 136, 32, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -129,7 +129,7 @@ "Bounds": "32, 232, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -147,7 +147,7 @@ "Bounds": "56, 200, 8, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -156,7 +156,7 @@ "Bounds": "56, 224, 24, 32" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -164,7 +164,7 @@ "Bounds": "80, 224, 6, 6" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -173,7 +173,7 @@ "Bounds": "80, 246, 48, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -181,7 +181,7 @@ "Bounds": "88, 184, 30, 30" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -189,7 +189,7 @@ "Bounds": "96, 64, 30, 38" }, { - "Entities": [ + "Types": [ 352, 354 ], @@ -197,7 +197,7 @@ "Bounds": "112, 102, 8, 1" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -205,7 +205,7 @@ "Bounds": "118, 184, 30, 30" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -214,7 +214,7 @@ "Bounds": "126, 88, 64, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -223,7 +223,7 @@ "Bounds": "128, 48, 32, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -231,7 +231,7 @@ "Bounds": "144, 224, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -248,7 +248,7 @@ "Bounds": "148, 184, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -257,7 +257,7 @@ "Bounds": "160, 104, 24, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -265,7 +265,7 @@ "Bounds": "184, 104, 6, 6" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -282,7 +282,7 @@ "Bounds": "190, 88, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -299,7 +299,7 @@ "Bounds": "204, 192, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -316,7 +316,7 @@ "Bounds": "204, 208, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -325,7 +325,7 @@ "Bounds": "208, 56, 48, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -333,7 +333,7 @@ "Bounds": "224, 0, 32, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -342,7 +342,7 @@ "Bounds": "228, 208, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -359,7 +359,7 @@ "Bounds": "236, 240, 16, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -373,7 +373,7 @@ "Bounds": "0, 0, 24, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -387,7 +387,7 @@ "Bounds": "24, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -404,7 +404,7 @@ "Bounds": "24, 152, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -422,7 +422,7 @@ "Bounds": "24, 168, 14, 5" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -430,7 +430,7 @@ "Bounds": "40, 144, 22, 29" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -444,7 +444,7 @@ "Bounds": "48, 0, 24, 32" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -453,7 +453,7 @@ "Bounds": "48, 120, 32, 8" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -464,7 +464,7 @@ "Bounds": "96, 0, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -473,7 +473,7 @@ "Bounds": "104, 233, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -482,7 +482,7 @@ "Bounds": "104, 241, 64, 8" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -493,7 +493,7 @@ "Bounds": "120, 0, 24, 32" }, { - "Entities": [ + "Types": [ 351, 354 ], @@ -501,7 +501,7 @@ "Bounds": "120, 209, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -519,7 +519,7 @@ "Bounds": "142, 249, 14, 5" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -527,7 +527,7 @@ "Bounds": "156, 249, 6, 6" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -535,7 +535,7 @@ "Bounds": "176, 96, 30, 22" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -543,7 +543,7 @@ "Bounds": "176, 118, 14, 6" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -551,7 +551,7 @@ "Bounds": "190, 118, 14, 6" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -560,7 +560,7 @@ "Bounds": "196, 156, 32, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -568,7 +568,7 @@ "Bounds": "206, 96, 46, 14" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -585,7 +585,7 @@ "Bounds": "228, 156, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -594,7 +594,7 @@ "Bounds": "0, 0, 64, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -602,7 +602,7 @@ "Bounds": "0, 40, 56, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -610,7 +610,7 @@ "Bounds": "0, 128, 24, 16" }, { - "Entities": [ + "Types": [ 351, 354 ], @@ -618,7 +618,7 @@ "Bounds": "0, 160, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -636,7 +636,7 @@ "Bounds": "0, 192, 14, 5" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -646,7 +646,7 @@ "Bounds": "14, 192, 6, 5" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -664,7 +664,7 @@ "Bounds": "24, 120, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -674,7 +674,7 @@ "Bounds": "24, 136, 6, 5" }, { - "Entities": [ + "Types": [ 4, 315 ], @@ -682,7 +682,7 @@ "Bounds": "32, 72, 6, 22" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -690,7 +690,7 @@ "Bounds": "32, 118, 16, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -698,7 +698,7 @@ "Bounds": "40, 56, 6, 14" }, { - "Entities": [ + "Types": [ 351, 352, 354 @@ -707,7 +707,7 @@ "Bounds": "40, 158, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -716,7 +716,7 @@ "Bounds": "40, 198, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -725,7 +725,7 @@ "Bounds": "48, 54, 24, 16" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -733,7 +733,7 @@ "Bounds": "48, 118, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -741,7 +741,7 @@ "Bounds": "50, 206, 14, 14" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -749,7 +749,7 @@ "Bounds": "56, 32, 56, 8" }, { - "Entities": [ + "Types": [ 351, 354 ], @@ -757,7 +757,7 @@ "Bounds": "56, 158, 16, 24" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -765,7 +765,7 @@ "Bounds": "64, 118, 16, 24" }, { - "Entities": [ + "Types": [ 351, 354 ], @@ -773,7 +773,7 @@ "Bounds": "72, 160, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -781,7 +781,7 @@ "Bounds": "72, 200, 14, 22" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -789,7 +789,7 @@ "Bounds": "80, 128, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -798,7 +798,7 @@ "Bounds": "86, 208, 32, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -807,7 +807,7 @@ "Bounds": "86, 216, 32, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -816,7 +816,7 @@ "Bounds": "112, 24, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -824,7 +824,7 @@ "Bounds": "112, 32, 56, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -832,7 +832,7 @@ "Bounds": "112, 120, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -841,7 +841,7 @@ "Bounds": "118, 208, 16, 16" }, { - "Entities": [ + "Types": [ 135, 136 ], @@ -849,7 +849,7 @@ "Bounds": "128, 0, 64, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -859,7 +859,7 @@ "Bounds": "128, 250, 14, 5" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -867,7 +867,7 @@ "Bounds": "136, 120, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -885,7 +885,7 @@ "Bounds": "136, 184, 8, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -893,7 +893,7 @@ "Bounds": "136, 204, 22, 14" }, { - "Entities": [ + "Types": [ 352, 354 ], @@ -901,7 +901,7 @@ "Bounds": "144, 164, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -910,7 +910,7 @@ "Bounds": "150, 218, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -928,7 +928,7 @@ "Bounds": "152, 56, 8, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -937,7 +937,7 @@ "Bounds": "152, 104, 24, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -945,7 +945,7 @@ "Bounds": "160, 116, 24, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -953,7 +953,7 @@ "Bounds": "160, 132, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -962,7 +962,7 @@ "Bounds": "160, 180, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -971,7 +971,7 @@ "Bounds": "166, 228, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -980,7 +980,7 @@ "Bounds": "180, 52, 48, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -988,7 +988,7 @@ "Bounds": "184, 116, 16, 24" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -996,7 +996,7 @@ "Bounds": "192, 0, 32, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1005,7 +1005,7 @@ "Bounds": "192, 206, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1014,7 +1014,7 @@ "Bounds": "198, 244, 24, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1022,7 +1022,7 @@ "Bounds": "200, 126, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1030,7 +1030,7 @@ "Bounds": "208, 16, 22, 22" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1038,7 +1038,7 @@ "Bounds": "208, 38, 30, 14" }, { - "Entities": [ + "Types": [ 4, 315 ], @@ -1046,7 +1046,7 @@ "Bounds": "208, 206, 6, 5" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1054,7 +1054,7 @@ "Bounds": "216, 118, 24, 16" }, { - "Entities": [ + "Types": [ 4, 315 ], @@ -1062,7 +1062,7 @@ "Bounds": "216, 190, 14, 22" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1070,7 +1070,7 @@ "Bounds": "224, 212, 6, 5" }, { - "Entities": [ + "Types": [ 1, 6, 7, @@ -1081,7 +1081,7 @@ "Bounds": "228, 52, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1090,7 +1090,7 @@ "Bounds": "230, 206, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1098,7 +1098,7 @@ "Bounds": "240, 126, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1116,7 +1116,7 @@ "Bounds": "244, 62, 8, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1124,7 +1124,7 @@ "Bounds": "0, 32, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1142,7 +1142,7 @@ "Bounds": "0, 104, 8, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1150,7 +1150,7 @@ "Bounds": "0, 200, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1158,7 +1158,7 @@ "Bounds": "0, 232, 6, 14" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -1168,7 +1168,7 @@ "Bounds": "6, 232, 6, 13" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1186,7 +1186,7 @@ "Bounds": "8, 104, 8, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1194,7 +1194,7 @@ "Bounds": "8, 200, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -1204,7 +1204,7 @@ "Bounds": "12, 232, 14, 5" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1213,7 +1213,7 @@ "Bounds": "12, 237, 8, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1222,7 +1222,7 @@ "Bounds": "16, 32, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1240,7 +1240,7 @@ "Bounds": "16, 104, 8, 24" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1249,7 +1249,7 @@ "Bounds": "16, 208, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1258,7 +1258,7 @@ "Bounds": "20, 237, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1266,7 +1266,7 @@ "Bounds": "22, 248, 8, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -1276,7 +1276,7 @@ "Bounds": "24, 104, 8, 24" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1285,7 +1285,7 @@ "Bounds": "24, 128, 8, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1293,7 +1293,7 @@ "Bounds": "24, 200, 8, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1301,7 +1301,7 @@ "Bounds": "32, 32, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1310,7 +1310,7 @@ "Bounds": "32, 160, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1318,7 +1318,7 @@ "Bounds": "32, 200, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1327,7 +1327,7 @@ "Bounds": "40, 104, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1336,7 +1336,7 @@ "Bounds": "40, 160, 8, 16" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -1344,7 +1344,7 @@ "Bounds": "48, 32, 16, 16" }, { - "Entities": [ + "Types": [ 352, 354 ], @@ -1352,7 +1352,7 @@ "Bounds": "48, 72, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1361,7 +1361,7 @@ "Bounds": "48, 160, 8, 16" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1369,7 +1369,7 @@ "Bounds": "48, 200, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1378,7 +1378,7 @@ "Bounds": "56, 160, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1387,7 +1387,7 @@ "Bounds": "56, 208, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -1397,7 +1397,7 @@ "Bounds": "56, 232, 14, 5" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1406,7 +1406,7 @@ "Bounds": "56, 237, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1415,7 +1415,7 @@ "Bounds": "64, 160, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1424,7 +1424,7 @@ "Bounds": "64, 168, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1433,7 +1433,7 @@ "Bounds": "64, 208, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1442,7 +1442,7 @@ "Bounds": "64, 237, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1451,7 +1451,7 @@ "Bounds": "72, 168, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1459,7 +1459,7 @@ "Bounds": "80, 128, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1468,7 +1468,7 @@ "Bounds": "80, 160, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1477,7 +1477,7 @@ "Bounds": "80, 168, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -1487,7 +1487,7 @@ "Bounds": "80, 232, 14, 5" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1496,7 +1496,7 @@ "Bounds": "80, 237, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1505,7 +1505,7 @@ "Bounds": "94, 232, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1514,7 +1514,7 @@ "Bounds": "96, 160, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1523,7 +1523,7 @@ "Bounds": "102, 232, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1532,7 +1532,7 @@ "Bounds": "104, 104, 24, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1540,7 +1540,7 @@ "Bounds": "104, 128, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1549,7 +1549,7 @@ "Bounds": "110, 232, 8, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1557,7 +1557,7 @@ "Bounds": "112, 128, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1566,7 +1566,7 @@ "Bounds": "112, 160, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1574,7 +1574,7 @@ "Bounds": "112, 200, 16, 8" }, { - "Entities": [ + "Types": [ 160, 185 ], @@ -1582,7 +1582,7 @@ "Bounds": "112, 248, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1591,7 +1591,7 @@ "Bounds": "118, 232, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1600,7 +1600,7 @@ "Bounds": "120, 88, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1608,7 +1608,7 @@ "Bounds": "120, 128, 24, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1616,7 +1616,7 @@ "Bounds": "120, 248, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1625,7 +1625,7 @@ "Bounds": "126, 232, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1643,7 +1643,7 @@ "Bounds": "128, 32, 8, 16" }, { - "Entities": [ + "Types": [ 205, 206, 209, @@ -1653,7 +1653,7 @@ "Bounds": "128, 48, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1662,7 +1662,7 @@ "Bounds": "128, 104, 24, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1670,7 +1670,7 @@ "Bounds": "128, 248, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1679,7 +1679,7 @@ "Bounds": "134, 232, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1688,7 +1688,7 @@ "Bounds": "142, 238, 8, 8" }, { - "Entities": [ + "Types": [ 213, 214, 217, @@ -1698,7 +1698,7 @@ "Bounds": "144, 48, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1707,7 +1707,7 @@ "Bounds": "152, 110, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1716,7 +1716,7 @@ "Bounds": "152, 166, 16, 8" }, { - "Entities": [ + "Types": [ 213, 214, 217, @@ -1726,7 +1726,7 @@ "Bounds": "160, 48, 16, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -1736,7 +1736,7 @@ "Bounds": "168, 134, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1745,7 +1745,7 @@ "Bounds": "168, 166, 8, 16" }, { - "Entities": [ + "Types": [ 232, 233 ], @@ -1753,7 +1753,7 @@ "Bounds": "176, 48, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1762,7 +1762,7 @@ "Bounds": "176, 110, 24, 8" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1772,7 +1772,7 @@ "Bounds": "176, 206, 16, 8" }, { - "Entities": [ + "Types": [ 205, 206, 209, @@ -1782,7 +1782,7 @@ "Bounds": "184, 214, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1791,7 +1791,7 @@ "Bounds": "200, 110, 24, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1799,7 +1799,7 @@ "Bounds": "200, 198, 8, 16" }, { - "Entities": [ + "Types": [ 244, 245, 246, @@ -1809,7 +1809,7 @@ "Bounds": "208, 48, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1817,7 +1817,7 @@ "Bounds": "208, 198, 8, 16" }, { - "Entities": [ + "Types": [ 132, 133 ], @@ -1825,7 +1825,7 @@ "Bounds": "208, 246, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1833,7 +1833,7 @@ "Bounds": "216, 16, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1841,7 +1841,7 @@ "Bounds": "216, 198, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1850,7 +1850,7 @@ "Bounds": "224, 164, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1859,7 +1859,7 @@ "Bounds": "224, 236, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1867,7 +1867,7 @@ "Bounds": "232, 16, 16, 16" }, { - "Entities": [ + "Types": [ 205, 206, 209, @@ -1883,7 +1883,7 @@ "Bounds": "232, 32, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1892,7 +1892,7 @@ "Bounds": "232, 236, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1900,7 +1900,7 @@ "Bounds": "240, 88, 14, 14" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1909,7 +1909,7 @@ "Bounds": "240, 164, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1918,7 +1918,7 @@ "Bounds": "240, 236, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1936,7 +1936,7 @@ "Bounds": "248, 32, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1945,7 +1945,7 @@ "Bounds": "248, 236, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1953,7 +1953,7 @@ "Bounds": "0, 0, 8, 8" }, { - "Entities": [ + "Types": [ 244, 246 ], @@ -1961,7 +1961,7 @@ "Bounds": "0, 8, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1969,7 +1969,7 @@ "Bounds": "8, 0, 8, 8" }, { - "Entities": [ + "Types": [ 244, 247 ], @@ -1977,7 +1977,7 @@ "Bounds": "8, 8, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1985,7 +1985,7 @@ "Bounds": "16, 0, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1993,7 +1993,7 @@ "Bounds": "24, 0, 8, 8" }, { - "Entities": [ + "Types": [ 352, 354 ], @@ -2001,7 +2001,7 @@ "Bounds": "56, 16, 8, 8" }, { - "Entities": [ + "Types": [ 352, 354 ], @@ -2009,7 +2009,7 @@ "Bounds": "64, 16, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -2017,7 +2017,7 @@ "Bounds": "88, 0, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -2025,7 +2025,7 @@ "Bounds": "104, 0, 8, 8" }, { - "Entities": [ + "Types": [ 185, 188 ], @@ -2033,7 +2033,7 @@ "Bounds": "136, 0, 8, 8" }, { - "Entities": [ + "Types": [ 205, 209, 217 @@ -2042,7 +2042,7 @@ "Bounds": "216, 0, 8, 8" }, { - "Entities": [ + "Types": [ 206, 210, 218 @@ -2051,7 +2051,7 @@ "Bounds": "224, 0, 8, 8" }, { - "Entities": [ + "Types": [ 213, 214, 217, @@ -2061,7 +2061,7 @@ "Bounds": "232, 0, 8, 8" }, { - "Entities": [ + "Types": [ 213, 214, 217, @@ -2071,7 +2071,7 @@ "Bounds": "240, 0, 8, 8" }, { - "Entities": [ + "Types": [ 217, 218 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CRASH.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CRASH.TR2-TextureRemap.json index d02b17426..a5e9f5ecf 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CRASH.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/CRASH.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 139, 140, 142 @@ -19,7 +19,7 @@ "Bounds": "64, 128, 64, 64" }, { - "Entities": [ + "Types": [ 1, 5, 6, @@ -31,7 +31,7 @@ "Bounds": "248, 40, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -40,7 +40,7 @@ "Bounds": "0, 128, 48, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -49,7 +49,7 @@ "Bounds": "0, 168, 64, 16" }, { - "Entities": [ + "Types": [ 232, 233 ], @@ -57,7 +57,7 @@ "Bounds": "0, 200, 32, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -76,7 +76,7 @@ "Bounds": "48, 128, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -84,7 +84,7 @@ "Bounds": "64, 120, 40, 32" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -92,7 +92,7 @@ "Bounds": "64, 192, 14, 6" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -110,7 +110,7 @@ "Bounds": "96, 198, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -118,7 +118,7 @@ "Bounds": "96, 240, 56, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -126,7 +126,7 @@ "Bounds": "104, 152, 32, 32" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -135,7 +135,7 @@ "Bounds": "104, 184, 32, 8" }, { - "Entities": [ + "Types": [ 139, 140, 142 @@ -144,7 +144,7 @@ "Bounds": "104, 192, 64, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -162,7 +162,7 @@ "Bounds": "136, 152, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -180,7 +180,7 @@ "Bounds": "144, 104, 16, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -188,7 +188,7 @@ "Bounds": "144, 120, 32, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -206,7 +206,7 @@ "Bounds": "152, 240, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -214,7 +214,7 @@ "Bounds": "168, 160, 8, 24" }, { - "Entities": [ + "Types": [ 139, 140, 142 @@ -223,7 +223,7 @@ "Bounds": "168, 184, 64, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -231,7 +231,7 @@ "Bounds": "176, 152, 32, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -239,7 +239,7 @@ "Bounds": "216, 96, 32, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -257,7 +257,7 @@ "Bounds": "216, 232, 16, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -266,7 +266,7 @@ "Bounds": "232, 184, 8, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -281,7 +281,7 @@ "Bounds": "0, 32, 24, 32" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -289,7 +289,7 @@ "Bounds": "0, 64, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -308,7 +308,7 @@ "Bounds": "0, 112, 16, 40" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -316,7 +316,7 @@ "Bounds": "0, 200, 24, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -325,7 +325,7 @@ "Bounds": "0, 248, 64, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -344,7 +344,7 @@ "Bounds": "16, 112, 16, 40" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -359,7 +359,7 @@ "Bounds": "24, 32, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -367,7 +367,7 @@ "Bounds": "24, 176, 24, 24" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -375,7 +375,7 @@ "Bounds": "24, 200, 24, 24" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -383,7 +383,7 @@ "Bounds": "32, 64, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -402,7 +402,7 @@ "Bounds": "32, 112, 16, 40" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -417,7 +417,7 @@ "Bounds": "48, 32, 24, 32" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -426,7 +426,7 @@ "Bounds": "48, 112, 32, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -434,7 +434,7 @@ "Bounds": "48, 176, 24, 24" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -442,7 +442,7 @@ "Bounds": "48, 200, 24, 24" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -450,7 +450,7 @@ "Bounds": "56, 64, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -459,7 +459,7 @@ "Bounds": "64, 248, 64, 8" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -474,7 +474,7 @@ "Bounds": "72, 32, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -493,7 +493,7 @@ "Bounds": "72, 176, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -502,7 +502,7 @@ "Bounds": "72, 184, 48, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -510,7 +510,7 @@ "Bounds": "72, 200, 24, 24" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -518,7 +518,7 @@ "Bounds": "80, 64, 24, 32" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -526,7 +526,7 @@ "Bounds": "88, 0, 56, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -534,7 +534,7 @@ "Bounds": "96, 200, 24, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -543,7 +543,7 @@ "Bounds": "112, 112, 16, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -551,7 +551,7 @@ "Bounds": "120, 200, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -570,7 +570,7 @@ "Bounds": "128, 112, 16, 40" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -579,7 +579,7 @@ "Bounds": "128, 248, 64, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -587,7 +587,7 @@ "Bounds": "144, 0, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -606,7 +606,7 @@ "Bounds": "144, 112, 16, 40" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -615,7 +615,7 @@ "Bounds": "144, 200, 24, 24" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -624,7 +624,7 @@ "Bounds": "168, 200, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -642,7 +642,7 @@ "Bounds": "176, 64, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -650,7 +650,7 @@ "Bounds": "176, 80, 32, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -659,7 +659,7 @@ "Bounds": "192, 152, 32, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -668,7 +668,7 @@ "Bounds": "192, 200, 24, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -677,7 +677,7 @@ "Bounds": "192, 248, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -695,7 +695,7 @@ "Bounds": "200, 16, 24, 32" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -703,7 +703,7 @@ "Bounds": "216, 192, 24, 24" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -718,7 +718,7 @@ "Bounds": "224, 16, 24, 32" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -727,7 +727,7 @@ "Bounds": "224, 128, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -746,7 +746,7 @@ "Bounds": "224, 184, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -755,7 +755,7 @@ "Bounds": "232, 168, 24, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -763,7 +763,7 @@ "Bounds": "0, 72, 56, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -772,7 +772,7 @@ "Bounds": "0, 232, 16, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -781,7 +781,7 @@ "Bounds": "0, 248, 32, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -789,7 +789,7 @@ "Bounds": "16, 88, 24, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -798,7 +798,7 @@ "Bounds": "16, 104, 16, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -806,7 +806,7 @@ "Bounds": "16, 128, 24, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -814,7 +814,7 @@ "Bounds": "32, 0, 32, 16" }, { - "Entities": [ + "Types": [ 5, 160, 185 @@ -823,7 +823,7 @@ "Bounds": "32, 104, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -831,7 +831,7 @@ "Bounds": "40, 88, 16, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -839,7 +839,7 @@ "Bounds": "40, 128, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -848,7 +848,7 @@ "Bounds": "56, 216, 32, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -856,7 +856,7 @@ "Bounds": "64, 88, 24, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -865,7 +865,7 @@ "Bounds": "64, 104, 16, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -873,7 +873,7 @@ "Bounds": "64, 128, 16, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -882,7 +882,7 @@ "Bounds": "64, 248, 16, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -891,7 +891,7 @@ "Bounds": "80, 104, 24, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -899,7 +899,7 @@ "Bounds": "80, 120, 24, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -907,7 +907,7 @@ "Bounds": "80, 136, 24, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -915,7 +915,7 @@ "Bounds": "88, 88, 24, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -924,7 +924,7 @@ "Bounds": "104, 104, 24, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -932,7 +932,7 @@ "Bounds": "104, 120, 16, 24" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -940,7 +940,7 @@ "Bounds": "112, 88, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -948,7 +948,7 @@ "Bounds": "112, 224, 16, 16" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -957,7 +957,7 @@ "Bounds": "120, 120, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -966,7 +966,7 @@ "Bounds": "120, 200, 8, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -975,7 +975,7 @@ "Bounds": "128, 104, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -983,7 +983,7 @@ "Bounds": "128, 224, 16, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -991,7 +991,7 @@ "Bounds": "128, 240, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1000,7 +1000,7 @@ "Bounds": "136, 88, 8, 16" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1008,7 +1008,7 @@ "Bounds": "136, 120, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1017,7 +1017,7 @@ "Bounds": "144, 56, 48, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1025,7 +1025,7 @@ "Bounds": "144, 64, 56, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1033,7 +1033,7 @@ "Bounds": "144, 160, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1042,7 +1042,7 @@ "Bounds": "144, 208, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1050,7 +1050,7 @@ "Bounds": "144, 224, 16, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1058,7 +1058,7 @@ "Bounds": "144, 240, 16, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1067,7 +1067,7 @@ "Bounds": "152, 104, 24, 16" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -1075,7 +1075,7 @@ "Bounds": "152, 120, 16, 24" }, { - "Entities": [ + "Types": [ 224, 225, 228, @@ -1087,7 +1087,7 @@ "Bounds": "152, 144, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1096,7 +1096,7 @@ "Bounds": "160, 168, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1105,7 +1105,7 @@ "Bounds": "160, 224, 16, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1113,7 +1113,7 @@ "Bounds": "160, 240, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1121,7 +1121,7 @@ "Bounds": "168, 120, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1130,7 +1130,7 @@ "Bounds": "176, 80, 24, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1138,7 +1138,7 @@ "Bounds": "176, 96, 16, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1147,7 +1147,7 @@ "Bounds": "176, 224, 16, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1155,7 +1155,7 @@ "Bounds": "176, 240, 16, 16" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -1163,7 +1163,7 @@ "Bounds": "192, 0, 32, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1171,7 +1171,7 @@ "Bounds": "192, 120, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1180,7 +1180,7 @@ "Bounds": "192, 224, 32, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1188,7 +1188,7 @@ "Bounds": "192, 240, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1196,7 +1196,7 @@ "Bounds": "200, 64, 56, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1204,7 +1204,7 @@ "Bounds": "208, 240, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1212,7 +1212,7 @@ "Bounds": "216, 120, 24, 16" }, { - "Entities": [ + "Types": [ 224, 225, 228, @@ -1224,7 +1224,7 @@ "Bounds": "224, 0, 32, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1233,7 +1233,7 @@ "Bounds": "224, 168, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1251,7 +1251,7 @@ "Bounds": "224, 216, 16, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1259,7 +1259,7 @@ "Bounds": "224, 240, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1267,7 +1267,7 @@ "Bounds": "240, 128, 16, 24" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1275,7 +1275,7 @@ "Bounds": "240, 240, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1284,7 +1284,7 @@ "Bounds": "248, 80, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1293,7 +1293,7 @@ "Bounds": "248, 208, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1301,7 +1301,7 @@ "Bounds": "0, 0, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1310,7 +1310,7 @@ "Bounds": "0, 104, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1319,7 +1319,7 @@ "Bounds": "0, 136, 16, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1327,7 +1327,7 @@ "Bounds": "0, 144, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1335,7 +1335,7 @@ "Bounds": "0, 160, 8, 16" }, { - "Entities": [ + "Types": [ 232, 233 ], @@ -1343,7 +1343,7 @@ "Bounds": "0, 176, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1351,7 +1351,7 @@ "Bounds": "0, 208, 14, 6" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1359,7 +1359,7 @@ "Bounds": "8, 144, 16, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1368,7 +1368,7 @@ "Bounds": "8, 152, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1376,7 +1376,7 @@ "Bounds": "8, 160, 8, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1384,7 +1384,7 @@ "Bounds": "8, 216, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1393,7 +1393,7 @@ "Bounds": "14, 208, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1401,7 +1401,7 @@ "Bounds": "16, 0, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1410,7 +1410,7 @@ "Bounds": "16, 136, 16, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1418,7 +1418,7 @@ "Bounds": "16, 160, 8, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1426,7 +1426,7 @@ "Bounds": "16, 216, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1435,7 +1435,7 @@ "Bounds": "22, 208, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1444,7 +1444,7 @@ "Bounds": "24, 96, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1453,7 +1453,7 @@ "Bounds": "24, 104, 24, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1461,7 +1461,7 @@ "Bounds": "24, 144, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1469,7 +1469,7 @@ "Bounds": "24, 160, 8, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1477,7 +1477,7 @@ "Bounds": "24, 216, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1486,7 +1486,7 @@ "Bounds": "30, 208, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1494,7 +1494,7 @@ "Bounds": "32, 0, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1503,7 +1503,7 @@ "Bounds": "32, 136, 16, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1511,7 +1511,7 @@ "Bounds": "32, 144, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1519,7 +1519,7 @@ "Bounds": "32, 160, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1528,7 +1528,7 @@ "Bounds": "32, 176, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1536,7 +1536,7 @@ "Bounds": "32, 216, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1545,7 +1545,7 @@ "Bounds": "38, 208, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1553,7 +1553,7 @@ "Bounds": "40, 144, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1561,7 +1561,7 @@ "Bounds": "40, 160, 16, 8" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1570,7 +1570,7 @@ "Bounds": "40, 168, 8, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1578,7 +1578,7 @@ "Bounds": "40, 216, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1586,7 +1586,7 @@ "Bounds": "40, 224, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1595,7 +1595,7 @@ "Bounds": "46, 208, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1603,7 +1603,7 @@ "Bounds": "48, 0, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1612,7 +1612,7 @@ "Bounds": "48, 96, 24, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1620,7 +1620,7 @@ "Bounds": "48, 104, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1628,7 +1628,7 @@ "Bounds": "48, 112, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1637,7 +1637,7 @@ "Bounds": "48, 136, 16, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1645,7 +1645,7 @@ "Bounds": "48, 144, 16, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1654,7 +1654,7 @@ "Bounds": "48, 152, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1663,7 +1663,7 @@ "Bounds": "48, 168, 8, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1671,7 +1671,7 @@ "Bounds": "48, 216, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1680,7 +1680,7 @@ "Bounds": "54, 208, 8, 8" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1688,7 +1688,7 @@ "Bounds": "56, 160, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1697,7 +1697,7 @@ "Bounds": "56, 176, 8, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1706,7 +1706,7 @@ "Bounds": "56, 216, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1714,7 +1714,7 @@ "Bounds": "56, 224, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1723,7 +1723,7 @@ "Bounds": "62, 208, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1731,7 +1731,7 @@ "Bounds": "64, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1740,7 +1740,7 @@ "Bounds": "64, 48, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1749,7 +1749,7 @@ "Bounds": "64, 136, 8, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1758,7 +1758,7 @@ "Bounds": "64, 152, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1767,7 +1767,7 @@ "Bounds": "64, 168, 8, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1776,7 +1776,7 @@ "Bounds": "64, 216, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1785,7 +1785,7 @@ "Bounds": "70, 208, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1793,7 +1793,7 @@ "Bounds": "72, 16, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1802,7 +1802,7 @@ "Bounds": "72, 96, 24, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1810,7 +1810,7 @@ "Bounds": "72, 104, 24, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1818,7 +1818,7 @@ "Bounds": "72, 112, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1827,7 +1827,7 @@ "Bounds": "72, 136, 8, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1836,7 +1836,7 @@ "Bounds": "72, 152, 8, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1845,7 +1845,7 @@ "Bounds": "72, 216, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1854,7 +1854,7 @@ "Bounds": "78, 208, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1862,7 +1862,7 @@ "Bounds": "80, 0, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1870,7 +1870,7 @@ "Bounds": "80, 112, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1879,7 +1879,7 @@ "Bounds": "80, 136, 8, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1888,7 +1888,7 @@ "Bounds": "80, 152, 16, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1897,7 +1897,7 @@ "Bounds": "80, 216, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1905,7 +1905,7 @@ "Bounds": "88, 16, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1914,7 +1914,7 @@ "Bounds": "88, 136, 8, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1923,7 +1923,7 @@ "Bounds": "88, 216, 8, 8" }, { - "Entities": [ + "Types": [ 185, 188 ], @@ -1931,7 +1931,7 @@ "Bounds": "88, 224, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1939,7 +1939,7 @@ "Bounds": "96, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1948,7 +1948,7 @@ "Bounds": "96, 96, 24, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1956,7 +1956,7 @@ "Bounds": "96, 104, 24, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1965,7 +1965,7 @@ "Bounds": "96, 152, 16, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1974,7 +1974,7 @@ "Bounds": "96, 216, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1982,7 +1982,7 @@ "Bounds": "104, 16, 16, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -1991,7 +1991,7 @@ "Bounds": "104, 216, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -1999,7 +1999,7 @@ "Bounds": "112, 0, 16, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -2007,7 +2007,7 @@ "Bounds": "112, 144, 16, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2016,7 +2016,7 @@ "Bounds": "112, 152, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -2025,7 +2025,7 @@ "Bounds": "120, 16, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -2034,7 +2034,7 @@ "Bounds": "120, 96, 24, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -2042,7 +2042,7 @@ "Bounds": "120, 104, 24, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2051,7 +2051,7 @@ "Bounds": "120, 152, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -2059,7 +2059,7 @@ "Bounds": "120, 160, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -2067,7 +2067,7 @@ "Bounds": "120, 240, 6, 6" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -2075,7 +2075,7 @@ "Bounds": "126, 240, 6, 6" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -2083,7 +2083,7 @@ "Bounds": "128, 0, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -2091,7 +2091,7 @@ "Bounds": "136, 16, 16, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2100,7 +2100,7 @@ "Bounds": "136, 152, 8, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2109,7 +2109,7 @@ "Bounds": "144, 0, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -2118,7 +2118,7 @@ "Bounds": "144, 96, 24, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2127,7 +2127,7 @@ "Bounds": "144, 104, 24, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -2135,7 +2135,7 @@ "Bounds": "144, 216, 8, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -2143,7 +2143,7 @@ "Bounds": "152, 16, 16, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -2151,7 +2151,7 @@ "Bounds": "152, 144, 8, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2160,7 +2160,7 @@ "Bounds": "160, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -2169,7 +2169,7 @@ "Bounds": "160, 56, 8, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -2177,7 +2177,7 @@ "Bounds": "160, 144, 16, 8" }, { - "Entities": [ + "Types": [ 38, 354 ], @@ -2185,7 +2185,7 @@ "Bounds": "160, 152, 16, 8" }, { - "Entities": [ + "Types": [ 224, 225, 228, @@ -2197,7 +2197,7 @@ "Bounds": "168, 32, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -2206,7 +2206,7 @@ "Bounds": "168, 96, 8, 8" }, { - "Entities": [ + "Types": [ 224, 225, 228, @@ -2218,7 +2218,7 @@ "Bounds": "168, 224, 8, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2227,7 +2227,7 @@ "Bounds": "176, 0, 16, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2236,7 +2236,7 @@ "Bounds": "176, 144, 8, 16" }, { - "Entities": [ + "Types": [ 224, 225, 228, @@ -2248,7 +2248,7 @@ "Bounds": "176, 224, 8, 8" }, { - "Entities": [ + "Types": [ 38, 354 ], @@ -2256,7 +2256,7 @@ "Bounds": "184, 152, 16, 8" }, { - "Entities": [ + "Types": [ 168, 170, 173, @@ -2267,7 +2267,7 @@ "Bounds": "184, 160, 16, 8" }, { - "Entities": [ + "Types": [ 244, 246 ], @@ -2275,7 +2275,7 @@ "Bounds": "184, 224, 8, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2284,7 +2284,7 @@ "Bounds": "192, 0, 16, 16" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -2292,7 +2292,7 @@ "Bounds": "192, 144, 16, 8" }, { - "Entities": [ + "Types": [ 244, 247 ], @@ -2300,7 +2300,7 @@ "Bounds": "192, 224, 8, 8" }, { - "Entities": [ + "Types": [ 244, 245, 246, @@ -2310,7 +2310,7 @@ "Bounds": "200, 32, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -2318,7 +2318,7 @@ "Bounds": "200, 216, 8, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2327,7 +2327,7 @@ "Bounds": "208, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -2336,7 +2336,7 @@ "Bounds": "208, 128, 8, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2345,7 +2345,7 @@ "Bounds": "208, 144, 16, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -2353,7 +2353,7 @@ "Bounds": "208, 216, 8, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -2362,7 +2362,7 @@ "Bounds": "216, 104, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -2371,7 +2371,7 @@ "Bounds": "216, 128, 8, 16" }, { - "Entities": [ + "Types": [ 224, 225, 272, @@ -2381,7 +2381,7 @@ "Bounds": "216, 168, 16, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -2389,7 +2389,7 @@ "Bounds": "216, 216, 8, 8" }, { - "Entities": [ + "Types": [ 38, 354 ], @@ -2397,7 +2397,7 @@ "Bounds": "224, 0, 16, 16" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2406,7 +2406,7 @@ "Bounds": "224, 88, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -2415,7 +2415,7 @@ "Bounds": "224, 128, 16, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -2423,7 +2423,7 @@ "Bounds": "224, 136, 16, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2432,7 +2432,7 @@ "Bounds": "224, 144, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -2440,7 +2440,7 @@ "Bounds": "224, 216, 8, 8" }, { - "Entities": [ + "Types": [ 38, 288 ], @@ -2448,7 +2448,7 @@ "Bounds": "232, 88, 8, 24" }, { - "Entities": [ + "Types": [ 224, 225, 228, @@ -2460,7 +2460,7 @@ "Bounds": "232, 168, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -2468,7 +2468,7 @@ "Bounds": "232, 200, 6, 14" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -2476,7 +2476,7 @@ "Bounds": "238, 200, 6, 14" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -2485,7 +2485,7 @@ "Bounds": "240, 128, 16, 8" }, { - "Entities": [ + "Types": [ 37, 352 ], @@ -2493,7 +2493,7 @@ "Bounds": "240, 136, 16, 8" }, { - "Entities": [ + "Types": [ 38, 288, 354 @@ -2502,7 +2502,7 @@ "Bounds": "240, 144, 16, 8" }, { - "Entities": [ + "Types": [ 224, 225, 228, @@ -2514,7 +2514,7 @@ "Bounds": "240, 168, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -2522,7 +2522,7 @@ "Bounds": "240, 216, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -2531,7 +2531,7 @@ "Bounds": "244, 200, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -2540,7 +2540,7 @@ "Bounds": "248, 48, 8, 16" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -2549,7 +2549,7 @@ "Bounds": "248, 104, 8, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -2557,7 +2557,7 @@ "Bounds": "248, 152, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/HOUSE.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/HOUSE.TR2-TextureRemap.json index 81de77b0c..2039362bb 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/HOUSE.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/HOUSE.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 131, 133 ], @@ -18,7 +18,7 @@ "Bounds": "0, 96, 64, 64" }, { - "Entities": [ + "Types": [ 135, 138 ], @@ -26,7 +26,7 @@ "Bounds": "64, 128, 64, 64" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -38,7 +38,7 @@ "Bounds": "40, 192, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -49,7 +49,7 @@ "Bounds": "48, 152, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -60,7 +60,7 @@ "Bounds": "80, 208, 8, 8" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -68,7 +68,7 @@ "Bounds": "120, 224, 48, 32" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -80,7 +80,7 @@ "Bounds": "216, 224, 8, 16" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -88,7 +88,7 @@ "Bounds": "0, 224, 24, 32" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -96,7 +96,7 @@ "Bounds": "24, 214, 24, 32" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -104,7 +104,7 @@ "Bounds": "24, 246, 24, 8" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -112,7 +112,7 @@ "Bounds": "48, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -124,7 +124,7 @@ "Bounds": "54, 184, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -135,7 +135,7 @@ "Bounds": "72, 24, 16, 24" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -143,7 +143,7 @@ "Bounds": "72, 224, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -155,7 +155,7 @@ "Bounds": "96, 64, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -166,7 +166,7 @@ "Bounds": "96, 112, 16, 16" }, { - "Entities": [ + "Types": [ 351, 352 ], @@ -174,7 +174,7 @@ "Bounds": "136, 56, 32, 40" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -185,7 +185,7 @@ "Bounds": "140, 208, 8, 8" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -193,7 +193,7 @@ "Bounds": "146, 216, 6, 5" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -201,7 +201,7 @@ "Bounds": "152, 192, 6, 13" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -213,7 +213,7 @@ "Bounds": "192, 16, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -225,7 +225,7 @@ "Bounds": "208, 206, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -236,7 +236,7 @@ "Bounds": "216, 190, 24, 32" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -244,7 +244,7 @@ "Bounds": "222, 222, 24, 32" }, { - "Entities": [ + "Types": [ 351, 352 ], @@ -252,7 +252,7 @@ "Bounds": "0, 144, 24, 24" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -260,7 +260,7 @@ "Bounds": "0, 224, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -272,7 +272,7 @@ "Bounds": "56, 56, 8, 24" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -280,7 +280,7 @@ "Bounds": "120, 198, 24, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -288,7 +288,7 @@ "Bounds": "128, 246, 56, 8" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -296,7 +296,7 @@ "Bounds": "168, 102, 6, 5" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -308,7 +308,7 @@ "Bounds": "184, 56, 8, 16" }, { - "Entities": [ + "Types": [ 118, 127, 135, @@ -320,7 +320,7 @@ "Bounds": "184, 246, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -328,7 +328,7 @@ "Bounds": "192, 32, 24, 16" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -336,7 +336,7 @@ "Bounds": "192, 166, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -347,7 +347,7 @@ "Bounds": "216, 72, 8, 8" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -355,7 +355,7 @@ "Bounds": "216, 166, 24, 24" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -363,7 +363,7 @@ "Bounds": "0, 46, 24, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -371,7 +371,7 @@ "Bounds": "16, 246, 16, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -379,7 +379,7 @@ "Bounds": "40, 62, 8, 8" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -387,7 +387,7 @@ "Bounds": "56, 193, 16, 16" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -395,7 +395,7 @@ "Bounds": "64, 70, 8, 16" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -403,7 +403,7 @@ "Bounds": "72, 192, 16, 16" }, { - "Entities": [ + "Types": [ 160, 185 ], @@ -411,7 +411,7 @@ "Bounds": "78, 161, 8, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -419,7 +419,7 @@ "Bounds": "80, 248, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -430,7 +430,7 @@ "Bounds": "86, 144, 16, 16" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -438,7 +438,7 @@ "Bounds": "88, 192, 16, 16" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -446,7 +446,7 @@ "Bounds": "96, 224, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -457,7 +457,7 @@ "Bounds": "102, 144, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -468,7 +468,7 @@ "Bounds": "118, 144, 16, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -476,7 +476,7 @@ "Bounds": "142, 176, 16, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -484,7 +484,7 @@ "Bounds": "160, 244, 24, 8" }, { - "Entities": [ + "Types": [ 135, 138 ], @@ -492,7 +492,7 @@ "Bounds": "166, 56, 8, 8" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -500,7 +500,7 @@ "Bounds": "174, 196, 16, 16" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -508,7 +508,7 @@ "Bounds": "190, 196, 16, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -516,7 +516,7 @@ "Bounds": "238, 180, 8, 8" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -524,7 +524,7 @@ "Bounds": "238, 190, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -536,7 +536,7 @@ "Bounds": "246, 62, 8, 16" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -544,7 +544,7 @@ "Bounds": "0, 64, 16, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -552,7 +552,7 @@ "Bounds": "32, 86, 8, 8" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -560,7 +560,7 @@ "Bounds": "40, 64, 16, 8" }, { - "Entities": [ + "Types": [ 360, 361 ], @@ -568,7 +568,7 @@ "Bounds": "64, 24, 24, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -576,7 +576,7 @@ "Bounds": "72, 96, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -588,7 +588,7 @@ "Bounds": "74, 0, 8, 24" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -596,7 +596,7 @@ "Bounds": "80, 96, 8, 8" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -604,7 +604,7 @@ "Bounds": "82, 0, 8, 24" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -612,7 +612,7 @@ "Bounds": "88, 48, 8, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -620,7 +620,7 @@ "Bounds": "96, 48, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -632,7 +632,7 @@ "Bounds": "200, 80, 14, 5" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -640,7 +640,7 @@ "Bounds": "200, 85, 14, 5" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -652,7 +652,7 @@ "Bounds": "214, 80, 14, 5" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -660,7 +660,7 @@ "Bounds": "214, 85, 14, 5" }, { - "Entities": [ + "Types": [ 0, 1, 5, @@ -672,7 +672,7 @@ "Bounds": "228, 80, 14, 5" }, { - "Entities": [ + "Types": [ 1, 315 ], @@ -680,7 +680,7 @@ "Bounds": "228, 85, 14, 5" }, { - "Entities": [ + "Types": [ 1, 315 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/JUNGLE.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/JUNGLE.TR2-TextureRemap.json index f794419e2..89b624021 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/JUNGLE.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/JUNGLE.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 3, 161, 186 @@ -11,7 +11,7 @@ "Bounds": "40, 128, 24, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -20,7 +20,7 @@ "Bounds": "56, 232, 48, 24" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -28,7 +28,7 @@ "Bounds": "64, 0, 72, 96" }, { - "Entities": [ + "Types": [ 1, 5, 6, @@ -40,7 +40,7 @@ "Bounds": "80, 184, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -58,7 +58,7 @@ "Bounds": "104, 232, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -67,7 +67,7 @@ "Bounds": "104, 240, 64, 16" }, { - "Entities": [ + "Types": [ 114, 131, 138, @@ -77,7 +77,7 @@ "Bounds": "136, 0, 64, 64" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -85,7 +85,7 @@ "Bounds": "144, 168, 80, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -94,7 +94,7 @@ "Bounds": "168, 240, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -113,7 +113,7 @@ "Bounds": "192, 224, 24, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -127,7 +127,7 @@ "Bounds": "0, 144, 24, 32" }, { - "Entities": [ + "Types": [ 1, 3, 6, @@ -139,7 +139,7 @@ "Bounds": "24, 144, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -148,7 +148,7 @@ "Bounds": "32, 32, 8, 24" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -157,7 +157,7 @@ "Bounds": "32, 56, 32, 32" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -166,7 +166,7 @@ "Bounds": "32, 88, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -185,7 +185,7 @@ "Bounds": "40, 238, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -193,7 +193,7 @@ "Bounds": "48, 144, 6, 6" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -207,7 +207,7 @@ "Bounds": "48, 150, 24, 32" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -215,7 +215,7 @@ "Bounds": "56, 118, 56, 16" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -223,7 +223,7 @@ "Bounds": "86, 232, 80, 8" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -231,7 +231,7 @@ "Bounds": "86, 240, 80, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -249,7 +249,7 @@ "Bounds": "96, 150, 16, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -257,7 +257,7 @@ "Bounds": "96, 208, 6, 6" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -265,7 +265,7 @@ "Bounds": "112, 112, 56, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -279,7 +279,7 @@ "Bounds": "112, 144, 24, 32" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -287,7 +287,7 @@ "Bounds": "120, 200, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -296,7 +296,7 @@ "Bounds": "134, 78, 32, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -305,7 +305,7 @@ "Bounds": "136, 38, 24, 8" }, { - "Entities": [ + "Types": [ 1, 3, 6, @@ -317,7 +317,7 @@ "Bounds": "136, 144, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -335,7 +335,7 @@ "Bounds": "144, 200, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -343,7 +343,7 @@ "Bounds": "144, 208, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -361,7 +361,7 @@ "Bounds": "152, 176, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -379,7 +379,7 @@ "Bounds": "160, 144, 8, 8" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -387,7 +387,7 @@ "Bounds": "160, 152, 24, 32" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -396,7 +396,7 @@ "Bounds": "166, 246, 32, 8" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -404,7 +404,7 @@ "Bounds": "184, 152, 24, 32" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -412,7 +412,7 @@ "Bounds": "208, 152, 14, 6" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -421,7 +421,7 @@ "Bounds": "0, 32, 16, 40" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -429,7 +429,7 @@ "Bounds": "0, 112, 24, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -438,7 +438,7 @@ "Bounds": "0, 136, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -447,7 +447,7 @@ "Bounds": "0, 144, 64, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -455,7 +455,7 @@ "Bounds": "0, 213, 56, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -464,7 +464,7 @@ "Bounds": "0, 229, 48, 8" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -472,7 +472,7 @@ "Bounds": "0, 237, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -481,7 +481,7 @@ "Bounds": "22, 184, 8, 16" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -489,7 +489,7 @@ "Bounds": "24, 112, 24, 24" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -497,7 +497,7 @@ "Bounds": "24, 237, 24, 16" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -505,7 +505,7 @@ "Bounds": "48, 30, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -524,7 +524,7 @@ "Bounds": "48, 168, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -533,7 +533,7 @@ "Bounds": "48, 230, 48, 8" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -541,7 +541,7 @@ "Bounds": "48, 238, 24, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -549,7 +549,7 @@ "Bounds": "56, 214, 56, 8" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -557,7 +557,7 @@ "Bounds": "72, 238, 24, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -565,7 +565,7 @@ "Bounds": "92, 192, 14, 6" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -574,7 +574,7 @@ "Bounds": "96, 152, 16, 32" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -582,7 +582,7 @@ "Bounds": "112, 214, 56, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -591,7 +591,7 @@ "Bounds": "120, 30, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -609,7 +609,7 @@ "Bounds": "136, 0, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -627,7 +627,7 @@ "Bounds": "152, 0, 16, 40" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -636,7 +636,7 @@ "Bounds": "160, 236, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -654,7 +654,7 @@ "Bounds": "168, 0, 16, 40" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -663,7 +663,7 @@ "Bounds": "168, 144, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -672,7 +672,7 @@ "Bounds": "172, 216, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -690,7 +690,7 @@ "Bounds": "184, 0, 16, 40" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -698,7 +698,7 @@ "Bounds": "184, 152, 32, 16" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -706,7 +706,7 @@ "Bounds": "188, 236, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -724,7 +724,7 @@ "Bounds": "200, 0, 16, 40" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -732,7 +732,7 @@ "Bounds": "216, 0, 16, 40" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -740,7 +740,7 @@ "Bounds": "222, 222, 16, 24" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -748,7 +748,7 @@ "Bounds": "232, 0, 16, 40" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -757,7 +757,7 @@ "Bounds": "232, 144, 16, 32" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -766,7 +766,7 @@ "Bounds": "248, 0, 8, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -784,7 +784,7 @@ "Bounds": "248, 32, 8, 8" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -793,7 +793,7 @@ "Bounds": "248, 80, 8, 32" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -801,7 +801,7 @@ "Bounds": "248, 208, 6, 14" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -809,7 +809,7 @@ "Bounds": "0, 24, 24, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -818,7 +818,7 @@ "Bounds": "0, 80, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -827,7 +827,7 @@ "Bounds": "0, 118, 16, 8" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -835,7 +835,7 @@ "Bounds": "0, 134, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -844,7 +844,7 @@ "Bounds": "0, 150, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -853,7 +853,7 @@ "Bounds": "0, 198, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -861,7 +861,7 @@ "Bounds": "0, 214, 24, 8" }, { - "Entities": [ + "Types": [ 71, 123, 124 @@ -870,7 +870,7 @@ "Bounds": "0, 230, 16, 8" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -879,7 +879,7 @@ "Bounds": "0, 238, 8, 16" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -888,7 +888,7 @@ "Bounds": "8, 238, 8, 16" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -896,7 +896,7 @@ "Bounds": "16, 134, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -904,7 +904,7 @@ "Bounds": "16, 150, 16, 16" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -912,7 +912,7 @@ "Bounds": "16, 230, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -921,7 +921,7 @@ "Bounds": "16, 246, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -929,7 +929,7 @@ "Bounds": "24, 24, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -938,7 +938,7 @@ "Bounds": "24, 198, 8, 8" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -946,7 +946,7 @@ "Bounds": "24, 206, 24, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -954,7 +954,7 @@ "Bounds": "24, 214, 24, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -962,7 +962,7 @@ "Bounds": "32, 144, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -971,7 +971,7 @@ "Bounds": "36, 222, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -979,7 +979,7 @@ "Bounds": "36, 238, 8, 16" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -988,7 +988,7 @@ "Bounds": "44, 236, 16, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -996,7 +996,7 @@ "Bounds": "48, 24, 24, 16" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -1004,7 +1004,7 @@ "Bounds": "48, 150, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1013,7 +1013,7 @@ "Bounds": "52, 102, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1021,7 +1021,7 @@ "Bounds": "60, 244, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1030,7 +1030,7 @@ "Bounds": "64, 56, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1038,7 +1038,7 @@ "Bounds": "64, 148, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1047,7 +1047,7 @@ "Bounds": "64, 204, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1056,7 +1056,7 @@ "Bounds": "68, 108, 32, 8" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -1065,7 +1065,7 @@ "Bounds": "68, 236, 16, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1073,7 +1073,7 @@ "Bounds": "72, 24, 16, 24" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -1082,7 +1082,7 @@ "Bounds": "72, 212, 8, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1090,7 +1090,7 @@ "Bounds": "80, 148, 16, 16" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1098,7 +1098,7 @@ "Bounds": "80, 212, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1107,7 +1107,7 @@ "Bounds": "88, 24, 8, 16" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -1115,7 +1115,7 @@ "Bounds": "96, 0, 24, 16" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -1123,7 +1123,7 @@ "Bounds": "96, 16, 16, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1132,7 +1132,7 @@ "Bounds": "96, 158, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1141,7 +1141,7 @@ "Bounds": "96, 222, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1149,7 +1149,7 @@ "Bounds": "96, 238, 8, 16" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -1158,7 +1158,7 @@ "Bounds": "104, 236, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1167,7 +1167,7 @@ "Bounds": "110, 204, 24, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1175,7 +1175,7 @@ "Bounds": "112, 16, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1194,7 +1194,7 @@ "Bounds": "116, 94, 16, 16" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -1202,7 +1202,7 @@ "Bounds": "120, 0, 24, 16" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -1210,7 +1210,7 @@ "Bounds": "132, 94, 16, 16" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -1218,7 +1218,7 @@ "Bounds": "134, 206, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1227,7 +1227,7 @@ "Bounds": "134, 222, 16, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1235,7 +1235,7 @@ "Bounds": "136, 24, 16, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1244,7 +1244,7 @@ "Bounds": "136, 72, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1253,7 +1253,7 @@ "Bounds": "136, 246, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1261,7 +1261,7 @@ "Bounds": "144, 238, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1270,7 +1270,7 @@ "Bounds": "148, 102, 16, 16" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -1279,7 +1279,7 @@ "Bounds": "148, 134, 16, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1287,7 +1287,7 @@ "Bounds": "152, 24, 24, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1296,7 +1296,7 @@ "Bounds": "152, 198, 24, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1304,7 +1304,7 @@ "Bounds": "152, 238, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1312,7 +1312,7 @@ "Bounds": "160, 238, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1321,7 +1321,7 @@ "Bounds": "164, 102, 32, 8" }, { - "Entities": [ + "Types": [ 5, 160, 185 @@ -1330,7 +1330,7 @@ "Bounds": "168, 56, 8, 8" }, { - "Entities": [ + "Types": [ 168, 170, 173, @@ -1341,7 +1341,7 @@ "Bounds": "168, 244, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1349,7 +1349,7 @@ "Bounds": "176, 8, 16, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1358,7 +1358,7 @@ "Bounds": "176, 204, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1367,7 +1367,7 @@ "Bounds": "184, 244, 8, 8" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -1375,7 +1375,7 @@ "Bounds": "190, 228, 8, 16" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -1384,7 +1384,7 @@ "Bounds": "192, 8, 16, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1392,7 +1392,7 @@ "Bounds": "198, 240, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1401,7 +1401,7 @@ "Bounds": "206, 190, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1410,7 +1410,7 @@ "Bounds": "206, 200, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1419,7 +1419,7 @@ "Bounds": "206, 224, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1427,7 +1427,7 @@ "Bounds": "206, 240, 16, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1435,7 +1435,7 @@ "Bounds": "208, 8, 16, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1443,7 +1443,7 @@ "Bounds": "224, 0, 24, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1451,7 +1451,7 @@ "Bounds": "224, 16, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1460,7 +1460,7 @@ "Bounds": "230, 200, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1478,7 +1478,7 @@ "Bounds": "238, 88, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1487,7 +1487,7 @@ "Bounds": "238, 104, 16, 16" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1495,7 +1495,7 @@ "Bounds": "238, 240, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1504,7 +1504,7 @@ "Bounds": "244, 152, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1513,7 +1513,7 @@ "Bounds": "246, 248, 8, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1522,7 +1522,7 @@ "Bounds": "248, 208, 8, 24" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1531,7 +1531,7 @@ "Bounds": "0, 0, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1540,7 +1540,7 @@ "Bounds": "0, 16, 8, 8" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -1549,7 +1549,7 @@ "Bounds": "0, 24, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1558,7 +1558,7 @@ "Bounds": "8, 0, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1567,7 +1567,7 @@ "Bounds": "8, 16, 8, 8" }, { - "Entities": [ + "Types": [ 124, 227, 231 @@ -1576,7 +1576,7 @@ "Bounds": "8, 24, 8, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1585,7 +1585,7 @@ "Bounds": "16, 0, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1594,7 +1594,7 @@ "Bounds": "16, 16, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1603,7 +1603,7 @@ "Bounds": "24, 16, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1612,7 +1612,7 @@ "Bounds": "32, 16, 8, 8" }, { - "Entities": [ + "Types": [ 127, 185, 188 @@ -1621,7 +1621,7 @@ "Bounds": "32, 24, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1630,7 +1630,7 @@ "Bounds": "40, 16, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1638,7 +1638,7 @@ "Bounds": "48, 24, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1647,7 +1647,7 @@ "Bounds": "88, 13, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1656,7 +1656,7 @@ "Bounds": "96, 13, 8, 8" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -1664,7 +1664,7 @@ "Bounds": "96, 21, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1673,7 +1673,7 @@ "Bounds": "104, 13, 8, 8" }, { - "Entities": [ + "Types": [ 71, 123 ], @@ -1681,7 +1681,7 @@ "Bounds": "104, 21, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1690,7 +1690,7 @@ "Bounds": "112, 16, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1699,7 +1699,7 @@ "Bounds": "120, 13, 8, 8" }, { - "Entities": [ + "Types": [ 71, 124 ], @@ -1707,7 +1707,7 @@ "Bounds": "120, 21, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1716,7 +1716,7 @@ "Bounds": "128, 13, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1724,7 +1724,7 @@ "Bounds": "128, 29, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1732,7 +1732,7 @@ "Bounds": "142, 8, 6, 14" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1741,7 +1741,7 @@ "Bounds": "148, 16, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1749,7 +1749,7 @@ "Bounds": "152, 24, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1757,7 +1757,7 @@ "Bounds": "160, 30, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1765,7 +1765,7 @@ "Bounds": "180, 24, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1773,7 +1773,7 @@ "Bounds": "204, 24, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1782,7 +1782,7 @@ "Bounds": "210, 8, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1790,7 +1790,7 @@ "Bounds": "212, 24, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1799,7 +1799,7 @@ "Bounds": "218, 8, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1807,7 +1807,7 @@ "Bounds": "220, 24, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1816,7 +1816,7 @@ "Bounds": "226, 8, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/MINES.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/MINES.TR2-TextureRemap.json index bd45aed8a..e06da606d 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/MINES.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/MINES.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 214, 218 ], @@ -18,7 +18,7 @@ "Bounds": "0, 144, 32, 48" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -35,7 +35,7 @@ "Bounds": "28, 236, 8, 8" }, { - "Entities": [ + "Types": [ 142, 143, 144 @@ -44,7 +44,7 @@ "Bounds": "136, 0, 64, 64" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -52,7 +52,7 @@ "Bounds": "144, 204, 28, 12" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -60,7 +60,7 @@ "Bounds": "172, 179, 12, 12" }, { - "Entities": [ + "Types": [ 206, 210, 218 @@ -69,7 +69,7 @@ "Bounds": "200, 0, 48, 48" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -77,7 +77,7 @@ "Bounds": "228, 204, 4, 3" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -94,7 +94,7 @@ "Bounds": "232, 136, 16, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -102,7 +102,7 @@ "Bounds": "232, 244, 20, 12" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -110,7 +110,7 @@ "Bounds": "248, 184, 4, 4" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -119,7 +119,7 @@ "Bounds": "0, 0, 48, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -128,7 +128,7 @@ "Bounds": "0, 124, 24, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -137,7 +137,7 @@ "Bounds": "24, 124, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -145,7 +145,7 @@ "Bounds": "32, 220, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -153,7 +153,7 @@ "Bounds": "48, 56, 28, 36" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -162,7 +162,7 @@ "Bounds": "48, 124, 24, 32" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -170,7 +170,7 @@ "Bounds": "48, 216, 32, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -178,7 +178,7 @@ "Bounds": "72, 96, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -195,7 +195,7 @@ "Bounds": "80, 24, 16, 8" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -206,7 +206,7 @@ "Bounds": "96, 128, 24, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -217,7 +217,7 @@ "Bounds": "120, 128, 24, 32" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -225,7 +225,7 @@ "Bounds": "128, 96, 56, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -233,7 +233,7 @@ "Bounds": "132, 64, 12, 12" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -250,7 +250,7 @@ "Bounds": "144, 32, 16, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -261,7 +261,7 @@ "Bounds": "144, 128, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -270,7 +270,7 @@ "Bounds": "160, 0, 64, 16" }, { - "Entities": [ + "Types": [ 206, 210, 218 @@ -279,7 +279,7 @@ "Bounds": "160, 16, 32, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -290,7 +290,7 @@ "Bounds": "168, 128, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -307,7 +307,7 @@ "Bounds": "184, 96, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -324,7 +324,7 @@ "Bounds": "188, 80, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -342,7 +342,7 @@ "Bounds": "192, 128, 16, 24" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -353,7 +353,7 @@ "Bounds": "192, 152, 24, 32" }, { - "Entities": [ + "Types": [ 214, 218 ], @@ -361,7 +361,7 @@ "Bounds": "200, 216, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -370,7 +370,7 @@ "Bounds": "208, 112, 16, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -379,7 +379,7 @@ "Bounds": "208, 120, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -387,7 +387,7 @@ "Bounds": "224, 64, 28, 28" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -395,7 +395,7 @@ "Bounds": "224, 92, 28, 28" }, { - "Entities": [ + "Types": [ 215, 219 ], @@ -403,7 +403,7 @@ "Bounds": "224, 216, 24, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -412,7 +412,7 @@ "Bounds": "232, 120, 24, 32" }, { - "Entities": [ + "Types": [ 206, 210 ], @@ -420,7 +420,7 @@ "Bounds": "240, 152, 16, 48" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -438,7 +438,7 @@ "Bounds": "240, 200, 8, 16" }, { - "Entities": [ + "Types": [ 205, 209 ], @@ -446,7 +446,7 @@ "Bounds": "248, 200, 8, 48" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -454,7 +454,7 @@ "Bounds": "0, 163, 56, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -463,7 +463,7 @@ "Bounds": "0, 171, 48, 8" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -471,7 +471,7 @@ "Bounds": "0, 227, 16, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -480,7 +480,7 @@ "Bounds": "12, 76, 32, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -488,7 +488,7 @@ "Bounds": "16, 227, 24, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -497,7 +497,7 @@ "Bounds": "32, 0, 16, 40" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -505,7 +505,7 @@ "Bounds": "32, 92, 6, 6" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -513,7 +513,7 @@ "Bounds": "32, 107, 32, 16" }, { - "Entities": [ + "Types": [ 214, 218 ], @@ -521,7 +521,7 @@ "Bounds": "32, 123, 16, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -530,7 +530,7 @@ "Bounds": "40, 48, 24, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -538,7 +538,7 @@ "Bounds": "40, 56, 28, 20" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -556,7 +556,7 @@ "Bounds": "40, 227, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -564,7 +564,7 @@ "Bounds": "44, 76, 14, 6" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -573,7 +573,7 @@ "Bounds": "44, 83, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -582,7 +582,7 @@ "Bounds": "44, 91, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -591,7 +591,7 @@ "Bounds": "48, 171, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -600,7 +600,7 @@ "Bounds": "48, 243, 32, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -609,7 +609,7 @@ "Bounds": "56, 163, 48, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -617,7 +617,7 @@ "Bounds": "58, 76, 6, 6" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -626,7 +626,7 @@ "Bounds": "64, 8, 24, 24" }, { - "Entities": [ + "Types": [ 214, 215, 218, @@ -636,7 +636,7 @@ "Bounds": "64, 107, 32, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -644,7 +644,7 @@ "Bounds": "68, 56, 20, 27" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -653,7 +653,7 @@ "Bounds": "80, 246, 32, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -661,7 +661,7 @@ "Bounds": "96, 222, 16, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -669,7 +669,7 @@ "Bounds": "104, 158, 56, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -678,7 +678,7 @@ "Bounds": "108, 86, 64, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -686,7 +686,7 @@ "Bounds": "112, 222, 16, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -695,7 +695,7 @@ "Bounds": "112, 246, 32, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -703,7 +703,7 @@ "Bounds": "128, 228, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -721,7 +721,7 @@ "Bounds": "144, 174, 8, 16" }, { - "Entities": [ + "Types": [ 142, 143, 144 @@ -730,7 +730,7 @@ "Bounds": "148, 94, 8, 64" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -738,7 +738,7 @@ "Bounds": "152, 236, 24, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -746,7 +746,7 @@ "Bounds": "160, 164, 56, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -764,7 +764,7 @@ "Bounds": "164, 94, 8, 24" }, { - "Entities": [ + "Types": [ 214, 218 ], @@ -772,7 +772,7 @@ "Bounds": "164, 118, 16, 32" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -780,7 +780,7 @@ "Bounds": "164, 150, 14, 6" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -788,7 +788,7 @@ "Bounds": "168, 220, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -805,7 +805,7 @@ "Bounds": "176, 236, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -813,7 +813,7 @@ "Bounds": "192, 220, 16, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -822,7 +822,7 @@ "Bounds": "192, 244, 32, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -830,7 +830,7 @@ "Bounds": "208, 64, 44, 12" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -838,7 +838,7 @@ "Bounds": "208, 228, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -846,7 +846,7 @@ "Bounds": "220, 156, 20, 20" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -854,7 +854,7 @@ "Bounds": "232, 236, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -872,7 +872,7 @@ "Bounds": "248, 0, 8, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -880,7 +880,7 @@ "Bounds": "0, 0, 16, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -888,7 +888,7 @@ "Bounds": "0, 112, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -897,7 +897,7 @@ "Bounds": "0, 180, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -906,7 +906,7 @@ "Bounds": "0, 236, 16, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -914,7 +914,7 @@ "Bounds": "16, 0, 16, 24" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -922,7 +922,7 @@ "Bounds": "16, 112, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -931,7 +931,7 @@ "Bounds": "16, 236, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -940,7 +940,7 @@ "Bounds": "24, 56, 16, 16" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -948,7 +948,7 @@ "Bounds": "24, 203, 8, 24" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -956,7 +956,7 @@ "Bounds": "32, 0, 24, 16" }, { - "Entities": [ + "Types": [ 214, 218 ], @@ -964,7 +964,7 @@ "Bounds": "32, 128, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -982,7 +982,7 @@ "Bounds": "36, 160, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -991,7 +991,7 @@ "Bounds": "40, 248, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1000,7 +1000,7 @@ "Bounds": "44, 168, 8, 24" }, { - "Entities": [ + "Types": [ 214, 218 ], @@ -1008,7 +1008,7 @@ "Bounds": "48, 136, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1017,7 +1017,7 @@ "Bounds": "48, 232, 16, 8" }, { - "Entities": [ + "Types": [ 207, 211 ], @@ -1025,7 +1025,7 @@ "Bounds": "56, 16, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1043,7 +1043,7 @@ "Bounds": "64, 160, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1052,7 +1052,7 @@ "Bounds": "64, 228, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1061,7 +1061,7 @@ "Bounds": "64, 244, 8, 8" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1069,7 +1069,7 @@ "Bounds": "72, 16, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1087,7 +1087,7 @@ "Bounds": "72, 160, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1105,7 +1105,7 @@ "Bounds": "80, 160, 8, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1113,7 +1113,7 @@ "Bounds": "80, 203, 24, 8" }, { - "Entities": [ + "Types": [ 207, 211, 219 @@ -1122,7 +1122,7 @@ "Bounds": "80, 211, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1131,7 +1131,7 @@ "Bounds": "84, 227, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1148,7 +1148,7 @@ "Bounds": "88, 48, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1157,7 +1157,7 @@ "Bounds": "92, 235, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1166,7 +1166,7 @@ "Bounds": "96, 179, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1175,7 +1175,7 @@ "Bounds": "108, 235, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1184,7 +1184,7 @@ "Bounds": "136, 48, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1192,7 +1192,7 @@ "Bounds": "136, 107, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1200,7 +1200,7 @@ "Bounds": "144, 155, 12, 20" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1209,7 +1209,7 @@ "Bounds": "148, 231, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1218,7 +1218,7 @@ "Bounds": "148, 247, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1235,7 +1235,7 @@ "Bounds": "152, 48, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1244,7 +1244,7 @@ "Bounds": "152, 107, 16, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1253,7 +1253,7 @@ "Bounds": "160, 199, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1262,7 +1262,7 @@ "Bounds": "164, 236, 16, 8" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1270,7 +1270,7 @@ "Bounds": "168, 123, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1288,7 +1288,7 @@ "Bounds": "168, 155, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1297,7 +1297,7 @@ "Bounds": "172, 48, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1306,7 +1306,7 @@ "Bounds": "176, 176, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1315,7 +1315,7 @@ "Bounds": "180, 236, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1324,7 +1324,7 @@ "Bounds": "196, 236, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1333,7 +1333,7 @@ "Bounds": "200, 176, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1342,7 +1342,7 @@ "Bounds": "204, 236, 8, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1351,7 +1351,7 @@ "Bounds": "208, 168, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1359,7 +1359,7 @@ "Bounds": "208, 200, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1368,7 +1368,7 @@ "Bounds": "212, 228, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1376,7 +1376,7 @@ "Bounds": "216, 104, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1385,7 +1385,7 @@ "Bounds": "220, 228, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1403,7 +1403,7 @@ "Bounds": "224, 40, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1412,7 +1412,7 @@ "Bounds": "224, 176, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1421,7 +1421,7 @@ "Bounds": "228, 232, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1429,7 +1429,7 @@ "Bounds": "232, 104, 16, 16" }, { - "Entities": [ + "Types": [ 206, 210 ], @@ -1437,7 +1437,7 @@ "Bounds": "232, 120, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1446,7 +1446,7 @@ "Bounds": "232, 168, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1464,7 +1464,7 @@ "Bounds": "248, 0, 8, 16" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1472,7 +1472,7 @@ "Bounds": "248, 200, 8, 24" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1482,7 +1482,7 @@ "Bounds": "0, 16, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1491,7 +1491,7 @@ "Bounds": "16, 40, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1500,7 +1500,7 @@ "Bounds": "24, 40, 8, 8" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1509,7 +1509,7 @@ "Bounds": "32, 16, 8, 16" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1517,7 +1517,7 @@ "Bounds": "32, 48, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1526,7 +1526,7 @@ "Bounds": "40, 16, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1535,7 +1535,7 @@ "Bounds": "48, 16, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1543,7 +1543,7 @@ "Bounds": "48, 32, 6, 14" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1551,7 +1551,7 @@ "Bounds": "54, 32, 6, 14" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1559,7 +1559,7 @@ "Bounds": "56, 8, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1567,7 +1567,7 @@ "Bounds": "64, 8, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1575,7 +1575,7 @@ "Bounds": "72, 8, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1584,7 +1584,7 @@ "Bounds": "72, 40, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1592,7 +1592,7 @@ "Bounds": "80, 8, 16, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1600,7 +1600,7 @@ "Bounds": "80, 54, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1608,7 +1608,7 @@ "Bounds": "96, 54, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1617,7 +1617,7 @@ "Bounds": "104, 40, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1626,7 +1626,7 @@ "Bounds": "112, 40, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1635,7 +1635,7 @@ "Bounds": "120, 40, 8, 8" }, { - "Entities": [ + "Types": [ 206, 210 ], @@ -1643,7 +1643,7 @@ "Bounds": "120, 56, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1651,7 +1651,7 @@ "Bounds": "128, 8, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1660,7 +1660,7 @@ "Bounds": "128, 40, 8, 8" }, { - "Entities": [ + "Types": [ 206, 210, 218 @@ -1669,7 +1669,7 @@ "Bounds": "128, 56, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1678,7 +1678,7 @@ "Bounds": "136, 40, 8, 8" }, { - "Entities": [ + "Types": [ 160, 185 ], @@ -1686,7 +1686,7 @@ "Bounds": "136, 48, 8, 8" }, { - "Entities": [ + "Types": [ 207, 211, 214, @@ -1696,7 +1696,7 @@ "Bounds": "136, 56, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1705,7 +1705,7 @@ "Bounds": "144, 40, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1713,7 +1713,7 @@ "Bounds": "144, 48, 8, 8" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1721,7 +1721,7 @@ "Bounds": "144, 56, 8, 8" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1729,7 +1729,7 @@ "Bounds": "176, 8, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1738,7 +1738,7 @@ "Bounds": "176, 40, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1746,7 +1746,7 @@ "Bounds": "176, 48, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1755,7 +1755,7 @@ "Bounds": "184, 40, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1763,7 +1763,7 @@ "Bounds": "184, 48, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1772,7 +1772,7 @@ "Bounds": "192, 40, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1780,7 +1780,7 @@ "Bounds": "192, 48, 8, 8" }, { - "Entities": [ + "Types": [ 185, 188 ], @@ -1788,7 +1788,7 @@ "Bounds": "200, 54, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1796,7 +1796,7 @@ "Bounds": "208, 48, 8, 8" }, { - "Entities": [ + "Types": [ 6, 7, 8, @@ -1806,7 +1806,7 @@ "Bounds": "212, 32, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1815,7 +1815,7 @@ "Bounds": "212, 40, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1823,7 +1823,7 @@ "Bounds": "216, 48, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1832,7 +1832,7 @@ "Bounds": "220, 32, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1841,7 +1841,7 @@ "Bounds": "220, 40, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1850,7 +1850,7 @@ "Bounds": "228, 32, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1858,7 +1858,7 @@ "Bounds": "232, 0, 8, 16" }, { - "Entities": [ + "Types": [ 205, 209 ], @@ -1866,7 +1866,7 @@ "Bounds": "232, 16, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1875,7 +1875,7 @@ "Bounds": "236, 32, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1883,7 +1883,7 @@ "Bounds": "240, 0, 8, 16" }, { - "Entities": [ + "Types": [ 206, 210, 218 @@ -1892,7 +1892,7 @@ "Bounds": "240, 16, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1901,7 +1901,7 @@ "Bounds": "244, 32, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1909,7 +1909,7 @@ "Bounds": "248, 0, 8, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/NEVADA.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/NEVADA.TR2-TextureRemap.json index 838027165..44387177f 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/NEVADA.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/NEVADA.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 132, 133, 134, @@ -20,7 +20,7 @@ "Bounds": "72, 64, 64, 64" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -28,7 +28,7 @@ "Bounds": "128, 192, 64, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -37,7 +37,7 @@ "Bounds": "232, 120, 24, 8" }, { - "Entities": [ + "Types": [ 130, 131, 133 @@ -46,7 +46,7 @@ "Bounds": "248, 56, 8, 64" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -54,7 +54,7 @@ "Bounds": "0, 224, 56, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -63,7 +63,7 @@ "Bounds": "48, 168, 32, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -71,7 +71,7 @@ "Bounds": "56, 208, 14, 6" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -79,7 +79,7 @@ "Bounds": "56, 230, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -97,7 +97,7 @@ "Bounds": "80, 136, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -105,7 +105,7 @@ "Bounds": "88, 184, 30, 30" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -114,7 +114,7 @@ "Bounds": "96, 112, 64, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -123,7 +123,7 @@ "Bounds": "96, 246, 64, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -131,7 +131,7 @@ "Bounds": "118, 200, 22, 14" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -139,7 +139,7 @@ "Bounds": "144, 184, 30, 30" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -157,7 +157,7 @@ "Bounds": "160, 96, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -176,7 +176,7 @@ "Bounds": "174, 184, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -194,7 +194,7 @@ "Bounds": "176, 40, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -203,7 +203,7 @@ "Bounds": "176, 88, 48, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -211,7 +211,7 @@ "Bounds": "208, 160, 14, 6" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -229,7 +229,7 @@ "Bounds": "208, 190, 16, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -237,7 +237,7 @@ "Bounds": "224, 96, 30, 38" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -245,7 +245,7 @@ "Bounds": "224, 190, 6, 6" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -253,7 +253,7 @@ "Bounds": "224, 216, 6, 6" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -262,7 +262,7 @@ "Bounds": "224, 222, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -280,7 +280,7 @@ "Bounds": "230, 190, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -299,7 +299,7 @@ "Bounds": "248, 166, 8, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -308,7 +308,7 @@ "Bounds": "0, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -327,7 +327,7 @@ "Bounds": "0, 102, 14, 5" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -336,7 +336,7 @@ "Bounds": "0, 204, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -345,7 +345,7 @@ "Bounds": "0, 212, 64, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -353,7 +353,7 @@ "Bounds": "0, 244, 56, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -372,7 +372,7 @@ "Bounds": "14, 102, 14, 5" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -386,7 +386,7 @@ "Bounds": "24, 0, 24, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -396,7 +396,7 @@ "Bounds": "28, 102, 14, 5" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -405,7 +405,7 @@ "Bounds": "44, 140, 24, 24" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -419,7 +419,7 @@ "Bounds": "48, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -438,7 +438,7 @@ "Bounds": "56, 236, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -457,7 +457,7 @@ "Bounds": "64, 204, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -467,7 +467,7 @@ "Bounds": "68, 140, 6, 13" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -481,7 +481,7 @@ "Bounds": "72, 0, 24, 32" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -489,7 +489,7 @@ "Bounds": "74, 140, 6, 6" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -497,7 +497,7 @@ "Bounds": "80, 124, 22, 29" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -506,7 +506,7 @@ "Bounds": "80, 248, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -524,7 +524,7 @@ "Bounds": "96, 172, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -532,7 +532,7 @@ "Bounds": "112, 221, 22, 22" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -543,7 +543,7 @@ "Bounds": "120, 0, 24, 32" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -551,7 +551,7 @@ "Bounds": "120, 108, 6, 14" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -561,7 +561,7 @@ "Bounds": "120, 192, 14, 5" }, { - "Entities": [ + "Types": [ 350, 351 ], @@ -569,7 +569,7 @@ "Bounds": "120, 197, 24, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -578,7 +578,7 @@ "Bounds": "124, 132, 16, 8" }, { - "Entities": [ + "Types": [ 4, 315 ], @@ -586,7 +586,7 @@ "Bounds": "140, 168, 6, 5" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -604,7 +604,7 @@ "Bounds": "142, 92, 8, 8" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -615,7 +615,7 @@ "Bounds": "144, 0, 24, 32" }, { - "Entities": [ + "Types": [ 1, 6, 7, @@ -626,7 +626,7 @@ "Bounds": "148, 144, 8, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -636,7 +636,7 @@ "Bounds": "148, 152, 6, 5" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -644,7 +644,7 @@ "Bounds": "156, 221, 30, 14" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -653,7 +653,7 @@ "Bounds": "156, 235, 48, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -672,7 +672,7 @@ "Bounds": "158, 104, 8, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -680,7 +680,7 @@ "Bounds": "168, 32, 32, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -688,7 +688,7 @@ "Bounds": "168, 245, 56, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -696,7 +696,7 @@ "Bounds": "176, 197, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -714,7 +714,7 @@ "Bounds": "182, 88, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -732,7 +732,7 @@ "Bounds": "192, 56, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -740,7 +740,7 @@ "Bounds": "192, 64, 30, 22" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -748,7 +748,7 @@ "Bounds": "192, 86, 46, 14" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -757,7 +757,7 @@ "Bounds": "198, 100, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -776,7 +776,7 @@ "Bounds": "204, 140, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -795,7 +795,7 @@ "Bounds": "212, 173, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -814,7 +814,7 @@ "Bounds": "222, 80, 14, 5" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -822,7 +822,7 @@ "Bounds": "224, 32, 32, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -832,7 +832,7 @@ "Bounds": "224, 249, 14, 5" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -842,7 +842,7 @@ "Bounds": "236, 160, 6, 5" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -852,7 +852,7 @@ "Bounds": "238, 249, 14, 5" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -871,7 +871,7 @@ "Bounds": "244, 160, 8, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -879,7 +879,7 @@ "Bounds": "244, 184, 6, 5" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -887,7 +887,7 @@ "Bounds": "0, 64, 24, 16" }, { - "Entities": [ + "Types": [ 244, 245, 246, @@ -897,7 +897,7 @@ "Bounds": "0, 184, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -906,7 +906,7 @@ "Bounds": "0, 222, 24, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -914,7 +914,7 @@ "Bounds": "0, 238, 24, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -922,7 +922,7 @@ "Bounds": "24, 64, 24, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -931,7 +931,7 @@ "Bounds": "24, 224, 24, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -939,7 +939,7 @@ "Bounds": "48, 0, 56, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -948,7 +948,7 @@ "Bounds": "48, 8, 48, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -956,7 +956,7 @@ "Bounds": "48, 64, 16, 24" }, { - "Entities": [ + "Types": [ 350, 351 ], @@ -964,7 +964,7 @@ "Bounds": "48, 198, 16, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -972,7 +972,7 @@ "Bounds": "64, 64, 24, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -981,7 +981,7 @@ "Bounds": "64, 96, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -990,7 +990,7 @@ "Bounds": "64, 134, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -998,7 +998,7 @@ "Bounds": "64, 160, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1016,7 +1016,7 @@ "Bounds": "76, 112, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1024,7 +1024,7 @@ "Bounds": "80, 160, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1032,7 +1032,7 @@ "Bounds": "80, 232, 24, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1040,7 +1040,7 @@ "Bounds": "88, 56, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1049,7 +1049,7 @@ "Bounds": "88, 216, 24, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -1059,7 +1059,7 @@ "Bounds": "96, 40, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1068,7 +1068,7 @@ "Bounds": "96, 160, 16, 16" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1076,7 +1076,7 @@ "Bounds": "104, 232, 8, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1084,7 +1084,7 @@ "Bounds": "112, 48, 16, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1092,7 +1092,7 @@ "Bounds": "112, 160, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1101,7 +1101,7 @@ "Bounds": "124, 112, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -1109,7 +1109,7 @@ "Bounds": "128, 56, 16, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1118,7 +1118,7 @@ "Bounds": "128, 96, 24, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -1126,7 +1126,7 @@ "Bounds": "128, 160, 16, 16" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1134,7 +1134,7 @@ "Bounds": "128, 176, 8, 32" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1143,7 +1143,7 @@ "Bounds": "128, 222, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1152,7 +1152,7 @@ "Bounds": "136, 8, 24, 16" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1160,7 +1160,7 @@ "Bounds": "136, 176, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1168,7 +1168,7 @@ "Bounds": "136, 222, 6, 14" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1177,7 +1177,7 @@ "Bounds": "140, 112, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1196,7 +1196,7 @@ "Bounds": "142, 208, 8, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1204,7 +1204,7 @@ "Bounds": "144, 56, 16, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1213,7 +1213,7 @@ "Bounds": "150, 222, 24, 8" }, { - "Entities": [ + "Types": [ 350, 351 ], @@ -1221,7 +1221,7 @@ "Bounds": "152, 198, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1229,7 +1229,7 @@ "Bounds": "156, 112, 14, 14" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1238,7 +1238,7 @@ "Bounds": "156, 126, 32, 8" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -1247,7 +1247,7 @@ "Bounds": "160, 48, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1256,7 +1256,7 @@ "Bounds": "160, 238, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1264,7 +1264,7 @@ "Bounds": "170, 112, 14, 14" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -1273,7 +1273,7 @@ "Bounds": "174, 222, 8, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1281,7 +1281,7 @@ "Bounds": "176, 56, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1290,7 +1290,7 @@ "Bounds": "176, 150, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1298,7 +1298,7 @@ "Bounds": "176, 158, 16, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -1308,7 +1308,7 @@ "Bounds": "182, 208, 8, 24" }, { - "Entities": [ + "Types": [ 4, 315 ], @@ -1316,7 +1316,7 @@ "Bounds": "184, 104, 14, 22" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1325,7 +1325,7 @@ "Bounds": "188, 126, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1333,7 +1333,7 @@ "Bounds": "198, 104, 14, 22" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1342,7 +1342,7 @@ "Bounds": "198, 222, 24, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1350,7 +1350,7 @@ "Bounds": "200, 56, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1359,7 +1359,7 @@ "Bounds": "212, 112, 32, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1368,7 +1368,7 @@ "Bounds": "212, 120, 32, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1376,7 +1376,7 @@ "Bounds": "224, 56, 24, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1384,7 +1384,7 @@ "Bounds": "232, 40, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1393,7 +1393,7 @@ "Bounds": "240, 208, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1412,7 +1412,7 @@ "Bounds": "248, 24, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1421,7 +1421,7 @@ "Bounds": "248, 248, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1430,7 +1430,7 @@ "Bounds": "0, 64, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1438,7 +1438,7 @@ "Bounds": "0, 72, 8, 8" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1446,7 +1446,7 @@ "Bounds": "8, 48, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1455,7 +1455,7 @@ "Bounds": "8, 64, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1463,7 +1463,7 @@ "Bounds": "8, 72, 8, 8" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1471,7 +1471,7 @@ "Bounds": "16, 48, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1480,7 +1480,7 @@ "Bounds": "16, 64, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1488,7 +1488,7 @@ "Bounds": "16, 72, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1496,7 +1496,7 @@ "Bounds": "24, 72, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1505,7 +1505,7 @@ "Bounds": "32, 8, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1514,7 +1514,7 @@ "Bounds": "32, 16, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1522,7 +1522,7 @@ "Bounds": "32, 72, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1531,7 +1531,7 @@ "Bounds": "40, 64, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1539,7 +1539,7 @@ "Bounds": "40, 72, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1548,7 +1548,7 @@ "Bounds": "48, 8, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1557,7 +1557,7 @@ "Bounds": "48, 40, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1566,7 +1566,7 @@ "Bounds": "48, 56, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1575,7 +1575,7 @@ "Bounds": "48, 64, 8, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1584,7 +1584,7 @@ "Bounds": "56, 40, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1593,7 +1593,7 @@ "Bounds": "56, 56, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1602,7 +1602,7 @@ "Bounds": "56, 64, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1611,7 +1611,7 @@ "Bounds": "64, 8, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1620,7 +1620,7 @@ "Bounds": "64, 56, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1629,7 +1629,7 @@ "Bounds": "72, 56, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1637,7 +1637,7 @@ "Bounds": "80, 32, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1646,7 +1646,7 @@ "Bounds": "80, 56, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1654,7 +1654,7 @@ "Bounds": "88, 32, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1663,7 +1663,7 @@ "Bounds": "88, 56, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1672,7 +1672,7 @@ "Bounds": "96, 8, 16, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1680,7 +1680,7 @@ "Bounds": "96, 32, 8, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1688,7 +1688,7 @@ "Bounds": "96, 72, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1696,7 +1696,7 @@ "Bounds": "104, 32, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1705,7 +1705,7 @@ "Bounds": "104, 56, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1714,7 +1714,7 @@ "Bounds": "112, 8, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1722,7 +1722,7 @@ "Bounds": "112, 32, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1731,7 +1731,7 @@ "Bounds": "112, 56, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1739,7 +1739,7 @@ "Bounds": "112, 72, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1747,7 +1747,7 @@ "Bounds": "120, 32, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1756,7 +1756,7 @@ "Bounds": "120, 56, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1765,7 +1765,7 @@ "Bounds": "128, 56, 8, 8" }, { - "Entities": [ + "Types": [ 29, 69, 185, @@ -1775,7 +1775,7 @@ "Bounds": "128, 64, 8, 8" }, { - "Entities": [ + "Types": [ 4, 315 ], @@ -1783,7 +1783,7 @@ "Bounds": "136, 0, 6, 22" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1791,7 +1791,7 @@ "Bounds": "136, 32, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1800,7 +1800,7 @@ "Bounds": "142, 8, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1808,7 +1808,7 @@ "Bounds": "144, 24, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1817,7 +1817,7 @@ "Bounds": "174, 8, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1825,7 +1825,7 @@ "Bounds": "184, 32, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1834,7 +1834,7 @@ "Bounds": "190, 8, 16, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1842,7 +1842,7 @@ "Bounds": "192, 64, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1851,7 +1851,7 @@ "Bounds": "206, 0, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1860,7 +1860,7 @@ "Bounds": "214, 8, 8, 16" }, { - "Entities": [ + "Types": [ 244, 246 ], @@ -1868,7 +1868,7 @@ "Bounds": "216, 72, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1877,7 +1877,7 @@ "Bounds": "222, 8, 8, 16" }, { - "Entities": [ + "Types": [ 244, 247 ], @@ -1885,7 +1885,7 @@ "Bounds": "224, 72, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1894,7 +1894,7 @@ "Bounds": "230, 0, 8, 16" }, { - "Entities": [ + "Types": [ 168, 170, 173, @@ -1905,7 +1905,7 @@ "Bounds": "232, 32, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1914,7 +1914,7 @@ "Bounds": "238, 0, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1923,7 +1923,7 @@ "Bounds": "240, 56, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1932,7 +1932,7 @@ "Bounds": "246, 0, 8, 16" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1941,7 +1941,7 @@ "Bounds": "248, 32, 8, 16" }, { - "Entities": [ + "Types": [ 160, 185 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/OFFICE.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/OFFICE.TR2-TextureRemap.json index def72e8a2..445b0c699 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/OFFICE.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/OFFICE.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -21,7 +21,7 @@ "Bounds": "0, 192, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -30,7 +30,7 @@ "Bounds": "24, 104, 64, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -38,7 +38,7 @@ "Bounds": "24, 160, 56, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -49,7 +49,7 @@ "Bounds": "24, 192, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -57,7 +57,7 @@ "Bounds": "32, 40, 40, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -66,7 +66,7 @@ "Bounds": "48, 192, 8, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -77,7 +77,7 @@ "Bounds": "48, 208, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -93,7 +93,7 @@ "Bounds": "56, 176, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -101,7 +101,7 @@ "Bounds": "72, 32, 32, 40" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -112,7 +112,7 @@ "Bounds": "72, 208, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -120,7 +120,7 @@ "Bounds": "80, 144, 56, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -131,7 +131,7 @@ "Bounds": "80, 176, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -139,7 +139,7 @@ "Bounds": "88, 88, 32, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -150,7 +150,7 @@ "Bounds": "96, 208, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -166,7 +166,7 @@ "Bounds": "104, 32, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -175,7 +175,7 @@ "Bounds": "104, 48, 48, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -186,7 +186,7 @@ "Bounds": "104, 176, 24, 32" }, { - "Entities": [ + "Types": [ 350, 351, 352, @@ -196,7 +196,7 @@ "Bounds": "120, 0, 32, 48" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -204,7 +204,7 @@ "Bounds": "120, 88, 32, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -220,7 +220,7 @@ "Bounds": "120, 208, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -236,7 +236,7 @@ "Bounds": "128, 176, 8, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -247,7 +247,7 @@ "Bounds": "128, 184, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -264,7 +264,7 @@ "Bounds": "136, 144, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -272,7 +272,7 @@ "Bounds": "136, 152, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -288,7 +288,7 @@ "Bounds": "144, 120, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -304,7 +304,7 @@ "Bounds": "152, 88, 8, 16" }, { - "Entities": [ + "Types": [ 350, 351, 352, @@ -314,7 +314,7 @@ "Bounds": "160, 72, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -331,7 +331,7 @@ "Bounds": "176, 184, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -347,7 +347,7 @@ "Bounds": "192, 152, 8, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -358,7 +358,7 @@ "Bounds": "192, 176, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -375,7 +375,7 @@ "Bounds": "200, 72, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -392,7 +392,7 @@ "Bounds": "200, 136, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -409,7 +409,7 @@ "Bounds": "208, 248, 16, 8" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -420,7 +420,7 @@ "Bounds": "216, 176, 24, 32" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -428,7 +428,7 @@ "Bounds": "224, 208, 32, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -437,7 +437,7 @@ "Bounds": "232, 0, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -454,7 +454,7 @@ "Bounds": "240, 104, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -470,7 +470,7 @@ "Bounds": "240, 176, 16, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -486,7 +486,7 @@ "Bounds": "248, 160, 8, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -494,7 +494,7 @@ "Bounds": "0, 184, 24, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -503,7 +503,7 @@ "Bounds": "0, 232, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -512,7 +512,7 @@ "Bounds": "0, 240, 64, 8" }, { - "Entities": [ + "Types": [ 350, 351, 352, @@ -522,7 +522,7 @@ "Bounds": "24, 32, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -530,7 +530,7 @@ "Bounds": "24, 184, 24, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -539,7 +539,7 @@ "Bounds": "48, 184, 64, 8" }, { - "Entities": [ + "Types": [ 1, 10 ], @@ -547,7 +547,7 @@ "Bounds": "64, 64, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -556,7 +556,7 @@ "Bounds": "96, 96, 32, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -565,7 +565,7 @@ "Bounds": "96, 232, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -581,7 +581,7 @@ "Bounds": "112, 144, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -590,7 +590,7 @@ "Bounds": "128, 104, 32, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -599,7 +599,7 @@ "Bounds": "136, 48, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -615,7 +615,7 @@ "Bounds": "152, 136, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -631,7 +631,7 @@ "Bounds": "168, 160, 8, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -640,7 +640,7 @@ "Bounds": "168, 240, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -649,7 +649,7 @@ "Bounds": "184, 248, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -665,7 +665,7 @@ "Bounds": "192, 32, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -674,7 +674,7 @@ "Bounds": "192, 192, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -690,7 +690,7 @@ "Bounds": "208, 152, 8, 24" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -698,7 +698,7 @@ "Bounds": "216, 240, 32, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -707,7 +707,7 @@ "Bounds": "232, 72, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -723,7 +723,7 @@ "Bounds": "240, 200, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -739,7 +739,7 @@ "Bounds": "248, 72, 8, 40" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -748,7 +748,7 @@ "Bounds": "0, 64, 48, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -756,7 +756,7 @@ "Bounds": "0, 104, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -765,7 +765,7 @@ "Bounds": "0, 200, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -773,7 +773,7 @@ "Bounds": "16, 96, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -782,7 +782,7 @@ "Bounds": "16, 200, 16, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -790,7 +790,7 @@ "Bounds": "16, 224, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -799,7 +799,7 @@ "Bounds": "24, 128, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -808,7 +808,7 @@ "Bounds": "32, 200, 32, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -816,7 +816,7 @@ "Bounds": "32, 232, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -824,7 +824,7 @@ "Bounds": "40, 80, 8, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -832,7 +832,7 @@ "Bounds": "40, 104, 24, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -840,7 +840,7 @@ "Bounds": "56, 64, 56, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -848,7 +848,7 @@ "Bounds": "64, 104, 16, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -857,7 +857,7 @@ "Bounds": "64, 176, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -866,7 +866,7 @@ "Bounds": "64, 200, 16, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -874,7 +874,7 @@ "Bounds": "80, 104, 24, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -882,7 +882,7 @@ "Bounds": "112, 64, 56, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -890,7 +890,7 @@ "Bounds": "120, 80, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -898,7 +898,7 @@ "Bounds": "120, 96, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -914,7 +914,7 @@ "Bounds": "120, 192, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -923,7 +923,7 @@ "Bounds": "128, 160, 32, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -931,7 +931,7 @@ "Bounds": "144, 80, 16, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -939,7 +939,7 @@ "Bounds": "152, 56, 56, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -948,7 +948,7 @@ "Bounds": "152, 176, 8, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -956,7 +956,7 @@ "Bounds": "160, 80, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -965,7 +965,7 @@ "Bounds": "168, 72, 48, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -973,7 +973,7 @@ "Bounds": "168, 192, 16, 16" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -981,7 +981,7 @@ "Bounds": "176, 80, 16, 24" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -989,7 +989,7 @@ "Bounds": "192, 80, 16, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -997,7 +997,7 @@ "Bounds": "192, 224, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1005,7 +1005,7 @@ "Bounds": "200, 192, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1021,7 +1021,7 @@ "Bounds": "208, 48, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1029,7 +1029,7 @@ "Bounds": "208, 88, 24, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1037,7 +1037,7 @@ "Bounds": "208, 224, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1046,7 +1046,7 @@ "Bounds": "216, 72, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1054,7 +1054,7 @@ "Bounds": "216, 160, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1062,7 +1062,7 @@ "Bounds": "216, 192, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1071,7 +1071,7 @@ "Bounds": "224, 224, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1079,7 +1079,7 @@ "Bounds": "232, 96, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1088,7 +1088,7 @@ "Bounds": "232, 216, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1097,7 +1097,7 @@ "Bounds": "240, 144, 8, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1105,7 +1105,7 @@ "Bounds": "240, 224, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1113,7 +1113,7 @@ "Bounds": "248, 160, 8, 8" }, { - "Entities": [ + "Types": [ 242, 244, 245, @@ -1124,7 +1124,7 @@ "Bounds": "0, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1133,7 +1133,7 @@ "Bounds": "0, 32, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1142,7 +1142,7 @@ "Bounds": "0, 56, 16, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1150,7 +1150,7 @@ "Bounds": "0, 64, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1159,7 +1159,7 @@ "Bounds": "0, 96, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1167,7 +1167,7 @@ "Bounds": "0, 104, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1175,7 +1175,7 @@ "Bounds": "8, 64, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1184,7 +1184,7 @@ "Bounds": "8, 96, 8, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1193,7 +1193,7 @@ "Bounds": "16, 72, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1202,7 +1202,7 @@ "Bounds": "16, 96, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1210,7 +1210,7 @@ "Bounds": "16, 104, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1219,7 +1219,7 @@ "Bounds": "24, 32, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1227,7 +1227,7 @@ "Bounds": "24, 64, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1235,7 +1235,7 @@ "Bounds": "32, 64, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1243,7 +1243,7 @@ "Bounds": "32, 88, 6, 14" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1252,7 +1252,7 @@ "Bounds": "40, 48, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1260,7 +1260,7 @@ "Bounds": "40, 104, 6, 6" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1269,7 +1269,7 @@ "Bounds": "48, 32, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1278,7 +1278,7 @@ "Bounds": "48, 48, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1286,7 +1286,7 @@ "Bounds": "48, 88, 6, 14" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1294,7 +1294,7 @@ "Bounds": "54, 88, 14, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1303,7 +1303,7 @@ "Bounds": "54, 94, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1312,7 +1312,7 @@ "Bounds": "56, 48, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1321,7 +1321,7 @@ "Bounds": "62, 94, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1330,7 +1330,7 @@ "Bounds": "64, 48, 8, 16" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1338,7 +1338,7 @@ "Bounds": "64, 64, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1346,7 +1346,7 @@ "Bounds": "68, 88, 14, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1355,7 +1355,7 @@ "Bounds": "70, 94, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1364,7 +1364,7 @@ "Bounds": "72, 32, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1373,7 +1373,7 @@ "Bounds": "72, 48, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1382,7 +1382,7 @@ "Bounds": "82, 88, 8, 8" }, { - "Entities": [ + "Types": [ 185, 188 ], @@ -1390,7 +1390,7 @@ "Bounds": "86, 104, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1399,7 +1399,7 @@ "Bounds": "88, 48, 8, 16" }, { - "Entities": [ + "Types": [ 6, 7, 8, @@ -1409,7 +1409,7 @@ "Bounds": "90, 88, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1418,7 +1418,7 @@ "Bounds": "98, 88, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1426,7 +1426,7 @@ "Bounds": "104, 64, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1435,7 +1435,7 @@ "Bounds": "106, 88, 8, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1444,7 +1444,7 @@ "Bounds": "112, 32, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1453,7 +1453,7 @@ "Bounds": "114, 88, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1461,7 +1461,7 @@ "Bounds": "118, 96, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1470,7 +1470,7 @@ "Bounds": "120, 48, 16, 8" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1479,7 +1479,7 @@ "Bounds": "120, 64, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1488,7 +1488,7 @@ "Bounds": "122, 88, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1496,7 +1496,7 @@ "Bounds": "128, 56, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1505,7 +1505,7 @@ "Bounds": "130, 88, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1514,7 +1514,7 @@ "Bounds": "136, 48, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1522,7 +1522,7 @@ "Bounds": "138, 88, 6, 6" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1530,7 +1530,7 @@ "Bounds": "144, 32, 8, 24" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1538,7 +1538,7 @@ "Bounds": "152, 32, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1547,7 +1547,7 @@ "Bounds": "160, 48, 16, 8" }, { - "Entities": [ + "Types": [ 242, 244, 246 @@ -1556,7 +1556,7 @@ "Bounds": "166, 104, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1565,7 +1565,7 @@ "Bounds": "168, 88, 8, 8" }, { - "Entities": [ + "Types": [ 160, 185, 315 @@ -1574,7 +1574,7 @@ "Bounds": "174, 96, 8, 8" }, { - "Entities": [ + "Types": [ 244, 247 ], @@ -1582,7 +1582,7 @@ "Bounds": "174, 104, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1591,7 +1591,7 @@ "Bounds": "176, 48, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1600,7 +1600,7 @@ "Bounds": "176, 88, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1608,7 +1608,7 @@ "Bounds": "182, 96, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1616,7 +1616,7 @@ "Bounds": "190, 96, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1625,7 +1625,7 @@ "Bounds": "192, 88, 8, 8" }, { - "Entities": [ + "Types": [ 350, 351, 352, @@ -1635,7 +1635,7 @@ "Bounds": "192, 112, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1643,7 +1643,7 @@ "Bounds": "198, 96, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1652,7 +1652,7 @@ "Bounds": "200, 24, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1660,7 +1660,7 @@ "Bounds": "200, 32, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1669,7 +1669,7 @@ "Bounds": "200, 48, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1678,7 +1678,7 @@ "Bounds": "200, 88, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1686,7 +1686,7 @@ "Bounds": "206, 96, 8, 8" }, { - "Entities": [ + "Types": [ 242, 246 ], @@ -1694,7 +1694,7 @@ "Bounds": "208, 72, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1703,7 +1703,7 @@ "Bounds": "208, 88, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1711,7 +1711,7 @@ "Bounds": "214, 96, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1720,7 +1720,7 @@ "Bounds": "216, 48, 8, 16" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1730,7 +1730,7 @@ "Bounds": "216, 64, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1738,7 +1738,7 @@ "Bounds": "222, 96, 8, 8" }, { - "Entities": [ + "Types": [ 350, 351, 352, @@ -1748,7 +1748,7 @@ "Bounds": "224, 16, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1756,7 +1756,7 @@ "Bounds": "224, 32, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1765,7 +1765,7 @@ "Bounds": "224, 88, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1774,7 +1774,7 @@ "Bounds": "232, 64, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1783,7 +1783,7 @@ "Bounds": "232, 88, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1791,7 +1791,7 @@ "Bounds": "240, 56, 8, 16" }, { - "Entities": [ + "Types": [ 350, 351, 352, @@ -1801,7 +1801,7 @@ "Bounds": "240, 80, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/QUADCHAS.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/QUADCHAS.TR2-TextureRemap.json index f2b498aa9..aab8c2891 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/QUADCHAS.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/QUADCHAS.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 6, 165, 190 @@ -11,7 +11,7 @@ "Bounds": "0, 240, 64, 16" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -19,7 +19,7 @@ "Bounds": "64, 0, 72, 96" }, { - "Entities": [ + "Types": [ 131, 132, 133, @@ -29,7 +29,7 @@ "Bounds": "136, 0, 64, 64" }, { - "Entities": [ + "Types": [ 142, 143, 144 @@ -38,7 +38,7 @@ "Bounds": "136, 64, 64, 64" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -47,7 +47,7 @@ "Bounds": "208, 232, 48, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -65,7 +65,7 @@ "Bounds": "240, 40, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -83,7 +83,7 @@ "Bounds": "240, 80, 16, 24" }, { - "Entities": [ + "Types": [ 142, 143, 144 @@ -92,7 +92,7 @@ "Bounds": "32, 142, 64, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -101,7 +101,7 @@ "Bounds": "40, 182, 32, 16" }, { - "Entities": [ + "Types": [ 1, 5, 6, @@ -113,7 +113,7 @@ "Bounds": "96, 142, 8, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -121,7 +121,7 @@ "Bounds": "96, 150, 32, 32" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -129,7 +129,7 @@ "Bounds": "96, 246, 80, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -137,7 +137,7 @@ "Bounds": "112, 214, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -156,7 +156,7 @@ "Bounds": "116, 32, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -164,7 +164,7 @@ "Bounds": "160, 96, 6, 6" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -183,7 +183,7 @@ "Bounds": "168, 118, 16, 16" }, { - "Entities": [ + "Types": [ 142, 143, 144 @@ -192,7 +192,7 @@ "Bounds": "168, 134, 64, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -200,7 +200,7 @@ "Bounds": "168, 214, 56, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -208,7 +208,7 @@ "Bounds": "172, 48, 6, 6" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -216,7 +216,7 @@ "Bounds": "172, 54, 80, 16" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -224,7 +224,7 @@ "Bounds": "176, 246, 80, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -233,7 +233,7 @@ "Bounds": "188, 102, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -251,7 +251,7 @@ "Bounds": "208, 198, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -260,7 +260,7 @@ "Bounds": "220, 46, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -278,7 +278,7 @@ "Bounds": "224, 198, 8, 8" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -292,7 +292,7 @@ "Bounds": "224, 206, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -311,7 +311,7 @@ "Bounds": "232, 174, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -329,7 +329,7 @@ "Bounds": "0, 80, 16, 40" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -338,7 +338,7 @@ "Bounds": "0, 224, 64, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -356,7 +356,7 @@ "Bounds": "16, 80, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -374,7 +374,7 @@ "Bounds": "32, 80, 16, 40" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -382,7 +382,7 @@ "Bounds": "32, 232, 32, 16" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -390,7 +390,7 @@ "Bounds": "48, 96, 16, 40" }, { - "Entities": [ + "Types": [ 1, 3, 6, @@ -402,7 +402,7 @@ "Bounds": "56, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -420,7 +420,7 @@ "Bounds": "56, 248, 8, 8" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -434,7 +434,7 @@ "Bounds": "80, 0, 24, 32" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -442,7 +442,7 @@ "Bounds": "80, 168, 16, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -450,7 +450,7 @@ "Bounds": "96, 48, 32, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -459,7 +459,7 @@ "Bounds": "96, 104, 24, 16" }, { - "Entities": [ + "Types": [ 1, 3, 6, @@ -471,7 +471,7 @@ "Bounds": "104, 0, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -480,7 +480,7 @@ "Bounds": "119, 216, 64, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -498,7 +498,7 @@ "Bounds": "120, 72, 8, 8" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -506,7 +506,7 @@ "Bounds": "120, 80, 16, 40" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -520,7 +520,7 @@ "Bounds": "128, 0, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -529,7 +529,7 @@ "Bounds": "128, 48, 16, 8" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -537,7 +537,7 @@ "Bounds": "136, 80, 16, 40" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -546,7 +546,7 @@ "Bounds": "152, 248, 24, 8" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -554,7 +554,7 @@ "Bounds": "176, 0, 24, 32" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -563,7 +563,7 @@ "Bounds": "176, 112, 16, 40" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -572,7 +572,7 @@ "Bounds": "176, 152, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -590,7 +590,7 @@ "Bounds": "182, 72, 16, 40" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -599,7 +599,7 @@ "Bounds": "183, 216, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -608,7 +608,7 @@ "Bounds": "198, 72, 8, 24" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -616,7 +616,7 @@ "Bounds": "200, 0, 24, 32" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -624,7 +624,7 @@ "Bounds": "231, 224, 16, 32" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -632,7 +632,7 @@ "Bounds": "0, 0, 16, 32" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -640,7 +640,7 @@ "Bounds": "0, 64, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -649,7 +649,7 @@ "Bounds": "0, 150, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -657,7 +657,7 @@ "Bounds": "0, 182, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -666,7 +666,7 @@ "Bounds": "0, 236, 24, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -674,7 +674,7 @@ "Bounds": "16, 64, 24, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -683,7 +683,7 @@ "Bounds": "24, 238, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -691,7 +691,7 @@ "Bounds": "48, 62, 16, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -699,7 +699,7 @@ "Bounds": "48, 190, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -708,7 +708,7 @@ "Bounds": "48, 238, 16, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -717,7 +717,7 @@ "Bounds": "64, 22, 48, 8" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -726,7 +726,7 @@ "Bounds": "64, 62, 16, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -734,7 +734,7 @@ "Bounds": "64, 182, 16, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -742,7 +742,7 @@ "Bounds": "64, 198, 16, 16" }, { - "Entities": [ + "Types": [ 5, 160, 185 @@ -751,7 +751,7 @@ "Bounds": "70, 158, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -759,7 +759,7 @@ "Bounds": "72, 246, 24, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -767,7 +767,7 @@ "Bounds": "80, 62, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -776,7 +776,7 @@ "Bounds": "80, 118, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -785,7 +785,7 @@ "Bounds": "80, 150, 16, 16" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -793,7 +793,7 @@ "Bounds": "80, 190, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -801,7 +801,7 @@ "Bounds": "96, 64, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -810,7 +810,7 @@ "Bounds": "96, 150, 32, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -818,7 +818,7 @@ "Bounds": "96, 246, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -827,7 +827,7 @@ "Bounds": "112, 24, 48, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -835,7 +835,7 @@ "Bounds": "120, 64, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -844,7 +844,7 @@ "Bounds": "128, 150, 32, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -853,7 +853,7 @@ "Bounds": "128, 230, 24, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -861,7 +861,7 @@ "Bounds": "130, 0, 56, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -869,7 +869,7 @@ "Bounds": "130, 8, 56, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -878,7 +878,7 @@ "Bounds": "136, 120, 16, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -886,7 +886,7 @@ "Bounds": "144, 72, 16, 24" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -894,7 +894,7 @@ "Bounds": "144, 197, 8, 32" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -902,7 +902,7 @@ "Bounds": "150, 181, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -910,7 +910,7 @@ "Bounds": "152, 197, 14, 6" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -918,7 +918,7 @@ "Bounds": "160, 64, 24, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -926,7 +926,7 @@ "Bounds": "160, 150, 6, 14" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -935,7 +935,7 @@ "Bounds": "166, 181, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -953,7 +953,7 @@ "Bounds": "184, 48, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -961,7 +961,7 @@ "Bounds": "184, 64, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -970,7 +970,7 @@ "Bounds": "184, 152, 32, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -978,7 +978,7 @@ "Bounds": "186, 0, 56, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -987,7 +987,7 @@ "Bounds": "192, 96, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -996,7 +996,7 @@ "Bounds": "200, 232, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1015,7 +1015,7 @@ "Bounds": "206, 136, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1023,7 +1023,7 @@ "Bounds": "208, 64, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1032,7 +1032,7 @@ "Bounds": "214, 192, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1041,7 +1041,7 @@ "Bounds": "216, 48, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1050,7 +1050,7 @@ "Bounds": "216, 152, 16, 16" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -1058,7 +1058,7 @@ "Bounds": "222, 136, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1076,7 +1076,7 @@ "Bounds": "224, 64, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1084,7 +1084,7 @@ "Bounds": "224, 72, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1093,7 +1093,7 @@ "Bounds": "224, 232, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1101,7 +1101,7 @@ "Bounds": "232, 56, 24, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1110,7 +1110,7 @@ "Bounds": "232, 120, 24, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1119,7 +1119,7 @@ "Bounds": "240, 184, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1128,7 +1128,7 @@ "Bounds": "240, 248, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1136,7 +1136,7 @@ "Bounds": "242, 14, 14, 6" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1145,7 +1145,7 @@ "Bounds": "248, 72, 8, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1154,7 +1154,7 @@ "Bounds": "8, 0, 8, 24" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -1163,7 +1163,7 @@ "Bounds": "16, 0, 8, 24" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1171,7 +1171,7 @@ "Bounds": "24, 0, 8, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1179,7 +1179,7 @@ "Bounds": "24, 24, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1187,7 +1187,7 @@ "Bounds": "24, 64, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1195,7 +1195,7 @@ "Bounds": "32, 24, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1203,7 +1203,7 @@ "Bounds": "32, 64, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1211,7 +1211,7 @@ "Bounds": "40, 24, 8, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1219,7 +1219,7 @@ "Bounds": "40, 40, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1227,7 +1227,7 @@ "Bounds": "40, 64, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1235,7 +1235,7 @@ "Bounds": "48, 24, 8, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1243,7 +1243,7 @@ "Bounds": "48, 40, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1251,7 +1251,7 @@ "Bounds": "48, 64, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1259,7 +1259,7 @@ "Bounds": "56, 24, 8, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1267,7 +1267,7 @@ "Bounds": "56, 40, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1276,7 +1276,7 @@ "Bounds": "56, 53, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1284,7 +1284,7 @@ "Bounds": "64, 24, 8, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1292,7 +1292,7 @@ "Bounds": "64, 69, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1300,7 +1300,7 @@ "Bounds": "72, 24, 16, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1308,7 +1308,7 @@ "Bounds": "72, 40, 16, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1316,7 +1316,7 @@ "Bounds": "72, 70, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1324,7 +1324,7 @@ "Bounds": "78, 48, 6, 14" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1333,7 +1333,7 @@ "Bounds": "80, 0, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1341,7 +1341,7 @@ "Bounds": "80, 64, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1350,7 +1350,7 @@ "Bounds": "88, 0, 8, 16" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1358,7 +1358,7 @@ "Bounds": "88, 24, 8, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1366,7 +1366,7 @@ "Bounds": "88, 40, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1374,7 +1374,7 @@ "Bounds": "88, 64, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1383,7 +1383,7 @@ "Bounds": "96, 0, 16, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1391,7 +1391,7 @@ "Bounds": "96, 40, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1400,7 +1400,7 @@ "Bounds": "96, 48, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1409,7 +1409,7 @@ "Bounds": "104, 48, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1418,7 +1418,7 @@ "Bounds": "112, 0, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1427,7 +1427,7 @@ "Bounds": "112, 48, 8, 8" }, { - "Entities": [ + "Types": [ 29, 91, 185, @@ -1438,7 +1438,7 @@ "Bounds": "116, 56, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1447,7 +1447,7 @@ "Bounds": "120, 48, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1456,7 +1456,7 @@ "Bounds": "128, 0, 8, 16" }, { - "Entities": [ + "Types": [ 71, 123 ], @@ -1464,7 +1464,7 @@ "Bounds": "128, 16, 16, 8" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1473,7 +1473,7 @@ "Bounds": "128, 32, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1482,7 +1482,7 @@ "Bounds": "128, 48, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1491,7 +1491,7 @@ "Bounds": "136, 0, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1500,7 +1500,7 @@ "Bounds": "136, 32, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1509,7 +1509,7 @@ "Bounds": "136, 48, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1518,7 +1518,7 @@ "Bounds": "144, 0, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1527,7 +1527,7 @@ "Bounds": "144, 32, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1536,7 +1536,7 @@ "Bounds": "144, 48, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1544,7 +1544,7 @@ "Bounds": "144, 64, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1553,7 +1553,7 @@ "Bounds": "152, 0, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1562,7 +1562,7 @@ "Bounds": "152, 48, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1570,7 +1570,7 @@ "Bounds": "160, 64, 8, 8" }, { - "Entities": [ + "Types": [ 71, 123 ], @@ -1578,7 +1578,7 @@ "Bounds": "164, 56, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1587,7 +1587,7 @@ "Bounds": "168, 48, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1595,7 +1595,7 @@ "Bounds": "176, 24, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1604,7 +1604,7 @@ "Bounds": "176, 48, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1613,7 +1613,7 @@ "Bounds": "184, 48, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1622,7 +1622,7 @@ "Bounds": "192, 48, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1631,7 +1631,7 @@ "Bounds": "200, 48, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1640,7 +1640,7 @@ "Bounds": "208, 48, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1649,7 +1649,7 @@ "Bounds": "224, 48, 8, 8" }, { - "Entities": [ + "Types": [ 168, 170, 173, @@ -1660,7 +1660,7 @@ "Bounds": "232, 24, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1669,7 +1669,7 @@ "Bounds": "232, 48, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1678,7 +1678,7 @@ "Bounds": "240, 48, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1686,7 +1686,7 @@ "Bounds": "244, 56, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/RAPIDS.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/RAPIDS.TR2-TextureRemap.json index 64019a0de..9cebb1462 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/RAPIDS.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/RAPIDS.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -19,7 +19,7 @@ "Bounds": "0, 248, 64, 8" }, { - "Entities": [ + "Types": [ 139, 142 ], @@ -27,7 +27,7 @@ "Bounds": "72, 64, 64, 64" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -35,7 +35,7 @@ "Bounds": "0, 144, 56, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -51,7 +51,7 @@ "Bounds": "0, 176, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -60,7 +60,7 @@ "Bounds": "0, 240, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -68,7 +68,7 @@ "Bounds": "24, 56, 32, 32" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -77,7 +77,7 @@ "Bounds": "24, 120, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -94,7 +94,7 @@ "Bounds": "40, 208, 8, 8" }, { - "Entities": [ + "Types": [ 1, 5, 6, @@ -106,7 +106,7 @@ "Bounds": "48, 176, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -115,7 +115,7 @@ "Bounds": "56, 56, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -124,7 +124,7 @@ "Bounds": "56, 64, 64, 16" }, { - "Entities": [ + "Types": [ 139, 142 ], @@ -132,7 +132,7 @@ "Bounds": "56, 80, 64, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -140,7 +140,7 @@ "Bounds": "56, 152, 56, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -148,7 +148,7 @@ "Bounds": "64, 216, 32, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -157,7 +157,7 @@ "Bounds": "80, 40, 48, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -174,7 +174,7 @@ "Bounds": "96, 184, 16, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -190,7 +190,7 @@ "Bounds": "112, 168, 24, 32" }, { - "Entities": [ + "Types": [ 139, 142 ], @@ -198,7 +198,7 @@ "Bounds": "120, 88, 64, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -207,7 +207,7 @@ "Bounds": "120, 248, 24, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -215,7 +215,7 @@ "Bounds": "136, 136, 56, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -230,7 +230,7 @@ "Bounds": "136, 168, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -239,7 +239,7 @@ "Bounds": "152, 104, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -257,7 +257,7 @@ "Bounds": "160, 64, 16, 24" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -273,7 +273,7 @@ "Bounds": "160, 168, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -281,7 +281,7 @@ "Bounds": "176, 56, 32, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -298,7 +298,7 @@ "Bounds": "176, 232, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -306,7 +306,7 @@ "Bounds": "184, 0, 32, 40" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -321,7 +321,7 @@ "Bounds": "184, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -338,7 +338,7 @@ "Bounds": "208, 168, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -346,7 +346,7 @@ "Bounds": "216, 0, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -363,7 +363,7 @@ "Bounds": "224, 152, 24, 32" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -372,7 +372,7 @@ "Bounds": "224, 240, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -389,7 +389,7 @@ "Bounds": "248, 176, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -407,7 +407,7 @@ "Bounds": "0, 0, 16, 40" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -415,7 +415,7 @@ "Bounds": "0, 128, 56, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -424,7 +424,7 @@ "Bounds": "0, 184, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -433,7 +433,7 @@ "Bounds": "0, 232, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -451,7 +451,7 @@ "Bounds": "16, 0, 16, 40" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -459,7 +459,7 @@ "Bounds": "16, 160, 24, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -467,7 +467,7 @@ "Bounds": "16, 176, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -476,7 +476,7 @@ "Bounds": "16, 208, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -493,7 +493,7 @@ "Bounds": "16, 216, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -511,7 +511,7 @@ "Bounds": "32, 0, 16, 40" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -519,7 +519,7 @@ "Bounds": "40, 160, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -537,7 +537,7 @@ "Bounds": "48, 0, 16, 40" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -546,7 +546,7 @@ "Bounds": "48, 72, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -555,7 +555,7 @@ "Bounds": "48, 80, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -564,7 +564,7 @@ "Bounds": "48, 88, 64, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -573,7 +573,7 @@ "Bounds": "48, 224, 16, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -581,7 +581,7 @@ "Bounds": "56, 128, 56, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -589,7 +589,7 @@ "Bounds": "56, 160, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -607,7 +607,7 @@ "Bounds": "64, 0, 16, 40" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -616,7 +616,7 @@ "Bounds": "64, 96, 48, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -625,7 +625,7 @@ "Bounds": "64, 248, 16, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -633,7 +633,7 @@ "Bounds": "72, 168, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -642,7 +642,7 @@ "Bounds": "80, 208, 8, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -650,7 +650,7 @@ "Bounds": "88, 160, 16, 24" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -658,7 +658,7 @@ "Bounds": "104, 160, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -676,7 +676,7 @@ "Bounds": "112, 80, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -685,7 +685,7 @@ "Bounds": "120, 40, 24, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -693,7 +693,7 @@ "Bounds": "120, 120, 56, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -701,7 +701,7 @@ "Bounds": "120, 160, 24, 16" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -709,7 +709,7 @@ "Bounds": "128, 104, 32, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -718,7 +718,7 @@ "Bounds": "128, 136, 48, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -727,7 +727,7 @@ "Bounds": "128, 208, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -736,7 +736,7 @@ "Bounds": "128, 224, 32, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -744,7 +744,7 @@ "Bounds": "136, 192, 8, 8" }, { - "Entities": [ + "Types": [ 5, 160, 185 @@ -753,7 +753,7 @@ "Bounds": "144, 160, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -761,7 +761,7 @@ "Bounds": "144, 168, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -770,7 +770,7 @@ "Bounds": "160, 200, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -779,7 +779,7 @@ "Bounds": "160, 224, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -787,7 +787,7 @@ "Bounds": "168, 40, 24, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -795,7 +795,7 @@ "Bounds": "168, 160, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -803,7 +803,7 @@ "Bounds": "168, 216, 16, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -812,7 +812,7 @@ "Bounds": "176, 0, 16, 40" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -820,7 +820,7 @@ "Bounds": "184, 216, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -828,7 +828,7 @@ "Bounds": "192, 160, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -836,7 +836,7 @@ "Bounds": "200, 216, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -845,7 +845,7 @@ "Bounds": "208, 248, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -862,7 +862,7 @@ "Bounds": "216, 48, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -870,7 +870,7 @@ "Bounds": "216, 160, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -879,7 +879,7 @@ "Bounds": "216, 216, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -888,7 +888,7 @@ "Bounds": "224, 232, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -896,7 +896,7 @@ "Bounds": "232, 40, 24, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -905,7 +905,7 @@ "Bounds": "232, 216, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -914,7 +914,7 @@ "Bounds": "232, 224, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -922,7 +922,7 @@ "Bounds": "240, 160, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -940,7 +940,7 @@ "Bounds": "248, 32, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -949,7 +949,7 @@ "Bounds": "0, 56, 24, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -957,7 +957,7 @@ "Bounds": "0, 72, 8, 24" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -965,7 +965,7 @@ "Bounds": "8, 72, 8, 24" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -974,7 +974,7 @@ "Bounds": "16, 112, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -982,7 +982,7 @@ "Bounds": "16, 128, 6, 14" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -990,7 +990,7 @@ "Bounds": "16, 142, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -998,7 +998,7 @@ "Bounds": "22, 128, 14, 6" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1007,7 +1007,7 @@ "Bounds": "24, 80, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1015,7 +1015,7 @@ "Bounds": "24, 104, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1023,7 +1023,7 @@ "Bounds": "24, 142, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1031,7 +1031,7 @@ "Bounds": "32, 104, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1039,7 +1039,7 @@ "Bounds": "32, 142, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1047,7 +1047,7 @@ "Bounds": "36, 128, 14, 6" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1056,7 +1056,7 @@ "Bounds": "40, 64, 8, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1064,7 +1064,7 @@ "Bounds": "48, 72, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1073,7 +1073,7 @@ "Bounds": "48, 80, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1082,7 +1082,7 @@ "Bounds": "50, 128, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1091,7 +1091,7 @@ "Bounds": "56, 48, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1100,7 +1100,7 @@ "Bounds": "56, 80, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1108,7 +1108,7 @@ "Bounds": "56, 104, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1117,7 +1117,7 @@ "Bounds": "58, 128, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1126,7 +1126,7 @@ "Bounds": "64, 56, 24, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1134,7 +1134,7 @@ "Bounds": "64, 104, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1143,7 +1143,7 @@ "Bounds": "66, 128, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1152,7 +1152,7 @@ "Bounds": "72, 80, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1161,7 +1161,7 @@ "Bounds": "72, 112, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1169,7 +1169,7 @@ "Bounds": "74, 128, 6, 6" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1177,7 +1177,7 @@ "Bounds": "80, 104, 8, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1185,7 +1185,7 @@ "Bounds": "80, 144, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1194,7 +1194,7 @@ "Bounds": "88, 56, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1203,7 +1203,7 @@ "Bounds": "88, 80, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1211,7 +1211,7 @@ "Bounds": "88, 104, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1220,7 +1220,7 @@ "Bounds": "96, 128, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1228,7 +1228,7 @@ "Bounds": "96, 144, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1237,7 +1237,7 @@ "Bounds": "104, 80, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1246,7 +1246,7 @@ "Bounds": "104, 128, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1255,7 +1255,7 @@ "Bounds": "120, 128, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1264,7 +1264,7 @@ "Bounds": "128, 128, 8, 8" }, { - "Entities": [ + "Types": [ 127, 132, 185, @@ -1274,7 +1274,7 @@ "Bounds": "134, 136, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1283,7 +1283,7 @@ "Bounds": "136, 80, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1291,7 +1291,7 @@ "Bounds": "136, 104, 16, 8" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1301,7 +1301,7 @@ "Bounds": "144, 112, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1310,7 +1310,7 @@ "Bounds": "144, 128, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1318,7 +1318,7 @@ "Bounds": "152, 0, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1327,7 +1327,7 @@ "Bounds": "152, 80, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1336,7 +1336,7 @@ "Bounds": "152, 128, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1345,7 +1345,7 @@ "Bounds": "160, 80, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1354,7 +1354,7 @@ "Bounds": "160, 128, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1362,7 +1362,7 @@ "Bounds": "168, 0, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1371,7 +1371,7 @@ "Bounds": "168, 80, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1380,7 +1380,7 @@ "Bounds": "168, 128, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1388,7 +1388,7 @@ "Bounds": "174, 136, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1397,7 +1397,7 @@ "Bounds": "176, 80, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1406,7 +1406,7 @@ "Bounds": "176, 112, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1415,7 +1415,7 @@ "Bounds": "176, 128, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1423,7 +1423,7 @@ "Bounds": "184, 0, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1432,7 +1432,7 @@ "Bounds": "184, 128, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1441,7 +1441,7 @@ "Bounds": "192, 48, 24, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1450,7 +1450,7 @@ "Bounds": "200, 0, 16, 16" }, { - "Entities": [ + "Types": [ 244, 245, 246, @@ -1460,7 +1460,7 @@ "Bounds": "200, 16, 16, 16" }, { - "Entities": [ + "Types": [ 244, 246 ], @@ -1468,7 +1468,7 @@ "Bounds": "200, 144, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1477,7 +1477,7 @@ "Bounds": "208, 32, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1485,7 +1485,7 @@ "Bounds": "208, 104, 16, 8" }, { - "Entities": [ + "Types": [ 244, 247 ], @@ -1493,7 +1493,7 @@ "Bounds": "208, 144, 8, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1501,7 +1501,7 @@ "Bounds": "216, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1510,7 +1510,7 @@ "Bounds": "216, 48, 24, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1518,7 +1518,7 @@ "Bounds": "230, 136, 8, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -1526,7 +1526,7 @@ "Bounds": "232, 0, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1534,7 +1534,7 @@ "Bounds": "232, 64, 24, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1542,7 +1542,7 @@ "Bounds": "238, 136, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1551,7 +1551,7 @@ "Bounds": "240, 72, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1559,7 +1559,7 @@ "Bounds": "240, 144, 6, 6" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1567,7 +1567,7 @@ "Bounds": "246, 142, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1575,7 +1575,7 @@ "Bounds": "248, 0, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1584,7 +1584,7 @@ "Bounds": "248, 72, 8, 16" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1592,7 +1592,7 @@ "Bounds": "248, 104, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/ROOFS.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/ROOFS.TR2-TextureRemap.json index ef71dbee9..cb16d7620 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/ROOFS.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/ROOFS.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -27,7 +27,7 @@ "Bounds": "48, 152, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -43,7 +43,7 @@ "Bounds": "56, 96, 16, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -52,7 +52,7 @@ "Bounds": "80, 248, 64, 8" }, { - "Entities": [ + "Types": [ 139, 140 ], @@ -60,7 +60,7 @@ "Bounds": "104, 208, 40, 40" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -69,7 +69,7 @@ "Bounds": "112, 168, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -86,7 +86,7 @@ "Bounds": "192, 64, 8, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -103,7 +103,7 @@ "Bounds": "192, 104, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -111,7 +111,7 @@ "Bounds": "224, 208, 32, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -128,7 +128,7 @@ "Bounds": "248, 152, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -137,7 +137,7 @@ "Bounds": "0, 80, 64, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -145,7 +145,7 @@ "Bounds": "0, 160, 56, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -156,7 +156,7 @@ "Bounds": "0, 192, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -165,7 +165,7 @@ "Bounds": "24, 56, 24, 8" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -176,7 +176,7 @@ "Bounds": "24, 192, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -193,7 +193,7 @@ "Bounds": "48, 192, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -210,7 +210,7 @@ "Bounds": "56, 128, 8, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -221,7 +221,7 @@ "Bounds": "56, 184, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -237,7 +237,7 @@ "Bounds": "64, 64, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -246,7 +246,7 @@ "Bounds": "80, 24, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -255,7 +255,7 @@ "Bounds": "80, 32, 64, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -264,7 +264,7 @@ "Bounds": "80, 56, 48, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -275,7 +275,7 @@ "Bounds": "80, 184, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -283,7 +283,7 @@ "Bounds": "104, 0, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -300,7 +300,7 @@ "Bounds": "112, 112, 16, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -308,7 +308,7 @@ "Bounds": "112, 152, 56, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -316,7 +316,7 @@ "Bounds": "128, 72, 32, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -327,7 +327,7 @@ "Bounds": "128, 184, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -344,7 +344,7 @@ "Bounds": "144, 216, 8, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -353,7 +353,7 @@ "Bounds": "144, 240, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -369,7 +369,7 @@ "Bounds": "152, 184, 16, 24" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -380,7 +380,7 @@ "Bounds": "152, 208, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -388,7 +388,7 @@ "Bounds": "168, 144, 56, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -399,7 +399,7 @@ "Bounds": "168, 176, 24, 32" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -407,7 +407,7 @@ "Bounds": "176, 232, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -424,7 +424,7 @@ "Bounds": "192, 72, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -435,7 +435,7 @@ "Bounds": "192, 176, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -443,7 +443,7 @@ "Bounds": "200, 56, 32, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -453,7 +453,7 @@ "Bounds": "216, 176, 8, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -464,7 +464,7 @@ "Bounds": "216, 192, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -481,7 +481,7 @@ "Bounds": "224, 144, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -492,7 +492,7 @@ "Bounds": "224, 160, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -508,7 +508,7 @@ "Bounds": "232, 56, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -524,7 +524,7 @@ "Bounds": "240, 0, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -540,7 +540,7 @@ "Bounds": "240, 40, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -548,7 +548,7 @@ "Bounds": "0, 96, 24, 24" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -556,7 +556,7 @@ "Bounds": "0, 184, 32, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -564,7 +564,7 @@ "Bounds": "0, 240, 56, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -581,7 +581,7 @@ "Bounds": "24, 96, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -597,7 +597,7 @@ "Bounds": "40, 64, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -613,7 +613,7 @@ "Bounds": "56, 152, 16, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -621,7 +621,7 @@ "Bounds": "56, 240, 56, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -637,7 +637,7 @@ "Bounds": "64, 216, 16, 16" }, { - "Entities": [ + "Types": [ 1, 10 ], @@ -645,7 +645,7 @@ "Bounds": "80, 72, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -662,7 +662,7 @@ "Bounds": "80, 96, 16, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -671,7 +671,7 @@ "Bounds": "112, 248, 48, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -680,7 +680,7 @@ "Bounds": "120, 88, 24, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -689,7 +689,7 @@ "Bounds": "168, 160, 64, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -697,7 +697,7 @@ "Bounds": "168, 232, 56, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -705,7 +705,7 @@ "Bounds": "192, 88, 24, 24" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -714,7 +714,7 @@ "Bounds": "200, 40, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -731,7 +731,7 @@ "Bounds": "200, 80, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -747,7 +747,7 @@ "Bounds": "208, 32, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -756,7 +756,7 @@ "Bounds": "208, 248, 48, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -765,7 +765,7 @@ "Bounds": "216, 152, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -774,7 +774,7 @@ "Bounds": "224, 240, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -790,7 +790,7 @@ "Bounds": "232, 56, 8, 8" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -798,7 +798,7 @@ "Bounds": "240, 168, 16, 32" }, { - "Entities": [ + "Types": [ 139, 140 ], @@ -806,7 +806,7 @@ "Bounds": "248, 64, 8, 40" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -814,7 +814,7 @@ "Bounds": "0, 24, 16, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -823,7 +823,7 @@ "Bounds": "0, 224, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -832,7 +832,7 @@ "Bounds": "16, 0, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -840,7 +840,7 @@ "Bounds": "16, 40, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -848,7 +848,7 @@ "Bounds": "16, 80, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -857,7 +857,7 @@ "Bounds": "16, 88, 32, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -866,7 +866,7 @@ "Bounds": "24, 224, 8, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -874,7 +874,7 @@ "Bounds": "32, 24, 16, 24" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -882,7 +882,7 @@ "Bounds": "48, 40, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -891,7 +891,7 @@ "Bounds": "56, 96, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -899,7 +899,7 @@ "Bounds": "56, 216, 8, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -907,7 +907,7 @@ "Bounds": "64, 88, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -915,7 +915,7 @@ "Bounds": "72, 24, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -924,7 +924,7 @@ "Bounds": "72, 136, 8, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -932,7 +932,7 @@ "Bounds": "72, 160, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -940,7 +940,7 @@ "Bounds": "80, 88, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -948,7 +948,7 @@ "Bounds": "80, 96, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -956,7 +956,7 @@ "Bounds": "88, 24, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -965,7 +965,7 @@ "Bounds": "96, 96, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -974,7 +974,7 @@ "Bounds": "96, 216, 8, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -982,7 +982,7 @@ "Bounds": "96, 248, 24, 8" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -990,7 +990,7 @@ "Bounds": "104, 176, 8, 32" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -998,7 +998,7 @@ "Bounds": "112, 32, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1007,7 +1007,7 @@ "Bounds": "112, 96, 16, 16" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1015,7 +1015,7 @@ "Bounds": "112, 176, 8, 32" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1023,7 +1023,7 @@ "Bounds": "120, 176, 8, 32" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1031,7 +1031,7 @@ "Bounds": "120, 248, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1040,7 +1040,7 @@ "Bounds": "128, 96, 32, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1049,7 +1049,7 @@ "Bounds": "128, 216, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1058,7 +1058,7 @@ "Bounds": "128, 224, 24, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1066,7 +1066,7 @@ "Bounds": "136, 32, 24, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1074,7 +1074,7 @@ "Bounds": "144, 152, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1083,7 +1083,7 @@ "Bounds": "152, 216, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1092,7 +1092,7 @@ "Bounds": "152, 224, 24, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1100,7 +1100,7 @@ "Bounds": "160, 32, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1109,7 +1109,7 @@ "Bounds": "160, 96, 32, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1117,7 +1117,7 @@ "Bounds": "160, 152, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1125,7 +1125,7 @@ "Bounds": "176, 152, 16, 16" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1133,7 +1133,7 @@ "Bounds": "176, 176, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1141,7 +1141,7 @@ "Bounds": "184, 32, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1149,7 +1149,7 @@ "Bounds": "184, 80, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1158,7 +1158,7 @@ "Bounds": "192, 96, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1167,7 +1167,7 @@ "Bounds": "192, 152, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1175,7 +1175,7 @@ "Bounds": "208, 16, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1183,7 +1183,7 @@ "Bounds": "208, 32, 16, 24" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1191,7 +1191,7 @@ "Bounds": "208, 56, 24, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1199,7 +1199,7 @@ "Bounds": "208, 152, 16, 16" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1207,7 +1207,7 @@ "Bounds": "208, 168, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1216,7 +1216,7 @@ "Bounds": "208, 232, 16, 8" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1224,7 +1224,7 @@ "Bounds": "220, 216, 1, 8" }, { - "Entities": [ + "Types": [ 244, 245, 247 @@ -1233,7 +1233,7 @@ "Bounds": "224, 176, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1241,7 +1241,7 @@ "Bounds": "232, 16, 16, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1250,7 +1250,7 @@ "Bounds": "240, 232, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1259,7 +1259,7 @@ "Bounds": "240, 248, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1267,7 +1267,7 @@ "Bounds": "0, 32, 16, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1275,7 +1275,7 @@ "Bounds": "16, 88, 8, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1284,7 +1284,7 @@ "Bounds": "24, 0, 8, 24" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1292,7 +1292,7 @@ "Bounds": "24, 88, 8, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1300,7 +1300,7 @@ "Bounds": "32, 0, 8, 24" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1308,7 +1308,7 @@ "Bounds": "32, 88, 8, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1316,7 +1316,7 @@ "Bounds": "40, 0, 8, 24" }, { - "Entities": [ + "Types": [ 160, 185 ], @@ -1324,7 +1324,7 @@ "Bounds": "40, 80, 8, 8" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1332,7 +1332,7 @@ "Bounds": "40, 88, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1340,7 +1340,7 @@ "Bounds": "48, 64, 6, 14" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1348,7 +1348,7 @@ "Bounds": "54, 64, 6, 14" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1357,7 +1357,7 @@ "Bounds": "56, 8, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1365,7 +1365,7 @@ "Bounds": "56, 32, 16, 8" }, { - "Entities": [ + "Types": [ 127, 185, 188 @@ -1374,7 +1374,7 @@ "Bounds": "56, 78, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1382,7 +1382,7 @@ "Bounds": "60, 64, 14, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1391,7 +1391,7 @@ "Bounds": "60, 70, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1399,7 +1399,7 @@ "Bounds": "64, 78, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1408,7 +1408,7 @@ "Bounds": "68, 70, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1417,7 +1417,7 @@ "Bounds": "72, 8, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1425,7 +1425,7 @@ "Bounds": "74, 64, 14, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1434,7 +1434,7 @@ "Bounds": "76, 70, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1443,7 +1443,7 @@ "Bounds": "80, 8, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1451,7 +1451,7 @@ "Bounds": "80, 80, 8, 8" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1459,7 +1459,7 @@ "Bounds": "80, 88, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1468,7 +1468,7 @@ "Bounds": "88, 8, 8, 16" }, { - "Entities": [ + "Types": [ 6, 7, 8, @@ -1478,7 +1478,7 @@ "Bounds": "88, 64, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1486,7 +1486,7 @@ "Bounds": "88, 80, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1495,7 +1495,7 @@ "Bounds": "96, 8, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1504,7 +1504,7 @@ "Bounds": "96, 64, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1512,7 +1512,7 @@ "Bounds": "96, 80, 8, 8" }, { - "Entities": [ + "Types": [ 244, 247 ], @@ -1520,7 +1520,7 @@ "Bounds": "96, 88, 8, 8" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1528,7 +1528,7 @@ "Bounds": "104, 32, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1537,7 +1537,7 @@ "Bounds": "104, 64, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1545,7 +1545,7 @@ "Bounds": "104, 80, 8, 8" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1554,7 +1554,7 @@ "Bounds": "112, 32, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1563,7 +1563,7 @@ "Bounds": "112, 64, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1571,7 +1571,7 @@ "Bounds": "112, 80, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1580,7 +1580,7 @@ "Bounds": "120, 64, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1588,7 +1588,7 @@ "Bounds": "120, 80, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1597,7 +1597,7 @@ "Bounds": "128, 64, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1606,7 +1606,7 @@ "Bounds": "144, 64, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1615,7 +1615,7 @@ "Bounds": "152, 64, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1623,7 +1623,7 @@ "Bounds": "152, 96, 6, 6" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1631,7 +1631,7 @@ "Bounds": "158, 96, 6, 6" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1640,7 +1640,7 @@ "Bounds": "160, 64, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1649,7 +1649,7 @@ "Bounds": "168, 64, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1658,7 +1658,7 @@ "Bounds": "176, 0, 8, 16" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1668,7 +1668,7 @@ "Bounds": "176, 32, 16, 8" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1676,7 +1676,7 @@ "Bounds": "176, 40, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1685,7 +1685,7 @@ "Bounds": "184, 0, 8, 16" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1693,7 +1693,7 @@ "Bounds": "184, 40, 8, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1701,7 +1701,7 @@ "Bounds": "184, 80, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1710,7 +1710,7 @@ "Bounds": "192, 0, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1719,7 +1719,7 @@ "Bounds": "192, 32, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1728,7 +1728,7 @@ "Bounds": "192, 64, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1737,7 +1737,7 @@ "Bounds": "200, 0, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1745,7 +1745,7 @@ "Bounds": "200, 24, 8, 16" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1753,7 +1753,7 @@ "Bounds": "200, 40, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1762,7 +1762,7 @@ "Bounds": "200, 64, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1770,7 +1770,7 @@ "Bounds": "200, 80, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1779,7 +1779,7 @@ "Bounds": "208, 0, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1787,7 +1787,7 @@ "Bounds": "208, 24, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1796,7 +1796,7 @@ "Bounds": "208, 64, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1804,7 +1804,7 @@ "Bounds": "216, 24, 8, 16" }, { - "Entities": [ + "Types": [ 225, 229 ], @@ -1812,7 +1812,7 @@ "Bounds": "216, 40, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1821,7 +1821,7 @@ "Bounds": "224, 0, 16, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1829,7 +1829,7 @@ "Bounds": "224, 24, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1838,7 +1838,7 @@ "Bounds": "224, 64, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1846,7 +1846,7 @@ "Bounds": "232, 24, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1855,7 +1855,7 @@ "Bounds": "232, 64, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1864,7 +1864,7 @@ "Bounds": "240, 0, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1872,7 +1872,7 @@ "Bounds": "240, 24, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1881,7 +1881,7 @@ "Bounds": "248, 32, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/SEWER.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/SEWER.TR2-TextureRemap.json index 0800e43a2..baa7fa0a2 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/SEWER.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/SEWER.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -19,7 +19,7 @@ "Bounds": "0, 88, 48, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -37,7 +37,7 @@ "Bounds": "48, 40, 16, 8" }, { - "Entities": [ + "Types": [ 132, 139 ], @@ -45,7 +45,7 @@ "Bounds": "64, 0, 48, 48" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -54,7 +54,7 @@ "Bounds": "64, 248, 48, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -71,7 +71,7 @@ "Bounds": "104, 112, 8, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -80,7 +80,7 @@ "Bounds": "104, 160, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -98,7 +98,7 @@ "Bounds": "112, 208, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -115,7 +115,7 @@ "Bounds": "144, 216, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -124,7 +124,7 @@ "Bounds": "144, 240, 64, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -133,7 +133,7 @@ "Bounds": "152, 192, 24, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -141,7 +141,7 @@ "Bounds": "152, 200, 32, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -158,7 +158,7 @@ "Bounds": "176, 128, 16, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -166,7 +166,7 @@ "Bounds": "184, 200, 40, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -184,7 +184,7 @@ "Bounds": "216, 160, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -202,7 +202,7 @@ "Bounds": "240, 112, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -219,7 +219,7 @@ "Bounds": "0, 96, 24, 32" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -227,7 +227,7 @@ "Bounds": "0, 136, 56, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -238,7 +238,7 @@ "Bounds": "0, 168, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -246,7 +246,7 @@ "Bounds": "24, 0, 32, 32" }, { - "Entities": [ + "Types": [ 133, 134, 135, @@ -256,7 +256,7 @@ "Bounds": "24, 32, 32, 32" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -264,7 +264,7 @@ "Bounds": "32, 232, 32, 24" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -275,7 +275,7 @@ "Bounds": "48, 168, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -283,7 +283,7 @@ "Bounds": "56, 0, 32, 32" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -291,7 +291,7 @@ "Bounds": "56, 136, 56, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -302,7 +302,7 @@ "Bounds": "72, 168, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -319,7 +319,7 @@ "Bounds": "96, 168, 16, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -330,7 +330,7 @@ "Bounds": "96, 184, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -338,7 +338,7 @@ "Bounds": "104, 120, 56, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -349,7 +349,7 @@ "Bounds": "112, 152, 24, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -360,7 +360,7 @@ "Bounds": "120, 184, 24, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -371,7 +371,7 @@ "Bounds": "136, 152, 24, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -382,7 +382,7 @@ "Bounds": "144, 184, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -399,7 +399,7 @@ "Bounds": "160, 80, 16, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -410,7 +410,7 @@ "Bounds": "160, 152, 24, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -421,7 +421,7 @@ "Bounds": "184, 152, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -439,7 +439,7 @@ "Bounds": "216, 184, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -457,7 +457,7 @@ "Bounds": "240, 192, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -474,7 +474,7 @@ "Bounds": "248, 64, 8, 40" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -483,7 +483,7 @@ "Bounds": "0, 144, 32, 8" }, { - "Entities": [ + "Types": [ 208, 212, 220 @@ -492,7 +492,7 @@ "Bounds": "0, 208, 24, 24" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -500,7 +500,7 @@ "Bounds": "24, 208, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -517,7 +517,7 @@ "Bounds": "64, 56, 8, 24" }, { - "Entities": [ + "Types": [ 233, 234 ], @@ -525,7 +525,7 @@ "Bounds": "72, 216, 24, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -534,7 +534,7 @@ "Bounds": "72, 240, 32, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -543,7 +543,7 @@ "Bounds": "88, 40, 16, 40" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -552,7 +552,7 @@ "Bounds": "104, 248, 64, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -560,7 +560,7 @@ "Bounds": "144, 152, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -577,7 +577,7 @@ "Bounds": "152, 96, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -585,7 +585,7 @@ "Bounds": "168, 152, 24, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -594,7 +594,7 @@ "Bounds": "168, 248, 48, 8" }, { - "Entities": [ + "Types": [ 207, 211 ], @@ -602,7 +602,7 @@ "Bounds": "184, 72, 40, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -611,7 +611,7 @@ "Bounds": "216, 152, 16, 8" }, { - "Entities": [ + "Types": [ 233, 234 ], @@ -619,7 +619,7 @@ "Bounds": "216, 208, 24, 24" }, { - "Entities": [ + "Types": [ 216, 220 ], @@ -627,7 +627,7 @@ "Bounds": "224, 48, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -644,7 +644,7 @@ "Bounds": "232, 104, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -652,7 +652,7 @@ "Bounds": "0, 80, 56, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -660,7 +660,7 @@ "Bounds": "0, 88, 56, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -668,7 +668,7 @@ "Bounds": "0, 136, 24, 16" }, { - "Entities": [ + "Types": [ 225, 226, 229, @@ -678,7 +678,7 @@ "Bounds": "0, 168, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -686,7 +686,7 @@ "Bounds": "0, 240, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -695,7 +695,7 @@ "Bounds": "16, 248, 32, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -704,7 +704,7 @@ "Bounds": "24, 0, 64, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -712,7 +712,7 @@ "Bounds": "24, 128, 16, 24" }, { - "Entities": [ + "Types": [ 233, 234 ], @@ -720,7 +720,7 @@ "Bounds": "24, 168, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -737,7 +737,7 @@ "Bounds": "40, 232, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -746,7 +746,7 @@ "Bounds": "48, 248, 32, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -754,7 +754,7 @@ "Bounds": "56, 128, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -762,7 +762,7 @@ "Bounds": "56, 144, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -779,7 +779,7 @@ "Bounds": "56, 232, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -787,7 +787,7 @@ "Bounds": "72, 144, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -804,7 +804,7 @@ "Bounds": "72, 232, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -821,7 +821,7 @@ "Bounds": "80, 24, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -829,7 +829,7 @@ "Bounds": "80, 80, 56, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -837,7 +837,7 @@ "Bounds": "80, 248, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -846,7 +846,7 @@ "Bounds": "88, 0, 64, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -854,7 +854,7 @@ "Bounds": "88, 16, 32, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -862,7 +862,7 @@ "Bounds": "88, 120, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -870,7 +870,7 @@ "Bounds": "88, 240, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -879,7 +879,7 @@ "Bounds": "104, 96, 24, 16" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -887,7 +887,7 @@ "Bounds": "104, 128, 16, 24" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -895,7 +895,7 @@ "Bounds": "120, 144, 24, 16" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -903,7 +903,7 @@ "Bounds": "128, 120, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -920,7 +920,7 @@ "Bounds": "136, 72, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -929,7 +929,7 @@ "Bounds": "136, 240, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -946,7 +946,7 @@ "Bounds": "144, 32, 8, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -954,7 +954,7 @@ "Bounds": "144, 128, 24, 16" }, { - "Entities": [ + "Types": [ 351, 354 ], @@ -962,7 +962,7 @@ "Bounds": "144, 192, 16, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -971,7 +971,7 @@ "Bounds": "152, 240, 16, 16" }, { - "Entities": [ + "Types": [ 205, 209 ], @@ -979,7 +979,7 @@ "Bounds": "160, 160, 24, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -987,7 +987,7 @@ "Bounds": "168, 128, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -996,7 +996,7 @@ "Bounds": "168, 240, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -1005,7 +1005,7 @@ "Bounds": "176, 48, 8, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1013,7 +1013,7 @@ "Bounds": "184, 232, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1021,7 +1021,7 @@ "Bounds": "192, 136, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1030,7 +1030,7 @@ "Bounds": "200, 240, 32, 8" }, { - "Entities": [ + "Types": [ 1, 10 ], @@ -1038,7 +1038,7 @@ "Bounds": "216, 120, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1046,7 +1046,7 @@ "Bounds": "216, 128, 24, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1054,7 +1054,7 @@ "Bounds": "216, 160, 24, 16" }, { - "Entities": [ + "Types": [ 206, 210 ], @@ -1062,7 +1062,7 @@ "Bounds": "232, 0, 16, 32" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1071,7 +1071,7 @@ "Bounds": "232, 240, 16, 16" }, { - "Entities": [ + "Types": [ 216, 220 ], @@ -1079,7 +1079,7 @@ "Bounds": "240, 144, 16, 24" }, { - "Entities": [ + "Types": [ 132, 139 ], @@ -1087,7 +1087,7 @@ "Bounds": "248, 96, 8, 48" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1096,7 +1096,7 @@ "Bounds": "248, 240, 8, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1104,7 +1104,7 @@ "Bounds": "0, 72, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1113,7 +1113,7 @@ "Bounds": "0, 136, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1122,7 +1122,7 @@ "Bounds": "0, 184, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1130,7 +1130,7 @@ "Bounds": "8, 240, 6, 14" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1139,7 +1139,7 @@ "Bounds": "14, 240, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1148,7 +1148,7 @@ "Bounds": "16, 184, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1157,7 +1157,7 @@ "Bounds": "24, 136, 24, 8" }, { - "Entities": [ + "Types": [ 244, 245, 247 @@ -1166,7 +1166,7 @@ "Bounds": "32, 72, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1174,7 +1174,7 @@ "Bounds": "40, 240, 14, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1183,7 +1183,7 @@ "Bounds": "40, 246, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1192,7 +1192,7 @@ "Bounds": "48, 176, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1200,7 +1200,7 @@ "Bounds": "54, 240, 14, 6" }, { - "Entities": [ + "Types": [ 216, 220 ], @@ -1208,7 +1208,7 @@ "Bounds": "56, 160, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1217,7 +1217,7 @@ "Bounds": "56, 184, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1226,7 +1226,7 @@ "Bounds": "72, 184, 16, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1234,7 +1234,7 @@ "Bounds": "80, 40, 8, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1243,7 +1243,7 @@ "Bounds": "80, 48, 16, 16" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1253,7 +1253,7 @@ "Bounds": "80, 208, 16, 8" }, { - "Entities": [ + "Types": [ 208, 212, 216, @@ -1263,7 +1263,7 @@ "Bounds": "80, 216, 16, 8" }, { - "Entities": [ + "Types": [ 6, 7, 8, @@ -1273,7 +1273,7 @@ "Bounds": "80, 240, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1282,7 +1282,7 @@ "Bounds": "88, 184, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1291,7 +1291,7 @@ "Bounds": "88, 240, 8, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1299,7 +1299,7 @@ "Bounds": "96, 48, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1308,7 +1308,7 @@ "Bounds": "96, 184, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1317,7 +1317,7 @@ "Bounds": "96, 208, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1326,7 +1326,7 @@ "Bounds": "96, 240, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1343,7 +1343,7 @@ "Bounds": "104, 128, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1352,7 +1352,7 @@ "Bounds": "104, 184, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1360,7 +1360,7 @@ "Bounds": "104, 200, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1369,7 +1369,7 @@ "Bounds": "104, 240, 8, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -1377,7 +1377,7 @@ "Bounds": "112, 48, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1394,7 +1394,7 @@ "Bounds": "112, 128, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1403,7 +1403,7 @@ "Bounds": "112, 184, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1411,7 +1411,7 @@ "Bounds": "112, 200, 8, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1419,7 +1419,7 @@ "Bounds": "112, 216, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1428,7 +1428,7 @@ "Bounds": "112, 240, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1437,7 +1437,7 @@ "Bounds": "120, 128, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1446,7 +1446,7 @@ "Bounds": "120, 136, 24, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1455,7 +1455,7 @@ "Bounds": "120, 208, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1464,7 +1464,7 @@ "Bounds": "120, 240, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1472,7 +1472,7 @@ "Bounds": "128, 200, 8, 16" }, { - "Entities": [ + "Types": [ 216, 220 ], @@ -1480,7 +1480,7 @@ "Bounds": "128, 216, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1489,7 +1489,7 @@ "Bounds": "128, 240, 8, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1498,7 +1498,7 @@ "Bounds": "136, 152, 8, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1506,7 +1506,7 @@ "Bounds": "136, 200, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1515,7 +1515,7 @@ "Bounds": "136, 240, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1524,7 +1524,7 @@ "Bounds": "144, 128, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1533,7 +1533,7 @@ "Bounds": "144, 136, 24, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1541,7 +1541,7 @@ "Bounds": "144, 200, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1550,7 +1550,7 @@ "Bounds": "152, 176, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1559,7 +1559,7 @@ "Bounds": "152, 240, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1568,7 +1568,7 @@ "Bounds": "160, 48, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1577,7 +1577,7 @@ "Bounds": "160, 176, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1585,7 +1585,7 @@ "Bounds": "160, 200, 8, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1593,7 +1593,7 @@ "Bounds": "160, 216, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1601,7 +1601,7 @@ "Bounds": "168, 200, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1610,7 +1610,7 @@ "Bounds": "176, 136, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1619,7 +1619,7 @@ "Bounds": "176, 176, 16, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1627,7 +1627,7 @@ "Bounds": "176, 216, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1636,7 +1636,7 @@ "Bounds": "176, 240, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1644,7 +1644,7 @@ "Bounds": "184, 40, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1653,7 +1653,7 @@ "Bounds": "184, 240, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1661,7 +1661,7 @@ "Bounds": "192, 152, 24, 8" }, { - "Entities": [ + "Types": [ 351, 354 ], @@ -1669,7 +1669,7 @@ "Bounds": "192, 224, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1678,7 +1678,7 @@ "Bounds": "192, 240, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1686,7 +1686,7 @@ "Bounds": "200, 40, 16, 16" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1694,7 +1694,7 @@ "Bounds": "200, 200, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1703,7 +1703,7 @@ "Bounds": "200, 240, 8, 8" }, { - "Entities": [ + "Types": [ 207, 211 ], @@ -1711,7 +1711,7 @@ "Bounds": "208, 56, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1720,7 +1720,7 @@ "Bounds": "208, 240, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1728,7 +1728,7 @@ "Bounds": "216, 40, 16, 16" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1736,7 +1736,7 @@ "Bounds": "216, 152, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1745,7 +1745,7 @@ "Bounds": "216, 176, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1754,7 +1754,7 @@ "Bounds": "216, 240, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1762,7 +1762,7 @@ "Bounds": "216, 248, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1771,7 +1771,7 @@ "Bounds": "224, 56, 8, 8" }, { - "Entities": [ + "Types": [ 216, 220 ], @@ -1779,7 +1779,7 @@ "Bounds": "224, 64, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1787,7 +1787,7 @@ "Bounds": "224, 128, 8, 24" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1795,7 +1795,7 @@ "Bounds": "224, 152, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1804,7 +1804,7 @@ "Bounds": "224, 240, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1813,7 +1813,7 @@ "Bounds": "232, 128, 8, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1821,7 +1821,7 @@ "Bounds": "232, 152, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1829,7 +1829,7 @@ "Bounds": "232, 200, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1838,7 +1838,7 @@ "Bounds": "232, 240, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1847,7 +1847,7 @@ "Bounds": "240, 240, 8, 8" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1856,7 +1856,7 @@ "Bounds": "248, 200, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1864,7 +1864,7 @@ "Bounds": "248, 232, 6, 14" }, { - "Entities": [ + "Types": [ 205, 209 ], @@ -1872,7 +1872,7 @@ "Bounds": "8, 8, 8, 8" }, { - "Entities": [ + "Types": [ 207, 211 ], @@ -1880,7 +1880,7 @@ "Bounds": "16, 8, 8, 8" }, { - "Entities": [ + "Types": [ 160, 185, 315 @@ -1889,7 +1889,7 @@ "Bounds": "24, 0, 8, 8" }, { - "Entities": [ + "Types": [ 214, 218 ], @@ -1897,7 +1897,7 @@ "Bounds": "24, 8, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1905,7 +1905,7 @@ "Bounds": "32, 0, 8, 8" }, { - "Entities": [ + "Types": [ 225, 226, 229, @@ -1915,7 +1915,7 @@ "Bounds": "32, 8, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1923,7 +1923,7 @@ "Bounds": "40, 0, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1931,7 +1931,7 @@ "Bounds": "48, 0, 8, 8" }, { - "Entities": [ + "Types": [ 244, 247 ], @@ -1939,7 +1939,7 @@ "Bounds": "48, 8, 8, 8" }, { - "Entities": [ + "Types": [ 351, 354 ], @@ -1947,7 +1947,7 @@ "Bounds": "48, 16, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1955,7 +1955,7 @@ "Bounds": "56, 0, 8, 8" }, { - "Entities": [ + "Types": [ 351, 354 ], @@ -1963,7 +1963,7 @@ "Bounds": "56, 16, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1971,7 +1971,7 @@ "Bounds": "64, 0, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1979,7 +1979,7 @@ "Bounds": "72, 0, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1987,7 +1987,7 @@ "Bounds": "136, 0, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1995,7 +1995,7 @@ "Bounds": "144, 16, 6, 6" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -2003,7 +2003,7 @@ "Bounds": "150, 16, 6, 6" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -2011,7 +2011,7 @@ "Bounds": "152, 0, 8, 8" }, { - "Entities": [ + "Types": [ 185, 188 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/SHORE.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/SHORE.TR2-TextureRemap.json index 5724406e0..16e74965c 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/SHORE.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/SHORE.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 134, 139, 142, @@ -21,7 +21,7 @@ "Bounds": "136, 0, 64, 64" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -30,7 +30,7 @@ "Bounds": "80, 216, 32, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -39,7 +39,7 @@ "Bounds": "112, 216, 24, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -48,7 +48,7 @@ "Bounds": "112, 240, 64, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -56,7 +56,7 @@ "Bounds": "136, 208, 40, 32" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -64,7 +64,7 @@ "Bounds": "176, 208, 40, 32" }, { - "Entities": [ + "Types": [ 134, 139, 142, @@ -75,7 +75,7 @@ "Bounds": "176, 240, 64, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -83,7 +83,7 @@ "Bounds": "216, 192, 32, 40" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -92,7 +92,7 @@ "Bounds": "216, 232, 32, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -101,7 +101,7 @@ "Bounds": "0, 0, 48, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -110,7 +110,7 @@ "Bounds": "0, 56, 32, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -118,7 +118,7 @@ "Bounds": "0, 80, 56, 16" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -126,7 +126,7 @@ "Bounds": "0, 144, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -143,7 +143,7 @@ "Bounds": "32, 144, 16, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -152,7 +152,7 @@ "Bounds": "40, 192, 16, 40" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -161,7 +161,7 @@ "Bounds": "40, 232, 32, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -169,7 +169,7 @@ "Bounds": "48, 0, 32, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -177,7 +177,7 @@ "Bounds": "48, 112, 8, 24" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -192,7 +192,7 @@ "Bounds": "56, 104, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -200,7 +200,7 @@ "Bounds": "80, 0, 32, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -215,7 +215,7 @@ "Bounds": "80, 104, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -224,7 +224,7 @@ "Bounds": "80, 136, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -242,7 +242,7 @@ "Bounds": "80, 184, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -260,7 +260,7 @@ "Bounds": "96, 184, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -277,7 +277,7 @@ "Bounds": "104, 104, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -285,7 +285,7 @@ "Bounds": "112, 0, 32, 32" }, { - "Entities": [ + "Types": [ 1, 5, 6, @@ -297,7 +297,7 @@ "Bounds": "112, 72, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -305,7 +305,7 @@ "Bounds": "112, 80, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -323,7 +323,7 @@ "Bounds": "112, 184, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -341,7 +341,7 @@ "Bounds": "128, 168, 16, 40" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -349,7 +349,7 @@ "Bounds": "144, 160, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -366,7 +366,7 @@ "Bounds": "152, 112, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -375,7 +375,7 @@ "Bounds": "152, 248, 64, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -392,7 +392,7 @@ "Bounds": "160, 32, 16, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -407,7 +407,7 @@ "Bounds": "168, 96, 24, 32" }, { - "Entities": [ + "Types": [ 134, 139, 142, @@ -418,7 +418,7 @@ "Bounds": "176, 0, 64, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -426,7 +426,7 @@ "Bounds": "176, 64, 56, 16" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -434,7 +434,7 @@ "Bounds": "176, 160, 24, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -449,7 +449,7 @@ "Bounds": "192, 96, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -458,7 +458,7 @@ "Bounds": "216, 48, 24, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -473,7 +473,7 @@ "Bounds": "216, 96, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -491,7 +491,7 @@ "Bounds": "224, 184, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -508,7 +508,7 @@ "Bounds": "224, 240, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -525,7 +525,7 @@ "Bounds": "232, 64, 24, 32" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -533,7 +533,7 @@ "Bounds": "240, 96, 16, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -541,7 +541,7 @@ "Bounds": "0, 0, 24, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -550,7 +550,7 @@ "Bounds": "0, 24, 32, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -558,7 +558,7 @@ "Bounds": "0, 136, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -567,7 +567,7 @@ "Bounds": "0, 192, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -576,7 +576,7 @@ "Bounds": "16, 192, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -584,7 +584,7 @@ "Bounds": "24, 0, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -601,7 +601,7 @@ "Bounds": "24, 72, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -609,7 +609,7 @@ "Bounds": "24, 104, 56, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -618,7 +618,7 @@ "Bounds": "32, 24, 64, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -626,7 +626,7 @@ "Bounds": "40, 136, 24, 16" }, { - "Entities": [ + "Types": [ 5, 160, 185 @@ -635,7 +635,7 @@ "Bounds": "40, 184, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -652,7 +652,7 @@ "Bounds": "48, 80, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -660,7 +660,7 @@ "Bounds": "48, 192, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -669,7 +669,7 @@ "Bounds": "64, 144, 16, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -677,7 +677,7 @@ "Bounds": "64, 192, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -685,7 +685,7 @@ "Bounds": "80, 104, 56, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -693,7 +693,7 @@ "Bounds": "80, 120, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -701,7 +701,7 @@ "Bounds": "80, 136, 24, 16" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -709,7 +709,7 @@ "Bounds": "80, 192, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -718,7 +718,7 @@ "Bounds": "96, 24, 64, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -726,7 +726,7 @@ "Bounds": "96, 184, 16, 16" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -734,7 +734,7 @@ "Bounds": "96, 232, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -742,7 +742,7 @@ "Bounds": "104, 120, 16, 24" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -750,7 +750,7 @@ "Bounds": "112, 48, 32, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -758,7 +758,7 @@ "Bounds": "112, 184, 16, 16" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -766,7 +766,7 @@ "Bounds": "120, 120, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -784,7 +784,7 @@ "Bounds": "136, 96, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -792,7 +792,7 @@ "Bounds": "136, 104, 56, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -801,7 +801,7 @@ "Bounds": "136, 112, 48, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -809,7 +809,7 @@ "Bounds": "136, 120, 16, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -818,7 +818,7 @@ "Bounds": "144, 32, 16, 8" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -826,7 +826,7 @@ "Bounds": "152, 120, 16, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -834,7 +834,7 @@ "Bounds": "168, 120, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -842,7 +842,7 @@ "Bounds": "168, 136, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -851,7 +851,7 @@ "Bounds": "168, 184, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -859,7 +859,7 @@ "Bounds": "176, 200, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -867,7 +867,7 @@ "Bounds": "176, 224, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -876,7 +876,7 @@ "Bounds": "184, 112, 48, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -884,7 +884,7 @@ "Bounds": "184, 136, 24, 16" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -892,7 +892,7 @@ "Bounds": "192, 96, 32, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -900,7 +900,7 @@ "Bounds": "192, 120, 24, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -908,7 +908,7 @@ "Bounds": "192, 224, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -916,7 +916,7 @@ "Bounds": "208, 176, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -924,7 +924,7 @@ "Bounds": "208, 224, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -932,7 +932,7 @@ "Bounds": "216, 120, 16, 24" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -941,7 +941,7 @@ "Bounds": "224, 224, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -950,7 +950,7 @@ "Bounds": "224, 248, 16, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -958,7 +958,7 @@ "Bounds": "232, 112, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -976,7 +976,7 @@ "Bounds": "240, 0, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -994,7 +994,7 @@ "Bounds": "240, 96, 8, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1002,7 +1002,7 @@ "Bounds": "240, 224, 16, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1010,7 +1010,7 @@ "Bounds": "240, 240, 16, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1018,7 +1018,7 @@ "Bounds": "0, 0, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1026,7 +1026,7 @@ "Bounds": "0, 48, 24, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1034,7 +1034,7 @@ "Bounds": "0, 64, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1042,7 +1042,7 @@ "Bounds": "0, 80, 8, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1050,7 +1050,7 @@ "Bounds": "0, 96, 8, 16" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1058,7 +1058,7 @@ "Bounds": "8, 64, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1066,7 +1066,7 @@ "Bounds": "8, 80, 8, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1074,7 +1074,7 @@ "Bounds": "8, 96, 8, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1082,7 +1082,7 @@ "Bounds": "16, 0, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1091,7 +1091,7 @@ "Bounds": "16, 40, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1099,7 +1099,7 @@ "Bounds": "16, 80, 16, 8" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1109,7 +1109,7 @@ "Bounds": "16, 88, 16, 8" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1117,7 +1117,7 @@ "Bounds": "16, 96, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1125,7 +1125,7 @@ "Bounds": "16, 104, 14, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1134,7 +1134,7 @@ "Bounds": "16, 110, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1142,7 +1142,7 @@ "Bounds": "16, 118, 8, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1150,7 +1150,7 @@ "Bounds": "16, 126, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1158,7 +1158,7 @@ "Bounds": "24, 48, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1167,7 +1167,7 @@ "Bounds": "24, 56, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1176,7 +1176,7 @@ "Bounds": "24, 110, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1184,7 +1184,7 @@ "Bounds": "24, 118, 8, 8" }, { - "Entities": [ + "Types": [ 244, 246 ], @@ -1192,7 +1192,7 @@ "Bounds": "24, 126, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1200,7 +1200,7 @@ "Bounds": "30, 104, 14, 6" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1208,7 +1208,7 @@ "Bounds": "32, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1217,7 +1217,7 @@ "Bounds": "32, 56, 8, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1225,7 +1225,7 @@ "Bounds": "32, 96, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1233,7 +1233,7 @@ "Bounds": "32, 118, 8, 8" }, { - "Entities": [ + "Types": [ 244, 247 ], @@ -1241,7 +1241,7 @@ "Bounds": "32, 126, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1250,7 +1250,7 @@ "Bounds": "40, 32, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1259,7 +1259,7 @@ "Bounds": "40, 56, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1268,7 +1268,7 @@ "Bounds": "44, 104, 8, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1276,7 +1276,7 @@ "Bounds": "48, 0, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1285,7 +1285,7 @@ "Bounds": "48, 56, 8, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1294,7 +1294,7 @@ "Bounds": "48, 88, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1303,7 +1303,7 @@ "Bounds": "52, 104, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1312,7 +1312,7 @@ "Bounds": "56, 56, 16, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1320,7 +1320,7 @@ "Bounds": "56, 64, 16, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1328,7 +1328,7 @@ "Bounds": "56, 112, 8, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1336,7 +1336,7 @@ "Bounds": "64, 0, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1345,7 +1345,7 @@ "Bounds": "64, 32, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1353,7 +1353,7 @@ "Bounds": "64, 80, 16, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1361,7 +1361,7 @@ "Bounds": "64, 96, 8, 16" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1369,7 +1369,7 @@ "Bounds": "64, 112, 8, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1377,7 +1377,7 @@ "Bounds": "72, 96, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1386,7 +1386,7 @@ "Bounds": "72, 104, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1394,7 +1394,7 @@ "Bounds": "72, 112, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1402,7 +1402,7 @@ "Bounds": "72, 120, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1411,7 +1411,7 @@ "Bounds": "80, 104, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1419,7 +1419,7 @@ "Bounds": "80, 112, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1428,7 +1428,7 @@ "Bounds": "88, 32, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1437,7 +1437,7 @@ "Bounds": "88, 56, 16, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1445,7 +1445,7 @@ "Bounds": "88, 64, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1454,7 +1454,7 @@ "Bounds": "88, 104, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1462,7 +1462,7 @@ "Bounds": "88, 120, 8, 8" }, { - "Entities": [ + "Types": [ 244, 245, 246, @@ -1472,7 +1472,7 @@ "Bounds": "96, 0, 16, 16" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1480,7 +1480,7 @@ "Bounds": "96, 64, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1489,7 +1489,7 @@ "Bounds": "96, 104, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1498,7 +1498,7 @@ "Bounds": "104, 56, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1507,7 +1507,7 @@ "Bounds": "112, 104, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1516,7 +1516,7 @@ "Bounds": "120, 56, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1525,7 +1525,7 @@ "Bounds": "120, 104, 8, 8" }, { - "Entities": [ + "Types": [ 111, 132, 133, @@ -1537,7 +1537,7 @@ "Bounds": "120, 112, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1545,7 +1545,7 @@ "Bounds": "128, 64, 8, 16" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1553,7 +1553,7 @@ "Bounds": "128, 80, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1562,7 +1562,7 @@ "Bounds": "136, 56, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1571,7 +1571,7 @@ "Bounds": "136, 104, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1580,7 +1580,7 @@ "Bounds": "144, 32, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1589,7 +1589,7 @@ "Bounds": "144, 104, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1598,7 +1598,7 @@ "Bounds": "152, 56, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1607,7 +1607,7 @@ "Bounds": "152, 104, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1616,7 +1616,7 @@ "Bounds": "160, 104, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1625,7 +1625,7 @@ "Bounds": "168, 32, 24, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1634,7 +1634,7 @@ "Bounds": "168, 40, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1643,7 +1643,7 @@ "Bounds": "168, 104, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1651,7 +1651,7 @@ "Bounds": "168, 112, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1660,7 +1660,7 @@ "Bounds": "176, 56, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1669,7 +1669,7 @@ "Bounds": "176, 104, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1678,7 +1678,7 @@ "Bounds": "184, 56, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1687,7 +1687,7 @@ "Bounds": "184, 104, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1696,7 +1696,7 @@ "Bounds": "192, 32, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1705,7 +1705,7 @@ "Bounds": "192, 56, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1714,7 +1714,7 @@ "Bounds": "192, 104, 8, 8" }, { - "Entities": [ + "Types": [ 205, 209, 213, @@ -1724,7 +1724,7 @@ "Bounds": "192, 120, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1733,7 +1733,7 @@ "Bounds": "200, 104, 8, 8" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1741,7 +1741,7 @@ "Bounds": "200, 120, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1749,7 +1749,7 @@ "Bounds": "208, 72, 8, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1757,7 +1757,7 @@ "Bounds": "208, 88, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1766,7 +1766,7 @@ "Bounds": "208, 104, 8, 8" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1774,7 +1774,7 @@ "Bounds": "208, 120, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1783,7 +1783,7 @@ "Bounds": "216, 32, 24, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1791,7 +1791,7 @@ "Bounds": "216, 56, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1799,7 +1799,7 @@ "Bounds": "216, 72, 8, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1807,7 +1807,7 @@ "Bounds": "216, 88, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1816,7 +1816,7 @@ "Bounds": "216, 104, 8, 8" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1824,7 +1824,7 @@ "Bounds": "216, 120, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1832,7 +1832,7 @@ "Bounds": "216, 128, 6, 6" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1840,7 +1840,7 @@ "Bounds": "222, 128, 6, 6" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1848,7 +1848,7 @@ "Bounds": "224, 40, 8, 24" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1857,7 +1857,7 @@ "Bounds": "224, 80, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1865,7 +1865,7 @@ "Bounds": "224, 112, 8, 8" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1873,7 +1873,7 @@ "Bounds": "224, 120, 8, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1881,7 +1881,7 @@ "Bounds": "232, 40, 8, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1889,7 +1889,7 @@ "Bounds": "232, 72, 8, 16" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1897,7 +1897,7 @@ "Bounds": "232, 88, 16, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1905,7 +1905,7 @@ "Bounds": "232, 112, 8, 8" }, { - "Entities": [ + "Types": [ 213, 217 ], @@ -1913,7 +1913,7 @@ "Bounds": "232, 120, 8, 8" }, { - "Entities": [ + "Types": [ 20, 21 ], @@ -1921,7 +1921,7 @@ "Bounds": "240, 56, 16, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1929,7 +1929,7 @@ "Bounds": "240, 72, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1937,7 +1937,7 @@ "Bounds": "240, 96, 6, 14" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1945,7 +1945,7 @@ "Bounds": "240, 118, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1953,7 +1953,7 @@ "Bounds": "246, 96, 6, 14" }, { - "Entities": [ + "Types": [ 174, 199, 309 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/STPAUL.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/STPAUL.TR2-TextureRemap.json index 2b58113a6..3408f7005 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/STPAUL.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/STPAUL.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 142, 143, 144 @@ -19,7 +19,7 @@ "Bounds": "128, 128, 64, 64" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -27,7 +27,7 @@ "Bounds": "0, 56, 32, 40" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -36,7 +36,7 @@ "Bounds": "0, 120, 64, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -47,7 +47,7 @@ "Bounds": "16, 168, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -55,7 +55,7 @@ "Bounds": "32, 64, 40, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -63,7 +63,7 @@ "Bounds": "64, 232, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -79,7 +79,7 @@ "Bounds": "72, 64, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -96,7 +96,7 @@ "Bounds": "96, 96, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -112,7 +112,7 @@ "Bounds": "104, 32, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -121,7 +121,7 @@ "Bounds": "128, 152, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -138,7 +138,7 @@ "Bounds": "136, 64, 16, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -146,7 +146,7 @@ "Bounds": "160, 104, 32, 32" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -154,7 +154,7 @@ "Bounds": "176, 232, 56, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -162,7 +162,7 @@ "Bounds": "192, 104, 32, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -173,7 +173,7 @@ "Bounds": "192, 168, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -182,7 +182,7 @@ "Bounds": "208, 32, 48, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -193,7 +193,7 @@ "Bounds": "232, 216, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -209,7 +209,7 @@ "Bounds": "240, 184, 16, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -217,7 +217,7 @@ "Bounds": "0, 0, 56, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -226,7 +226,7 @@ "Bounds": "0, 200, 32, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -235,7 +235,7 @@ "Bounds": "0, 240, 64, 8" }, { - "Entities": [ + "Types": [ 142, 143, 144 @@ -244,7 +244,7 @@ "Bounds": "0, 248, 64, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -260,7 +260,7 @@ "Bounds": "32, 160, 8, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -269,7 +269,7 @@ "Bounds": "32, 184, 24, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -285,7 +285,7 @@ "Bounds": "48, 32, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -296,7 +296,7 @@ "Bounds": "56, 16, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -305,7 +305,7 @@ "Bounds": "64, 240, 64, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -321,7 +321,7 @@ "Bounds": "80, 96, 16, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -332,7 +332,7 @@ "Bounds": "104, 16, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -349,7 +349,7 @@ "Bounds": "104, 184, 16, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -357,7 +357,7 @@ "Bounds": "104, 192, 32, 16" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -368,7 +368,7 @@ "Bounds": "128, 16, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -384,7 +384,7 @@ "Bounds": "136, 112, 8, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -392,7 +392,7 @@ "Bounds": "136, 184, 24, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -400,7 +400,7 @@ "Bounds": "144, 64, 32, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -417,7 +417,7 @@ "Bounds": "144, 88, 16, 40" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -426,7 +426,7 @@ "Bounds": "144, 232, 64, 8" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -437,7 +437,7 @@ "Bounds": "152, 16, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -445,7 +445,7 @@ "Bounds": "160, 184, 24, 24" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -456,7 +456,7 @@ "Bounds": "176, 16, 24, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -467,7 +467,7 @@ "Bounds": "200, 16, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -483,7 +483,7 @@ "Bounds": "208, 184, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -492,7 +492,7 @@ "Bounds": "208, 232, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -508,7 +508,7 @@ "Bounds": "216, 48, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -519,7 +519,7 @@ "Bounds": "224, 0, 24, 32" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -528,7 +528,7 @@ "Bounds": "232, 88, 16, 40" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -537,7 +537,7 @@ "Bounds": "232, 248, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -553,7 +553,7 @@ "Bounds": "240, 208, 16, 32" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -561,7 +561,7 @@ "Bounds": "0, 112, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -570,7 +570,7 @@ "Bounds": "0, 184, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -579,7 +579,7 @@ "Bounds": "16, 64, 48, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -587,7 +587,7 @@ "Bounds": "16, 96, 16, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -596,7 +596,7 @@ "Bounds": "16, 184, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -604,7 +604,7 @@ "Bounds": "32, 104, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -613,7 +613,7 @@ "Bounds": "32, 184, 32, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -622,7 +622,7 @@ "Bounds": "32, 192, 32, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -630,7 +630,7 @@ "Bounds": "56, 96, 16, 24" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -638,7 +638,7 @@ "Bounds": "64, 0, 32, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -646,7 +646,7 @@ "Bounds": "64, 48, 56, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -662,7 +662,7 @@ "Bounds": "64, 152, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -671,7 +671,7 @@ "Bounds": "64, 184, 16, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -679,7 +679,7 @@ "Bounds": "64, 216, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -687,7 +687,7 @@ "Bounds": "72, 112, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -703,7 +703,7 @@ "Bounds": "80, 176, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -712,7 +712,7 @@ "Bounds": "80, 224, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -728,7 +728,7 @@ "Bounds": "88, 88, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -736,7 +736,7 @@ "Bounds": "88, 96, 24, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -744,7 +744,7 @@ "Bounds": "88, 112, 24, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -752,7 +752,7 @@ "Bounds": "96, 224, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -761,7 +761,7 @@ "Bounds": "96, 248, 16, 8" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -769,7 +769,7 @@ "Bounds": "112, 96, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -786,7 +786,7 @@ "Bounds": "112, 120, 16, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -794,7 +794,7 @@ "Bounds": "112, 224, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -802,7 +802,7 @@ "Bounds": "120, 48, 56, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -818,7 +818,7 @@ "Bounds": "128, 32, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -826,7 +826,7 @@ "Bounds": "128, 96, 24, 16" }, { - "Entities": [ + "Types": [ 244, 245, 247 @@ -835,7 +835,7 @@ "Bounds": "128, 240, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -851,7 +851,7 @@ "Bounds": "136, 168, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -860,7 +860,7 @@ "Bounds": "152, 64, 48, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -868,7 +868,7 @@ "Bounds": "152, 96, 24, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -876,7 +876,7 @@ "Bounds": "176, 48, 56, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -885,7 +885,7 @@ "Bounds": "176, 248, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -893,7 +893,7 @@ "Bounds": "184, 88, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -901,7 +901,7 @@ "Bounds": "184, 176, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -910,7 +910,7 @@ "Bounds": "200, 64, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -918,7 +918,7 @@ "Bounds": "200, 104, 24, 16" }, { - "Entities": [ + "Types": [ 1, 10 ], @@ -926,7 +926,7 @@ "Bounds": "200, 152, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -935,7 +935,7 @@ "Bounds": "200, 160, 24, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -943,7 +943,7 @@ "Bounds": "200, 176, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -951,7 +951,7 @@ "Bounds": "216, 176, 16, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5 @@ -960,7 +960,7 @@ "Bounds": "224, 64, 8, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -976,7 +976,7 @@ "Bounds": "224, 104, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -984,7 +984,7 @@ "Bounds": "224, 216, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1001,7 +1001,7 @@ "Bounds": "232, 32, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1017,7 +1017,7 @@ "Bounds": "232, 56, 16, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1025,7 +1025,7 @@ "Bounds": "232, 96, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1041,7 +1041,7 @@ "Bounds": "240, 144, 8, 40" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1049,7 +1049,7 @@ "Bounds": "240, 216, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1058,7 +1058,7 @@ "Bounds": "0, 32, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1067,7 +1067,7 @@ "Bounds": "0, 64, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1075,7 +1075,7 @@ "Bounds": "0, 80, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1084,7 +1084,7 @@ "Bounds": "0, 128, 8, 8" }, { - "Entities": [ + "Types": [ 127, 185, 188, @@ -1094,7 +1094,7 @@ "Bounds": "0, 136, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1103,7 +1103,7 @@ "Bounds": "8, 64, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1111,7 +1111,7 @@ "Bounds": "8, 80, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1120,7 +1120,7 @@ "Bounds": "8, 128, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1128,7 +1128,7 @@ "Bounds": "8, 136, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1137,7 +1137,7 @@ "Bounds": "16, 56, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1146,7 +1146,7 @@ "Bounds": "16, 88, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1155,7 +1155,7 @@ "Bounds": "16, 128, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1164,7 +1164,7 @@ "Bounds": "24, 32, 24, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1173,7 +1173,7 @@ "Bounds": "24, 40, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1182,7 +1182,7 @@ "Bounds": "24, 64, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1190,7 +1190,7 @@ "Bounds": "24, 80, 8, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1198,7 +1198,7 @@ "Bounds": "32, 48, 24, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1206,7 +1206,7 @@ "Bounds": "32, 80, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1214,7 +1214,7 @@ "Bounds": "40, 80, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1223,7 +1223,7 @@ "Bounds": "48, 32, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1232,7 +1232,7 @@ "Bounds": "48, 56, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1240,7 +1240,7 @@ "Bounds": "48, 80, 16, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1249,7 +1249,7 @@ "Bounds": "48, 88, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1257,7 +1257,7 @@ "Bounds": "48, 120, 6, 14" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1265,7 +1265,7 @@ "Bounds": "54, 120, 14, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1274,7 +1274,7 @@ "Bounds": "54, 126, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1283,7 +1283,7 @@ "Bounds": "56, 56, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1292,7 +1292,7 @@ "Bounds": "62, 126, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1301,7 +1301,7 @@ "Bounds": "64, 56, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1309,7 +1309,7 @@ "Bounds": "68, 120, 14, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1318,7 +1318,7 @@ "Bounds": "70, 126, 8, 8" }, { - "Entities": [ + "Types": [ 244, 247 ], @@ -1326,7 +1326,7 @@ "Bounds": "72, 144, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1334,7 +1334,7 @@ "Bounds": "80, 40, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1343,7 +1343,7 @@ "Bounds": "80, 56, 16, 8" }, { - "Entities": [ + "Types": [ 160, 185, 315 @@ -1352,7 +1352,7 @@ "Bounds": "88, 136, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1361,7 +1361,7 @@ "Bounds": "96, 56, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1369,7 +1369,7 @@ "Bounds": "96, 136, 8, 8" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1377,7 +1377,7 @@ "Bounds": "104, 40, 8, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1385,7 +1385,7 @@ "Bounds": "104, 80, 16, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1393,7 +1393,7 @@ "Bounds": "104, 136, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1401,7 +1401,7 @@ "Bounds": "106, 120, 8, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1409,7 +1409,7 @@ "Bounds": "112, 40, 8, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1417,7 +1417,7 @@ "Bounds": "112, 136, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1425,7 +1425,7 @@ "Bounds": "114, 120, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1433,7 +1433,7 @@ "Bounds": "120, 40, 24, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1441,7 +1441,7 @@ "Bounds": "120, 72, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1449,7 +1449,7 @@ "Bounds": "120, 136, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1458,7 +1458,7 @@ "Bounds": "122, 120, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1467,7 +1467,7 @@ "Bounds": "128, 56, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1475,7 +1475,7 @@ "Bounds": "128, 136, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1484,7 +1484,7 @@ "Bounds": "130, 120, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1492,7 +1492,7 @@ "Bounds": "136, 136, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1501,7 +1501,7 @@ "Bounds": "138, 120, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1510,7 +1510,7 @@ "Bounds": "144, 56, 16, 8" }, { - "Entities": [ + "Types": [ 6, 7, 8, @@ -1520,7 +1520,7 @@ "Bounds": "146, 120, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1529,7 +1529,7 @@ "Bounds": "154, 120, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1538,7 +1538,7 @@ "Bounds": "160, 56, 16, 8" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1546,7 +1546,7 @@ "Bounds": "160, 80, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1555,7 +1555,7 @@ "Bounds": "162, 120, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1564,7 +1564,7 @@ "Bounds": "170, 120, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1573,7 +1573,7 @@ "Bounds": "178, 120, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1582,7 +1582,7 @@ "Bounds": "184, 24, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1591,7 +1591,7 @@ "Bounds": "184, 56, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1600,7 +1600,7 @@ "Bounds": "186, 120, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1609,7 +1609,7 @@ "Bounds": "194, 120, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1617,7 +1617,7 @@ "Bounds": "200, 136, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1626,7 +1626,7 @@ "Bounds": "202, 120, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1635,7 +1635,7 @@ "Bounds": "208, 24, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1644,7 +1644,7 @@ "Bounds": "210, 120, 8, 8" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1654,7 +1654,7 @@ "Bounds": "216, 80, 16, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1662,7 +1662,7 @@ "Bounds": "216, 136, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1671,7 +1671,7 @@ "Bounds": "218, 120, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1680,7 +1680,7 @@ "Bounds": "226, 120, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1688,7 +1688,7 @@ "Bounds": "232, 16, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1697,7 +1697,7 @@ "Bounds": "232, 56, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1706,7 +1706,7 @@ "Bounds": "234, 120, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1715,7 +1715,7 @@ "Bounds": "240, 16, 8, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1723,7 +1723,7 @@ "Bounds": "242, 120, 6, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1732,7 +1732,7 @@ "Bounds": "242, 126, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1741,7 +1741,7 @@ "Bounds": "248, 48, 8, 16" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1750,7 +1750,7 @@ "Bounds": "248, 80, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1758,7 +1758,7 @@ "Bounds": "248, 112, 6, 14" }, { - "Entities": [ + "Types": [ 174, 199 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TEMPLE.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TEMPLE.TR2-TextureRemap.json index f5a3154f5..82bf6066b 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TEMPLE.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TEMPLE.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 3, 161, 186 @@ -11,7 +11,7 @@ "Bounds": "0, 224, 48, 8" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -19,7 +19,7 @@ "Bounds": "0, 232, 80, 16" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -27,7 +27,7 @@ "Bounds": "0, 248, 80, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -46,7 +46,7 @@ "Bounds": "48, 192, 16, 16" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -54,7 +54,7 @@ "Bounds": "64, 0, 72, 96" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -62,7 +62,7 @@ "Bounds": "80, 248, 80, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -71,7 +71,7 @@ "Bounds": "104, 208, 24, 24" }, { - "Entities": [ + "Types": [ 114, 116, 131, @@ -83,7 +83,7 @@ "Bounds": "136, 0, 64, 64" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -101,7 +101,7 @@ "Bounds": "240, 0, 16, 40" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -109,7 +109,7 @@ "Bounds": "0, 160, 56, 16" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -117,7 +117,7 @@ "Bounds": "24, 192, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -126,7 +126,7 @@ "Bounds": "32, 40, 64, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -134,7 +134,7 @@ "Bounds": "48, 192, 6, 6" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -142,7 +142,7 @@ "Bounds": "48, 198, 24, 32" }, { - "Entities": [ + "Types": [ 97, 107 ], @@ -150,7 +150,7 @@ "Bounds": "64, 56, 32, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -168,7 +168,7 @@ "Bounds": "80, 230, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -187,7 +187,7 @@ "Bounds": "96, 198, 16, 16" }, { - "Entities": [ + "Types": [ 1, 3, 6, @@ -199,7 +199,7 @@ "Bounds": "112, 182, 24, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -213,7 +213,7 @@ "Bounds": "136, 182, 24, 32" }, { - "Entities": [ + "Types": [ 1, 3, 6, @@ -225,7 +225,7 @@ "Bounds": "160, 182, 24, 32" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -234,7 +234,7 @@ "Bounds": "160, 246, 32, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -242,7 +242,7 @@ "Bounds": "168, 150, 56, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -251,7 +251,7 @@ "Bounds": "176, 0, 48, 24" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -265,7 +265,7 @@ "Bounds": "184, 182, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -283,7 +283,7 @@ "Bounds": "192, 214, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -301,7 +301,7 @@ "Bounds": "208, 182, 16, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -309,7 +309,7 @@ "Bounds": "208, 206, 14, 6" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -318,7 +318,7 @@ "Bounds": "208, 244, 48, 8" }, { - "Entities": [ + "Types": [ 1, 5, 6, @@ -330,7 +330,7 @@ "Bounds": "224, 102, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -349,7 +349,7 @@ "Bounds": "224, 148, 24, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -363,7 +363,7 @@ "Bounds": "224, 180, 24, 32" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -371,7 +371,7 @@ "Bounds": "0, 248, 56, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -379,7 +379,7 @@ "Bounds": "24, 32, 32, 24" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -387,7 +387,7 @@ "Bounds": "24, 56, 16, 40" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -395,7 +395,7 @@ "Bounds": "40, 56, 16, 40" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -404,7 +404,7 @@ "Bounds": "40, 102, 32, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -413,7 +413,7 @@ "Bounds": "56, 62, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -431,7 +431,7 @@ "Bounds": "56, 248, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -439,7 +439,7 @@ "Bounds": "64, 222, 16, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -448,7 +448,7 @@ "Bounds": "72, 86, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -457,7 +457,7 @@ "Bounds": "72, 126, 8, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -466,7 +466,7 @@ "Bounds": "72, 174, 32, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -474,7 +474,7 @@ "Bounds": "80, 222, 16, 32" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -482,7 +482,7 @@ "Bounds": "96, 208, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -500,7 +500,7 @@ "Bounds": "100, 54, 16, 40" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -509,7 +509,7 @@ "Bounds": "104, 176, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -518,7 +518,7 @@ "Bounds": "104, 184, 64, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -536,7 +536,7 @@ "Bounds": "116, 54, 16, 40" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -544,7 +544,7 @@ "Bounds": "130, 46, 14, 6" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -552,7 +552,7 @@ "Bounds": "132, 56, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -571,7 +571,7 @@ "Bounds": "140, 224, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -579,7 +579,7 @@ "Bounds": "144, 0, 32, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -588,7 +588,7 @@ "Bounds": "168, 184, 64, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -596,7 +596,7 @@ "Bounds": "174, 248, 56, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -605,7 +605,7 @@ "Bounds": "230, 248, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -623,7 +623,7 @@ "Bounds": "232, 184, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -641,7 +641,7 @@ "Bounds": "236, 48, 16, 40" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -649,7 +649,7 @@ "Bounds": "0, 0, 56, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -658,7 +658,7 @@ "Bounds": "0, 8, 24, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -666,7 +666,7 @@ "Bounds": "0, 56, 16, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -674,7 +674,7 @@ "Bounds": "0, 182, 16, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -682,7 +682,7 @@ "Bounds": "0, 230, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -691,7 +691,7 @@ "Bounds": "0, 246, 24, 8" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -700,7 +700,7 @@ "Bounds": "16, 56, 16, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -708,7 +708,7 @@ "Bounds": "16, 182, 16, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -716,7 +716,7 @@ "Bounds": "16, 230, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -725,7 +725,7 @@ "Bounds": "24, 32, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -734,7 +734,7 @@ "Bounds": "24, 246, 24, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -742,7 +742,7 @@ "Bounds": "32, 56, 16, 24" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -750,7 +750,7 @@ "Bounds": "32, 182, 16, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -758,7 +758,7 @@ "Bounds": "32, 230, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -766,7 +766,7 @@ "Bounds": "48, 56, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -775,7 +775,7 @@ "Bounds": "48, 150, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -784,7 +784,7 @@ "Bounds": "48, 182, 16, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -792,7 +792,7 @@ "Bounds": "48, 230, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -801,7 +801,7 @@ "Bounds": "48, 246, 24, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -809,7 +809,7 @@ "Bounds": "64, 56, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -818,7 +818,7 @@ "Bounds": "64, 150, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -826,7 +826,7 @@ "Bounds": "64, 182, 16, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -834,7 +834,7 @@ "Bounds": "64, 198, 16, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -842,7 +842,7 @@ "Bounds": "64, 230, 16, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -850,7 +850,7 @@ "Bounds": "80, 104, 16, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -858,7 +858,7 @@ "Bounds": "88, 56, 24, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -866,7 +866,7 @@ "Bounds": "96, 104, 16, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -875,7 +875,7 @@ "Bounds": "96, 246, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -884,7 +884,7 @@ "Bounds": "110, 150, 32, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -892,7 +892,7 @@ "Bounds": "112, 56, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -910,7 +910,7 @@ "Bounds": "112, 104, 8, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -918,7 +918,7 @@ "Bounds": "128, 198, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -936,7 +936,7 @@ "Bounds": "136, 56, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -944,7 +944,7 @@ "Bounds": "136, 64, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -953,7 +953,7 @@ "Bounds": "142, 150, 32, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -961,7 +961,7 @@ "Bounds": "144, 222, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -969,7 +969,7 @@ "Bounds": "160, 56, 24, 16" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -977,7 +977,7 @@ "Bounds": "160, 182, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -986,7 +986,7 @@ "Bounds": "172, 238, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -995,7 +995,7 @@ "Bounds": "174, 150, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1003,7 +1003,7 @@ "Bounds": "184, 56, 24, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1011,7 +1011,7 @@ "Bounds": "192, 222, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1019,7 +1019,7 @@ "Bounds": "198, 136, 6, 6" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -1027,7 +1027,7 @@ "Bounds": "198, 142, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1045,7 +1045,7 @@ "Bounds": "200, 88, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1053,7 +1053,7 @@ "Bounds": "208, 56, 16, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1062,7 +1062,7 @@ "Bounds": "216, 112, 24, 8" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -1070,7 +1070,7 @@ "Bounds": "224, 0, 16, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1078,7 +1078,7 @@ "Bounds": "224, 40, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1086,7 +1086,7 @@ "Bounds": "224, 56, 16, 24" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1094,7 +1094,7 @@ "Bounds": "230, 128, 8, 32" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1102,7 +1102,7 @@ "Bounds": "232, 80, 24, 16" }, { - "Entities": [ + "Types": [ 224, 228, 232 @@ -1111,7 +1111,7 @@ "Bounds": "240, 56, 16, 24" }, { - "Entities": [ + "Types": [ 5, 160, 185 @@ -1120,7 +1120,7 @@ "Bounds": "248, 152, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1129,7 +1129,7 @@ "Bounds": "0, 38, 16, 8" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1137,7 +1137,7 @@ "Bounds": "0, 70, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1146,7 +1146,7 @@ "Bounds": "0, 102, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1154,7 +1154,7 @@ "Bounds": "0, 126, 8, 8" }, { - "Entities": [ + "Types": [ 168, 170, 173, @@ -1165,7 +1165,7 @@ "Bounds": "8, 70, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1174,7 +1174,7 @@ "Bounds": "8, 102, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1182,7 +1182,7 @@ "Bounds": "8, 126, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1191,7 +1191,7 @@ "Bounds": "16, 38, 16, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1199,7 +1199,7 @@ "Bounds": "16, 86, 16, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1207,7 +1207,7 @@ "Bounds": "16, 126, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1215,7 +1215,7 @@ "Bounds": "24, 126, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1224,7 +1224,7 @@ "Bounds": "32, 38, 16, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1232,7 +1232,7 @@ "Bounds": "32, 86, 16, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1240,7 +1240,7 @@ "Bounds": "32, 126, 8, 8" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1249,7 +1249,7 @@ "Bounds": "40, 70, 8, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1257,7 +1257,7 @@ "Bounds": "40, 126, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1266,7 +1266,7 @@ "Bounds": "48, 40, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1275,7 +1275,7 @@ "Bounds": "48, 96, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1284,7 +1284,7 @@ "Bounds": "48, 104, 8, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1292,7 +1292,7 @@ "Bounds": "48, 120, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1300,7 +1300,7 @@ "Bounds": "48, 128, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1309,7 +1309,7 @@ "Bounds": "56, 96, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1318,7 +1318,7 @@ "Bounds": "56, 104, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1326,7 +1326,7 @@ "Bounds": "56, 128, 8, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1335,7 +1335,7 @@ "Bounds": "62, 16, 8, 24" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1343,7 +1343,7 @@ "Bounds": "64, 62, 8, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1351,7 +1351,7 @@ "Bounds": "64, 78, 16, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1359,7 +1359,7 @@ "Bounds": "64, 86, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1368,7 +1368,7 @@ "Bounds": "70, 38, 16, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1376,7 +1376,7 @@ "Bounds": "72, 62, 8, 16" }, { - "Entities": [ + "Types": [ 70, 205, 206, @@ -1391,7 +1391,7 @@ "Bounds": "72, 108, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1399,7 +1399,7 @@ "Bounds": "80, 62, 8, 16" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1407,7 +1407,7 @@ "Bounds": "80, 78, 16, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1415,7 +1415,7 @@ "Bounds": "80, 86, 16, 8" }, { - "Entities": [ + "Types": [ 70, 205, 206, @@ -1430,7 +1430,7 @@ "Bounds": "80, 108, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1439,7 +1439,7 @@ "Bounds": "86, 38, 16, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1447,7 +1447,7 @@ "Bounds": "88, 126, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1456,7 +1456,7 @@ "Bounds": "94, 102, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1464,7 +1464,7 @@ "Bounds": "96, 86, 8, 16" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1472,7 +1472,7 @@ "Bounds": "96, 110, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1480,7 +1480,7 @@ "Bounds": "96, 126, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1489,7 +1489,7 @@ "Bounds": "102, 38, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1498,7 +1498,7 @@ "Bounds": "102, 102, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1506,7 +1506,7 @@ "Bounds": "104, 62, 8, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1514,7 +1514,7 @@ "Bounds": "104, 86, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1523,7 +1523,7 @@ "Bounds": "110, 104, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1531,7 +1531,7 @@ "Bounds": "112, 56, 8, 16" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -1540,7 +1540,7 @@ "Bounds": "118, 16, 8, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1548,7 +1548,7 @@ "Bounds": "120, 62, 16, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1556,7 +1556,7 @@ "Bounds": "120, 126, 8, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1564,7 +1564,7 @@ "Bounds": "126, 24, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1573,7 +1573,7 @@ "Bounds": "126, 38, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1582,7 +1582,7 @@ "Bounds": "126, 102, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1590,7 +1590,7 @@ "Bounds": "128, 126, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1598,7 +1598,7 @@ "Bounds": "134, 16, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1607,7 +1607,7 @@ "Bounds": "134, 38, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1616,7 +1616,7 @@ "Bounds": "134, 102, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1625,7 +1625,7 @@ "Bounds": "136, 70, 8, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1633,7 +1633,7 @@ "Bounds": "136, 86, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1642,7 +1642,7 @@ "Bounds": "142, 38, 8, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1650,7 +1650,7 @@ "Bounds": "144, 88, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1659,7 +1659,7 @@ "Bounds": "144, 96, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1667,7 +1667,7 @@ "Bounds": "150, 56, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1675,7 +1675,7 @@ "Bounds": "150, 112, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1683,7 +1683,7 @@ "Bounds": "152, 72, 6, 14" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1692,7 +1692,7 @@ "Bounds": "152, 96, 8, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1700,7 +1700,7 @@ "Bounds": "158, 16, 8, 24" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1709,7 +1709,7 @@ "Bounds": "158, 70, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1717,7 +1717,7 @@ "Bounds": "158, 112, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1725,7 +1725,7 @@ "Bounds": "160, 88, 8, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1733,7 +1733,7 @@ "Bounds": "166, 16, 24, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -1741,7 +1741,7 @@ "Bounds": "166, 24, 24, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1749,7 +1749,7 @@ "Bounds": "166, 112, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1758,7 +1758,7 @@ "Bounds": "168, 96, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1767,7 +1767,7 @@ "Bounds": "172, 32, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1775,7 +1775,7 @@ "Bounds": "174, 112, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1784,7 +1784,7 @@ "Bounds": "176, 96, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1793,7 +1793,7 @@ "Bounds": "180, 32, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1801,7 +1801,7 @@ "Bounds": "182, 112, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1809,7 +1809,7 @@ "Bounds": "190, 112, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1817,7 +1817,7 @@ "Bounds": "192, 88, 6, 14" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1826,7 +1826,7 @@ "Bounds": "198, 96, 8, 8" }, { - "Entities": [ + "Types": [ 70, 122, 185, @@ -1837,7 +1837,7 @@ "Bounds": "198, 104, 8, 8" }, { - "Entities": [ + "Types": [ 71, 123 ], @@ -1845,7 +1845,7 @@ "Bounds": "204, 48, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1853,7 +1853,7 @@ "Bounds": "204, 64, 16, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1861,7 +1861,7 @@ "Bounds": "206, 84, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1870,7 +1870,7 @@ "Bounds": "206, 100, 8, 8" }, { - "Entities": [ + "Types": [ 71, 123 ], @@ -1878,7 +1878,7 @@ "Bounds": "206, 108, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1887,7 +1887,7 @@ "Bounds": "214, 100, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1895,7 +1895,7 @@ "Bounds": "214, 116, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1904,7 +1904,7 @@ "Bounds": "222, 32, 8, 16" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1912,7 +1912,7 @@ "Bounds": "222, 84, 16, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1921,7 +1921,7 @@ "Bounds": "222, 100, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1930,7 +1930,7 @@ "Bounds": "230, 36, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1939,7 +1939,7 @@ "Bounds": "230, 100, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1947,7 +1947,7 @@ "Bounds": "230, 116, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1956,7 +1956,7 @@ "Bounds": "238, 36, 16, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1964,7 +1964,7 @@ "Bounds": "238, 84, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1973,7 +1973,7 @@ "Bounds": "238, 100, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], @@ -1981,7 +1981,7 @@ "Bounds": "240, 124, 8, 8" }, { - "Entities": [ + "Types": [ 349, 350 ], diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TONYBOSS.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TONYBOSS.TR2-TextureRemap.json index 9b563be01..1b07e3bf8 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TONYBOSS.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TONYBOSS.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 177, 202 ], @@ -10,7 +10,7 @@ "Bounds": "48, 232, 32, 24" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -18,7 +18,7 @@ "Bounds": "64, 0, 72, 96" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -26,7 +26,7 @@ "Bounds": "80, 248, 80, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -35,7 +35,7 @@ "Bounds": "96, 152, 32, 16" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -43,7 +43,7 @@ "Bounds": "96, 200, 80, 16" }, { - "Entities": [ + "Types": [ 142, 143, 144 @@ -52,7 +52,7 @@ "Bounds": "136, 0, 64, 64" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -61,7 +61,7 @@ "Bounds": "160, 224, 48, 24" }, { - "Entities": [ + "Types": [ 1, 185 ], @@ -69,7 +69,7 @@ "Bounds": "160, 248, 80, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -78,7 +78,7 @@ "Bounds": "176, 200, 24, 24" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -87,7 +87,7 @@ "Bounds": "240, 248, 16, 8" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -95,7 +95,7 @@ "Bounds": "0, 136, 24, 32" }, { - "Entities": [ + "Types": [ 142, 143, 144 @@ -104,7 +104,7 @@ "Bounds": "72, 48, 64, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -118,7 +118,7 @@ "Bounds": "72, 120, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -134,7 +134,7 @@ "Bounds": "72, 216, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -150,7 +150,7 @@ "Bounds": "88, 216, 16, 40" }, { - "Entities": [ + "Types": [ 1, 3, 6, @@ -162,7 +162,7 @@ "Bounds": "96, 120, 24, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -171,7 +171,7 @@ "Bounds": "104, 0, 64, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -187,7 +187,7 @@ "Bounds": "104, 216, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -203,7 +203,7 @@ "Bounds": "120, 120, 8, 8" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -217,7 +217,7 @@ "Bounds": "120, 128, 24, 32" }, { - "Entities": [ + "Types": [ 1, 5, 6, @@ -229,7 +229,7 @@ "Bounds": "128, 88, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -237,7 +237,7 @@ "Bounds": "128, 96, 56, 16" }, { - "Entities": [ + "Types": [ 1, 3, 6, @@ -249,7 +249,7 @@ "Bounds": "144, 128, 24, 32" }, { - "Entities": [ + "Types": [ 142, 143, 144 @@ -258,7 +258,7 @@ "Bounds": "168, 32, 64, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -272,7 +272,7 @@ "Bounds": "168, 128, 24, 32" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -280,7 +280,7 @@ "Bounds": "168, 216, 16, 40" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -288,7 +288,7 @@ "Bounds": "184, 96, 56, 16" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -296,7 +296,7 @@ "Bounds": "184, 216, 16, 40" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -304,7 +304,7 @@ "Bounds": "216, 128, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -321,7 +321,7 @@ "Bounds": "232, 40, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -330,7 +330,7 @@ "Bounds": "232, 72, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -346,7 +346,7 @@ "Bounds": "240, 96, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -362,7 +362,7 @@ "Bounds": "240, 136, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -379,7 +379,7 @@ "Bounds": "240, 240, 16, 16" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -387,7 +387,7 @@ "Bounds": "0, 0, 16, 40" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -396,7 +396,7 @@ "Bounds": "0, 80, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -405,7 +405,7 @@ "Bounds": "0, 88, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -414,7 +414,7 @@ "Bounds": "0, 96, 64, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -422,7 +422,7 @@ "Bounds": "0, 136, 56, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -430,7 +430,7 @@ "Bounds": "0, 176, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -447,7 +447,7 @@ "Bounds": "0, 232, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -456,7 +456,7 @@ "Bounds": "0, 248, 32, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -464,7 +464,7 @@ "Bounds": "16, 184, 24, 16" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -472,7 +472,7 @@ "Bounds": "24, 200, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -481,7 +481,7 @@ "Bounds": "32, 248, 32, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -489,7 +489,7 @@ "Bounds": "40, 192, 24, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -498,7 +498,7 @@ "Bounds": "40, 232, 24, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -506,7 +506,7 @@ "Bounds": "56, 136, 56, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -522,7 +522,7 @@ "Bounds": "64, 80, 8, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -530,7 +530,7 @@ "Bounds": "64, 88, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -546,7 +546,7 @@ "Bounds": "64, 192, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -555,7 +555,7 @@ "Bounds": "64, 248, 32, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -563,7 +563,7 @@ "Bounds": "72, 184, 24, 16" }, { - "Entities": [ + "Types": [ 240, 244 ], @@ -571,7 +571,7 @@ "Bounds": "96, 64, 24, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -580,7 +580,7 @@ "Bounds": "96, 112, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -588,7 +588,7 @@ "Bounds": "96, 184, 24, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -596,7 +596,7 @@ "Bounds": "112, 136, 56, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -605,7 +605,7 @@ "Bounds": "112, 144, 48, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -613,7 +613,7 @@ "Bounds": "120, 184, 24, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -622,7 +622,7 @@ "Bounds": "120, 232, 32, 8" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -630,7 +630,7 @@ "Bounds": "144, 176, 16, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -638,7 +638,7 @@ "Bounds": "160, 176, 24, 16" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -646,7 +646,7 @@ "Bounds": "160, 240, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -655,7 +655,7 @@ "Bounds": "176, 144, 48, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -671,7 +671,7 @@ "Bounds": "184, 176, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -679,7 +679,7 @@ "Bounds": "184, 184, 16, 24" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -688,7 +688,7 @@ "Bounds": "192, 0, 16, 40" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -696,7 +696,7 @@ "Bounds": "192, 168, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -704,7 +704,7 @@ "Bounds": "200, 184, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -720,7 +720,7 @@ "Bounds": "208, 96, 8, 8" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -728,7 +728,7 @@ "Bounds": "208, 248, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -736,7 +736,7 @@ "Bounds": "216, 168, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -752,7 +752,7 @@ "Bounds": "224, 104, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -768,7 +768,7 @@ "Bounds": "224, 224, 16, 16" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -777,7 +777,7 @@ "Bounds": "232, 168, 16, 24" }, { - "Entities": [ + "Types": [ 4, 5 ], @@ -785,7 +785,7 @@ "Bounds": "240, 128, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -802,7 +802,7 @@ "Bounds": "240, 192, 16, 16" }, { - "Entities": [ + "Types": [ 5, 160, 185 @@ -811,7 +811,7 @@ "Bounds": "0, 40, 8, 8" }, { - "Entities": [ + "Types": [ 240, 244 ], @@ -819,7 +819,7 @@ "Bounds": "0, 48, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -828,7 +828,7 @@ "Bounds": "0, 144, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -836,7 +836,7 @@ "Bounds": "0, 152, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -844,7 +844,7 @@ "Bounds": "8, 32, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -853,7 +853,7 @@ "Bounds": "8, 144, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -861,7 +861,7 @@ "Bounds": "8, 152, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -869,7 +869,7 @@ "Bounds": "8, 168, 6, 6" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -877,7 +877,7 @@ "Bounds": "14, 168, 6, 6" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -885,7 +885,7 @@ "Bounds": "16, 120, 16, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -894,7 +894,7 @@ "Bounds": "16, 128, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -903,7 +903,7 @@ "Bounds": "16, 144, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -911,7 +911,7 @@ "Bounds": "16, 152, 8, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -920,7 +920,7 @@ "Bounds": "24, 32, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -929,7 +929,7 @@ "Bounds": "24, 144, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -938,7 +938,7 @@ "Bounds": "32, 144, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -947,7 +947,7 @@ "Bounds": "40, 0, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -955,7 +955,7 @@ "Bounds": "40, 32, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -964,7 +964,7 @@ "Bounds": "56, 0, 16, 16" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -972,7 +972,7 @@ "Bounds": "56, 32, 16, 16" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -981,7 +981,7 @@ "Bounds": "56, 88, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -990,7 +990,7 @@ "Bounds": "64, 72, 8, 24" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -998,7 +998,7 @@ "Bounds": "64, 120, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1007,7 +1007,7 @@ "Bounds": "72, 0, 16, 16" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1015,7 +1015,7 @@ "Bounds": "72, 80, 24, 8" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1023,7 +1023,7 @@ "Bounds": "96, 80, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1032,7 +1032,7 @@ "Bounds": "96, 96, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1040,7 +1040,7 @@ "Bounds": "96, 136, 6, 14" }, { - "Entities": [ + "Types": [ 240, 244 ], @@ -1048,7 +1048,7 @@ "Bounds": "96, 158, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1056,7 +1056,7 @@ "Bounds": "102, 136, 6, 14" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1065,7 +1065,7 @@ "Bounds": "104, 96, 8, 16" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1074,7 +1074,7 @@ "Bounds": "104, 120, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1082,7 +1082,7 @@ "Bounds": "104, 150, 8, 8" }, { - "Entities": [ + "Types": [ 240, 244 ], @@ -1090,7 +1090,7 @@ "Bounds": "104, 158, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1098,7 +1098,7 @@ "Bounds": "108, 136, 14, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1107,7 +1107,7 @@ "Bounds": "108, 142, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1116,7 +1116,7 @@ "Bounds": "112, 72, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1125,7 +1125,7 @@ "Bounds": "112, 96, 8, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1133,7 +1133,7 @@ "Bounds": "112, 112, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1141,7 +1141,7 @@ "Bounds": "112, 150, 8, 8" }, { - "Entities": [ + "Types": [ 240, 244 ], @@ -1149,7 +1149,7 @@ "Bounds": "112, 158, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1158,7 +1158,7 @@ "Bounds": "116, 142, 8, 8" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1166,7 +1166,7 @@ "Bounds": "120, 80, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1174,7 +1174,7 @@ "Bounds": "120, 88, 24, 8" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1182,7 +1182,7 @@ "Bounds": "120, 96, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1190,7 +1190,7 @@ "Bounds": "120, 112, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1198,7 +1198,7 @@ "Bounds": "120, 150, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1206,7 +1206,7 @@ "Bounds": "122, 136, 14, 6" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1215,7 +1215,7 @@ "Bounds": "124, 142, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1223,7 +1223,7 @@ "Bounds": "128, 112, 8, 16" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1231,7 +1231,7 @@ "Bounds": "136, 96, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1239,7 +1239,7 @@ "Bounds": "136, 112, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1248,7 +1248,7 @@ "Bounds": "136, 136, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1256,7 +1256,7 @@ "Bounds": "136, 152, 8, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1264,7 +1264,7 @@ "Bounds": "144, 88, 8, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1272,7 +1272,7 @@ "Bounds": "144, 112, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1281,7 +1281,7 @@ "Bounds": "144, 136, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1289,7 +1289,7 @@ "Bounds": "152, 88, 24, 8" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1297,7 +1297,7 @@ "Bounds": "152, 96, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1305,7 +1305,7 @@ "Bounds": "152, 112, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1314,7 +1314,7 @@ "Bounds": "152, 136, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1322,7 +1322,7 @@ "Bounds": "152, 152, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1331,7 +1331,7 @@ "Bounds": "160, 112, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1340,7 +1340,7 @@ "Bounds": "160, 136, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1348,7 +1348,7 @@ "Bounds": "168, 16, 16, 16" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1356,7 +1356,7 @@ "Bounds": "168, 96, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1365,7 +1365,7 @@ "Bounds": "168, 136, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1374,7 +1374,7 @@ "Bounds": "176, 72, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1382,7 +1382,7 @@ "Bounds": "184, 16, 16, 16" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1390,7 +1390,7 @@ "Bounds": "184, 96, 16, 8" }, { - "Entities": [ + "Types": [ 91, 185, 188 @@ -1399,7 +1399,7 @@ "Bounds": "188, 144, 8, 8" }, { - "Entities": [ + "Types": [ 168, 170, 173, @@ -1410,7 +1410,7 @@ "Bounds": "192, 120, 16, 8" }, { - "Entities": [ + "Types": [ 240, 244 ], @@ -1418,7 +1418,7 @@ "Bounds": "192, 128, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1427,7 +1427,7 @@ "Bounds": "192, 136, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1436,7 +1436,7 @@ "Bounds": "200, 72, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1444,7 +1444,7 @@ "Bounds": "200, 112, 16, 8" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1452,7 +1452,7 @@ "Bounds": "200, 136, 8, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1460,7 +1460,7 @@ "Bounds": "204, 144, 8, 8" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1468,7 +1468,7 @@ "Bounds": "208, 96, 8, 16" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1476,7 +1476,7 @@ "Bounds": "208, 136, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1485,7 +1485,7 @@ "Bounds": "216, 96, 8, 16" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1493,7 +1493,7 @@ "Bounds": "216, 136, 8, 8" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1501,7 +1501,7 @@ "Bounds": "224, 72, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1510,7 +1510,7 @@ "Bounds": "224, 96, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1519,7 +1519,7 @@ "Bounds": "224, 120, 8, 16" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1527,7 +1527,7 @@ "Bounds": "224, 136, 8, 8" }, { - "Entities": [ + "Types": [ 240, 244 ], @@ -1535,7 +1535,7 @@ "Bounds": "232, 32, 16, 16" }, { - "Entities": [ + "Types": [ 7, 191 ], @@ -1543,7 +1543,7 @@ "Bounds": "240, 136, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1552,7 +1552,7 @@ "Bounds": "248, 32, 8, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1561,7 +1561,7 @@ "Bounds": "248, 80, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TOWER.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TOWER.TR2-TextureRemap.json index cb6557fda..aac756d5f 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TOWER.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TOWER.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 133, 140 ], @@ -18,7 +18,7 @@ "Bounds": "88, 120, 48, 48" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -35,7 +35,7 @@ "Bounds": "120, 168, 16, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -52,7 +52,7 @@ "Bounds": "136, 56, 16, 8" }, { - "Entities": [ + "Types": [ 137, 138 ], @@ -60,7 +60,7 @@ "Bounds": "136, 128, 48, 48" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -76,7 +76,7 @@ "Bounds": "184, 128, 16, 40" }, { - "Entities": [ + "Types": [ 134, 139 ], @@ -84,7 +84,7 @@ "Bounds": "200, 120, 48, 48" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -101,7 +101,7 @@ "Bounds": "248, 128, 8, 40" }, { - "Entities": [ + "Types": [ 86, 121 ], @@ -109,7 +109,7 @@ "Bounds": "0, 112, 16, 64" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -118,7 +118,7 @@ "Bounds": "0, 176, 16, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -126,7 +126,7 @@ "Bounds": "0, 208, 56, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -134,7 +134,7 @@ "Bounds": "0, 240, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -151,7 +151,7 @@ "Bounds": "40, 144, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -168,7 +168,7 @@ "Bounds": "48, 112, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -176,7 +176,7 @@ "Bounds": "64, 104, 32, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -192,7 +192,7 @@ "Bounds": "80, 80, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -209,7 +209,7 @@ "Bounds": "88, 48, 16, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -217,7 +217,7 @@ "Bounds": "96, 104, 32, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -234,7 +234,7 @@ "Bounds": "104, 168, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -250,7 +250,7 @@ "Bounds": "112, 136, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -267,7 +267,7 @@ "Bounds": "128, 56, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -276,7 +276,7 @@ "Bounds": "128, 104, 64, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -284,7 +284,7 @@ "Bounds": "136, 24, 32, 40" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -292,7 +292,7 @@ "Bounds": "168, 24, 40, 32" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -300,7 +300,7 @@ "Bounds": "168, 224, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -316,7 +316,7 @@ "Bounds": "176, 152, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -325,7 +325,7 @@ "Bounds": "208, 64, 48, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -341,7 +341,7 @@ "Bounds": "216, 168, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -357,7 +357,7 @@ "Bounds": "216, 176, 24, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -368,7 +368,7 @@ "Bounds": "224, 208, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -377,7 +377,7 @@ "Bounds": "224, 240, 32, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -393,7 +393,7 @@ "Bounds": "240, 176, 16, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -410,7 +410,7 @@ "Bounds": "248, 0, 8, 24" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -421,7 +421,7 @@ "Bounds": "0, 16, 24, 32" }, { - "Entities": [ + "Types": [ 1, 10 ], @@ -429,7 +429,7 @@ "Bounds": "16, 176, 8, 8" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -440,7 +440,7 @@ "Bounds": "24, 16, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -449,7 +449,7 @@ "Bounds": "24, 144, 24, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -466,7 +466,7 @@ "Bounds": "48, 16, 8, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -477,7 +477,7 @@ "Bounds": "56, 0, 24, 32" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -488,7 +488,7 @@ "Bounds": "80, 0, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -497,7 +497,7 @@ "Bounds": "80, 144, 48, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -506,7 +506,7 @@ "Bounds": "88, 248, 64, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -514,7 +514,7 @@ "Bounds": "96, 224, 24, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -525,7 +525,7 @@ "Bounds": "104, 0, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -533,7 +533,7 @@ "Bounds": "120, 224, 24, 24" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -544,7 +544,7 @@ "Bounds": "128, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -560,7 +560,7 @@ "Bounds": "144, 160, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -569,7 +569,7 @@ "Bounds": "144, 224, 48, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -578,7 +578,7 @@ "Bounds": "152, 248, 64, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -586,7 +586,7 @@ "Bounds": "168, 112, 32, 24" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -597,7 +597,7 @@ "Bounds": "176, 0, 24, 32" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -608,7 +608,7 @@ "Bounds": "200, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -624,7 +624,7 @@ "Bounds": "200, 112, 16, 16" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -633,7 +633,7 @@ "Bounds": "200, 176, 16, 40" }, { - "Entities": [ + "Types": [ 86, 121 ], @@ -641,7 +641,7 @@ "Bounds": "216, 96, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -650,7 +650,7 @@ "Bounds": "216, 176, 24, 24" }, { - "Entities": [ + "Types": [ 3, 6, 7, @@ -661,7 +661,7 @@ "Bounds": "224, 0, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -678,7 +678,7 @@ "Bounds": "240, 112, 8, 16" }, { - "Entities": [ + "Types": [ 134, 139 ], @@ -686,7 +686,7 @@ "Bounds": "248, 112, 8, 48" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -703,7 +703,7 @@ "Bounds": "248, 240, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -711,7 +711,7 @@ "Bounds": "0, 168, 56, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -720,7 +720,7 @@ "Bounds": "0, 200, 16, 24" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -729,7 +729,7 @@ "Bounds": "16, 200, 24, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -737,7 +737,7 @@ "Bounds": "16, 232, 24, 16" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -746,7 +746,7 @@ "Bounds": "32, 72, 32, 16" }, { - "Entities": [ + "Types": [ 133, 140 ], @@ -754,7 +754,7 @@ "Bounds": "40, 224, 48, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -762,7 +762,7 @@ "Bounds": "40, 232, 16, 24" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -770,7 +770,7 @@ "Bounds": "56, 232, 16, 24" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -778,7 +778,7 @@ "Bounds": "72, 232, 16, 24" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -786,7 +786,7 @@ "Bounds": "80, 88, 32, 16" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -794,7 +794,7 @@ "Bounds": "88, 232, 16, 24" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -803,7 +803,7 @@ "Bounds": "104, 200, 24, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -811,7 +811,7 @@ "Bounds": "104, 232, 24, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -820,7 +820,7 @@ "Bounds": "104, 248, 24, 8" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -828,7 +828,7 @@ "Bounds": "112, 88, 32, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -836,7 +836,7 @@ "Bounds": "112, 160, 56, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -845,7 +845,7 @@ "Bounds": "120, 0, 24, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -853,7 +853,7 @@ "Bounds": "128, 232, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -861,7 +861,7 @@ "Bounds": "128, 240, 24, 16" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -870,7 +870,7 @@ "Bounds": "144, 0, 24, 24" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -878,7 +878,7 @@ "Bounds": "168, 232, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -894,7 +894,7 @@ "Bounds": "176, 168, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -903,7 +903,7 @@ "Bounds": "192, 48, 64, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -911,7 +911,7 @@ "Bounds": "192, 232, 24, 16" }, { - "Entities": [ + "Types": [ 1, 4, 5, @@ -921,7 +921,7 @@ "Bounds": "200, 120, 8, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -930,7 +930,7 @@ "Bounds": "200, 136, 24, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -938,7 +938,7 @@ "Bounds": "200, 160, 56, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -946,7 +946,7 @@ "Bounds": "216, 232, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -954,7 +954,7 @@ "Bounds": "232, 248, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -970,7 +970,7 @@ "Bounds": "240, 32, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -978,7 +978,7 @@ "Bounds": "240, 240, 16, 16" }, { - "Entities": [ + "Types": [ 137, 138 ], @@ -986,7 +986,7 @@ "Bounds": "0, 0, 8, 48" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -995,7 +995,7 @@ "Bounds": "0, 48, 8, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1004,7 +1004,7 @@ "Bounds": "0, 56, 40, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1013,7 +1013,7 @@ "Bounds": "0, 72, 32, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1022,7 +1022,7 @@ "Bounds": "0, 96, 16, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1030,7 +1030,7 @@ "Bounds": "0, 144, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1039,7 +1039,7 @@ "Bounds": "0, 232, 24, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1047,7 +1047,7 @@ "Bounds": "8, 0, 16, 24" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1056,7 +1056,7 @@ "Bounds": "16, 96, 16, 16" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1065,7 +1065,7 @@ "Bounds": "16, 144, 16, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1073,7 +1073,7 @@ "Bounds": "24, 0, 16, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1082,7 +1082,7 @@ "Bounds": "24, 232, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1091,7 +1091,7 @@ "Bounds": "32, 24, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1099,7 +1099,7 @@ "Bounds": "32, 64, 16, 16" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1108,7 +1108,7 @@ "Bounds": "32, 96, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -1116,7 +1116,7 @@ "Bounds": "32, 144, 16, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1124,7 +1124,7 @@ "Bounds": "40, 0, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1132,7 +1132,7 @@ "Bounds": "48, 64, 16, 16" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1141,7 +1141,7 @@ "Bounds": "48, 96, 16, 16" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -1149,7 +1149,7 @@ "Bounds": "48, 144, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1158,7 +1158,7 @@ "Bounds": "48, 232, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1167,7 +1167,7 @@ "Bounds": "56, 224, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1176,7 +1176,7 @@ "Bounds": "64, 64, 16, 16" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1185,7 +1185,7 @@ "Bounds": "64, 96, 32, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1194,7 +1194,7 @@ "Bounds": "80, 64, 16, 16" }, { - "Entities": [ + "Types": [ 6, 7, 8, @@ -1204,7 +1204,7 @@ "Bounds": "88, 136, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1213,7 +1213,7 @@ "Bounds": "112, 72, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1222,7 +1222,7 @@ "Bounds": "112, 168, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1231,7 +1231,7 @@ "Bounds": "128, 176, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -1248,7 +1248,7 @@ "Bounds": "128, 216, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1257,7 +1257,7 @@ "Bounds": "136, 144, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1266,7 +1266,7 @@ "Bounds": "136, 216, 24, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1275,7 +1275,7 @@ "Bounds": "136, 232, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1284,7 +1284,7 @@ "Bounds": "152, 64, 32, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1293,7 +1293,7 @@ "Bounds": "168, 152, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1302,7 +1302,7 @@ "Bounds": "168, 224, 24, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1311,7 +1311,7 @@ "Bounds": "168, 232, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1320,7 +1320,7 @@ "Bounds": "184, 64, 32, 8" }, { - "Entities": [ + "Types": [ 244, 245, 247 @@ -1329,7 +1329,7 @@ "Bounds": "184, 160, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1337,7 +1337,7 @@ "Bounds": "184, 248, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1346,7 +1346,7 @@ "Bounds": "192, 224, 24, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1355,7 +1355,7 @@ "Bounds": "192, 232, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1364,7 +1364,7 @@ "Bounds": "200, 160, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1373,7 +1373,7 @@ "Bounds": "200, 240, 16, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1381,7 +1381,7 @@ "Bounds": "208, 248, 24, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1390,7 +1390,7 @@ "Bounds": "216, 64, 32, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1399,7 +1399,7 @@ "Bounds": "224, 88, 16, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1407,7 +1407,7 @@ "Bounds": "224, 136, 16, 16" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1416,7 +1416,7 @@ "Bounds": "224, 224, 8, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -1424,7 +1424,7 @@ "Bounds": "232, 216, 8, 24" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1433,7 +1433,7 @@ "Bounds": "240, 88, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1441,7 +1441,7 @@ "Bounds": "240, 136, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1450,7 +1450,7 @@ "Bounds": "240, 216, 8, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1459,7 +1459,7 @@ "Bounds": "248, 64, 8, 8" }, { - "Entities": [ + "Types": [ 118, 205, 209, @@ -1469,7 +1469,7 @@ "Bounds": "0, 0, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1478,7 +1478,7 @@ "Bounds": "0, 24, 16, 8" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1486,7 +1486,7 @@ "Bounds": "0, 56, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1494,7 +1494,7 @@ "Bounds": "0, 104, 8, 8" }, { - "Entities": [ + "Types": [ 118, 205, 209, @@ -1504,7 +1504,7 @@ "Bounds": "8, 0, 8, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1512,7 +1512,7 @@ "Bounds": "8, 104, 8, 8" }, { - "Entities": [ + "Types": [ 244, 247 ], @@ -1520,7 +1520,7 @@ "Bounds": "8, 112, 8, 8" }, { - "Entities": [ + "Types": [ 118, 205, 209, @@ -1530,7 +1530,7 @@ "Bounds": "16, 0, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1539,7 +1539,7 @@ "Bounds": "16, 24, 16, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1547,7 +1547,7 @@ "Bounds": "16, 104, 8, 8" }, { - "Entities": [ + "Types": [ 172, 197, 306, @@ -1557,7 +1557,7 @@ "Bounds": "24, 56, 8, 16" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1566,7 +1566,7 @@ "Bounds": "24, 96, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1574,7 +1574,7 @@ "Bounds": "24, 104, 8, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1583,7 +1583,7 @@ "Bounds": "32, 0, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1592,7 +1592,7 @@ "Bounds": "32, 24, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1600,7 +1600,7 @@ "Bounds": "32, 88, 14, 6" }, { - "Entities": [ + "Types": [ 170, 195 ], @@ -1608,7 +1608,7 @@ "Bounds": "40, 0, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1617,7 +1617,7 @@ "Bounds": "40, 24, 8, 16" }, { - "Entities": [ + "Types": [ 205, 209, 217 @@ -1626,7 +1626,7 @@ "Bounds": "40, 110, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1634,7 +1634,7 @@ "Bounds": "46, 88, 14, 6" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1642,7 +1642,7 @@ "Bounds": "48, 0, 8, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1651,7 +1651,7 @@ "Bounds": "48, 24, 8, 16" }, { - "Entities": [ + "Types": [ 205, 209, 217 @@ -1660,7 +1660,7 @@ "Bounds": "48, 110, 8, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1669,7 +1669,7 @@ "Bounds": "56, 96, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1677,7 +1677,7 @@ "Bounds": "56, 104, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1686,7 +1686,7 @@ "Bounds": "60, 88, 8, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1695,7 +1695,7 @@ "Bounds": "64, 96, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1703,7 +1703,7 @@ "Bounds": "64, 120, 6, 6" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1712,7 +1712,7 @@ "Bounds": "68, 88, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1720,7 +1720,7 @@ "Bounds": "70, 120, 6, 6" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -1729,7 +1729,7 @@ "Bounds": "72, 96, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1738,7 +1738,7 @@ "Bounds": "76, 88, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1747,7 +1747,7 @@ "Bounds": "80, 24, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1756,7 +1756,7 @@ "Bounds": "80, 56, 8, 16" }, { - "Entities": [ + "Types": [ 306, 310 ], @@ -1764,7 +1764,7 @@ "Bounds": "80, 112, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1773,7 +1773,7 @@ "Bounds": "84, 88, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1781,7 +1781,7 @@ "Bounds": "88, 48, 8, 16" }, { - "Entities": [ + "Types": [ 205, 209, 217 @@ -1790,7 +1790,7 @@ "Bounds": "88, 64, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1799,7 +1799,7 @@ "Bounds": "92, 88, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1807,7 +1807,7 @@ "Bounds": "96, 48, 8, 16" }, { - "Entities": [ + "Types": [ 205, 209, 217 @@ -1816,7 +1816,7 @@ "Bounds": "96, 64, 8, 16" }, { - "Entities": [ + "Types": [ 170, 173, 195, @@ -1826,7 +1826,7 @@ "Bounds": "104, 56, 16, 8" }, { - "Entities": [ + "Types": [ 205, 209, 217 @@ -1835,7 +1835,7 @@ "Bounds": "104, 64, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1844,7 +1844,7 @@ "Bounds": "112, 88, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1852,7 +1852,7 @@ "Bounds": "120, 48, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1861,7 +1861,7 @@ "Bounds": "120, 88, 8, 8" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -1869,7 +1869,7 @@ "Bounds": "120, 104, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1877,7 +1877,7 @@ "Bounds": "128, 48, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1886,7 +1886,7 @@ "Bounds": "128, 88, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1895,7 +1895,7 @@ "Bounds": "136, 16, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1903,7 +1903,7 @@ "Bounds": "136, 48, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1912,7 +1912,7 @@ "Bounds": "136, 88, 8, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -1920,7 +1920,7 @@ "Bounds": "136, 104, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1929,7 +1929,7 @@ "Bounds": "144, 16, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1937,7 +1937,7 @@ "Bounds": "144, 48, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1946,7 +1946,7 @@ "Bounds": "144, 88, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1955,7 +1955,7 @@ "Bounds": "152, 16, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1963,7 +1963,7 @@ "Bounds": "152, 48, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1972,7 +1972,7 @@ "Bounds": "152, 88, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1981,7 +1981,7 @@ "Bounds": "160, 16, 8, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1990,7 +1990,7 @@ "Bounds": "168, 16, 16, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1999,7 +1999,7 @@ "Bounds": "168, 56, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -2008,7 +2008,7 @@ "Bounds": "168, 88, 8, 8" }, { - "Entities": [ + "Types": [ 185, 188, 213 @@ -2017,7 +2017,7 @@ "Bounds": "168, 104, 8, 8" }, { - "Entities": [ + "Types": [ 205, 209, 217 @@ -2026,7 +2026,7 @@ "Bounds": "184, 0, 8, 24" }, { - "Entities": [ + "Types": [ 224, 228 ], @@ -2034,7 +2034,7 @@ "Bounds": "192, 0, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -2043,7 +2043,7 @@ "Bounds": "192, 16, 16, 8" }, { - "Entities": [ + "Types": [ 118, 205, 209, @@ -2053,7 +2053,7 @@ "Bounds": "192, 96, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -2061,7 +2061,7 @@ "Bounds": "200, 48, 16, 8" }, { - "Entities": [ + "Types": [ 118, 205, 209, @@ -2071,7 +2071,7 @@ "Bounds": "200, 96, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -2080,7 +2080,7 @@ "Bounds": "208, 16, 16, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -2089,7 +2089,7 @@ "Bounds": "208, 24, 16, 8" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -2097,7 +2097,7 @@ "Bounds": "208, 96, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -2106,7 +2106,7 @@ "Bounds": "224, 16, 16, 8" }, { - "Entities": [ + "Types": [ 26, 119, 351 @@ -2115,7 +2115,7 @@ "Bounds": "224, 24, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -2123,7 +2123,7 @@ "Bounds": "240, 80, 6, 14" }, { - "Entities": [ + "Types": [ 160, 185 ], @@ -2131,7 +2131,7 @@ "Bounds": "240, 102, 8, 8" }, { - "Entities": [ + "Types": [ 205, 209, 217 @@ -2140,7 +2140,7 @@ "Bounds": "240, 110, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -2148,7 +2148,7 @@ "Bounds": "246, 80, 6, 14" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -2156,7 +2156,7 @@ "Bounds": "248, 102, 8, 8" }, { - "Entities": [ + "Types": [ 205, 209, 217 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TRIBOSS.TR2-TextureRemap.json b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TRIBOSS.TR2-TextureRemap.json index e0a652c23..54a8c1050 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TRIBOSS.TR2-TextureRemap.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Deduplication/TRIBOSS.TR2-TextureRemap.json @@ -2,7 +2,7 @@ "Remapping": [], "Dependencies": [ { - "Entities": [ + "Types": [ 145, 158 ], @@ -10,7 +10,7 @@ "Bounds": "0, 0, 72, 96" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -18,7 +18,7 @@ "Bounds": "0, 200, 32, 40" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -27,7 +27,7 @@ "Bounds": "0, 240, 32, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -35,7 +35,7 @@ "Bounds": "32, 200, 8, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -51,7 +51,7 @@ "Bounds": "40, 160, 24, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -59,7 +59,7 @@ "Bounds": "88, 216, 40, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -68,7 +68,7 @@ "Bounds": "144, 192, 48, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -85,7 +85,7 @@ "Bounds": "208, 216, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -93,7 +93,7 @@ "Bounds": "0, 16, 32, 32" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -101,7 +101,7 @@ "Bounds": "0, 96, 56, 16" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -116,7 +116,7 @@ "Bounds": "0, 128, 24, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -131,7 +131,7 @@ "Bounds": "24, 128, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -147,7 +147,7 @@ "Bounds": "24, 184, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -155,7 +155,7 @@ "Bounds": "24, 192, 32, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -164,7 +164,7 @@ "Bounds": "32, 16, 64, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -173,7 +173,7 @@ "Bounds": "32, 160, 16, 8" }, { - "Entities": [ + "Types": [ 1, 5, 6, @@ -185,7 +185,7 @@ "Bounds": "48, 128, 8, 8" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -200,7 +200,7 @@ "Bounds": "48, 136, 24, 32" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -215,7 +215,7 @@ "Bounds": "72, 136, 24, 32" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -232,7 +232,7 @@ "Bounds": "80, 192, 16, 40" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -240,7 +240,7 @@ "Bounds": "112, 104, 56, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -249,7 +249,7 @@ "Bounds": "128, 216, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -266,7 +266,7 @@ "Bounds": "152, 192, 16, 40" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -275,7 +275,7 @@ "Bounds": "160, 0, 48, 24" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -283,7 +283,7 @@ "Bounds": "168, 104, 56, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -300,7 +300,7 @@ "Bounds": "168, 192, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -317,7 +317,7 @@ "Bounds": "184, 192, 16, 40" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -334,7 +334,7 @@ "Bounds": "200, 192, 16, 40" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -342,7 +342,7 @@ "Bounds": "208, 0, 32, 32" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -351,7 +351,7 @@ "Bounds": "208, 248, 48, 8" }, { - "Entities": [ + "Types": [ 1, 3, 4, @@ -366,7 +366,7 @@ "Bounds": "224, 104, 24, 32" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -375,7 +375,7 @@ "Bounds": "232, 64, 24, 24" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -384,7 +384,7 @@ "Bounds": "0, 0, 16, 40" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -392,7 +392,7 @@ "Bounds": "0, 104, 56, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -400,7 +400,7 @@ "Bounds": "0, 112, 56, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -408,7 +408,7 @@ "Bounds": "0, 120, 56, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -416,7 +416,7 @@ "Bounds": "0, 160, 16, 24" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -425,7 +425,7 @@ "Bounds": "0, 224, 32, 8" }, { - "Entities": [ + "Types": [ 175, 200 ], @@ -433,7 +433,7 @@ "Bounds": "16, 152, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -442,7 +442,7 @@ "Bounds": "24, 48, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -451,7 +451,7 @@ "Bounds": "24, 56, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -460,7 +460,7 @@ "Bounds": "24, 64, 64, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -468,7 +468,7 @@ "Bounds": "32, 152, 24, 16" }, { - "Entities": [ + "Types": [ 178, 203 ], @@ -476,7 +476,7 @@ "Bounds": "32, 168, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -485,7 +485,7 @@ "Bounds": "40, 200, 8, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -493,7 +493,7 @@ "Bounds": "40, 216, 16, 16" }, { - "Entities": [ + "Types": [ 5, 160, 185 @@ -502,7 +502,7 @@ "Bounds": "56, 152, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -510,7 +510,7 @@ "Bounds": "56, 160, 24, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -518,7 +518,7 @@ "Bounds": "56, 216, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -527,7 +527,7 @@ "Bounds": "64, 72, 24, 8" }, { - "Entities": [ + "Types": [ 132, 133 ], @@ -535,7 +535,7 @@ "Bounds": "64, 80, 64, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -544,7 +544,7 @@ "Bounds": "64, 240, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -553,7 +553,7 @@ "Bounds": "72, 216, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -569,7 +569,7 @@ "Bounds": "80, 104, 16, 16" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -577,7 +577,7 @@ "Bounds": "80, 152, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -593,7 +593,7 @@ "Bounds": "88, 32, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -602,7 +602,7 @@ "Bounds": "88, 216, 32, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -611,7 +611,7 @@ "Bounds": "88, 224, 32, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -627,7 +627,7 @@ "Bounds": "120, 208, 16, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -636,7 +636,7 @@ "Bounds": "120, 224, 32, 8" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -644,7 +644,7 @@ "Bounds": "128, 80, 32, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -652,7 +652,7 @@ "Bounds": "136, 144, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -660,7 +660,7 @@ "Bounds": "152, 16, 24, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -668,7 +668,7 @@ "Bounds": "152, 152, 24, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -677,7 +677,7 @@ "Bounds": "152, 208, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -686,7 +686,7 @@ "Bounds": "152, 216, 16, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -702,7 +702,7 @@ "Bounds": "160, 200, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -711,7 +711,7 @@ "Bounds": "160, 248, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -720,7 +720,7 @@ "Bounds": "168, 216, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -729,7 +729,7 @@ "Bounds": "168, 224, 16, 16" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -737,7 +737,7 @@ "Bounds": "176, 16, 24, 24" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -745,7 +745,7 @@ "Bounds": "176, 160, 24, 16" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -761,7 +761,7 @@ "Bounds": "176, 208, 16, 16" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -769,7 +769,7 @@ "Bounds": "200, 144, 24, 16" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -777,7 +777,7 @@ "Bounds": "200, 160, 16, 24" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -794,7 +794,7 @@ "Bounds": "208, 120, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -811,7 +811,7 @@ "Bounds": "216, 40, 8, 8" }, { - "Entities": [ + "Types": [ 0, 1, 3, @@ -827,7 +827,7 @@ "Bounds": "224, 16, 8, 8" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -836,7 +836,7 @@ "Bounds": "224, 144, 16, 24" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -845,7 +845,7 @@ "Bounds": "240, 64, 8, 24" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -853,7 +853,7 @@ "Bounds": "240, 144, 16, 24" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -861,7 +861,7 @@ "Bounds": "240, 200, 8, 8" }, { - "Entities": [ + "Types": [ 5, 315 ], @@ -869,7 +869,7 @@ "Bounds": "240, 208, 16, 16" }, { - "Entities": [ + "Types": [ 132, 133 ], @@ -877,7 +877,7 @@ "Bounds": "248, 24, 8, 64" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -886,7 +886,7 @@ "Bounds": "248, 248, 8, 8" }, { - "Entities": [ + "Types": [ 176, 201 ], @@ -894,7 +894,7 @@ "Bounds": "0, 16, 16, 16" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -903,7 +903,7 @@ "Bounds": "0, 56, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -912,7 +912,7 @@ "Bounds": "0, 80, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -920,7 +920,7 @@ "Bounds": "0, 128, 14, 6" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -928,7 +928,7 @@ "Bounds": "8, 112, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -936,7 +936,7 @@ "Bounds": "14, 128, 14, 6" }, { - "Entities": [ + "Types": [ 180, 204 ], @@ -944,7 +944,7 @@ "Bounds": "16, 16, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -953,7 +953,7 @@ "Bounds": "16, 80, 16, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -962,7 +962,7 @@ "Bounds": "24, 56, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -970,7 +970,7 @@ "Bounds": "24, 72, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -979,7 +979,7 @@ "Bounds": "28, 128, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -988,7 +988,7 @@ "Bounds": "32, 80, 16, 8" }, { - "Entities": [ + "Types": [ 181, 182 ], @@ -996,7 +996,7 @@ "Bounds": "32, 144, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1005,7 +1005,7 @@ "Bounds": "36, 128, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1014,7 +1014,7 @@ "Bounds": "44, 128, 8, 8" }, { - "Entities": [ + "Types": [ 168, 170, 195 @@ -1023,7 +1023,7 @@ "Bounds": "48, 72, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1032,7 +1032,7 @@ "Bounds": "52, 128, 8, 8" }, { - "Entities": [ + "Types": [ 173, 198 ], @@ -1040,7 +1040,7 @@ "Bounds": "56, 72, 8, 24" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1049,7 +1049,7 @@ "Bounds": "60, 128, 8, 8" }, { - "Entities": [ + "Types": [ 177, 202 ], @@ -1057,7 +1057,7 @@ "Bounds": "64, 72, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1066,7 +1066,7 @@ "Bounds": "64, 80, 16, 8" }, { - "Entities": [ + "Types": [ 168, 170, 173, @@ -1077,7 +1077,7 @@ "Bounds": "64, 112, 16, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1086,7 +1086,7 @@ "Bounds": "68, 128, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1095,7 +1095,7 @@ "Bounds": "80, 80, 16, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1103,7 +1103,7 @@ "Bounds": "88, 152, 6, 6" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1112,7 +1112,7 @@ "Bounds": "96, 80, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1120,7 +1120,7 @@ "Bounds": "96, 104, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1129,7 +1129,7 @@ "Bounds": "96, 128, 8, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1137,7 +1137,7 @@ "Bounds": "104, 104, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1146,7 +1146,7 @@ "Bounds": "104, 128, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1155,7 +1155,7 @@ "Bounds": "112, 56, 24, 8" }, { - "Entities": [ + "Types": [ 174, 199, 309 @@ -1164,7 +1164,7 @@ "Bounds": "112, 112, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1173,7 +1173,7 @@ "Bounds": "112, 128, 8, 8" }, { - "Entities": [ + "Types": [ 132, 133, 185, @@ -1183,7 +1183,7 @@ "Bounds": "112, 136, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1192,7 +1192,7 @@ "Bounds": "120, 80, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1200,7 +1200,7 @@ "Bounds": "120, 104, 8, 16" }, { - "Entities": [ + "Types": [ 145, 158 ], @@ -1208,7 +1208,7 @@ "Bounds": "120, 136, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1216,7 +1216,7 @@ "Bounds": "128, 104, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1225,7 +1225,7 @@ "Bounds": "128, 128, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1234,7 +1234,7 @@ "Bounds": "136, 56, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1243,7 +1243,7 @@ "Bounds": "136, 80, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1251,7 +1251,7 @@ "Bounds": "136, 104, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1260,7 +1260,7 @@ "Bounds": "136, 128, 8, 8" }, { - "Entities": [ + "Types": [ 243, 244, 247 @@ -1269,7 +1269,7 @@ "Bounds": "136, 144, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1278,7 +1278,7 @@ "Bounds": "144, 80, 8, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1286,7 +1286,7 @@ "Bounds": "144, 104, 8, 16" }, { - "Entities": [ + "Types": [ 244, 246 ], @@ -1294,7 +1294,7 @@ "Bounds": "144, 144, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1303,7 +1303,7 @@ "Bounds": "152, 80, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1312,7 +1312,7 @@ "Bounds": "152, 128, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1321,7 +1321,7 @@ "Bounds": "160, 80, 8, 16" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1330,7 +1330,7 @@ "Bounds": "160, 128, 8, 8" }, { - "Entities": [ + "Types": [ 8, 167, 192 @@ -1339,7 +1339,7 @@ "Bounds": "168, 128, 8, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1348,7 +1348,7 @@ "Bounds": "176, 56, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1356,7 +1356,7 @@ "Bounds": "176, 104, 16, 8" }, { - "Entities": [ + "Types": [ 162, 187 ], @@ -1364,7 +1364,7 @@ "Bounds": "176, 136, 8, 8" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1373,7 +1373,7 @@ "Bounds": "184, 112, 8, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1381,7 +1381,7 @@ "Bounds": "184, 136, 8, 8" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1389,7 +1389,7 @@ "Bounds": "192, 0, 16, 16" }, { - "Entities": [ + "Types": [ 163, 188 ], @@ -1397,7 +1397,7 @@ "Bounds": "192, 136, 8, 8" }, { - "Entities": [ + "Types": [ 3, 161, 186 @@ -1406,7 +1406,7 @@ "Bounds": "200, 48, 24, 8" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1415,7 +1415,7 @@ "Bounds": "200, 56, 24, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1423,7 +1423,7 @@ "Bounds": "200, 136, 8, 8" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1431,7 +1431,7 @@ "Bounds": "208, 0, 16, 16" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1439,7 +1439,7 @@ "Bounds": "208, 136, 8, 8" }, { - "Entities": [ + "Types": [ 163, 171, 188 @@ -1448,7 +1448,7 @@ "Bounds": "216, 64, 8, 24" }, { - "Entities": [ + "Types": [ 164, 189 ], @@ -1456,7 +1456,7 @@ "Bounds": "216, 136, 8, 8" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1464,7 +1464,7 @@ "Bounds": "224, 0, 16, 16" }, { - "Entities": [ + "Types": [ 7, 166, 191 @@ -1473,7 +1473,7 @@ "Bounds": "224, 56, 24, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1482,7 +1482,7 @@ "Bounds": "232, 72, 8, 16" }, { - "Entities": [ + "Types": [ 167, 192 ], @@ -1490,7 +1490,7 @@ "Bounds": "232, 104, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1498,7 +1498,7 @@ "Bounds": "232, 120, 6, 14" }, { - "Entities": [ + "Types": [ 175, 200, 311 @@ -1507,7 +1507,7 @@ "Bounds": "240, 0, 16, 16" }, { - "Entities": [ + "Types": [ 243, 244, 245, @@ -1518,7 +1518,7 @@ "Bounds": "240, 16, 16, 16" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1527,7 +1527,7 @@ "Bounds": "240, 48, 8, 8" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1536,7 +1536,7 @@ "Bounds": "240, 72, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1544,7 +1544,7 @@ "Bounds": "240, 136, 6, 6" }, { - "Entities": [ + "Types": [ 6, 165, 190 @@ -1553,7 +1553,7 @@ "Bounds": "248, 72, 8, 16" }, { - "Entities": [ + "Types": [ 172, 197, 310 @@ -1562,7 +1562,7 @@ "Bounds": "248, 104, 8, 16" }, { - "Entities": [ + "Types": [ 174, 199 ], @@ -1570,7 +1570,7 @@ "Bounds": "248, 120, 6, 14" }, { - "Entities": [ + "Types": [ 178, 203 ], diff --git a/TRRandomizerCore/Textures/DynamicTextureBuilder.cs b/TRRandomizerCore/Textures/DynamicTextureBuilder.cs index 25ce4f318..7ffae77a1 100644 --- a/TRRandomizerCore/Textures/DynamicTextureBuilder.cs +++ b/TRRandomizerCore/Textures/DynamicTextureBuilder.cs @@ -323,7 +323,6 @@ private void DuplicateMeshTextures(TR1Level level, TRMesh mesh) packer.Pack(true); // Map the packed segments to object textures. - Queue reusableIndices = new(level.GetInvalidObjectTextureIndices()); Dictionary reindex = new(); foreach (TRTextileSegment segment in duplicates.SelectMany(r => r.Segments)) { @@ -332,23 +331,13 @@ private void DuplicateMeshTextures(TR1Level level, TRMesh mesh) continue; } - int newIndex; - if (reusableIndices.Count > 0) + if (level.ObjectTextures.Count >= maximumObjects) { - newIndex = reusableIndices.Dequeue(); - level.ObjectTextures[newIndex] = objTexture; - } - else if (level.ObjectTextures.Count < maximumObjects) - { - level.ObjectTextures.Add(objTexture); - newIndex = level.ObjectTextures.Count - 1; - } - else - { - throw new PackingException(string.Format("Limit of {0} textures reached.", maximumObjects)); + throw new PackingException($"Limit of {maximumObjects} textures reached."); } - reindex[segment.Index] = newIndex; + reindex[segment.Index] = level.ObjectTextures.Count; + level.ObjectTextures.Add(objTexture); } // Remap the mesh's faces. diff --git a/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs b/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs index 195de6c27..51db65e22 100644 --- a/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs +++ b/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs @@ -54,8 +54,11 @@ public void Apply(L level, WireframeData data) ScanRooms(level); ScanMeshes(level); - ISet roomSizes = new SortedSet(_roomFace3s.Values.Concat(_roomFace4s.Values)); - ISet meshSizes = new SortedSet(_meshFaces.Values); + _triggerFaces.RemoveAll(f => IsTextureExcluded(f.Texture)); + _deathFaces.RemoveAll(f => IsTextureExcluded(f.Texture)); + + SortedSet roomSizes = new(_roomFace3s.Values.Concat(_roomFace4s.Values)); + SortedSet meshSizes = new(_meshFaces.Values); Pen roomPen = new(_data.HighlightColour, 1) { @@ -77,9 +80,11 @@ public void Apply(L level, WireframeData data) DashCap = DashCap.Round }; + DeleteAnimatedTextures(level); + TRTexturePacker packer = CreatePacker(level); DeleteTextures(packer); - ResetUnusedTextures(level); + level.ResetUnusedTextures(); TRSize roomSize = GetLargestSize(roomSizes); roomSize.RoundDown(); @@ -100,36 +105,28 @@ public void Apply(L level, WireframeData data) packer.Options.StartMethod = PackingStartMethod.FirstTile; packer.Pack(true); - Queue reusableTextures = new(GetInvalidObjectTextureIndices(level)); - List levelObjectTextures = GetObjectTextures(level); - - ushort roomTextureIndex = (ushort)reusableTextures.Dequeue(); - levelObjectTextures[roomTextureIndex] = roomTexture.Texture as TRObjectTexture; - - ushort ladderTextureIndex = (ushort)reusableTextures.Dequeue(); - levelObjectTextures[ladderTextureIndex] = ladderTexture.Texture as TRObjectTexture; - - ushort triggerTextureIndex = (ushort)reusableTextures.Dequeue(); - levelObjectTextures[triggerTextureIndex] = triggerTexture.Texture as TRObjectTexture; + ushort StoreTexture(TRTextileSegment segment) + { + level.ObjectTextures.Add(segment.Texture as TRObjectTexture); + return (ushort)(level.ObjectTextures.Count - 1); + } - ushort deathTextureIndex = (ushort)reusableTextures.Dequeue(); - levelObjectTextures[deathTextureIndex] = deathTexture.Texture as TRObjectTexture; + ushort roomTextureIndex = StoreTexture(roomTexture); + ushort ladderTextureIndex = StoreTexture(ladderTexture); + ushort triggerTextureIndex = StoreTexture(triggerTexture); + ushort deathTextureIndex = StoreTexture(deathTexture); Dictionary specialTextureRemap = new(); foreach (ushort originalTexture in specialTextures.Keys) { - ushort newIndex = (ushort)reusableTextures.Dequeue(); - levelObjectTextures[newIndex] = specialTextures[originalTexture].Texture as TRObjectTexture; - specialTextureRemap[originalTexture] = newIndex; + specialTextureRemap[originalTexture] = StoreTexture(specialTextures[originalTexture]); } foreach (TRSize size in modelRemap.Keys) { if (!size.Equals(_nullSize)) { - ushort texture = (ushort)reusableTextures.Dequeue(); - levelObjectTextures[texture] = modelRemap[size].Texture as TRObjectTexture; - modelRemap[size].Index = texture; + modelRemap[size].Index = StoreTexture(modelRemap[size]); } } @@ -137,15 +134,13 @@ public void Apply(L level, WireframeData data) ResetMeshTextures(modelRemap, specialTextureRemap); TidyModels(level); SetSkyboxVisible(level); - DeleteAnimatedTextures(level); } private void RetainCustomTextures(L level) { - List textures = GetObjectTextures(level); - for (ushort i = 0; i < textures.Count; i++) + for (ushort i = 0; i < level.ObjectTextures.Count; i++) { - if (textures[i].BlendingMode == TRBlendingMode.Unused01) + if (level.ObjectTextures[i].BlendingMode == TRBlendingMode.Unused01) { _data.ExcludedTextures.Add(i); } @@ -207,18 +202,13 @@ private void ScanMesh(L level, TRMesh mesh) private TRSize GetTextureSize(L level, ushort textureIndex) { - TRObjectTexture texture = GetObjectTextures(level)[textureIndex]; - if (texture.IsValid()) + TRObjectTexture texture = level.ObjectTextures[textureIndex]; + _allTextures.Add(textureIndex); + TRTextileSegment itext = new() { - _allTextures.Add(textureIndex); - TRTextileSegment itext = new() - { - Texture = texture - }; - return new TRSize(itext.Bounds.Width, itext.Bounds.Height); - } - - return _nullSize; + Texture = texture + }; + return new(itext.Bounds.Width, itext.Bounds.Height); } private void DeleteTextures(TRTexturePacker packer) @@ -255,10 +245,10 @@ private TRTextileSegment CreateWireframe(TRTexturePacker packer, TRSize size, Pe return null; } - TRTextileSegment texture = CreateSegment(new Rectangle(0, 0, size.W, size.H)); + TRTextileSegment texture = CreateSegment(new(0, 0, size.W, size.H)); TRImage frame = CreateFrame(size.W, size.H, pen, mode, true); - packer.AddRectangle(new TRTextileRegion(texture, frame)); + packer.AddRectangle(new(texture, frame)); return texture; } @@ -270,7 +260,7 @@ private TRTextileSegment CreateLadderWireframe(TRTexturePacker packer, TRSize si return null; } - TRTextileSegment texture = CreateSegment(new Rectangle(0, 0, size.W, size.H)); + TRTextileSegment texture = CreateSegment(new(0, 0, size.W, size.H)); TRImage frame = CreateFrame(size.W, size.H, pen, mode, false); using Bitmap bmp = frame.ToBitmap(); using Graphics graphics = Graphics.FromImage(bmp); @@ -285,7 +275,7 @@ private TRTextileSegment CreateLadderWireframe(TRTexturePacker packer, TRSize si graphics.DrawLine(pen, 0, y, size.W, y + rungSplit); } - packer.AddRectangle(new TRTextileRegion(texture, new(bmp))); + packer.AddRectangle(new(texture, new(bmp))); return texture; } @@ -297,7 +287,7 @@ private TRTextileSegment CreateTriggerWireframe(TRTexturePacker packer, TRSize s return null; } - TRTextileSegment texture = CreateSegment(new Rectangle(0, 0, size.W, size.H)); + TRTextileSegment texture = CreateSegment(new(0, 0, size.W, size.H)); TRImage frame = CreateFrame(size.W, size.H, pen, mode, true); using Bitmap bmp = frame.ToBitmap(); using Graphics graphics = Graphics.FromImage(bmp); @@ -305,7 +295,7 @@ private TRTextileSegment CreateTriggerWireframe(TRTexturePacker packer, TRSize s // X marks the spot graphics.DrawLine(pen, 0, size.H, size.W, 0); - packer.AddRectangle(new TRTextileRegion(texture, new(bmp))); + packer.AddRectangle(new(texture, new(bmp))); return texture; } @@ -317,7 +307,7 @@ private TRTextileSegment CreateDeathWireframe(TRTexturePacker packer, TRSize siz return null; } - TRTextileSegment texture = CreateSegment(new Rectangle(0, 0, size.W, size.H)); + TRTextileSegment texture = CreateSegment(new(0, 0, size.W, size.H)); TRImage frame = CreateFrame(size.W, size.H, pen, mode, true); using Bitmap bmp = frame.ToBitmap(); using Graphics graphics = Graphics.FromImage(bmp); @@ -327,7 +317,7 @@ private TRTextileSegment CreateDeathWireframe(TRTexturePacker packer, TRSize siz graphics.DrawLine(pen, size.W / 2, 0, size.W / 2, size.H); graphics.DrawLine(pen, 0, size.H / 2, size.W, size.H / 2); - packer.AddRectangle(new TRTextileRegion(texture, new(bmp))); + packer.AddRectangle(new(texture, new(bmp))); return texture; } @@ -345,15 +335,12 @@ private Dictionary CreateSpecialTextures(TRTexturePack } protected virtual Dictionary CreateSpecialSegments(L level, Pen pen) - { - return new Dictionary(); - } + => new(); private void ProcessClips(TRTexturePacker packer, L level, Pen pen, SmoothingMode mode) { // Some animated textures are shared in segments e.g. 4 32x32 segments within a 64x64 container, // so in instances where we only want to wireframe a section of these, we use manual clipping. - List textures = GetObjectTextures(level); foreach (WireframeClip clip in _data.ManualClips) { TRImage frame = CreateFrame(clip.Clip.Width, clip.Clip.Height, pen, mode, true); @@ -363,7 +350,7 @@ private void ProcessClips(TRTexturePacker packer, L level, Pen pen, SmoothingMod TRTextileSegment indexedTexture = new() { Index = texture, - Texture = textures[texture] + Texture = level.ObjectTextures[texture] }; TRImage bmp = packer.Tiles[indexedTexture.Atlas].Image; @@ -380,7 +367,7 @@ private void ProcessClips(TRTexturePacker packer, L level, Pen pen, SmoothingMod } // Ensure these clipped textures support transparency - foreach (TRObjectTexture texture in textures) + foreach (TRObjectTexture texture in level.ObjectTextures) { if (texture.BlendingMode == TRBlendingMode.Opaque) { @@ -396,7 +383,7 @@ protected TRImage CreateFrame(int width, int height, Pen pen, SmoothingMode mode graphics.SmoothingMode = mode; - graphics.FillRectangle(new SolidBrush(Color.Transparent), new Rectangle(0, 0, width, height)); + graphics.FillRectangle(new SolidBrush(Color.Transparent), new(0, 0, width, height)); graphics.DrawRectangle(pen, 0, 0, width - 1, height - 1); if (addDiagonal) { @@ -452,19 +439,12 @@ private void ResetRoomTextures(ushort wireframeIndex, ushort ladderIndex, ushort foreach (TRFace face in _triggerFaces) { - // Exclusion example is Bacon Lara's heavy trigger - we want to retain the Lava here - if (!IsTextureExcluded(face.Texture)) - { - face.Texture = triggerIndex; - } + face.Texture = triggerIndex; } foreach (TRFace face in _deathFaces) { - if (!IsTextureExcluded(face.Texture)) - { - face.Texture = deathIndex; - } + face.Texture = deathIndex; } } @@ -518,7 +498,7 @@ private void TidyModels(L level) SetFace3Colours(mesh.ColouredTriangles, blackIndex); } - ISet processedModelMeshes = new HashSet(); + HashSet processedModelMeshes = new(); foreach (var (type, model) in GetModels(level)) { if (IsSkybox(type)) @@ -592,11 +572,9 @@ private void SetFace3Colours(IEnumerable faces, int colourIndex) private void DeleteAnimatedTextures(L level) { - List animatedTextures = GetAnimatedTextures(level); - - for (int i = animatedTextures.Count - 1; i >= 0; i--) + for (int i = level.AnimatedTextures.Count - 1; i >= 0; i--) { - TRAnimatedTexture animatedTexture = animatedTextures[i]; + TRAnimatedTexture animatedTexture = level.AnimatedTextures[i]; for (int j = animatedTexture.Textures.Count - 1; j >= 0; j--) { if (!IsTextureExcluded(animatedTexture.Textures[j])) @@ -607,7 +585,7 @@ private void DeleteAnimatedTextures(L level) if (animatedTexture.Textures.Count < 2) { - animatedTextures.RemoveAt(i); + level.AnimatedTextures.RemoveAt(i); } } } @@ -618,9 +596,6 @@ private void DeleteAnimatedTextures(L level) protected abstract TRTexturePacker CreatePacker(L level); protected abstract IEnumerable> GetRoomFace4s(L level); protected abstract IEnumerable> GetRoomFace3s(L level); - protected abstract void ResetUnusedTextures(L level); - protected abstract IEnumerable GetInvalidObjectTextureIndices(L level); - protected abstract List GetObjectTextures(L level); protected abstract int GetBlackPaletteIndex(L level); protected abstract int ImportColour(L level, Color c); protected abstract TRDictionary GetModels(L level); @@ -631,7 +606,6 @@ private void DeleteAnimatedTextures(L level) protected abstract bool IsInteractableModel(E type); protected virtual bool ShouldSolidifyModel(E type) => false; protected abstract void SetSkyboxVisible(L level); - protected abstract List GetAnimatedTextures(L level); public virtual bool Is8BitPalette { get; } protected virtual void ResetPaletteTracking(L level) { } diff --git a/TRRandomizerCore/Textures/Wireframing/TR1Wireframer.cs b/TRRandomizerCore/Textures/Wireframing/TR1Wireframer.cs index 33f370739..653d12548 100644 --- a/TRRandomizerCore/Textures/Wireframing/TR1Wireframer.cs +++ b/TRRandomizerCore/Textures/Wireframing/TR1Wireframer.cs @@ -1,6 +1,5 @@ using System.Drawing; using System.Drawing.Drawing2D; -using TRDataControl; using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Helpers; @@ -78,21 +77,11 @@ protected override int GetBlackPaletteIndex(TR1Level level) return ImportColour(level, Color.Black); } - protected override IEnumerable GetInvalidObjectTextureIndices(TR1Level level) - { - return level.GetInvalidObjectTextureIndices(); - } - protected override TRDictionary GetModels(TR1Level level) { return level.Models; } - protected override List GetObjectTextures(TR1Level level) - { - return level.ObjectTextures; - } - protected override IEnumerable> GetRoomFace3s(TR1Level level) { List> faces = new(); @@ -139,11 +128,6 @@ protected override void ResetPaletteTracking(TR1Level level) _packer.PaletteControl?.MergePredefinedColours(); } - protected override void ResetUnusedTextures(TR1Level level) - { - level.ResetUnusedTextures(); - } - protected override void SetSkyboxVisible(TR1Level level) { } protected override Dictionary> CollectLadders(TR1Level level) @@ -161,11 +145,6 @@ protected override List CollectDeathFaces(TR1Level level) return FaceUtilities.GetTriggerFaces(level, new(), true); } - protected override List GetAnimatedTextures(TR1Level level) - { - return level.AnimatedTextures; - } - protected override Dictionary CreateSpecialSegments(TR1Level level, Pen pen) { Dictionary segments = new(); diff --git a/TRRandomizerCore/Textures/Wireframing/TR2Wireframer.cs b/TRRandomizerCore/Textures/Wireframing/TR2Wireframer.cs index 1171799c5..bb4213733 100644 --- a/TRRandomizerCore/Textures/Wireframing/TR2Wireframer.cs +++ b/TRRandomizerCore/Textures/Wireframing/TR2Wireframer.cs @@ -1,5 +1,4 @@ using System.Drawing; -using TRDataControl; using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Helpers; @@ -51,21 +50,11 @@ protected override int GetBlackPaletteIndex(TR2Level level) return level.Palette16.ToList().FindIndex(c => c.Red + c.Green + c.Blue == 0); } - protected override IEnumerable GetInvalidObjectTextureIndices(TR2Level level) - { - return level.GetInvalidObjectTextureIndices(); - } - protected override TRDictionary GetModels(TR2Level level) { return level.Models; } - protected override List GetObjectTextures(TR2Level level) - { - return level.ObjectTextures; - } - protected override IEnumerable> GetRoomFace3s(TR2Level level) { List> faces = new(); @@ -102,11 +91,6 @@ protected override bool IsEnemyModel(TR2Type type) return TR2TypeUtilities.IsEnemyType(type) || _additionalEnemyEntities.Contains(type); } - protected override void ResetUnusedTextures(TR2Level level) - { - level.ResetUnusedTextures(); - } - protected override void SetSkyboxVisible(TR2Level level) { foreach (TR2Room room in level.Rooms) @@ -129,9 +113,4 @@ protected override List CollectDeathFaces(TR2Level level) { return FaceUtilities.GetTriggerFaces(level, new(), true); } - - protected override List GetAnimatedTextures(TR2Level level) - { - return level.AnimatedTextures; - } } diff --git a/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs b/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs index c1d158a66..945744639 100644 --- a/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs +++ b/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs @@ -1,6 +1,5 @@ using System.Drawing; using System.Drawing.Drawing2D; -using TRDataControl; using TRImageControl; using TRImageControl.Packing; using TRLevelControl.Helpers; @@ -45,21 +44,11 @@ protected override int GetBlackPaletteIndex(TR3Level level) return level.Palette16.ToList().FindIndex(c => c.Red + c.Green + c.Blue == 0); } - protected override IEnumerable GetInvalidObjectTextureIndices(TR3Level level) - { - return level.GetInvalidObjectTextureIndices(); - } - protected override TRDictionary GetModels(TR3Level level) { return level.Models; } - protected override List GetObjectTextures(TR3Level level) - { - return level.ObjectTextures; - } - protected override IEnumerable> GetRoomFace3s(TR3Level level) { List> faces = new(); @@ -106,11 +95,6 @@ protected override bool ShouldSolidifyModel(TR3Type type) return TR3TypeUtilities.IsAnyPickupType(type) || TR3TypeUtilities.IsCrystalPickup(type); } - protected override void ResetUnusedTextures(TR3Level level) - { - level.ResetUnusedTextures(); - } - protected override void SetSkyboxVisible(TR3Level level) { foreach (TR3Room room in level.Rooms) @@ -134,11 +118,6 @@ protected override List CollectDeathFaces(TR3Level level) return FaceUtilities.GetTriggerFaces(level, new(), true); } - protected override List GetAnimatedTextures(TR3Level level) - { - return level.AnimatedTextures; - } - protected override Dictionary CreateSpecialSegments(TR3Level level, Pen pen) { Dictionary segments = new();