diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8c11c919..1b3af3ab9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 ## [Unreleased](https://github.com/LostArtefacts/TR-Rando/compare/V1.10.2...master) - xxxx-xx-xx
 - added support for TR1X 4.14 (now the minimum version supported) (#803)
-- added support TR2X (#821)
+- added support for TR2X (#821)
 - added support for The Golden Mask in TR2X and playing in combined mode (see Level Sequencing options) (#59)
 - added Spanish translations for TR1 (#800)
 - added an option to include extra pickups in certain levels in TR2X (#832)
@@ -29,6 +29,10 @@
 - fixed an uncollectible secret in Natla's Mines (#849)
 - fixed models all using the same highlight colour in wireframe mode (#852)
 - fixed the Temple of Xian Dragon Seal room (default placement) sometimes being flipped on arrival, leading to potential softlocks (OG bug)
+- fixed a glitchless secret in Bartoli's Hideout not always being obtainable without using glitches
+- fixed Lara not being invisible in the Diving Area cutscene if she was invisible in the level itself
+- fixed an error message during TR1 outfit randomization
+- fixed the imported dragon room in Floating Islands using the wrong textures
 - removed support for the dragon (TR2 Remastered only) in all levels except Dragon's Lair (may revisit)
 
 ## [V1.10.2](https://github.com/LostArtefacts/TR-Rando/compare/V1.10.1...V1.10.2) - 2024-12-06
diff --git a/Deps/TRGE.Core.dll b/Deps/TRGE.Core.dll
index f7dc10aa3..4846607ad 100644
Binary files a/Deps/TRGE.Core.dll and b/Deps/TRGE.Core.dll differ
diff --git a/TRDataControl/Environment/Model/EMType.cs b/TRDataControl/Environment/Model/EMType.cs
index 9b11ce055..9b5849cbb 100644
--- a/TRDataControl/Environment/Model/EMType.cs
+++ b/TRDataControl/Environment/Model/EMType.cs
@@ -96,6 +96,7 @@ public enum EMType
     ImportNonGraphicsModel = 145,
     CopySpriteSequence = 146,
     RemoveStaticCollision = 147,
+    CloneType = 148,
 
     // NOOP/Placeholder
     NOOP = 1000
diff --git a/TRDataControl/Environment/Model/Types/Models/EMCloneTypeFunction.cs b/TRDataControl/Environment/Model/Types/Models/EMCloneTypeFunction.cs
new file mode 100644
index 000000000..bd68ce614
--- /dev/null
+++ b/TRDataControl/Environment/Model/Types/Models/EMCloneTypeFunction.cs
@@ -0,0 +1,45 @@
+using TRLevelControl.Model;
+
+namespace TRDataControl.Environment;
+
+public class EMCloneTypeFunction : BaseEMFunction
+{
+    public Dictionary<uint, uint> ModelMap { get; set; }
+    public Dictionary<uint, uint> SpriteMap { get; set; }
+
+    public override void ApplyToLevel(TR1Level level)
+        => Clone(level.Models, level.Sprites);
+
+    public override void ApplyToLevel(TR2Level level)
+        => Clone(level.Models, level.Sprites);
+
+    public override void ApplyToLevel(TR3Level level)
+        => Clone(level.Models, level.Sprites);
+
+    private void Clone<T>(TRDictionary<T, TRModel> models, TRDictionary<T, TRSpriteSequence> sprites)
+        where T : Enum
+    {
+        Clone(models, ModelMap);
+        Clone(sprites, SpriteMap);
+    }
+
+    private static void Clone<T, V>(TRDictionary<T, V> levelMap, Dictionary<uint, uint> cloneMap)
+        where T : Enum
+        where V : class, ICloneable
+    {
+        if (cloneMap == null)
+        {
+            return;
+        }
+
+        foreach (var (baseId, targetId) in cloneMap)
+        {
+            var baseType = (T)(object)baseId;
+            var targetType = (T)(object)targetId;
+            if (levelMap.TryGetValue(baseType, out var value))
+            {
+                levelMap[targetType] = (V)value.Clone();
+            }
+        }
+    }
+}
diff --git a/TRDataControl/Environment/Parsing/EMConverter.cs b/TRDataControl/Environment/Parsing/EMConverter.cs
index bedd15738..975e671b8 100644
--- a/TRDataControl/Environment/Parsing/EMConverter.cs
+++ b/TRDataControl/Environment/Parsing/EMConverter.cs
@@ -127,6 +127,7 @@ private object ReadEMType(JObject jo)
             EMType.ImportNonGraphicsModel => JsonConvert.DeserializeObject<EMImportNonGraphicsModelFunction>(jo.ToString(), this),
             EMType.CopySpriteSequence => JsonConvert.DeserializeObject<EMCopySpriteSequenceFunction>(jo.ToString(), this),
             EMType.RemoveStaticCollision => JsonConvert.DeserializeObject<EMRemoveStaticCollisionFunction>(jo.ToString(), this),
+            EMType.CloneType => JsonConvert.DeserializeObject<EMCloneTypeFunction>(jo.ToString(), this),
 
             // NOOP
             EMType.NOOP => JsonConvert.DeserializeObject<EMPlaceholderFunction>(jo.ToString(), this),
diff --git a/TRRandomizerCore/Processors/TR2/Tasks/TR2XFloorDataTask.cs b/TRRandomizerCore/Processors/TR2/Tasks/TR2XFloorDataTask.cs
index 90f0c4e36..9413fbf60 100644
--- a/TRRandomizerCore/Processors/TR2/Tasks/TR2XFloorDataTask.cs
+++ b/TRRandomizerCore/Processors/TR2/Tasks/TR2XFloorDataTask.cs
@@ -41,5 +41,12 @@ public void Run(TR2CombinedLevel level)
         {
             level.Data.Cameras[7].Y -= TRConsts.Step2 + 16;
         }
+
+        if (level.Is(TR2LevelNames.CHICKEN))
+        {
+            var sector = level.Data.Rooms[48].GetSector(5, 4, TRUnit.Sector);
+            var zone = level.Data.Boxes[sector.BoxIndex].Zone;
+            zone.FlipOnZone = zone.FlipOffZone.Clone();
+        }
     }
 }
diff --git a/TRRandomizerCore/Randomizers/Shared/EnemyAllocator.cs b/TRRandomizerCore/Randomizers/Shared/EnemyAllocator.cs
index c1515e052..9e8f03cd9 100644
--- a/TRRandomizerCore/Randomizers/Shared/EnemyAllocator.cs
+++ b/TRRandomizerCore/Randomizers/Shared/EnemyAllocator.cs
@@ -1,5 +1,4 @@
-using Newtonsoft.Json;
-using TRLevelControl.Model;
+using TRLevelControl.Model;
 using TRRandomizerCore.Editors;
 using TRRandomizerCore.Helpers;
 using TRRandomizerCore.Utilities;
@@ -22,10 +21,13 @@ public EnemyAllocator(TRGameVersion version)
     {
         string relocFile = $"Resources/{version}/Locations/enemy_relocations.json";
         _relocations = File.Exists(relocFile)
-            ? JsonConvert.DeserializeObject<Dictionary<string, List<Location>>>(File.ReadAllText(relocFile))
-            : new();
+            ? JsonUtils.ReadFile<Dictionary<string, List<Location>>>(relocFile)
+            : [];
+        RelocationsLoaded();
     }
 
+    protected virtual void RelocationsLoaded() { }
+
     public void Initialise()
     {
         _resultantEnemies = new();
diff --git a/TRRandomizerCore/Randomizers/TR1/Classic/TR1OutfitRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1OutfitRandomizer.cs
index 3a32eff4a..158d71bee 100644
--- a/TRRandomizerCore/Randomizers/TR1/Classic/TR1OutfitRandomizer.cs
+++ b/TRRandomizerCore/Randomizers/TR1/Classic/TR1OutfitRandomizer.cs
@@ -19,6 +19,7 @@ namespace TRRandomizerCore.Randomizers;
 public class TR1OutfitRandomizer : BaseTR1Randomizer
 {
     private static readonly string _gymOutfitHash = "6523d69dbf1f0ab671f5f877afe6ff35";
+    private static readonly string _mauledOutfitHash = "ab52e600b2f4fa7edfd3e9a32d1a5582";
     private static readonly Version _minBraidCutsceneVersion = new(2, 13, 0);
     private static readonly TR1SFX[] _barefootSfxIDs = new TR1SFX[] { TR1SFX.LaraFeet, TR1SFX.LaraLand };
     private static readonly double _mauledLaraChance = (double)1 / 3;
@@ -803,6 +804,11 @@ private void ConvertToMauledOutfit(TR1CombinedLevel level)
             List<TRMesh> laraShotgun = level.Data.Models[TR1Type.LaraShotgunAnim_H]?.Meshes;
             List<TRMesh> laraMisc = level.Data.Models[TR1Type.LaraMiscAnim_H]?.Meshes;
 
+            if (laraMisc == null || laraMisc.ComputeSkeletonHash() != _mauledOutfitHash)
+            {
+                return;
+            }
+
             if (level.Is(TR1LevelNames.QUALOPEC_CUT))
             {
                 // This model is completely different to all others, so just
diff --git a/TRRandomizerCore/Randomizers/TR1/Classic/TR1TextureRandomizer.cs b/TRRandomizerCore/Randomizers/TR1/Classic/TR1TextureRandomizer.cs
index c11fae45e..7679e6500 100644
--- a/TRRandomizerCore/Randomizers/TR1/Classic/TR1TextureRandomizer.cs
+++ b/TRRandomizerCore/Randomizers/TR1/Classic/TR1TextureRandomizer.cs
@@ -281,10 +281,7 @@ internal TextureProcessor(TR1TextureRandomizer outer)
             : base(outer)
         {
             _holders = new();
-            _landmarkImporter = new()
-            {
-                IsCommunityPatch = true
-            };
+            _landmarkImporter = new();
             _wireframer = new();
         }
 
diff --git a/TRRandomizerCore/Randomizers/TR2/Classic/TR2EnemyRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2EnemyRandomizer.cs
index b0edef81e..8f4914e50 100644
--- a/TRRandomizerCore/Randomizers/TR2/Classic/TR2EnemyRandomizer.cs
+++ b/TRRandomizerCore/Randomizers/TR2/Classic/TR2EnemyRandomizer.cs
@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using TRDataControl;
 using TRDataControl.Environment;
+using TRLevelControl;
 using TRLevelControl.Helpers;
 using TRLevelControl.Model;
 using TRRandomizerCore.Helpers;
@@ -184,14 +185,26 @@ private void AdjustFurnaceBlockRoom(TR2CombinedLevel level)
             return;
         }
 
-        var enemyTrigActions = level.Data.Entities
+        var enemies = level.Data.Entities
             .Select((entity, idx) => (entity, idx))
-            .Where(x => x.entity.Room == 11 && TR2TypeUtilities.IsEnemyType(x.entity.TypeID))
-            .Select(x => new FDActionItem
+            .Where(x => x.entity.Room == 11 && TR2TypeUtilities.IsEnemyType(x.entity.TypeID));
+        foreach (var enemy in enemies.Select(x => x.entity))
+        {
+            var x = (enemy.X - level.Data.Rooms[11].Info.X) / TRConsts.Step4;
+            var z = (enemy.Z - level.Data.Rooms[11].Info.Z) / TRConsts.Step4;
+            enemy.Angle = (x, z) switch
             {
-                Action = FDTrigAction.Object,
-                Parameter = (short)x.idx,
-            }).ToList();
+                (1, _) => -16384,
+                (_, 1) => -32768,
+                _ => 0,
+            };
+        }
+
+        var enemyTrigActions = enemies.Select(x => new FDActionItem
+        {
+            Action = FDTrigAction.Object,
+            Parameter = (short)x.idx,
+        }).ToList();
         enemyTrigActions.Shuffle(_generator);
         var actionGroups = enemyTrigActions.Split(4);
 
diff --git a/TRRandomizerCore/Randomizers/TR2/Classic/TR2EnvironmentRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2EnvironmentRandomizer.cs
index 65de42bf0..1ce89599b 100644
--- a/TRRandomizerCore/Randomizers/TR2/Classic/TR2EnvironmentRandomizer.cs
+++ b/TRRandomizerCore/Randomizers/TR2/Classic/TR2EnvironmentRandomizer.cs
@@ -169,6 +169,10 @@ private void FinalizeEnvironment(TR2CombinedLevel level)
 
         if (mapping != null)
         {
+            if (level.IsUKBox)
+            {
+                mapping.AlternateTextures();
+            }
             mapping.SetCommunityPatch(ScriptEditor.Edition.IsCommunityPatch);
 
             foreach (EMConditionalSingleEditorSet mod in mapping.ConditionalAll)
diff --git a/TRRandomizerCore/Randomizers/TR2/Classic/TR2OutfitRandomizer.cs b/TRRandomizerCore/Randomizers/TR2/Classic/TR2OutfitRandomizer.cs
index d12b18f26..be47046b5 100644
--- a/TRRandomizerCore/Randomizers/TR2/Classic/TR2OutfitRandomizer.cs
+++ b/TRRandomizerCore/Randomizers/TR2/Classic/TR2OutfitRandomizer.cs
@@ -143,7 +143,7 @@ internal class OutfitProcessor : AbstractProcessorThread<TR2OutfitRandomizer>
             TR2Type.Lara, TR2Type.LaraPonytail_H, TR2Type.LaraFlareAnim_H,
             TR2Type.LaraPistolAnim_H, TR2Type.LaraShotgunAnim_H, TR2Type.LaraAutoAnim_H,
             TR2Type.LaraUziAnim_H, TR2Type.LaraM16Anim_H, TR2Type.LaraHarpoonAnim_H,
-            TR2Type.LaraGrenadeAnim_H, TR2Type.LaraMiscAnim_H
+            TR2Type.LaraGrenadeAnim_H, TR2Type.LaraMiscAnim_H, TR2Type.CutsceneActor3,
         };
 
         private readonly Dictionary<TR2CombinedLevel, TR2Type> _outfitAllocations;
diff --git a/TRRandomizerCore/Randomizers/TR2/Shared/TR2EnemyAllocator.cs b/TRRandomizerCore/Randomizers/TR2/Shared/TR2EnemyAllocator.cs
index 0a2caa4bf..40587c6ef 100644
--- a/TRRandomizerCore/Randomizers/TR2/Shared/TR2EnemyAllocator.cs
+++ b/TRRandomizerCore/Randomizers/TR2/Shared/TR2EnemyAllocator.cs
@@ -29,6 +29,15 @@ public class TR2EnemyAllocator : EnemyAllocator<TR2Type>
         TR2LevelNames.MONASTERY,
     };
 
+    private static readonly List<TR2Type> _furnaceBlockRoomRestrictedTypes =
+    [
+        .. TR2TypeUtilities.GetFamily(TR2Type.BirdMonsterOG),
+        .. TR2TypeUtilities.GetFamily(TR2Type.FlamethrowerGoonOG),
+        TR2Type.ShotgunGoon,
+        TR2Type.TRex,
+        TR2Type.XianGuardSpear,
+    ];
+
     public TR2EnemyAllocator()
         : base(TRGameVersion.TR2) { }
 
@@ -47,6 +56,26 @@ protected override Dictionary<TR2Type, List<int>> GetRestrictedRooms(string leve
     protected override bool IsOneShotType(TR2Type type)
         => type == TR2Type.MarcoBartoli;
 
+    protected override void RelocationsLoaded()
+    {
+        foreach (var locations in _relocations.Values)
+        {
+            var blackLocations = locations.FindAll(l => l.TargetType == (short)TR2Type.BlackMorayEel);
+            foreach (var blackEel in blackLocations)
+            {
+                var hasYellowEel = locations.Any(l => l.IsEquivalent(blackEel)
+                    && l.EntityIndex == blackEel.EntityIndex
+                    && l.TargetType == (short)TR2Type.YellowMorayEel);
+                if (!hasYellowEel)
+                {
+                    var yellowEel = blackEel.Clone();
+                    yellowEel.TargetType = (short)TR2Type.YellowMorayEel;
+                    locations.Add(yellowEel);
+                }
+            }
+        }
+    }
+
     public EnemyTransportCollection<TR2Type> SelectCrossLevelEnemies(string levelName, TR2Level level)
     {
         if (levelName == TR2LevelNames.ASSAULT)
@@ -483,6 +512,13 @@ public void RandomizeEnemies(string levelName, TR2Level level, EnemyRandomizatio
                 }
             }
 
+            if (levelName == TR2LevelNames.FURNACE && currentEntity.Room == 11
+                && difficulty == RandoDifficulty.Default)
+            {
+                newType = SelectFurnaceBlockRoomType(newType, enemyPool,
+                    enemyEntities.FindAll(e => e.Room == 11 && e != currentEntity));
+            }
+
             // If we are restricting count per level for this enemy and have reached that count, pick
             // something else. This applies when we are restricting by in-level count, but not by room
             // (e.g. Winston).
@@ -554,6 +590,19 @@ public void RandomizeEnemies(string levelName, TR2Level level, EnemyRandomizatio
         }
     }
 
+    private TR2Type SelectFurnaceBlockRoomType(TR2Type selectedType, List<TR2Type> pool, List<TR2Entity> neighbours)
+    {
+        var safePool = pool.Except(_furnaceBlockRoomRestrictedTypes).ToList();
+        if (!_furnaceBlockRoomRestrictedTypes.Contains(selectedType) || safePool.Count == 0)
+        {
+            return selectedType;
+        }
+
+        return neighbours.Any(e => e.TypeID == TR2TypeUtilities.TranslateAlias(selectedType))
+            ? safePool.RandomItem(Generator)
+            : selectedType;
+    }
+
     private void LimitSkidooEntities(string levelName, TR2Level level)
     {
         if (!Settings.IsRemastered)
diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json
index 19c9b5406..fcec54884 100644
--- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json
+++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json
@@ -3196,9 +3196,9 @@
                   "Z": 2048
                 },
                 {
-                  "X": 4096,
+                  "X": 5120,
                   "Y": 1280,
-                  "Z": 2048
+                  "Z": 3072
                 }
               ]
             },
@@ -3240,12 +3240,12 @@
               "Vertices": [
                 {
                   "X": 2048,
-                  "Y": -3840,
+                  "Y": -1792,
                   "Z": 1024
                 },
                 {
                   "X": 1024,
-                  "Y": -3840,
+                  "Y": -1792,
                   "Z": 1024
                 },
                 {
@@ -3269,12 +3269,12 @@
               "Vertices": [
                 {
                   "X": 1024,
-                  "Y": -3840,
+                  "Y": -1792,
                   "Z": 3072
                 },
                 {
                   "X": 2048,
-                  "Y": -3840,
+                  "Y": -1792,
                   "Z": 3072
                 },
                 {
@@ -4002,7 +4002,7 @@
               "Z": 90624,
               "Room": -3
             },
-            "Timer": 30
+            "Timer": 34
           }
         },
         {
diff --git a/TRRandomizerCore/Resources/TR1/Textures/Mapping/LEVEL3A.PHD-Textures.json b/TRRandomizerCore/Resources/TR1/Textures/Mapping/LEVEL3A.PHD-Textures.json
index 9b6f6217f..d9600ef7d 100644
--- a/TRRandomizerCore/Resources/TR1/Textures/Mapping/LEVEL3A.PHD-Textures.json
+++ b/TRRandomizerCore/Resources/TR1/Textures/Mapping/LEVEL3A.PHD-Textures.json
@@ -8,6 +8,15 @@
           "BackgroundIndex": 3
         }
       ]
+    },
+    "Landmarks.GMSryBut": {
+      "0": [
+        {
+          "RoomNumber": 61,
+          "RectangleIndices": [ 7 ],
+          "BackgroundIndex": 5
+        }
+      ]
     }
   },
 
diff --git a/TRRandomizerCore/Resources/TR1/Textures/Mapping/LEVEL6.PHD-Textures.json b/TRRandomizerCore/Resources/TR1/Textures/Mapping/LEVEL6.PHD-Textures.json
index 827d29cf1..386438afa 100644
--- a/TRRandomizerCore/Resources/TR1/Textures/Mapping/LEVEL6.PHD-Textures.json
+++ b/TRRandomizerCore/Resources/TR1/Textures/Mapping/LEVEL6.PHD-Textures.json
@@ -1,4 +1,15 @@
 {
+  "Landmarks": {
+    "Landmarks.NevByte": {
+      "0": [
+        {
+          "RoomNumber": 23,
+          "RectangleIndices": [ 76 ],
+          "BackgroundIndex": 44
+        }
+      ]
+    }
+  },
   "Static": {
     "Lara.Bobble": [
       {
diff --git a/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/GMSryBut/Data.json b/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/GMSryBut/Data.json
new file mode 100644
index 000000000..9a39542ef
--- /dev/null
+++ b/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/GMSryBut/Data.json
@@ -0,0 +1,8 @@
+{
+  "Info": "https://www.twitch.tv/gmsrybut",
+  "VariantMap": {
+    "Default": [
+      "0, 0, 64, 64"
+    ]
+  }
+}
diff --git a/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/GMSryBut/Segments.png b/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/GMSryBut/Segments.png
new file mode 100644
index 000000000..a273f0ed9
Binary files /dev/null and b/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/GMSryBut/Segments.png differ
diff --git a/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/NevByte/Data.json b/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/NevByte/Data.json
new file mode 100644
index 000000000..8835973f8
--- /dev/null
+++ b/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/NevByte/Data.json
@@ -0,0 +1,8 @@
+{
+  "Info": "https://www.twitch.tv/nevbyte",
+  "VariantMap": {
+    "Default": [
+      "0, 0, 64, 64"
+    ]
+  }
+}
diff --git a/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/NevByte/Segments.png b/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/NevByte/Segments.png
new file mode 100644
index 000000000..373c2840c
Binary files /dev/null and b/TRRandomizerCore/Resources/TR1/Textures/Source/Static/Landmarks/NevByte/Segments.png differ
diff --git a/TRRandomizerCore/Resources/TR2/Environment/EMPRTOMB.TR2-Environment.json b/TRRandomizerCore/Resources/TR2/Environment/EMPRTOMB.TR2-Environment.json
index 61f7eaafe..3677936b2 100644
--- a/TRRandomizerCore/Resources/TR2/Environment/EMPRTOMB.TR2-Environment.json
+++ b/TRRandomizerCore/Resources/TR2/Environment/EMPRTOMB.TR2-Environment.json
@@ -110,6 +110,27 @@
         }
       ]
     },
+    {
+      "Comments": "Switch off flipmap 3 after leaving that area.",
+      "EMType": 61,
+      "Locations": [
+        {
+          "X": 30208,
+          "Y": 29696,
+          "Z": 35328,
+          "Room": 57
+        }
+      ],
+      "Trigger": {
+        "Mask": 31,
+        "Actions": [
+          {
+            "Action": 5,
+            "Parameter": 3
+          }
+        ]
+      }
+    },
     {
       "Comments": "It's entirely possible to softlock in OG in the main chamber area, so prevent that by adding extra triggers for trapdoors 79 and 145.",
       "EMType": 61,
diff --git a/TRRandomizerCore/Resources/TR2/Environment/ICECAVE.TR2-Environment.json b/TRRandomizerCore/Resources/TR2/Environment/ICECAVE.TR2-Environment.json
index 22534a250..e92628483 100644
--- a/TRRandomizerCore/Resources/TR2/Environment/ICECAVE.TR2-Environment.json
+++ b/TRRandomizerCore/Resources/TR2/Environment/ICECAVE.TR2-Environment.json
@@ -2276,16 +2276,23 @@
           }
         },
         {
-          "Comments": "Convert the CoT slot into an empty one.",
-          "EMType": 45,
-          "EntityIndex": 10,
-          "NewEntityType": 182
+          "Comments": "Clone puzzle 1 objects into puzzle 4.",
+          "EMType": 148,
+          "ModelMap": {
+            "178": 181,
+            "182": 185,
+            "186": 189
+          },
+          "SpriteMap": {
+            "174": 177
+          }
         },
         {
-          "Comments": "Reposition it to the ladder.",
-          "EMType": 44,
-          "EntityIndex": 10,
-          "TargetLocation": {
+          "Comments": "Add a slot4 at the base of the ladder.",
+          "EMType": 51,
+          "TypeID": 185,
+          "Intensity": -1,
+          "Location": {
             "X": 62976,
             "Y": 11520,
             "Z": 44544,
@@ -2294,16 +2301,11 @@
           }
         },
         {
-          "Comments": "Convert one of the CoT doors into a smaller door.",
-          "EMType": 45,
-          "EntityIndex": 16,
-          "NewEntityType": 108
-        },
-        {
-          "Comments": "Reposition it to the exit.",
-          "EMType": 44,
-          "EntityIndex": 16,
-          "TargetLocation": {
+          "Comments": "Add a door.",
+          "EMType": 51,
+          "TypeID": 108,
+          "Intensity": -1,
+          "Location": {
             "X": 62976,
             "Y": 7424,
             "Z": 43520,
@@ -2312,37 +2314,32 @@
           }
         },
         {
-          "Comments": "Convert one of the CoT doors into a mask.",
-          "EMType": 45,
-          "EntityIndex": 15,
-          "NewEntityType": 174
-        },
-        {
-          "Comments": "The chicken stole it.",
-          "EMType": 44,
-          "EntityIndex": 15,
-          "TargetLocation": {
-            "X": 66048,
-            "Y": 11520,
-            "Z": 41472,
-            "Room": 143
-          }
-        },
-        {
-          "Comments": "Make a new trigger to open the final door.",
+          "Comments": "Make a trigger to open the final door.",
           "EMType": 61,
-          "EntityLocation": 10,
+          "EntityLocation": -2,
           "Trigger": {
             "TrigType": 3,
             "Mask": 31,
-            "SwitchOrKeyRef": 10,
+            "SwitchOrKeyRef": -2,
             "Actions": [
               {
-                "Parameter": 16
+                "Parameter": -1
               }
             ]
           }
         },
+        {
+          "Comments": "Whatever the chicken is will drop a mask.",
+          "EMType": 51,
+          "TypeID": 177,
+          "Intensity": -1,
+          "Location": {
+            "X": 66048,
+            "Y": 11520,
+            "Z": 41472,
+            "Room": 143
+          }
+        },
         {
           "Comments": "Move the Talion to the new room.",
           "EMType": 44,
diff --git a/TRRandomizerCore/Resources/TR2/Locations/enemy_relocations.json b/TRRandomizerCore/Resources/TR2/Locations/enemy_relocations.json
index 99a89c85b..49845835e 100644
--- a/TRRandomizerCore/Resources/TR2/Locations/enemy_relocations.json
+++ b/TRRandomizerCore/Resources/TR2/Locations/enemy_relocations.json
@@ -1,14 +1,5 @@
 {
   "WALL.TR2": [
-    {
-      "X": 36352,
-      "Y": -3072,
-      "Z": 28672,
-      "Room": 2,
-      "Angle": 0,
-      "EntityIndex": 2,
-      "TargetType": 26
-    },
     {
       "X": 36352,
       "Y": -3072,
@@ -18,15 +9,6 @@
       "EntityIndex": 2,
       "TargetType": 27
     },
-    {
-      "X": 44544,
-      "Y": 1792,
-      "Z": 45056,
-      "Room": 7,
-      "Angle": -32768,
-      "EntityIndex": 11,
-      "TargetType": 26
-    },
     {
       "X": 44544,
       "Y": 1792,
@@ -36,14 +18,6 @@
       "EntityIndex": 11,
       "TargetType": 27
     },
-    {
-      "X": 30719,
-      "Y": -3072,
-      "Z": 36352,
-      "Room": 0,
-      "EntityIndex": 12,
-      "TargetType": 26
-    },
     {
       "X": 30719,
       "Y": -3072,
@@ -52,15 +26,6 @@
       "EntityIndex": 12,
       "TargetType": 27
     },
-    {
-      "X": 31232,
-      "Y": 0,
-      "Z": 36864,
-      "Room": 7,
-      "Angle": 0,
-      "EntityIndex": 13,
-      "TargetType": 26
-    },
     {
       "X": 31232,
       "Y": 0,
@@ -70,15 +35,6 @@
       "EntityIndex": 13,
       "TargetType": 27
     },
-    {
-      "X": 29184,
-      "Y": -3584,
-      "Z": 30720,
-      "Room": 4,
-      "Angle": 0,
-      "EntityIndex": 8,
-      "TargetType": 26
-    },
     {
       "X": 29184,
       "Y": -3584,
@@ -136,14 +92,6 @@
       "EntityIndex": 10,
       "TargetType": 27
     },
-    {
-      "X": 13311,
-      "Y": -1536,
-      "Z": 35328,
-      "Room": 42,
-      "EntityIndex": 25,
-      "TargetType": 26
-    },
     {
       "X": 13311,
       "Y": -1536,
@@ -152,14 +100,6 @@
       "EntityIndex": 25,
       "TargetType": 27
     },
-    {
-      "X": 13311,
-      "Y": -1536,
-      "Z": 36352,
-      "Room": 42,
-      "EntityIndex": 26,
-      "TargetType": 26
-    },
     {
       "X": 13311,
       "Y": -1536,
@@ -168,14 +108,6 @@
       "EntityIndex": 26,
       "TargetType": 27
     },
-    {
-      "X": 13311,
-      "Y": -1536,
-      "Z": 37376,
-      "Room": 42,
-      "EntityIndex": 27,
-      "TargetType": 26
-    },
     {
       "X": 13311,
       "Y": -1536,
@@ -236,14 +168,6 @@
       "EntityIndex": 95,
       "TargetType": 27
     },
-    {
-      "X": 60415,
-      "Y": 23552,
-      "Z": 74240,
-      "Room": 63,
-      "EntityIndex": 99,
-      "TargetType": 26
-    },
     {
       "X": 60415,
       "Y": 23552,
@@ -252,15 +176,6 @@
       "EntityIndex": 99,
       "TargetType": 27
     },
-    {
-      "X": 80895,
-      "Y": 25088,
-      "Z": 73216,
-      "Room": 79,
-      "Angle": -16384,
-      "EntityIndex": 104,
-      "TargetType": 26
-    },
     {
       "X": 80895,
       "Y": 25088,
@@ -312,14 +227,6 @@
     }
   ],
   "BOAT.TR2": [
-    {
-      "X": 56319,
-      "Y": -1024,
-      "Z": 35328,
-      "Room": 6,
-      "EntityIndex": 1,
-      "TargetType": 26
-    },
     {
       "X": 56319,
       "Y": -1024,
@@ -328,15 +235,6 @@
       "EntityIndex": 1,
       "TargetType": 27
     },
-    {
-      "X": 50175,
-      "Y": -1792,
-      "Z": 39424,
-      "Room": 20,
-      "Angle": -16384,
-      "EntityIndex": 11,
-      "TargetType": 26
-    },
     {
       "X": 50175,
       "Y": -1792,
@@ -346,15 +244,6 @@
       "EntityIndex": 11,
       "TargetType": 27
     },
-    {
-      "X": 50688,
-      "Y": -4864,
-      "Z": 40960,
-      "Room": 24,
-      "Angle": -32768,
-      "EntityIndex": 10,
-      "TargetType": 26
-    },
     {
       "X": 50688,
       "Y": -4864,
@@ -364,14 +253,6 @@
       "EntityIndex": 10,
       "TargetType": 27
     },
-    {
-      "X": 56319,
-      "Y": -5120,
-      "Z": 38400,
-      "Room": 7,
-      "EntityIndex": 3,
-      "TargetType": 26
-    },
     {
       "X": 56319,
       "Y": -5120,
@@ -380,14 +261,6 @@
       "EntityIndex": 3,
       "TargetType": 27
     },
-    {
-      "X": 51199,
-      "Y": -5120,
-      "Z": 44544,
-      "Room": 36,
-      "EntityIndex": 32,
-      "TargetType": 26
-    },
     {
       "X": 51199,
       "Y": -5120,
@@ -396,15 +269,6 @@
       "EntityIndex": 32,
       "TargetType": 27
     },
-    {
-      "X": 53247,
-      "Y": -1024,
-      "Z": 36352,
-      "Room": 17,
-      "Angle": -16384,
-      "EntityIndex": 6,
-      "TargetType": 26
-    },
     {
       "X": 53247,
       "Y": -1024,
@@ -414,15 +278,6 @@
       "EntityIndex": 6,
       "TargetType": 27
     },
-    {
-      "X": 40448,
-      "Y": 2048,
-      "Z": 34816,
-      "Room": 47,
-      "Angle": -32768,
-      "EntityIndex": 37,
-      "TargetType": 26
-    },
     {
       "X": 40448,
       "Y": 2048,
@@ -432,15 +287,6 @@
       "EntityIndex": 37,
       "TargetType": 27
     },
-    {
-      "X": 37376,
-      "Y": 2048,
-      "Z": 24576,
-      "Room": 46,
-      "Angle": 0,
-      "EntityIndex": 36,
-      "TargetType": 26
-    },
     {
       "X": 37376,
       "Y": 2048,
@@ -450,15 +296,6 @@
       "EntityIndex": 36,
       "TargetType": 27
     },
-    {
-      "X": 34304,
-      "Y": 3328,
-      "Z": 37888,
-      "Room": 62,
-      "Angle": -32768,
-      "EntityIndex": 45,
-      "TargetType": 26
-    },
     {
       "X": 34304,
       "Y": 3328,
@@ -468,15 +305,6 @@
       "EntityIndex": 45,
       "TargetType": 27
     },
-    {
-      "X": 33280,
-      "Y": 3328,
-      "Z": 37888,
-      "Room": 62,
-      "Angle": -32768,
-      "EntityIndex": 49,
-      "TargetType": 26
-    },
     {
       "X": 33280,
       "Y": 3328,
@@ -486,14 +314,6 @@
       "EntityIndex": 49,
       "TargetType": 27
     },
-    {
-      "X": 20479,
-      "Y": -3584,
-      "Z": 53760,
-      "Room": 96,
-      "EntityIndex": 103,
-      "TargetType": 26
-    },
     {
       "X": 20479,
       "Y": -3584,
@@ -502,14 +322,6 @@
       "EntityIndex": 103,
       "TargetType": 27
     },
-    {
-      "X": 20479,
-      "Y": -3584,
-      "Z": 52736,
-      "Room": 96,
-      "EntityIndex": 104,
-      "TargetType": 26
-    },
     {
       "X": 20479,
       "Y": -3584,
@@ -518,15 +330,6 @@
       "EntityIndex": 104,
       "TargetType": 27
     },
-    {
-      "X": 31232,
-      "Y": -3840,
-      "Z": 56320,
-      "Room": 77,
-      "Angle": -32768,
-      "EntityIndex": 79,
-      "TargetType": 26
-    },
     {
       "X": 31232,
       "Y": -3840,
@@ -536,14 +339,6 @@
       "EntityIndex": 79,
       "TargetType": 27
     },
-    {
-      "X": 29695,
-      "Y": -3840,
-      "Z": 51712,
-      "Room": 77,
-      "EntityIndex": 81,
-      "TargetType": 26
-    },
     {
       "X": 29695,
       "Y": -3840,
@@ -552,15 +347,6 @@
       "EntityIndex": 81,
       "TargetType": 27
     },
-    {
-      "X": 24064,
-      "Y": -1792,
-      "Z": 65536,
-      "Room": 94,
-      "Angle": -32768,
-      "EntityIndex": 89,
-      "TargetType": 26
-    },
     {
       "X": 24064,
       "Y": -1792,
@@ -570,15 +356,6 @@
       "EntityIndex": 89,
       "TargetType": 27
     },
-    {
-      "X": 24064,
-      "Y": -2816,
-      "Z": 65536,
-      "Room": 94,
-      "Angle": -32768,
-      "EntityIndex": 130,
-      "TargetType": 26
-    },
     {
       "X": 24064,
       "Y": -2816,
@@ -588,15 +365,6 @@
       "EntityIndex": 130,
       "TargetType": 27
     },
-    {
-      "X": 58880,
-      "Y": -1024,
-      "Z": 64512,
-      "Room": 147,
-      "Angle": 0,
-      "EntityIndex": 120,
-      "TargetType": 26
-    },
     {
       "X": 58880,
       "Y": -1024,
@@ -606,15 +374,6 @@
       "EntityIndex": 120,
       "TargetType": 27
     },
-    {
-      "X": 57856,
-      "Y": -768,
-      "Z": 64512,
-      "Room": 147,
-      "Angle": 0,
-      "EntityIndex": 118,
-      "TargetType": 26
-    },
     {
       "X": 57856,
       "Y": -768,
@@ -624,15 +383,6 @@
       "EntityIndex": 118,
       "TargetType": 27
     },
-    {
-      "X": 59904,
-      "Y": -768,
-      "Z": 64512,
-      "Room": 147,
-      "Angle": 0,
-      "EntityIndex": 119,
-      "TargetType": 26
-    },
     {
       "X": 59904,
       "Y": -768,
@@ -649,24 +399,7 @@
       "Room": 79,
       "Angle": 0,
       "EntityIndex": 85,
-      "TargetType": 26
-    },
-    {
-      "X": 60928,
-      "Y": -1024,
-      "Z": 51200,
-      "Room": 79,
-      "Angle": 0,
-      "EntityIndex": 85,
-      "TargetType": 27
-    },
-    {
-      "X": 57343,
-      "Y": -3072,
-      "Z": 47616,
-      "Room": 150,
-      "EntityIndex": 125,
-      "TargetType": 26
+      "TargetType": 27
     },
     {
       "X": 57343,
@@ -676,14 +409,6 @@
       "EntityIndex": 125,
       "TargetType": 27
     },
-    {
-      "X": 57343,
-      "Y": -3072,
-      "Z": 48640,
-      "Room": 150,
-      "EntityIndex": 124,
-      "TargetType": 26
-    },
     {
       "X": 57343,
       "Y": -3072,
@@ -692,15 +417,6 @@
       "EntityIndex": 124,
       "TargetType": 27
     },
-    {
-      "X": 79871,
-      "Y": -1280,
-      "Z": 60928,
-      "Room": 71,
-      "Angle": -16384,
-      "EntityIndex": 115,
-      "TargetType": 26
-    },
     {
       "X": 79871,
       "Y": -1280,
@@ -710,14 +426,6 @@
       "EntityIndex": 115,
       "TargetType": 27
     },
-    {
-      "X": 39935,
-      "Y": -1024,
-      "Z": 49664,
-      "Room": 69,
-      "EntityIndex": 59,
-      "TargetType": 26
-    },
     {
       "X": 39935,
       "Y": -1024,
@@ -810,14 +518,6 @@
     }
   ],
   "VENICE.TR2": [
-    {
-      "X": 70655,
-      "Y": 3328,
-      "Z": 43520,
-      "Room": 106,
-      "EntityIndex": 99,
-      "TargetType": 26
-    },
     {
       "X": 70655,
       "Y": 3328,
@@ -826,14 +526,6 @@
       "EntityIndex": 99,
       "TargetType": 27
     },
-    {
-      "X": 70655,
-      "Y": 3328,
-      "Z": 44544,
-      "Room": 106,
-      "EntityIndex": 100,
-      "TargetType": 26
-    },
     {
       "X": 70655,
       "Y": 3328,
@@ -842,14 +534,6 @@
       "EntityIndex": 100,
       "TargetType": 27
     },
-    {
-      "X": 66559,
-      "Y": 1280,
-      "Z": 33280,
-      "Room": 101,
-      "EntityIndex": 92,
-      "TargetType": 26
-    },
     {
       "X": 66559,
       "Y": 1280,
@@ -858,14 +542,6 @@
       "EntityIndex": 92,
       "TargetType": 27
     },
-    {
-      "X": 66559,
-      "Y": 256,
-      "Z": 33280,
-      "Room": 104,
-      "EntityIndex": 93,
-      "TargetType": 26
-    },
     {
       "X": 66559,
       "Y": 256,
@@ -874,15 +550,6 @@
       "EntityIndex": 93,
       "TargetType": 27
     },
-    {
-      "X": 71168,
-      "Y": 2048,
-      "Z": 31744,
-      "Room": 106,
-      "Angle": 0,
-      "EntityIndex": 76,
-      "TargetType": 26
-    },
     {
       "X": 71168,
       "Y": 2048,
@@ -892,15 +559,6 @@
       "EntityIndex": 76,
       "TargetType": 27
     },
-    {
-      "X": 74751,
-      "Y": 1024,
-      "Z": 33280,
-      "Room": 106,
-      "Angle": -16384,
-      "EntityIndex": 78,
-      "TargetType": 26
-    },
     {
       "X": 74751,
       "Y": 1024,
@@ -910,14 +568,6 @@
       "EntityIndex": 78,
       "TargetType": 27
     },
-    {
-      "X": 70655,
-      "Y": -512,
-      "Z": 35328,
-      "Room": 107,
-      "EntityIndex": 106,
-      "TargetType": 26
-    },
     {
       "X": 70655,
       "Y": -512,
@@ -926,15 +576,6 @@
       "EntityIndex": 106,
       "TargetType": 27
     },
-    {
-      "X": 66559,
-      "Y": 512,
-      "Z": 23040,
-      "Room": 91,
-      "Angle": -16384,
-      "EntityIndex": 67,
-      "TargetType": 26
-    },
     {
       "X": 66559,
       "Y": 512,
@@ -944,14 +585,6 @@
       "EntityIndex": 67,
       "TargetType": 27
     },
-    {
-      "X": 65535,
-      "Y": 3072,
-      "Z": 42496,
-      "Room": 49,
-      "EntityIndex": 46,
-      "TargetType": 26
-    },
     {
       "X": 65535,
       "Y": 3072,
@@ -960,14 +593,6 @@
       "EntityIndex": 46,
       "TargetType": 27
     },
-    {
-      "X": 61439,
-      "Y": 3072,
-      "Z": 43520,
-      "Room": 118,
-      "EntityIndex": 120,
-      "TargetType": 26
-    },
     {
       "X": 61439,
       "Y": 3072,
@@ -976,14 +601,6 @@
       "EntityIndex": 120,
       "TargetType": 27
     },
-    {
-      "X": 65535,
-      "Y": 1024,
-      "Z": 42496,
-      "Room": 116,
-      "EntityIndex": 118,
-      "TargetType": 26
-    },
     {
       "X": 65535,
       "Y": 1024,
@@ -992,15 +609,6 @@
       "EntityIndex": 118,
       "TargetType": 27
     },
-    {
-      "X": 68096,
-      "Y": -1536,
-      "Z": 48128,
-      "Room": 159,
-      "Angle": -32768,
-      "EntityIndex": 109,
-      "TargetType": 26
-    },
     {
       "X": 68096,
       "Y": -1536,
@@ -1010,15 +618,6 @@
       "EntityIndex": 109,
       "TargetType": 27
     },
-    {
-      "X": 67072,
-      "Y": -1536,
-      "Z": 48128,
-      "Room": 159,
-      "Angle": -32768,
-      "EntityIndex": 110,
-      "TargetType": 26
-    },
     {
       "X": 67072,
       "Y": -1536,
@@ -1028,15 +627,6 @@
       "EntityIndex": 110,
       "TargetType": 27
     },
-    {
-      "X": 66559,
-      "Y": -1024,
-      "Z": 37376,
-      "Room": 13,
-      "Angle": -16384,
-      "EntityIndex": 130,
-      "TargetType": 26
-    },
     {
       "X": 66559,
       "Y": -1024,
@@ -1046,15 +636,6 @@
       "EntityIndex": 130,
       "TargetType": 27
     },
-    {
-      "X": 66559,
-      "Y": -1024,
-      "Z": 38400,
-      "Room": 13,
-      "Angle": -16384,
-      "EntityIndex": 131,
-      "TargetType": 26
-    },
     {
       "X": 66559,
       "Y": -1024,
@@ -1064,15 +645,6 @@
       "EntityIndex": 131,
       "TargetType": 27
     },
-    {
-      "X": 62976,
-      "Y": -1024,
-      "Z": 34816,
-      "Room": 1,
-      "Angle": -32768,
-      "EntityIndex": 5,
-      "TargetType": 26
-    },
     {
       "X": 62976,
       "Y": -1024,
@@ -1082,14 +654,6 @@
       "EntityIndex": 5,
       "TargetType": 27
     },
-    {
-      "X": 56321,
-      "Y": -1536,
-      "Z": 25088,
-      "Room": 96,
-      "EntityIndex": 89,
-      "TargetType": 26
-    },
     {
       "X": 56321,
       "Y": -1536,
@@ -1098,15 +662,6 @@
       "EntityIndex": 89,
       "TargetType": 27
     },
-    {
-      "X": 57856,
-      "Y": -1792,
-      "Z": 26624,
-      "Room": 0,
-      "Angle": 0,
-      "EntityIndex": 88,
-      "TargetType": 26
-    },
     {
       "X": 57856,
       "Y": -1792,
@@ -1116,15 +671,6 @@
       "EntityIndex": 88,
       "TargetType": 27
     },
-    {
-      "X": 60415,
-      "Y": -1024,
-      "Z": 29184,
-      "Room": 0,
-      "Angle": -16384,
-      "EntityIndex": 0,
-      "TargetType": 26
-    },
     {
       "X": 60415,
       "Y": -1024,
@@ -1134,15 +680,6 @@
       "EntityIndex": 0,
       "TargetType": 27
     },
-    {
-      "X": 60415,
-      "Y": -1024,
-      "Z": 32256,
-      "Room": 0,
-      "Angle": -16384,
-      "EntityIndex": 1,
-      "TargetType": 26
-    },
     {
       "X": 60415,
       "Y": -1024,
@@ -1152,15 +689,6 @@
       "EntityIndex": 1,
       "TargetType": 27
     },
-    {
-      "X": 50688,
-      "Y": -2048,
-      "Z": 29184,
-      "Room": 4,
-      "Angle": -32768,
-      "EntityIndex": 7,
-      "TargetType": 26
-    },
     {
       "X": 50688,
       "Y": -2048,
@@ -1170,14 +698,6 @@
       "EntityIndex": 7,
       "TargetType": 27
     },
-    {
-      "X": 43009,
-      "Y": 1024,
-      "Z": 35328,
-      "Room": 22,
-      "EntityIndex": 25,
-      "TargetType": 26
-    },
     {
       "X": 43009,
       "Y": 1024,
@@ -1186,15 +706,6 @@
       "EntityIndex": 25,
       "TargetType": 27
     },
-    {
-      "X": 55295,
-      "Y": 1536,
-      "Z": 36352,
-      "Room": 22,
-      "Angle": -16384,
-      "EntityIndex": 24,
-      "TargetType": 26
-    },
     {
       "X": 55295,
       "Y": 1536,
@@ -1204,15 +715,6 @@
       "EntityIndex": 24,
       "TargetType": 27
     },
-    {
-      "X": 55295,
-      "Y": 1536,
-      "Z": 39424,
-      "Room": 22,
-      "Angle": -16384,
-      "EntityIndex": 23,
-      "TargetType": 26
-    },
     {
       "X": 55295,
       "Y": 1536,
@@ -1222,15 +724,6 @@
       "EntityIndex": 23,
       "TargetType": 27
     },
-    {
-      "X": 55295,
-      "Y": -4864,
-      "Z": 36352,
-      "Room": 29,
-      "Angle": -16384,
-      "EntityIndex": 30,
-      "TargetType": 26
-    },
     {
       "X": 55295,
       "Y": -4864,
@@ -1247,24 +740,7 @@
       "Room": 29,
       "Angle": -16384,
       "EntityIndex": 31,
-      "TargetType": 26
-    },
-    {
-      "X": 55295,
-      "Y": -4864,
-      "Z": 38400,
-      "Room": 29,
-      "Angle": -16384,
-      "EntityIndex": 31,
-      "TargetType": 27
-    },
-    {
-      "X": 43009,
-      "Y": -4864,
-      "Z": 40448,
-      "Room": 29,
-      "EntityIndex": 32,
-      "TargetType": 26
+      "TargetType": 27
     },
     {
       "X": 43009,
@@ -1274,15 +750,6 @@
       "EntityIndex": 32,
       "TargetType": 27
     },
-    {
-      "X": 49664,
-      "Y": 1536,
-      "Z": 23552,
-      "Room": 79,
-      "Angle": -32768,
-      "EntityIndex": 83,
-      "TargetType": 26
-    },
     {
       "X": 49664,
       "Y": 1536,
@@ -1292,14 +759,6 @@
       "EntityIndex": 83,
       "TargetType": 27
     },
-    {
-      "X": 39935,
-      "Y": 3584,
-      "Z": 28160,
-      "Room": 43,
-      "EntityIndex": 56,
-      "TargetType": 26
-    },
     {
       "X": 39935,
       "Y": 3584,
@@ -1308,15 +767,6 @@
       "EntityIndex": 56,
       "TargetType": 27
     },
-    {
-      "X": 48640,
-      "Y": 1536,
-      "Z": 17408,
-      "Room": 79,
-      "Angle": 0,
-      "EntityIndex": 82,
-      "TargetType": 26
-    },
     {
       "X": 48640,
       "Y": 1536,
@@ -1326,15 +776,6 @@
       "EntityIndex": 82,
       "TargetType": 27
     },
-    {
-      "X": 51712,
-      "Y": 3584,
-      "Z": 19456,
-      "Room": 62,
-      "Angle": 0,
-      "EntityIndex": 55,
-      "TargetType": 26
-    },
     {
       "X": 51712,
       "Y": 3584,
@@ -1344,15 +785,6 @@
       "EntityIndex": 55,
       "TargetType": 27
     },
-    {
-      "X": 55808,
-      "Y": 3584,
-      "Z": 19456,
-      "Room": 62,
-      "Angle": 0,
-      "EntityIndex": 64,
-      "TargetType": 26
-    },
     {
       "X": 55808,
       "Y": 3584,
@@ -1362,15 +794,6 @@
       "EntityIndex": 64,
       "TargetType": 27
     },
-    {
-      "X": 66559,
-      "Y": 3328,
-      "Z": 19968,
-      "Room": 86,
-      "Angle": -16384,
-      "EntityIndex": 86,
-      "TargetType": 26
-    },
     {
       "X": 66559,
       "Y": 3328,
@@ -1380,14 +803,6 @@
       "EntityIndex": 86,
       "TargetType": 27
     },
-    {
-      "X": 39935,
-      "Y": 3584,
-      "Z": 25088,
-      "Room": 43,
-      "EntityIndex": 70,
-      "TargetType": 26
-    },
     {
       "X": 39935,
       "Y": 3584,
@@ -1396,15 +811,6 @@
       "EntityIndex": 70,
       "TargetType": 27
     },
-    {
-      "X": 40448,
-      "Y": 3584,
-      "Z": 17408,
-      "Room": 70,
-      "Angle": 0,
-      "EntityIndex": 71,
-      "TargetType": 26
-    },
     {
       "X": 40448,
       "Y": 3584,
@@ -1414,14 +820,6 @@
       "EntityIndex": 71,
       "TargetType": 27
     },
-    {
-      "X": 33791,
-      "Y": 3584,
-      "Z": 19968,
-      "Room": 73,
-      "EntityIndex": 74,
-      "TargetType": 26
-    },
     {
       "X": 33791,
       "Y": 3584,
@@ -1430,14 +828,6 @@
       "EntityIndex": 74,
       "TargetType": 27
     },
-    {
-      "X": 33791,
-      "Y": 1024,
-      "Z": 22016,
-      "Room": 130,
-      "EntityIndex": 124,
-      "TargetType": 26
-    },
     {
       "X": 33791,
       "Y": 1024,
@@ -1760,15 +1150,6 @@
     }
   ],
   "RIG.TR2": [
-    {
-      "X": 39424,
-      "Y": -2816,
-      "Z": 77824,
-      "Room": 0,
-      "Angle": 0,
-      "EntityIndex": 8,
-      "TargetType": 26
-    },
     {
       "X": 39424,
       "Y": -2816,
@@ -1778,15 +1159,6 @@
       "EntityIndex": 8,
       "TargetType": 27
     },
-    {
-      "X": 40448,
-      "Y": -3072,
-      "Z": 77824,
-      "Room": 0,
-      "Angle": 0,
-      "EntityIndex": 9,
-      "TargetType": 26
-    },
     {
       "X": 40448,
       "Y": -3072,
@@ -1796,15 +1168,6 @@
       "EntityIndex": 9,
       "TargetType": 27
     },
-    {
-      "X": 36352,
-      "Y": -3840,
-      "Z": 68608,
-      "Room": 15,
-      "Angle": 0,
-      "EntityIndex": 27,
-      "TargetType": 26
-    },
     {
       "X": 36352,
       "Y": -3840,
@@ -1814,15 +1177,6 @@
       "EntityIndex": 27,
       "TargetType": 27
     },
-    {
-      "X": 26112,
-      "Y": 0,
-      "Z": 63488,
-      "Room": 60,
-      "Angle": 0,
-      "EntityIndex": 36,
-      "TargetType": 26
-    },
     {
       "X": 26112,
       "Y": 0,
@@ -1832,15 +1186,6 @@
       "EntityIndex": 36,
       "TargetType": 27
     },
-    {
-      "X": 19968,
-      "Y": -4608,
-      "Z": 65536,
-      "Room": 27,
-      "Angle": 0,
-      "EntityIndex": 46,
-      "TargetType": 26
-    },
     {
       "X": 19968,
       "Y": -4608,
@@ -1850,15 +1195,6 @@
       "EntityIndex": 46,
       "TargetType": 27
     },
-    {
-      "X": 37376,
-      "Y": -5120,
-      "Z": 61440,
-      "Room": 30,
-      "Angle": 0,
-      "EntityIndex": 47,
-      "TargetType": 26
-    },
     {
       "X": 37376,
       "Y": -5120,
@@ -1868,15 +1204,6 @@
       "EntityIndex": 47,
       "TargetType": 27
     },
-    {
-      "X": 40448,
-      "Y": -5120,
-      "Z": 61440,
-      "Room": 30,
-      "Angle": 0,
-      "EntityIndex": 49,
-      "TargetType": 26
-    },
     {
       "X": 40448,
       "Y": -5120,
@@ -1886,15 +1213,6 @@
       "EntityIndex": 49,
       "TargetType": 27
     },
-    {
-      "X": 41983,
-      "Y": -5120,
-      "Z": 65024,
-      "Room": 30,
-      "Angle": -16384,
-      "EntityIndex": 48,
-      "TargetType": 26
-    },
     {
       "X": 41983,
       "Y": -5120,
@@ -1904,14 +1222,6 @@
       "EntityIndex": 48,
       "TargetType": 27
     },
-    {
-      "X": 41983,
-      "Y": -6144,
-      "Z": 55808,
-      "Room": 33,
-      "EntityIndex": 57,
-      "TargetType": 26
-    },
     {
       "X": 41983,
       "Y": -6144,
@@ -1920,14 +1230,6 @@
       "EntityIndex": 57,
       "TargetType": 27
     },
-    {
-      "X": 43007,
-      "Y": -6144,
-      "Z": 53760,
-      "Room": 34,
-      "EntityIndex": 63,
-      "TargetType": 26
-    },
     {
       "X": 43007,
       "Y": -6144,
@@ -1936,15 +1238,6 @@
       "EntityIndex": 63,
       "TargetType": 27
     },
-    {
-      "X": 50175,
-      "Y": -6912,
-      "Z": 44544,
-      "Room": 34,
-      "Angle": -16384,
-      "EntityIndex": 69,
-      "TargetType": 26
-    },
     {
       "X": 50175,
       "Y": -6912,
@@ -1954,15 +1247,6 @@
       "EntityIndex": 69,
       "TargetType": 27
     },
-    {
-      "X": 44544,
-      "Y": -2816,
-      "Z": 39936,
-      "Room": 35,
-      "Angle": 0,
-      "EntityIndex": 70,
-      "TargetType": 26
-    },
     {
       "X": 44544,
       "Y": -2816,
@@ -1972,14 +1256,6 @@
       "EntityIndex": 70,
       "TargetType": 27
     },
-    {
-      "X": 25599,
-      "Y": 1536,
-      "Z": 45568,
-      "Room": 48,
-      "EntityIndex": 75,
-      "TargetType": 26
-    },
     {
       "X": 25599,
       "Y": 1536,
@@ -1988,14 +1264,6 @@
       "EntityIndex": 75,
       "TargetType": 27
     },
-    {
-      "X": 31232,
-      "Y": -5120,
-      "Z": 53760,
-      "Room": 51,
-      "EntityIndex": 80,
-      "TargetType": 26
-    },
     {
       "X": 31232,
       "Y": -5120,
@@ -2004,15 +1272,6 @@
       "EntityIndex": 80,
       "TargetType": 27
     },
-    {
-      "X": 30208,
-      "Y": 1536,
-      "Z": 54272,
-      "Room": 101,
-      "Angle": 0,
-      "EntityIndex": 102,
-      "TargetType": 26
-    },
     {
       "X": 30208,
       "Y": 1536,
@@ -2022,14 +1281,6 @@
       "EntityIndex": 102,
       "TargetType": 27
     },
-    {
-      "X": 39424,
-      "Y": 1536,
-      "Z": 52736,
-      "Room": 102,
-      "EntityIndex": 104,
-      "TargetType": 26
-    },
     {
       "X": 39424,
       "Y": 1536,
@@ -2038,15 +1289,6 @@
       "EntityIndex": 104,
       "TargetType": 27
     },
-    {
-      "X": 34304,
-      "Y": 7936,
-      "Z": 33792,
-      "Room": 103,
-      "Angle": 0,
-      "EntityIndex": 106,
-      "TargetType": 26
-    },
     {
       "X": 34304,
       "Y": 7936,
@@ -2063,44 +1305,17 @@
       "Room": 110,
       "Angle": -16384,
       "EntityIndex": 109,
-      "TargetType": 26
+      "TargetType": 27
     },
     {
       "X": 43007,
       "Y": 5120,
-      "Z": 54784,
+      "Z": 57856,
       "Room": 110,
       "Angle": -16384,
-      "EntityIndex": 109,
+      "EntityIndex": 110,
       "TargetType": 27
     },
-    {
-      "X": 43007,
-      "Y": 5120,
-      "Z": 57856,
-      "Room": 110,
-      "Angle": -16384,
-      "EntityIndex": 110,
-      "TargetType": 26
-    },
-    {
-      "X": 43007,
-      "Y": 5120,
-      "Z": 57856,
-      "Room": 110,
-      "Angle": -16384,
-      "EntityIndex": 110,
-      "TargetType": 27
-    },
-    {
-      "X": 34304,
-      "Y": 7936,
-      "Z": 59392,
-      "Room": 105,
-      "Angle": -32768,
-      "EntityIndex": 107,
-      "TargetType": 26
-    },
     {
       "X": 34304,
       "Y": 7936,
@@ -2136,15 +1351,6 @@
     }
   ],
   "PLATFORM.TR2": [
-    {
-      "X": 45568,
-      "Y": -6144,
-      "Z": 72704,
-      "Room": 12,
-      "Angle": 0,
-      "EntityIndex": 10,
-      "TargetType": 26
-    },
     {
       "X": 45568,
       "Y": -6144,
@@ -2154,15 +1360,6 @@
       "EntityIndex": 10,
       "TargetType": 27
     },
-    {
-      "X": 50175,
-      "Y": -6144,
-      "Z": 77312,
-      "Room": 12,
-      "Angle": -16384,
-      "EntityIndex": 11,
-      "TargetType": 26
-    },
     {
       "X": 50175,
       "Y": -6144,
@@ -2172,14 +1369,6 @@
       "EntityIndex": 11,
       "TargetType": 27
     },
-    {
-      "X": 37887,
-      "Y": -6144,
-      "Z": 71168,
-      "Room": 15,
-      "EntityIndex": 14,
-      "TargetType": 26
-    },
     {
       "X": 37887,
       "Y": -6144,
@@ -2188,14 +1377,6 @@
       "EntityIndex": 14,
       "TargetType": 27
     },
-    {
-      "X": 37887,
-      "Y": -6144,
-      "Z": 70144,
-      "Room": 15,
-      "EntityIndex": 15,
-      "TargetType": 26
-    },
     {
       "X": 37887,
       "Y": -6144,
@@ -2204,14 +1385,6 @@
       "EntityIndex": 15,
       "TargetType": 27
     },
-    {
-      "X": 37887,
-      "Y": -6144,
-      "Z": 83456,
-      "Room": 15,
-      "EntityIndex": 19,
-      "TargetType": 26
-    },
     {
       "X": 37887,
       "Y": -6144,
@@ -2220,14 +1393,6 @@
       "EntityIndex": 19,
       "TargetType": 27
     },
-    {
-      "X": 37887,
-      "Y": -6144,
-      "Z": 84480,
-      "Room": 15,
-      "EntityIndex": 20,
-      "TargetType": 26
-    },
     {
       "X": 37887,
       "Y": -6144,
@@ -2236,15 +1401,6 @@
       "EntityIndex": 20,
       "TargetType": 27
     },
-    {
-      "X": 51712,
-      "Y": -6144,
-      "Z": 84992,
-      "Room": 16,
-      "Angle": -32768,
-      "EntityIndex": 21,
-      "TargetType": 26
-    },
     {
       "X": 51712,
       "Y": -6144,
@@ -2254,15 +1410,6 @@
       "EntityIndex": 21,
       "TargetType": 27
     },
-    {
-      "X": 48640,
-      "Y": -2048,
-      "Z": 71680,
-      "Room": 17,
-      "Angle": 0,
-      "EntityIndex": 28,
-      "TargetType": 26
-    },
     {
       "X": 48640,
       "Y": -2048,
@@ -2272,14 +1419,6 @@
       "EntityIndex": 28,
       "TargetType": 27
     },
-    {
-      "X": 39935,
-      "Y": -2048,
-      "Z": 81408,
-      "Room": 17,
-      "EntityIndex": 29,
-      "TargetType": 26
-    },
     {
       "X": 39935,
       "Y": -2048,
@@ -2288,15 +1427,6 @@
       "EntityIndex": 29,
       "TargetType": 27
     },
-    {
-      "X": 49664,
-      "Y": -2048,
-      "Z": 82944,
-      "Room": 17,
-      "Angle": -32768,
-      "EntityIndex": 34,
-      "TargetType": 26
-    },
     {
       "X": 49664,
       "Y": -2048,
@@ -2306,15 +1436,6 @@
       "EntityIndex": 34,
       "TargetType": 27
     },
-    {
-      "X": 43520,
-      "Y": -10240,
-      "Z": 81920,
-      "Room": 21,
-      "Angle": -32768,
-      "EntityIndex": 36,
-      "TargetType": 26
-    },
     {
       "X": 43520,
       "Y": -10240,
@@ -2324,15 +1445,6 @@
       "EntityIndex": 36,
       "TargetType": 27
     },
-    {
-      "X": 47616,
-      "Y": -10240,
-      "Z": 81920,
-      "Room": 21,
-      "Angle": -32768,
-      "EntityIndex": 37,
-      "TargetType": 26
-    },
     {
       "X": 47616,
       "Y": -10240,
@@ -2342,15 +1454,6 @@
       "EntityIndex": 37,
       "TargetType": 27
     },
-    {
-      "X": 45568,
-      "Y": -10496,
-      "Z": 81920,
-      "Room": 21,
-      "Angle": -32768,
-      "EntityIndex": 38,
-      "TargetType": 26
-    },
     {
       "X": 45568,
       "Y": -10496,
@@ -2360,15 +1463,6 @@
       "EntityIndex": 38,
       "TargetType": 27
     },
-    {
-      "X": 47616,
-      "Y": -10240,
-      "Z": 72704,
-      "Room": 21,
-      "Angle": 0,
-      "EntityIndex": 39,
-      "TargetType": 26
-    },
     {
       "X": 47616,
       "Y": -10240,
@@ -2378,15 +1472,6 @@
       "EntityIndex": 39,
       "TargetType": 27
     },
-    {
-      "X": 43520,
-      "Y": -10240,
-      "Z": 72704,
-      "Room": 21,
-      "Angle": 0,
-      "EntityIndex": 40,
-      "TargetType": 26
-    },
     {
       "X": 43520,
       "Y": -10240,
@@ -2396,15 +1481,6 @@
       "EntityIndex": 40,
       "TargetType": 27
     },
-    {
-      "X": 45568,
-      "Y": -10496,
-      "Z": 72704,
-      "Room": 21,
-      "Angle": 0,
-      "EntityIndex": 48,
-      "TargetType": 26
-    },
     {
       "X": 45568,
       "Y": -10496,
@@ -2414,14 +1490,6 @@
       "EntityIndex": 48,
       "TargetType": 27
     },
-    {
-      "X": 59391,
-      "Y": -4864,
-      "Z": 77312,
-      "Room": 34,
-      "EntityIndex": 51,
-      "TargetType": 26
-    },
     {
       "X": 59391,
       "Y": -4864,
@@ -2430,14 +1498,6 @@
       "EntityIndex": 51,
       "TargetType": 27
     },
-    {
-      "X": 59391,
-      "Y": -4864,
-      "Z": 76288,
-      "Room": 34,
-      "EntityIndex": 59,
-      "TargetType": 26
-    },
     {
       "X": 59391,
       "Y": -4864,
@@ -2446,15 +1506,6 @@
       "EntityIndex": 59,
       "TargetType": 27
     },
-    {
-      "X": 65024,
-      "Y": -4864,
-      "Z": 66560,
-      "Room": 34,
-      "Angle": 0,
-      "EntityIndex": 61,
-      "TargetType": 26
-    },
     {
       "X": 65024,
       "Y": -4864,
@@ -2464,15 +1515,6 @@
       "EntityIndex": 61,
       "TargetType": 27
     },
-    {
-      "X": 61952,
-      "Y": -4864,
-      "Z": 66560,
-      "Room": 34,
-      "Angle": 0,
-      "EntityIndex": 62,
-      "TargetType": 26
-    },
     {
       "X": 61952,
       "Y": -4864,
@@ -2482,14 +1524,6 @@
       "EntityIndex": 62,
       "TargetType": 27
     },
-    {
-      "X": 32767,
-      "Y": 0,
-      "Z": 53760,
-      "Room": 42,
-      "EntityIndex": 74,
-      "TargetType": 26
-    },
     {
       "X": 32767,
       "Y": 0,
@@ -2498,14 +1532,6 @@
       "EntityIndex": 74,
       "TargetType": 27
     },
-    {
-      "X": 32767,
-      "Y": 0,
-      "Z": 52736,
-      "Room": 42,
-      "EntityIndex": 75,
-      "TargetType": 26
-    },
     {
       "X": 32767,
       "Y": 0,
@@ -2514,15 +1540,6 @@
       "EntityIndex": 75,
       "TargetType": 27
     },
-    {
-      "X": 40959,
-      "Y": 0,
-      "Z": 52736,
-      "Room": 42,
-      "Angle": -16384,
-      "EntityIndex": 79,
-      "TargetType": 26
-    },
     {
       "X": 40959,
       "Y": 0,
@@ -2532,15 +1549,6 @@
       "EntityIndex": 79,
       "TargetType": 27
     },
-    {
-      "X": 40959,
-      "Y": 0,
-      "Z": 53760,
-      "Room": 42,
-      "Angle": -16384,
-      "EntityIndex": 81,
-      "TargetType": 26
-    },
     {
       "X": 40959,
       "Y": 0,
@@ -2550,15 +1558,6 @@
       "EntityIndex": 81,
       "TargetType": 27
     },
-    {
-      "X": 40448,
-      "Y": 0,
-      "Z": 52224,
-      "Room": 42,
-      "Angle": 0,
-      "EntityIndex": 80,
-      "TargetType": 26
-    },
     {
       "X": 40448,
       "Y": 0,
@@ -2568,15 +1567,6 @@
       "EntityIndex": 80,
       "TargetType": 27
     },
-    {
-      "X": 32767,
-      "Y": -6144,
-      "Z": 77312,
-      "Room": 54,
-      "Angle": -16384,
-      "EntityIndex": 95,
-      "TargetType": 26
-    },
     {
       "X": 32767,
       "Y": -6144,
@@ -2593,28 +1583,10 @@
       "Room": 65,
       "Angle": 0,
       "EntityIndex": 101,
-      "TargetType": 26
+      "TargetType": 27
     },
     {
-      "X": 57856,
-      "Y": -3840,
-      "Z": 83968,
-      "Room": 65,
-      "Angle": 0,
-      "EntityIndex": 101,
-      "TargetType": 27
-    },
-    {
-      "X": 59904,
-      "Y": -3840,
-      "Z": 83968,
-      "Room": 65,
-      "Angle": 0,
-      "EntityIndex": 102,
-      "TargetType": 26
-    },
-    {
-      "X": 59904,
+      "X": 59904,
       "Y": -3840,
       "Z": 83968,
       "Room": 65,
@@ -2622,15 +1594,6 @@
       "EntityIndex": 102,
       "TargetType": 27
     },
-    {
-      "X": 44544,
-      "Y": 4096,
-      "Z": 80896,
-      "Room": 20,
-      "Angle": -32768,
-      "EntityIndex": 109,
-      "TargetType": 26
-    },
     {
       "X": 44544,
       "Y": 4096,
@@ -2640,15 +1603,6 @@
       "EntityIndex": 109,
       "TargetType": 27
     },
-    {
-      "X": 46592,
-      "Y": 4096,
-      "Z": 80896,
-      "Room": 20,
-      "Angle": -32768,
-      "EntityIndex": 110,
-      "TargetType": 26
-    },
     {
       "X": 46592,
       "Y": 4096,
@@ -2658,15 +1612,6 @@
       "EntityIndex": 110,
       "TargetType": 27
     },
-    {
-      "X": 45568,
-      "Y": 2048,
-      "Z": 73728,
-      "Room": 20,
-      "Angle": 0,
-      "EntityIndex": 111,
-      "TargetType": 26
-    },
     {
       "X": 45568,
       "Y": 2048,
@@ -2676,15 +1621,6 @@
       "EntityIndex": 111,
       "TargetType": 27
     },
-    {
-      "X": 66559,
-      "Y": -1536,
-      "Z": 71168,
-      "Room": 32,
-      "Angle": -16384,
-      "EntityIndex": 125,
-      "TargetType": 26
-    },
     {
       "X": 66559,
       "Y": -1536,
@@ -2778,15 +1714,6 @@
     }
   ],
   "UNWATER.TR2": [
-    {
-      "X": 46592,
-      "Y": 0,
-      "Z": 67584,
-      "Room": 2,
-      "Angle": -32768,
-      "EntityIndex": 2,
-      "TargetType": 26
-    },
     {
       "X": 46592,
       "Y": 0,
@@ -2796,15 +1723,6 @@
       "EntityIndex": 2,
       "TargetType": 27
     },
-    {
-      "X": 56319,
-      "Y": -6656,
-      "Z": 68096,
-      "Room": 2,
-      "Angle": -16384,
-      "EntityIndex": 3,
-      "TargetType": 26
-    },
     {
       "X": 56319,
       "Y": -6656,
@@ -2814,15 +1732,6 @@
       "EntityIndex": 3,
       "TargetType": 27
     },
-    {
-      "X": 68096,
-      "Y": -7936,
-      "Z": 71680,
-      "Room": 20,
-      "Angle": 0,
-      "EntityIndex": 12,
-      "TargetType": 26
-    },
     {
       "X": 68096,
       "Y": -7936,
@@ -2832,15 +1741,6 @@
       "EntityIndex": 12,
       "TargetType": 27
     },
-    {
-      "X": 84991,
-      "Y": -10240,
-      "Z": 45568,
-      "Room": 36,
-      "Angle": -16384,
-      "EntityIndex": 32,
-      "TargetType": 26
-    },
     {
       "X": 84991,
       "Y": -10240,
@@ -2850,14 +1750,6 @@
       "EntityIndex": 32,
       "TargetType": 27
     },
-    {
-      "X": 78847,
-      "Y": -10240,
-      "Z": 45568,
-      "Room": 36,
-      "EntityIndex": 35,
-      "TargetType": 26
-    },
     {
       "X": 78847,
       "Y": -10240,
@@ -2866,14 +1758,6 @@
       "EntityIndex": 35,
       "TargetType": 27
     },
-    {
-      "X": 78847,
-      "Y": -10240,
-      "Z": 46592,
-      "Room": 37,
-      "EntityIndex": 36,
-      "TargetType": 26
-    },
     {
       "X": 78847,
       "Y": -10240,
@@ -2882,14 +1766,6 @@
       "EntityIndex": 36,
       "TargetType": 27
     },
-    {
-      "X": 62463,
-      "Y": -2304,
-      "Z": 77312,
-      "Room": 21,
-      "EntityIndex": 61,
-      "TargetType": 26
-    },
     {
       "X": 62463,
       "Y": -2304,
@@ -2898,15 +1774,6 @@
       "EntityIndex": 61,
       "TargetType": 27
     },
-    {
-      "X": 68607,
-      "Y": -2304,
-      "Z": 77312,
-      "Room": 21,
-      "Angle": -16384,
-      "EntityIndex": 62,
-      "TargetType": 26
-    },
     {
       "X": 68607,
       "Y": -2304,
@@ -2916,15 +1783,6 @@
       "EntityIndex": 62,
       "TargetType": 27
     },
-    {
-      "X": 82432,
-      "Y": -3072,
-      "Z": 33792,
-      "Room": 44,
-      "Angle": -32768,
-      "EntityIndex": 68,
-      "TargetType": 26
-    },
     {
       "X": 82432,
       "Y": -3072,
@@ -2944,15 +1802,6 @@
     }
   ],
   "KEEL.TR2": [
-    {
-      "X": 75264,
-      "Y": 11008,
-      "Z": 17920,
-      "Room": 88,
-      "Angle": 0,
-      "EntityIndex": 0,
-      "TargetType": 26
-    },
     {
       "X": 75264,
       "Y": 11008,
@@ -2962,15 +1811,6 @@
       "EntityIndex": 0,
       "TargetType": 27
     },
-    {
-      "X": 77312,
-      "Y": 11008,
-      "Z": 15872,
-      "Room": 88,
-      "Angle": 0,
-      "EntityIndex": 2,
-      "TargetType": 26
-    },
     {
       "X": 77312,
       "Y": 11008,
@@ -2980,15 +1820,6 @@
       "EntityIndex": 2,
       "TargetType": 27
     },
-    {
-      "X": 79360,
-      "Y": 11008,
-      "Z": 15872,
-      "Room": 88,
-      "Angle": 0,
-      "EntityIndex": 3,
-      "TargetType": 26
-    },
     {
       "X": 79360,
       "Y": 11008,
@@ -2998,14 +1829,6 @@
       "EntityIndex": 3,
       "TargetType": 27
     },
-    {
-      "X": 67072,
-      "Y": 2560,
-      "Z": 41472,
-      "Room": 15,
-      "EntityIndex": 10,
-      "TargetType": 26
-    },
     {
       "X": 67072,
       "Y": 2560,
@@ -3014,15 +1837,6 @@
       "EntityIndex": 10,
       "TargetType": 27
     },
-    {
-      "X": 66048,
-      "Y": 2560,
-      "Z": 52736,
-      "Room": 12,
-      "Angle": 0,
-      "EntityIndex": 7,
-      "TargetType": 26
-    },
     {
       "X": 66048,
       "Y": 2560,
@@ -3032,15 +1846,6 @@
       "EntityIndex": 7,
       "TargetType": 27
     },
-    {
-      "X": 53760,
-      "Y": -5632,
-      "Z": 26624,
-      "Room": 23,
-      "Angle": 0,
-      "EntityIndex": 22,
-      "TargetType": 26
-    },
     {
       "X": 53760,
       "Y": -5632,
@@ -3050,15 +1855,6 @@
       "EntityIndex": 22,
       "TargetType": 27
     },
-    {
-      "X": 58880,
-      "Y": -5632,
-      "Z": 26624,
-      "Room": 23,
-      "Angle": 0,
-      "EntityIndex": 23,
-      "TargetType": 26
-    },
     {
       "X": 58880,
       "Y": -5632,
@@ -3068,15 +1864,6 @@
       "EntityIndex": 23,
       "TargetType": 27
     },
-    {
-      "X": 53760,
-      "Y": -5632,
-      "Z": 20480,
-      "Room": 25,
-      "Angle": 0,
-      "EntityIndex": 26,
-      "TargetType": 26
-    },
     {
       "X": 53760,
       "Y": -5632,
@@ -3086,15 +1873,6 @@
       "EntityIndex": 26,
       "TargetType": 27
     },
-    {
-      "X": 58880,
-      "Y": -5632,
-      "Z": 20480,
-      "Room": 25,
-      "Angle": 0,
-      "EntityIndex": 30,
-      "TargetType": 26
-    },
     {
       "X": 58880,
       "Y": -5632,
@@ -3104,15 +1882,6 @@
       "EntityIndex": 30,
       "TargetType": 27
     },
-    {
-      "X": 51712,
-      "Y": 1792,
-      "Z": 37888,
-      "Room": 41,
-      "Angle": 0,
-      "EntityIndex": 46,
-      "TargetType": 26
-    },
     {
       "X": 51712,
       "Y": 1792,
@@ -3122,15 +1891,6 @@
       "EntityIndex": 46,
       "TargetType": 27
     },
-    {
-      "X": 46592,
-      "Y": 1792,
-      "Z": 37888,
-      "Room": 41,
-      "Angle": 0,
-      "EntityIndex": 57,
-      "TargetType": 26
-    },
     {
       "X": 46592,
       "Y": 1792,
@@ -3140,15 +1900,6 @@
       "EntityIndex": 57,
       "TargetType": 27
     },
-    {
-      "X": 45568,
-      "Y": 1792,
-      "Z": 37888,
-      "Room": 41,
-      "Angle": 0,
-      "EntityIndex": 58,
-      "TargetType": 26
-    },
     {
       "X": 45568,
       "Y": 1792,
@@ -3158,15 +1909,6 @@
       "EntityIndex": 58,
       "TargetType": 27
     },
-    {
-      "X": 53760,
-      "Y": 3072,
-      "Z": 48128,
-      "Room": 41,
-      "Angle": -32768,
-      "EntityIndex": 59,
-      "TargetType": 26
-    },
     {
       "X": 53760,
       "Y": 3072,
@@ -3182,43 +1924,18 @@
       "Z": 54784,
       "Room": 47,
       "EntityIndex": 69,
-      "TargetType": 26
+      "TargetType": 27
     },
     {
       "X": 60415,
       "Y": 3328,
-      "Z": 54784,
+      "Z": 55808,
       "Room": 47,
-      "EntityIndex": 69,
+      "EntityIndex": 70,
       "TargetType": 27
     },
     {
-      "X": 60415,
-      "Y": 3328,
-      "Z": 55808,
-      "Room": 47,
-      "EntityIndex": 70,
-      "TargetType": 26
-    },
-    {
-      "X": 60415,
-      "Y": 3328,
-      "Z": 55808,
-      "Room": 47,
-      "EntityIndex": 70,
-      "TargetType": 27
-    },
-    {
-      "X": 65024,
-      "Y": 3328,
-      "Z": 52224,
-      "Room": 47,
-      "Angle": 0,
-      "EntityIndex": 71,
-      "TargetType": 26
-    },
-    {
-      "X": 65024,
+      "X": 65024,
       "Y": 3328,
       "Z": 52224,
       "Room": 47,
@@ -3226,15 +1943,6 @@
       "EntityIndex": 71,
       "TargetType": 27
     },
-    {
-      "X": 64000,
-      "Y": 3328,
-      "Z": 52224,
-      "Room": 47,
-      "Angle": 0,
-      "EntityIndex": 72,
-      "TargetType": 26
-    },
     {
       "X": 64000,
       "Y": 3328,
@@ -3244,14 +1952,6 @@
       "EntityIndex": 72,
       "TargetType": 27
     },
-    {
-      "X": 60415,
-      "Y": 3840,
-      "Z": 66048,
-      "Room": 49,
-      "EntityIndex": 86,
-      "TargetType": 26
-    },
     {
       "X": 60415,
       "Y": 3840,
@@ -3260,15 +1960,6 @@
       "EntityIndex": 86,
       "TargetType": 27
     },
-    {
-      "X": 76288,
-      "Y": 4096,
-      "Z": 61440,
-      "Room": 55,
-      "Angle": 0,
-      "EntityIndex": 88,
-      "TargetType": 26
-    },
     {
       "X": 76288,
       "Y": 4096,
@@ -3278,15 +1969,6 @@
       "EntityIndex": 88,
       "TargetType": 27
     },
-    {
-      "X": 73216,
-      "Y": 4096,
-      "Z": 61440,
-      "Room": 55,
-      "Angle": 0,
-      "EntityIndex": 92,
-      "TargetType": 26
-    },
     {
       "X": 73216,
       "Y": 4096,
@@ -3296,14 +1978,6 @@
       "EntityIndex": 92,
       "TargetType": 27
     },
-    {
-      "X": 67583,
-      "Y": 2048,
-      "Z": 70144,
-      "Room": 56,
-      "EntityIndex": 93,
-      "TargetType": 26
-    },
     {
       "X": 67583,
       "Y": 2048,
@@ -3312,15 +1986,6 @@
       "EntityIndex": 93,
       "TargetType": 27
     },
-    {
-      "X": 81919,
-      "Y": 2048,
-      "Z": 70144,
-      "Room": 56,
-      "Angle": -16384,
-      "EntityIndex": 98,
-      "TargetType": 26
-    },
     {
       "X": 81919,
       "Y": 2048,
@@ -3330,15 +1995,6 @@
       "EntityIndex": 98,
       "TargetType": 27
     },
-    {
-      "X": 60928,
-      "Y": 2304,
-      "Z": 79872,
-      "Room": 63,
-      "Angle": 0,
-      "EntityIndex": 118,
-      "TargetType": 26
-    },
     {
       "X": 60928,
       "Y": 2304,
@@ -3348,15 +2004,6 @@
       "EntityIndex": 118,
       "TargetType": 27
     },
-    {
-      "X": 55808,
-      "Y": 3328,
-      "Z": 84992,
-      "Room": 71,
-      "Angle": 0,
-      "EntityIndex": 131,
-      "TargetType": 26
-    },
     {
       "X": 55808,
       "Y": 3328,
@@ -3366,15 +2013,6 @@
       "EntityIndex": 131,
       "TargetType": 27
     },
-    {
-      "X": 48128,
-      "Y": 6400,
-      "Z": 82432,
-      "Room": 76,
-      "Angle": -16384,
-      "EntityIndex": 152,
-      "TargetType": 26
-    },
     {
       "X": 48128,
       "Y": 6400,
@@ -3384,15 +2022,6 @@
       "EntityIndex": 152,
       "TargetType": 27
     },
-    {
-      "X": 48128,
-      "Y": 6400,
-      "Z": 81408,
-      "Room": 76,
-      "Angle": -16384,
-      "EntityIndex": 153,
-      "TargetType": 26
-    },
     {
       "X": 48128,
       "Y": 6400,
@@ -3402,15 +2031,6 @@
       "EntityIndex": 153,
       "TargetType": 27
     },
-    {
-      "X": 49152,
-      "Y": 2560,
-      "Z": 85504,
-      "Room": 80,
-      "Angle": -16384,
-      "EntityIndex": 158,
-      "TargetType": 26
-    },
     {
       "X": 49152,
       "Y": 2560,
@@ -3420,15 +2040,6 @@
       "EntityIndex": 158,
       "TargetType": 27
     },
-    {
-      "X": 42496,
-      "Y": 1536,
-      "Z": 12288,
-      "Room": 82,
-      "Angle": 0,
-      "EntityIndex": 168,
-      "TargetType": 26
-    },
     {
       "X": 42496,
       "Y": 1536,
@@ -3438,15 +2049,6 @@
       "EntityIndex": 168,
       "TargetType": 27
     },
-    {
-      "X": 52736,
-      "Y": 1536,
-      "Z": 12288,
-      "Room": 82,
-      "Angle": 0,
-      "EntityIndex": 169,
-      "TargetType": 26
-    },
     {
       "X": 52736,
       "Y": 1536,
@@ -3456,15 +2058,6 @@
       "EntityIndex": 169,
       "TargetType": 27
     },
-    {
-      "X": 80384,
-      "Y": 11008,
-      "Z": 17920,
-      "Room": 88,
-      "Angle": 0,
-      "EntityIndex": 175,
-      "TargetType": 26
-    },
     {
       "X": 80384,
       "Y": 11008,
@@ -3474,15 +2067,6 @@
       "EntityIndex": 175,
       "TargetType": 27
     },
-    {
-      "X": 37376,
-      "Y": 2944,
-      "Z": 26624,
-      "Room": 37,
-      "Angle": 0,
-      "EntityIndex": 184,
-      "TargetType": 26
-    },
     {
       "X": 37376,
       "Y": 2944,
@@ -3492,14 +2076,6 @@
       "EntityIndex": 184,
       "TargetType": 27
     },
-    {
-      "X": 41472,
-      "Y": 9088,
-      "Z": 82432,
-      "Room": 98,
-      "EntityIndex": 190,
-      "TargetType": 26
-    },
     {
       "X": 41472,
       "Y": 9088,
@@ -3508,15 +2084,6 @@
       "EntityIndex": 190,
       "TargetType": 27
     },
-    {
-      "X": 48127,
-      "Y": 6400,
-      "Z": 12800,
-      "Room": 102,
-      "Angle": -16384,
-      "EntityIndex": 191,
-      "TargetType": 26
-    },
     {
       "X": 48127,
       "Y": 6400,
@@ -3526,14 +2093,6 @@
       "EntityIndex": 191,
       "TargetType": 27
     },
-    {
-      "X": 37888,
-      "Y": 7680,
-      "Z": 17920,
-      "Room": 100,
-      "EntityIndex": 192,
-      "TargetType": 26
-    },
     {
       "X": 37888,
       "Y": 7680,
@@ -3542,15 +2101,6 @@
       "EntityIndex": 192,
       "TargetType": 27
     },
-    {
-      "X": 44544,
-      "Y": 1792,
-      "Z": 37888,
-      "Room": 41,
-      "Angle": 0,
-      "EntityIndex": 194,
-      "TargetType": 26
-    },
     {
       "X": 44544,
       "Y": 1792,
@@ -3560,15 +2110,6 @@
       "EntityIndex": 194,
       "TargetType": 27
     },
-    {
-      "X": 52736,
-      "Y": 1792,
-      "Z": 37888,
-      "Room": 41,
-      "Angle": 0,
-      "EntityIndex": 195,
-      "TargetType": 26
-    },
     {
       "X": 52736,
       "Y": 1792,
@@ -3578,15 +2119,6 @@
       "EntityIndex": 195,
       "TargetType": 27
     },
-    {
-      "X": 61952,
-      "Y": -1792,
-      "Z": 31744,
-      "Room": 19,
-      "Angle": -32768,
-      "EntityIndex": 196,
-      "TargetType": 26
-    },
     {
       "X": 61952,
       "Y": -1792,
@@ -3698,15 +2230,6 @@
     }
   ],
   "LIVING.TR2": [
-    {
-      "X": 76288,
-      "Y": -1024,
-      "Z": 91136,
-      "Room": 0,
-      "Angle": -32768,
-      "EntityIndex": 3,
-      "TargetType": 26
-    },
     {
       "X": 76288,
       "Y": -1024,
@@ -3716,15 +2239,6 @@
       "EntityIndex": 3,
       "TargetType": 27
     },
-    {
-      "X": 64000,
-      "Y": -256,
-      "Z": 64512,
-      "Room": 6,
-      "Angle": 0,
-      "EntityIndex": 17,
-      "TargetType": 26
-    },
     {
       "X": 64000,
       "Y": -256,
@@ -3734,15 +2248,6 @@
       "EntityIndex": 17,
       "TargetType": 27
     },
-    {
-      "X": 62976,
-      "Y": -256,
-      "Z": 64512,
-      "Room": 6,
-      "Angle": 0,
-      "EntityIndex": 18,
-      "TargetType": 26
-    },
     {
       "X": 62976,
       "Y": -256,
@@ -3752,15 +2257,6 @@
       "EntityIndex": 18,
       "TargetType": 27
     },
-    {
-      "X": 61952,
-      "Y": 256,
-      "Z": 72704,
-      "Room": 6,
-      "Angle": -32768,
-      "EntityIndex": 21,
-      "TargetType": 26
-    },
     {
       "X": 61952,
       "Y": 256,
@@ -3770,15 +2266,6 @@
       "EntityIndex": 21,
       "TargetType": 27
     },
-    {
-      "X": 73727,
-      "Y": -5376,
-      "Z": 92672,
-      "Room": 12,
-      "Angle": -16384,
-      "EntityIndex": 31,
-      "TargetType": 26
-    },
     {
       "X": 73727,
       "Y": -5376,
@@ -3788,15 +2275,6 @@
       "EntityIndex": 31,
       "TargetType": 27
     },
-    {
-      "X": 66559,
-      "Y": 3328,
-      "Z": 58880,
-      "Room": 15,
-      "Angle": -16384,
-      "EntityIndex": 34,
-      "TargetType": 26
-    },
     {
       "X": 66559,
       "Y": 3328,
@@ -3806,15 +2284,6 @@
       "EntityIndex": 34,
       "TargetType": 27
     },
-    {
-      "X": 73216,
-      "Y": -2560,
-      "Z": 59392,
-      "Room": 18,
-      "Angle": -32768,
-      "EntityIndex": 41,
-      "TargetType": 26
-    },
     {
       "X": 73216,
       "Y": -2560,
@@ -3824,15 +2293,6 @@
       "EntityIndex": 41,
       "TargetType": 27
     },
-    {
-      "X": 61952,
-      "Y": -3328,
-      "Z": 50176,
-      "Room": 20,
-      "Angle": -32768,
-      "EntityIndex": 43,
-      "TargetType": 26
-    },
     {
       "X": 61952,
       "Y": -3328,
@@ -3842,15 +2302,6 @@
       "EntityIndex": 43,
       "TargetType": 27
     },
-    {
-      "X": 59391,
-      "Y": -3072,
-      "Z": 41472,
-      "Room": 21,
-      "Angle": -16384,
-      "EntityIndex": 45,
-      "TargetType": 26
-    },
     {
       "X": 59391,
       "Y": -3072,
@@ -3860,14 +2311,6 @@
       "EntityIndex": 45,
       "TargetType": 27
     },
-    {
-      "X": 55295,
-      "Y": -3072,
-      "Z": 38400,
-      "Room": 34,
-      "EntityIndex": 46,
-      "TargetType": 26
-    },
     {
       "X": 55295,
       "Y": -3072,
@@ -3876,15 +2319,6 @@
       "EntityIndex": 46,
       "TargetType": 27
     },
-    {
-      "X": 50688,
-      "Y": 512,
-      "Z": 63488,
-      "Room": 26,
-      "Angle": 0,
-      "EntityIndex": 52,
-      "TargetType": 26
-    },
     {
       "X": 50688,
       "Y": 512,
@@ -3894,15 +2328,6 @@
       "EntityIndex": 52,
       "TargetType": 27
     },
-    {
-      "X": 55808,
-      "Y": -1792,
-      "Z": 72704,
-      "Room": 29,
-      "Angle": -32768,
-      "EntityIndex": 54,
-      "TargetType": 26
-    },
     {
       "X": 55808,
       "Y": -1792,
@@ -3912,15 +2337,6 @@
       "EntityIndex": 54,
       "TargetType": 27
     },
-    {
-      "X": 45568,
-      "Y": 1280,
-      "Z": 69632,
-      "Room": 32,
-      "Angle": 0,
-      "EntityIndex": 55,
-      "TargetType": 26
-    },
     {
       "X": 45568,
       "Y": 1280,
@@ -3930,15 +2346,6 @@
       "EntityIndex": 55,
       "TargetType": 27
     },
-    {
-      "X": 59904,
-      "Y": -3072,
-      "Z": 40960,
-      "Room": 34,
-      "Angle": -32768,
-      "EntityIndex": 57,
-      "TargetType": 26
-    },
     {
       "X": 59904,
       "Y": -3072,
@@ -3948,15 +2355,6 @@
       "EntityIndex": 57,
       "TargetType": 27
     },
-    {
-      "X": 71679,
-      "Y": -3584,
-      "Z": 35328,
-      "Room": 42,
-      "Angle": -16384,
-      "EntityIndex": 60,
-      "TargetType": 26
-    },
     {
       "X": 71679,
       "Y": -3584,
@@ -3966,14 +2364,6 @@
       "EntityIndex": 60,
       "TargetType": 27
     },
-    {
-      "X": 45055,
-      "Y": -3072,
-      "Z": 31232,
-      "Room": 37,
-      "EntityIndex": 65,
-      "TargetType": 26
-    },
     {
       "X": 45055,
       "Y": -3072,
@@ -3982,14 +2372,6 @@
       "EntityIndex": 65,
       "TargetType": 27
     },
-    {
-      "X": 43011,
-      "Y": -2560,
-      "Z": 34304,
-      "Room": 37,
-      "EntityIndex": 70,
-      "TargetType": 26
-    },
     {
       "X": 43011,
       "Y": -2560,
@@ -3998,15 +2380,6 @@
       "EntityIndex": 70,
       "TargetType": 27
     },
-    {
-      "X": 54784,
-      "Y": -2560,
-      "Z": 30720,
-      "Room": 37,
-      "Angle": 0,
-      "EntityIndex": 66,
-      "TargetType": 26
-    },
     {
       "X": 54784,
       "Y": -2560,
@@ -4016,14 +2389,6 @@
       "EntityIndex": 66,
       "TargetType": 27
     },
-    {
-      "X": 43007,
-      "Y": -4864,
-      "Z": 41472,
-      "Room": 37,
-      "EntityIndex": 67,
-      "TargetType": 26
-    },
     {
       "X": 43007,
       "Y": -4864,
@@ -4032,15 +2397,6 @@
       "EntityIndex": 67,
       "TargetType": 27
     },
-    {
-      "X": 40448,
-      "Y": -5120,
-      "Z": 39936,
-      "Room": 38,
-      "Angle": -32768,
-      "EntityIndex": 71,
-      "TargetType": 26
-    },
     {
       "X": 40448,
       "Y": -5120,
@@ -4084,14 +2440,6 @@
     }
   ],
   "DECK.TR2": [
-    {
-      "X": 51199,
-      "Y": 4864,
-      "Z": 51712,
-      "Room": 12,
-      "EntityIndex": 11,
-      "TargetType": 26
-    },
     {
       "X": 51199,
       "Y": 4864,
@@ -4100,15 +2448,6 @@
       "EntityIndex": 11,
       "TargetType": 27
     },
-    {
-      "X": 37376,
-      "Y": -3072,
-      "Z": 45056,
-      "Room": 30,
-      "Angle": -32768,
-      "EntityIndex": 14,
-      "TargetType": 26
-    },
     {
       "X": 37376,
       "Y": -3072,
@@ -4118,15 +2457,6 @@
       "EntityIndex": 14,
       "TargetType": 27
     },
-    {
-      "X": 42496,
-      "Y": -3072,
-      "Z": 45056,
-      "Room": 20,
-      "Angle": -32768,
-      "EntityIndex": 15,
-      "TargetType": 26
-    },
     {
       "X": 42496,
       "Y": -3072,
@@ -4136,15 +2466,6 @@
       "EntityIndex": 15,
       "TargetType": 27
     },
-    {
-      "X": 52736,
-      "Y": 8832,
-      "Z": 65536,
-      "Room": 23,
-      "Angle": 0,
-      "EntityIndex": 19,
-      "TargetType": 26
-    },
     {
       "X": 52736,
       "Y": 8832,
@@ -4154,15 +2475,6 @@
       "EntityIndex": 19,
       "TargetType": 27
     },
-    {
-      "X": 66048,
-      "Y": 7424,
-      "Z": 69632,
-      "Room": 24,
-      "Angle": -32768,
-      "EntityIndex": 20,
-      "TargetType": 26
-    },
     {
       "X": 66048,
       "Y": 7424,
@@ -4172,15 +2484,6 @@
       "EntityIndex": 20,
       "TargetType": 27
     },
-    {
-      "X": 61952,
-      "Y": 7424,
-      "Z": 63488,
-      "Room": 24,
-      "Angle": -32768,
-      "EntityIndex": 21,
-      "TargetType": 26
-    },
     {
       "X": 61952,
       "Y": 7424,
@@ -4190,15 +2493,6 @@
       "EntityIndex": 21,
       "TargetType": 27
     },
-    {
-      "X": 55808,
-      "Y": 7680,
-      "Z": 60416,
-      "Room": 25,
-      "Angle": -32768,
-      "EntityIndex": 23,
-      "TargetType": 26
-    },
     {
       "X": 55808,
       "Y": 7680,
@@ -4208,15 +2502,6 @@
       "EntityIndex": 23,
       "TargetType": 27
     },
-    {
-      "X": 57856,
-      "Y": 8576,
-      "Z": 69632,
-      "Room": 25,
-      "Angle": -32768,
-      "EntityIndex": 24,
-      "TargetType": 26
-    },
     {
       "X": 57856,
       "Y": 8576,
@@ -4226,14 +2511,6 @@
       "EntityIndex": 24,
       "TargetType": 27
     },
-    {
-      "X": 58367,
-      "Y": 7424,
-      "Z": 41472,
-      "Room": 29,
-      "EntityIndex": 25,
-      "TargetType": 26
-    },
     {
       "X": 58367,
       "Y": 7424,
@@ -4242,15 +2519,6 @@
       "EntityIndex": 25,
       "TargetType": 27
     },
-    {
-      "X": 43520,
-      "Y": -5376,
-      "Z": 50176,
-      "Room": 41,
-      "Angle": -32768,
-      "EntityIndex": 29,
-      "TargetType": 26
-    },
     {
       "X": 43520,
       "Y": -5376,
@@ -4260,15 +2528,6 @@
       "EntityIndex": 29,
       "TargetType": 27
     },
-    {
-      "X": 43520,
-      "Y": -7680,
-      "Z": 60416,
-      "Room": 47,
-      "Angle": -32768,
-      "EntityIndex": 32,
-      "TargetType": 26
-    },
     {
       "X": 43520,
       "Y": -7680,
@@ -4278,15 +2537,6 @@
       "EntityIndex": 32,
       "TargetType": 27
     },
-    {
-      "X": 45568,
-      "Y": -7680,
-      "Z": 60416,
-      "Room": 47,
-      "Angle": -32768,
-      "EntityIndex": 33,
-      "TargetType": 26
-    },
     {
       "X": 45568,
       "Y": -7680,
@@ -4296,15 +2546,6 @@
       "EntityIndex": 33,
       "TargetType": 27
     },
-    {
-      "X": 34304,
-      "Y": -7680,
-      "Z": 60416,
-      "Room": 48,
-      "Angle": -32768,
-      "EntityIndex": 36,
-      "TargetType": 26
-    },
     {
       "X": 34304,
       "Y": -7680,
@@ -4314,15 +2555,6 @@
       "EntityIndex": 36,
       "TargetType": 27
     },
-    {
-      "X": 36352,
-      "Y": -7680,
-      "Z": 60416,
-      "Room": 48,
-      "Angle": -32768,
-      "EntityIndex": 39,
-      "TargetType": 26
-    },
     {
       "X": 36352,
       "Y": -7680,
@@ -4339,25 +2571,7 @@
       "Room": 60,
       "Angle": 0,
       "EntityIndex": 43,
-      "TargetType": 26
-    },
-    {
-      "X": 32256,
-      "Y": 256,
-      "Z": 18432,
-      "Room": 60,
-      "Angle": 0,
-      "EntityIndex": 43,
-      "TargetType": 27
-    },
-    {
-      "X": 33280,
-      "Y": 0,
-      "Z": 26624,
-      "Room": 60,
-      "Angle": -32768,
-      "EntityIndex": 44,
-      "TargetType": 26
+      "TargetType": 27
     },
     {
       "X": 33280,
@@ -4368,14 +2582,6 @@
       "EntityIndex": 44,
       "TargetType": 27
     },
-    {
-      "X": 28671,
-      "Y": -11264,
-      "Z": 76288,
-      "Room": 63,
-      "EntityIndex": 46,
-      "TargetType": 26
-    },
     {
       "X": 28671,
       "Y": -11264,
@@ -4384,15 +2590,6 @@
       "EntityIndex": 46,
       "TargetType": 27
     },
-    {
-      "X": 34815,
-      "Y": -11264,
-      "Z": 70144,
-      "Room": 63,
-      "Angle": -16384,
-      "EntityIndex": 47,
-      "TargetType": 26
-    },
     {
       "X": 34815,
       "Y": -11264,
@@ -4402,15 +2599,6 @@
       "EntityIndex": 47,
       "TargetType": 27
     },
-    {
-      "X": 35839,
-      "Y": -11264,
-      "Z": 67072,
-      "Room": 63,
-      "Angle": -16384,
-      "EntityIndex": 56,
-      "TargetType": 26
-    },
     {
       "X": 35839,
       "Y": -11264,
@@ -4420,15 +2608,6 @@
       "EntityIndex": 56,
       "TargetType": 27
     },
-    {
-      "X": 34304,
-      "Y": 768,
-      "Z": 39936,
-      "Room": 77,
-      "Angle": -32768,
-      "EntityIndex": 69,
-      "TargetType": 26
-    },
     {
       "X": 34304,
       "Y": 768,
@@ -4438,15 +2617,6 @@
       "EntityIndex": 69,
       "TargetType": 27
     },
-    {
-      "X": 33280,
-      "Y": 768,
-      "Z": 39936,
-      "Room": 77,
-      "Angle": -32768,
-      "EntityIndex": 70,
-      "TargetType": 26
-    },
     {
       "X": 33280,
       "Y": 768,
@@ -4456,15 +2626,6 @@
       "EntityIndex": 70,
       "TargetType": 27
     },
-    {
-      "X": 52736,
-      "Y": 8704,
-      "Z": 54272,
-      "Room": 80,
-      "Angle": 0,
-      "EntityIndex": 73,
-      "TargetType": 26
-    },
     {
       "X": 52736,
       "Y": 8704,
@@ -4474,15 +2635,6 @@
       "EntityIndex": 73,
       "TargetType": 27
     },
-    {
-      "X": 51712,
-      "Y": 8704,
-      "Z": 54272,
-      "Room": 80,
-      "Angle": 0,
-      "EntityIndex": 74,
-      "TargetType": 26
-    },
     {
       "X": 51712,
       "Y": 8704,
@@ -4492,15 +2644,6 @@
       "EntityIndex": 74,
       "TargetType": 27
     },
-    {
-      "X": 35328,
-      "Y": 768,
-      "Z": 39936,
-      "Room": 77,
-      "Angle": -32768,
-      "EntityIndex": 83,
-      "TargetType": 26
-    },
     {
       "X": 35328,
       "Y": 768,
@@ -4510,15 +2653,6 @@
       "EntityIndex": 83,
       "TargetType": 27
     },
-    {
-      "X": 63487,
-      "Y": -512,
-      "Z": 65024,
-      "Room": 53,
-      "Angle": -16384,
-      "EntityIndex": 87,
-      "TargetType": 26
-    },
     {
       "X": 63487,
       "Y": -512,
@@ -4528,15 +2662,6 @@
       "EntityIndex": 87,
       "TargetType": 27
     },
-    {
-      "X": 39424,
-      "Y": -7680,
-      "Z": 60416,
-      "Room": 48,
-      "Angle": -32768,
-      "EntityIndex": 89,
-      "TargetType": 26
-    },
     {
       "X": 39424,
       "Y": -7680,
@@ -4546,15 +2671,6 @@
       "EntityIndex": 89,
       "TargetType": 27
     },
-    {
-      "X": 26623,
-      "Y": -12544,
-      "Z": 60928,
-      "Room": 97,
-      "Angle": -16384,
-      "EntityIndex": 91,
-      "TargetType": 26
-    },
     {
       "X": 26623,
       "Y": -12544,
@@ -4564,14 +2680,6 @@
       "EntityIndex": 91,
       "TargetType": 27
     },
-    {
-      "X": 21503,
-      "Y": -13056,
-      "Z": 61952,
-      "Room": 97,
-      "EntityIndex": 92,
-      "TargetType": 26
-    },
     {
       "X": 21503,
       "Y": -13056,
@@ -4580,15 +2688,6 @@
       "EntityIndex": 92,
       "TargetType": 27
     },
-    {
-      "X": 45568,
-      "Y": -11520,
-      "Z": 64512,
-      "Room": 68,
-      "Angle": 0,
-      "EntityIndex": 103,
-      "TargetType": 26
-    },
     {
       "X": 45568,
       "Y": -11520,
@@ -4598,15 +2697,6 @@
       "EntityIndex": 103,
       "TargetType": 27
     },
-    {
-      "X": 44544,
-      "Y": -11776,
-      "Z": 69632,
-      "Room": 68,
-      "Angle": -32768,
-      "EntityIndex": 104,
-      "TargetType": 26
-    },
     {
       "X": 44544,
       "Y": -11776,
@@ -4652,15 +2742,6 @@
     }
   ],
   "SKIDOO.TR2": [
-    {
-      "X": 72192,
-      "Y": -1792,
-      "Z": 27648,
-      "Room": 10,
-      "Angle": 0,
-      "EntityIndex": 1,
-      "TargetType": 26
-    },
     {
       "X": 72192,
       "Y": -1792,
@@ -4670,15 +2751,6 @@
       "EntityIndex": 1,
       "TargetType": 27
     },
-    {
-      "X": 66048,
-      "Y": -2048,
-      "Z": 27648,
-      "Room": 10,
-      "Angle": 0,
-      "EntityIndex": 2,
-      "TargetType": 26
-    },
     {
       "X": 66048,
       "Y": -2048,
@@ -4688,14 +2760,6 @@
       "EntityIndex": 2,
       "TargetType": 27
     },
-    {
-      "X": 63487,
-      "Y": -1024,
-      "Z": 38400,
-      "Room": 11,
-      "EntityIndex": 4,
-      "TargetType": 26
-    },
     {
       "X": 63487,
       "Y": -1024,
@@ -4704,15 +2768,6 @@
       "EntityIndex": 4,
       "TargetType": 27
     },
-    {
-      "X": 77823,
-      "Y": -512,
-      "Z": 40448,
-      "Room": 12,
-      "Angle": -16384,
-      "EntityIndex": 5,
-      "TargetType": 26
-    },
     {
       "X": 77823,
       "Y": -512,
@@ -4722,15 +2777,6 @@
       "EntityIndex": 5,
       "TargetType": 27
     },
-    {
-      "X": 79871,
-      "Y": -2048,
-      "Z": 32256,
-      "Room": 23,
-      "Angle": -16384,
-      "EntityIndex": 14,
-      "TargetType": 26
-    },
     {
       "X": 79871,
       "Y": -2048,
@@ -4740,14 +2786,6 @@
       "EntityIndex": 14,
       "TargetType": 27
     },
-    {
-      "X": 84992,
-      "Y": -2816,
-      "Z": 84480,
-      "Room": 41,
-      "EntityIndex": 20,
-      "TargetType": 26
-    },
     {
       "X": 84992,
       "Y": -2816,
@@ -4756,15 +2794,6 @@
       "EntityIndex": 20,
       "TargetType": 27
     },
-    {
-      "X": 92672,
-      "Y": -2304,
-      "Z": 71680,
-      "Room": 41,
-      "Angle": 0,
-      "EntityIndex": 21,
-      "TargetType": 26
-    },
     {
       "X": 92672,
       "Y": -2304,
@@ -4774,15 +2803,6 @@
       "EntityIndex": 21,
       "TargetType": 27
     },
-    {
-      "X": 76288,
-      "Y": -2560,
-      "Z": 57344,
-      "Room": 47,
-      "Angle": -32768,
-      "EntityIndex": 26,
-      "TargetType": 26
-    },
     {
       "X": 76288,
       "Y": -2560,
@@ -4792,15 +2812,6 @@
       "EntityIndex": 26,
       "TargetType": 27
     },
-    {
-      "X": 77312,
-      "Y": -2560,
-      "Z": 53248,
-      "Room": 47,
-      "Angle": 0,
-      "EntityIndex": 27,
-      "TargetType": 26
-    },
     {
       "X": 77312,
       "Y": -2560,
@@ -4810,14 +2821,6 @@
       "EntityIndex": 27,
       "TargetType": 27
     },
-    {
-      "X": 38911,
-      "Y": -512,
-      "Z": 45568,
-      "Room": 51,
-      "EntityIndex": 28,
-      "TargetType": 26
-    },
     {
       "X": 38911,
       "Y": -512,
@@ -4826,14 +2829,6 @@
       "EntityIndex": 28,
       "TargetType": 27
     },
-    {
-      "X": 51199,
-      "Y": -2304,
-      "Z": 59904,
-      "Room": 62,
-      "EntityIndex": 29,
-      "TargetType": 26
-    },
     {
       "X": 51199,
       "Y": -2304,
@@ -4842,15 +2837,6 @@
       "EntityIndex": 29,
       "TargetType": 27
     },
-    {
-      "X": 69631,
-      "Y": -1024,
-      "Z": 61952,
-      "Room": 138,
-      "Angle": -16384,
-      "EntityIndex": 32,
-      "TargetType": 26
-    },
     {
       "X": 69631,
       "Y": -1024,
@@ -4860,15 +2846,6 @@
       "EntityIndex": 32,
       "TargetType": 27
     },
-    {
-      "X": 46079,
-      "Y": -2816,
-      "Z": 95744,
-      "Room": 66,
-      "Angle": -16384,
-      "EntityIndex": 35,
-      "TargetType": 26
-    },
     {
       "X": 46079,
       "Y": -2816,
@@ -4878,15 +2855,6 @@
       "EntityIndex": 35,
       "TargetType": 27
     },
-    {
-      "X": 20992,
-      "Y": 5888,
-      "Z": 87040,
-      "Room": 61,
-      "Angle": 0,
-      "EntityIndex": 36,
-      "TargetType": 26
-    },
     {
       "X": 20992,
       "Y": 5888,
@@ -4896,15 +2864,6 @@
       "EntityIndex": 36,
       "TargetType": 27
     },
-    {
-      "X": 32767,
-      "Y": -2560,
-      "Z": 91648,
-      "Room": 14,
-      "Angle": -16384,
-      "EntityIndex": 40,
-      "TargetType": 26
-    },
     {
       "X": 32767,
       "Y": -2560,
@@ -4914,15 +2873,6 @@
       "EntityIndex": 40,
       "TargetType": 27
     },
-    {
-      "X": 32767,
-      "Y": -3584,
-      "Z": 91648,
-      "Room": 14,
-      "Angle": -16384,
-      "EntityIndex": 41,
-      "TargetType": 26
-    },
     {
       "X": 32767,
       "Y": -3584,
@@ -4932,15 +2882,6 @@
       "EntityIndex": 41,
       "TargetType": 27
     },
-    {
-      "X": 40959,
-      "Y": -3072,
-      "Z": 94720,
-      "Room": 66,
-      "Angle": -16384,
-      "EntityIndex": 42,
-      "TargetType": 26
-    },
     {
       "X": 40959,
       "Y": -3072,
@@ -4950,14 +2891,6 @@
       "EntityIndex": 42,
       "TargetType": 27
     },
-    {
-      "X": 37887,
-      "Y": -3072,
-      "Z": 96768,
-      "Room": 66,
-      "EntityIndex": 43,
-      "TargetType": 26
-    },
     {
       "X": 37887,
       "Y": -3072,
@@ -4966,15 +2899,6 @@
       "EntityIndex": 43,
       "TargetType": 27
     },
-    {
-      "X": 7680,
-      "Y": -1536,
-      "Z": 76800,
-      "Room": 74,
-      "Angle": 0,
-      "EntityIndex": 52,
-      "TargetType": 26
-    },
     {
       "X": 7680,
       "Y": -1536,
@@ -4984,15 +2908,6 @@
       "EntityIndex": 52,
       "TargetType": 27
     },
-    {
-      "X": 96768,
-      "Y": -2560,
-      "Z": 9216,
-      "Room": 77,
-      "Angle": 0,
-      "EntityIndex": 54,
-      "TargetType": 26
-    },
     {
       "X": 96768,
       "Y": -2560,
@@ -5002,14 +2917,6 @@
       "EntityIndex": 54,
       "TargetType": 27
     },
-    {
-      "X": 72703,
-      "Y": -3328,
-      "Z": 11776,
-      "Room": 78,
-      "EntityIndex": 57,
-      "TargetType": 26
-    },
     {
       "X": 72703,
       "Y": -3328,
@@ -5018,14 +2925,6 @@
       "EntityIndex": 57,
       "TargetType": 27
     },
-    {
-      "X": 15360,
-      "Y": 0,
-      "Z": 89600,
-      "Room": 61,
-      "EntityIndex": 73,
-      "TargetType": 26
-    },
     {
       "X": 15360,
       "Y": 0,
@@ -5034,15 +2933,6 @@
       "EntityIndex": 73,
       "TargetType": 27
     },
-    {
-      "X": 89600,
-      "Y": 2816,
-      "Z": 36864,
-      "Room": 99,
-      "Angle": -32768,
-      "EntityIndex": 77,
-      "TargetType": 26
-    },
     {
       "X": 89600,
       "Y": 2816,
@@ -5052,15 +2942,6 @@
       "EntityIndex": 77,
       "TargetType": 27
     },
-    {
-      "X": 90624,
-      "Y": 2816,
-      "Z": 36864,
-      "Room": 99,
-      "Angle": -32768,
-      "EntityIndex": 78,
-      "TargetType": 26
-    },
     {
       "X": 90624,
       "Y": 2816,
@@ -5070,14 +2951,6 @@
       "EntityIndex": 78,
       "TargetType": 27
     },
-    {
-      "X": 84993,
-      "Y": 2048,
-      "Z": 28160,
-      "Room": 99,
-      "EntityIndex": 79,
-      "TargetType": 26
-    },
     {
       "X": 84993,
       "Y": 2048,
@@ -5086,15 +2959,6 @@
       "EntityIndex": 79,
       "TargetType": 27
     },
-    {
-      "X": 94720,
-      "Y": 2560,
-      "Z": 36864,
-      "Room": 99,
-      "Angle": -32768,
-      "EntityIndex": 83,
-      "TargetType": 26
-    },
     {
       "X": 94720,
       "Y": 2560,
@@ -5104,14 +2968,6 @@
       "EntityIndex": 83,
       "TargetType": 27
     },
-    {
-      "X": 31743,
-      "Y": -768,
-      "Z": 14848,
-      "Room": 104,
-      "EntityIndex": 84,
-      "TargetType": 26
-    },
     {
       "X": 31743,
       "Y": -768,
@@ -5120,15 +2976,6 @@
       "EntityIndex": 84,
       "TargetType": 27
     },
-    {
-      "X": 25599,
-      "Y": 2048,
-      "Z": 20992,
-      "Room": 112,
-      "Angle": -16384,
-      "EntityIndex": 86,
-      "TargetType": 26
-    },
     {
       "X": 25599,
       "Y": 2048,
@@ -5138,15 +2985,6 @@
       "EntityIndex": 86,
       "TargetType": 27
     },
-    {
-      "X": 19968,
-      "Y": 4096,
-      "Z": 21504,
-      "Room": 123,
-      "Angle": 0,
-      "EntityIndex": 87,
-      "TargetType": 26
-    },
     {
       "X": 19968,
       "Y": 4096,
@@ -5156,15 +2994,6 @@
       "EntityIndex": 87,
       "TargetType": 27
     },
-    {
-      "X": 31232,
-      "Y": 0,
-      "Z": 16384,
-      "Room": 115,
-      "Angle": 0,
-      "EntityIndex": 88,
-      "TargetType": 26
-    },
     {
       "X": 31232,
       "Y": 0,
@@ -5174,15 +3003,6 @@
       "EntityIndex": 88,
       "TargetType": 27
     },
-    {
-      "X": 25599,
-      "Y": 9728,
-      "Z": 28160,
-      "Room": 128,
-      "Angle": -16384,
-      "EntityIndex": 89,
-      "TargetType": 26
-    },
     {
       "X": 25599,
       "Y": 9728,
@@ -5192,14 +3012,6 @@
       "EntityIndex": 89,
       "TargetType": 27
     },
-    {
-      "X": 16383,
-      "Y": 5888,
-      "Z": 94720,
-      "Room": 132,
-      "EntityIndex": 99,
-      "TargetType": 26
-    },
     {
       "X": 16383,
       "Y": 5888,
@@ -5208,14 +3020,6 @@
       "EntityIndex": 99,
       "TargetType": 27
     },
-    {
-      "X": 16383,
-      "Y": 5888,
-      "Z": 95744,
-      "Room": 132,
-      "EntityIndex": 100,
-      "TargetType": 26
-    },
     {
       "X": 16383,
       "Y": 5888,
@@ -5300,14 +3104,6 @@
     }
   ],
   "CATACOMB.TR2": [
-    {
-      "X": 19455,
-      "Y": 1024,
-      "Z": 42496,
-      "Room": 1,
-      "EntityIndex": 10,
-      "TargetType": 26
-    },
     {
       "X": 19455,
       "Y": 1024,
@@ -5316,14 +3112,6 @@
       "EntityIndex": 10,
       "TargetType": 27
     },
-    {
-      "X": 22527,
-      "Y": 4096,
-      "Z": 37376,
-      "Room": 98,
-      "EntityIndex": 14,
-      "TargetType": 26
-    },
     {
       "X": 22527,
       "Y": 4096,
@@ -5332,14 +3120,6 @@
       "EntityIndex": 14,
       "TargetType": 27
     },
-    {
-      "X": 22527,
-      "Y": 3840,
-      "Z": 38400,
-      "Room": 98,
-      "EntityIndex": 15,
-      "TargetType": 26
-    },
     {
       "X": 22527,
       "Y": 3840,
@@ -5348,15 +3128,6 @@
       "EntityIndex": 15,
       "TargetType": 27
     },
-    {
-      "X": 49151,
-      "Y": 7168,
-      "Z": 62976,
-      "Room": 8,
-      "Angle": -16384,
-      "EntityIndex": 22,
-      "TargetType": 26
-    },
     {
       "X": 49151,
       "Y": 7168,
@@ -5366,14 +3137,6 @@
       "EntityIndex": 22,
       "TargetType": 27
     },
-    {
-      "X": 37887,
-      "Y": 7168,
-      "Z": 61952,
-      "Room": 8,
-      "EntityIndex": 23,
-      "TargetType": 26
-    },
     {
       "X": 37887,
       "Y": 7168,
@@ -5382,15 +3145,6 @@
       "EntityIndex": 23,
       "TargetType": 27
     },
-    {
-      "X": 49151,
-      "Y": 7168,
-      "Z": 64000,
-      "Room": 8,
-      "Angle": -16384,
-      "EntityIndex": 25,
-      "TargetType": 26
-    },
     {
       "X": 49151,
       "Y": 7168,
@@ -5400,14 +3154,6 @@
       "EntityIndex": 25,
       "TargetType": 27
     },
-    {
-      "X": 43007,
-      "Y": 10496,
-      "Z": 49664,
-      "Room": 34,
-      "EntityIndex": 26,
-      "TargetType": 26
-    },
     {
       "X": 43007,
       "Y": 10496,
@@ -5416,14 +3162,6 @@
       "EntityIndex": 26,
       "TargetType": 27
     },
-    {
-      "X": 43007,
-      "Y": 10496,
-      "Z": 50688,
-      "Room": 34,
-      "EntityIndex": 27,
-      "TargetType": 26
-    },
     {
       "X": 43007,
       "Y": 10496,
@@ -5432,15 +3170,6 @@
       "EntityIndex": 27,
       "TargetType": 27
     },
-    {
-      "X": 48640,
-      "Y": 8192,
-      "Z": 60416,
-      "Room": 79,
-      "Angle": -32768,
-      "EntityIndex": 42,
-      "TargetType": 26
-    },
     {
       "X": 48640,
       "Y": 8192,
@@ -5450,15 +3179,6 @@
       "EntityIndex": 42,
       "TargetType": 27
     },
-    {
-      "X": 53760,
-      "Y": 8192,
-      "Z": 60416,
-      "Room": 11,
-      "Angle": -32768,
-      "EntityIndex": 43,
-      "TargetType": 26
-    },
     {
       "X": 53760,
       "Y": 8192,
@@ -5468,15 +3188,6 @@
       "EntityIndex": 43,
       "TargetType": 27
     },
-    {
-      "X": 36352,
-      "Y": 6400,
-      "Z": 46080,
-      "Room": 18,
-      "Angle": 0,
-      "EntityIndex": 53,
-      "TargetType": 26
-    },
     {
       "X": 36352,
       "Y": 6400,
@@ -5486,15 +3197,6 @@
       "EntityIndex": 53,
       "TargetType": 27
     },
-    {
-      "X": 33280,
-      "Y": 6400,
-      "Z": 46080,
-      "Room": 18,
-      "Angle": 0,
-      "EntityIndex": 54,
-      "TargetType": 26
-    },
     {
       "X": 33280,
       "Y": 6400,
@@ -5504,15 +3206,6 @@
       "EntityIndex": 54,
       "TargetType": 27
     },
-    {
-      "X": 9728,
-      "Y": 4608,
-      "Z": 63488,
-      "Room": 22,
-      "Angle": 0,
-      "EntityIndex": 61,
-      "TargetType": 26
-    },
     {
       "X": 9728,
       "Y": 4608,
@@ -5522,15 +3215,6 @@
       "EntityIndex": 61,
       "TargetType": 27
     },
-    {
-      "X": 22528,
-      "Y": 7168,
-      "Z": 62976,
-      "Room": 28,
-      "Angle": -16384,
-      "EntityIndex": 62,
-      "TargetType": 26
-    },
     {
       "X": 22528,
       "Y": 7168,
@@ -5540,15 +3224,6 @@
       "EntityIndex": 62,
       "TargetType": 27
     },
-    {
-      "X": 15360,
-      "Y": 2560,
-      "Z": 47616,
-      "Room": 23,
-      "Angle": -16384,
-      "EntityIndex": 66,
-      "TargetType": 26
-    },
     {
       "X": 15360,
       "Y": 2560,
@@ -5558,14 +3233,6 @@
       "EntityIndex": 66,
       "TargetType": 27
     },
-    {
-      "X": 18431,
-      "Y": 4864,
-      "Z": 55808,
-      "Room": 29,
-      "EntityIndex": 67,
-      "TargetType": 26
-    },
     {
       "X": 18431,
       "Y": 4864,
@@ -5574,15 +3241,6 @@
       "EntityIndex": 67,
       "TargetType": 27
     },
-    {
-      "X": 23551,
-      "Y": 7168,
-      "Z": 57856,
-      "Room": 29,
-      "Angle": -16384,
-      "EntityIndex": 68,
-      "TargetType": 26
-    },
     {
       "X": 23551,
       "Y": 7168,
@@ -5592,15 +3250,6 @@
       "EntityIndex": 68,
       "TargetType": 27
     },
-    {
-      "X": 20992,
-      "Y": 6656,
-      "Z": 51200,
-      "Room": 60,
-      "Angle": -32768,
-      "EntityIndex": 69,
-      "TargetType": 26
-    },
     {
       "X": 20992,
       "Y": 6656,
@@ -5610,15 +3259,6 @@
       "EntityIndex": 69,
       "TargetType": 27
     },
-    {
-      "X": 22016,
-      "Y": 6656,
-      "Z": 51200,
-      "Room": 60,
-      "Angle": -32768,
-      "EntityIndex": 70,
-      "TargetType": 26
-    },
     {
       "X": 22016,
       "Y": 6656,
@@ -5628,15 +3268,6 @@
       "EntityIndex": 70,
       "TargetType": 27
     },
-    {
-      "X": 36352,
-      "Y": 7168,
-      "Z": 61440,
-      "Room": 71,
-      "Angle": 0,
-      "EntityIndex": 102,
-      "TargetType": 26
-    },
     {
       "X": 36352,
       "Y": 7168,
@@ -5646,15 +3277,6 @@
       "EntityIndex": 102,
       "TargetType": 27
     },
-    {
-      "X": 41983,
-      "Y": 6912,
-      "Z": 53760,
-      "Room": 62,
-      "Angle": -16384,
-      "EntityIndex": 103,
-      "TargetType": 26
-    },
     {
       "X": 41983,
       "Y": 6912,
@@ -5664,15 +3286,6 @@
       "EntityIndex": 103,
       "TargetType": 27
     },
-    {
-      "X": 33280,
-      "Y": 4608,
-      "Z": 61440,
-      "Room": 39,
-      "Angle": -32768,
-      "EntityIndex": 105,
-      "TargetType": 26
-    },
     {
       "X": 33280,
       "Y": 4608,
@@ -5682,15 +3295,6 @@
       "EntityIndex": 105,
       "TargetType": 27
     },
-    {
-      "X": 33280,
-      "Y": 7168,
-      "Z": 69632,
-      "Room": 70,
-      "Angle": -32768,
-      "EntityIndex": 120,
-      "TargetType": 26
-    },
     {
       "X": 33280,
       "Y": 7168,
@@ -5700,15 +3304,6 @@
       "EntityIndex": 120,
       "TargetType": 27
     },
-    {
-      "X": 34304,
-      "Y": 7168,
-      "Z": 69632,
-      "Room": 70,
-      "Angle": -32768,
-      "EntityIndex": 121,
-      "TargetType": 26
-    },
     {
       "X": 34304,
       "Y": 7168,
@@ -5718,15 +3313,6 @@
       "EntityIndex": 121,
       "TargetType": 27
     },
-    {
-      "X": 35328,
-      "Y": 7168,
-      "Z": 69632,
-      "Room": 70,
-      "Angle": -32768,
-      "EntityIndex": 122,
-      "TargetType": 26
-    },
     {
       "X": 35328,
       "Y": 7168,
@@ -5736,15 +3322,6 @@
       "EntityIndex": 122,
       "TargetType": 27
     },
-    {
-      "X": 17407,
-      "Y": 2560,
-      "Z": 41472,
-      "Room": 74,
-      "Angle": -16384,
-      "EntityIndex": 127,
-      "TargetType": 26
-    },
     {
       "X": 17407,
       "Y": 2560,
@@ -5754,15 +3331,6 @@
       "EntityIndex": 127,
       "TargetType": 27
     },
-    {
-      "X": 15872,
-      "Y": 4352,
-      "Z": 59392,
-      "Room": 82,
-      "Angle": -32768,
-      "EntityIndex": 135,
-      "TargetType": 26
-    },
     {
       "X": 15872,
       "Y": 4352,
@@ -5772,15 +3340,6 @@
       "EntityIndex": 135,
       "TargetType": 27
     },
-    {
-      "X": 36863,
-      "Y": 4352,
-      "Z": 40448,
-      "Room": 98,
-      "Angle": -16384,
-      "EntityIndex": 144,
-      "TargetType": 26
-    },
     {
       "X": 36863,
       "Y": 4352,
@@ -5790,15 +3349,6 @@
       "EntityIndex": 144,
       "TargetType": 27
     },
-    {
-      "X": 36863,
-      "Y": 4096,
-      "Z": 39424,
-      "Room": 98,
-      "Angle": -16384,
-      "EntityIndex": 145,
-      "TargetType": 26
-    },
     {
       "X": 36863,
       "Y": 4096,
@@ -5808,15 +3358,6 @@
       "EntityIndex": 145,
       "TargetType": 27
     },
-    {
-      "X": 28160,
-      "Y": 7168,
-      "Z": 46080,
-      "Room": 108,
-      "Angle": 0,
-      "EntityIndex": 149,
-      "TargetType": 26
-    },
     {
       "X": 28160,
       "Y": 7168,
@@ -5826,15 +3367,6 @@
       "EntityIndex": 149,
       "TargetType": 27
     },
-    {
-      "X": 29184,
-      "Y": 6912,
-      "Z": 46080,
-      "Room": 108,
-      "Angle": 0,
-      "EntityIndex": 150,
-      "TargetType": 26
-    },
     {
       "X": 29184,
       "Y": 6912,
@@ -5844,15 +3376,6 @@
       "EntityIndex": 150,
       "TargetType": 27
     },
-    {
-      "X": 30719,
-      "Y": 7168,
-      "Z": 49664,
-      "Room": 108,
-      "Angle": -16384,
-      "EntityIndex": 151,
-      "TargetType": 26
-    },
     {
       "X": 30719,
       "Y": 7168,
@@ -5862,15 +3385,6 @@
       "EntityIndex": 151,
       "TargetType": 27
     },
-    {
-      "X": 30719,
-      "Y": 7168,
-      "Z": 48640,
-      "Room": 108,
-      "Angle": -16384,
-      "EntityIndex": 154,
-      "TargetType": 26
-    },
     {
       "X": 30719,
       "Y": 7168,
@@ -5898,14 +3412,6 @@
     }
   ],
   "ICECAVE.TR2": [
-    {
-      "X": 28671,
-      "Y": 4864,
-      "Z": 58880,
-      "Room": 22,
-      "EntityIndex": 20,
-      "TargetType": 26
-    },
     {
       "X": 28671,
       "Y": 4864,
@@ -5914,15 +3420,6 @@
       "EntityIndex": 20,
       "TargetType": 27
     },
-    {
-      "X": 33791,
-      "Y": 7168,
-      "Z": 61952,
-      "Room": 22,
-      "Angle": -16384,
-      "EntityIndex": 21,
-      "TargetType": 26
-    },
     {
       "X": 33791,
       "Y": 7168,
@@ -5932,15 +3429,6 @@
       "EntityIndex": 21,
       "TargetType": 27
     },
-    {
-      "X": 32256,
-      "Y": 6144,
-      "Z": 24576,
-      "Room": 11,
-      "Angle": 0,
-      "EntityIndex": 24,
-      "TargetType": 26
-    },
     {
       "X": 32256,
       "Y": 6144,
@@ -5950,14 +3438,6 @@
       "EntityIndex": 24,
       "TargetType": 27
     },
-    {
-      "X": 30719,
-      "Y": 8192,
-      "Z": 42496,
-      "Room": 25,
-      "EntityIndex": 25,
-      "TargetType": 26
-    },
     {
       "X": 30719,
       "Y": 8192,
@@ -5966,14 +3446,6 @@
       "EntityIndex": 25,
       "TargetType": 27
     },
-    {
-      "X": 28671,
-      "Y": 7168,
-      "Z": 38400,
-      "Room": 25,
-      "EntityIndex": 26,
-      "TargetType": 26
-    },
     {
       "X": 28671,
       "Y": 7168,
@@ -5982,14 +3454,6 @@
       "EntityIndex": 26,
       "TargetType": 27
     },
-    {
-      "X": 28671,
-      "Y": 7168,
-      "Z": 37376,
-      "Room": 25,
-      "EntityIndex": 27,
-      "TargetType": 26
-    },
     {
       "X": 28671,
       "Y": 7168,
@@ -5998,15 +3462,6 @@
       "EntityIndex": 27,
       "TargetType": 27
     },
-    {
-      "X": 62976,
-      "Y": 5888,
-      "Z": 76800,
-      "Room": 40,
-      "Angle": -32768,
-      "EntityIndex": 31,
-      "TargetType": 26
-    },
     {
       "X": 62976,
       "Y": 5888,
@@ -6016,15 +3471,6 @@
       "EntityIndex": 31,
       "TargetType": 27
     },
-    {
-      "X": 64000,
-      "Y": 5888,
-      "Z": 76800,
-      "Room": 40,
-      "Angle": -32768,
-      "EntityIndex": 32,
-      "TargetType": 26
-    },
     {
       "X": 64000,
       "Y": 5888,
@@ -6034,15 +3480,6 @@
       "EntityIndex": 32,
       "TargetType": 27
     },
-    {
-      "X": 65024,
-      "Y": 5888,
-      "Z": 76800,
-      "Room": 40,
-      "Angle": -32768,
-      "EntityIndex": 33,
-      "TargetType": 26
-    },
     {
       "X": 65024,
       "Y": 5888,
@@ -6052,15 +3489,6 @@
       "EntityIndex": 33,
       "TargetType": 27
     },
-    {
-      "X": 52223,
-      "Y": 6912,
-      "Z": 56832,
-      "Room": 64,
-      "Angle": -16384,
-      "EntityIndex": 55,
-      "TargetType": 26
-    },
     {
       "X": 52223,
       "Y": 6912,
@@ -6070,15 +3498,6 @@
       "EntityIndex": 55,
       "TargetType": 27
     },
-    {
-      "X": 33280,
-      "Y": 5376,
-      "Z": 24576,
-      "Room": 11,
-      "Angle": 0,
-      "EntityIndex": 70,
-      "TargetType": 26
-    },
     {
       "X": 33280,
       "Y": 5376,
@@ -6088,14 +3507,6 @@
       "EntityIndex": 70,
       "TargetType": 27
     },
-    {
-      "X": 28671,
-      "Y": 6144,
-      "Z": 33280,
-      "Room": 25,
-      "EntityIndex": 84,
-      "TargetType": 26
-    },
     {
       "X": 28671,
       "Y": 6144,
@@ -6104,15 +3515,6 @@
       "EntityIndex": 84,
       "TargetType": 27
     },
-    {
-      "X": 38400,
-      "Y": 5120,
-      "Z": 30720,
-      "Room": 61,
-      "Angle": -32768,
-      "EntityIndex": 85,
-      "TargetType": 26
-    },
     {
       "X": 38400,
       "Y": 5120,
@@ -6122,15 +3524,6 @@
       "EntityIndex": 85,
       "TargetType": 27
     },
-    {
-      "X": 44544,
-      "Y": 4096,
-      "Z": 21504,
-      "Room": 73,
-      "Angle": -32768,
-      "EntityIndex": 116,
-      "TargetType": 26
-    },
     {
       "X": 44544,
       "Y": 4096,
@@ -6140,15 +3533,6 @@
       "EntityIndex": 116,
       "TargetType": 27
     },
-    {
-      "X": 73216,
-      "Y": 2048,
-      "Z": 67584,
-      "Room": 72,
-      "Angle": 0,
-      "EntityIndex": 119,
-      "TargetType": 26
-    },
     {
       "X": 73216,
       "Y": 2048,
@@ -6158,15 +3542,6 @@
       "EntityIndex": 119,
       "TargetType": 27
     },
-    {
-      "X": 58367,
-      "Y": 2304,
-      "Z": 59904,
-      "Room": 90,
-      "Angle": -16384,
-      "EntityIndex": 126,
-      "TargetType": 26
-    },
     {
       "X": 58367,
       "Y": 2304,
@@ -6176,15 +3551,6 @@
       "EntityIndex": 126,
       "TargetType": 27
     },
-    {
-      "X": 72659,
-      "Y": -2048,
-      "Z": 65024,
-      "Room": 98,
-      "Angle": -16384,
-      "EntityIndex": 132,
-      "TargetType": 26
-    },
     {
       "X": 72659,
       "Y": -2048,
@@ -6194,15 +3560,6 @@
       "EntityIndex": 132,
       "TargetType": 27
     },
-    {
-      "X": 64511,
-      "Y": -256,
-      "Z": 62976,
-      "Room": 100,
-      "Angle": -16384,
-      "EntityIndex": 134,
-      "TargetType": 26
-    },
     {
       "X": 64511,
       "Y": -256,
@@ -6212,14 +3569,6 @@
       "EntityIndex": 134,
       "TargetType": 27
     },
-    {
-      "X": 59391,
-      "Y": -1024,
-      "Z": 64000,
-      "Room": 101,
-      "EntityIndex": 135,
-      "TargetType": 26
-    },
     {
       "X": 59391,
       "Y": -1024,
@@ -6228,15 +3577,6 @@
       "EntityIndex": 135,
       "TargetType": 27
     },
-    {
-      "X": 61952,
-      "Y": 0,
-      "Z": 51200,
-      "Room": 100,
-      "Angle": 0,
-      "EntityIndex": 136,
-      "TargetType": 26
-    },
     {
       "X": 61952,
       "Y": 0,
@@ -6246,15 +3586,6 @@
       "EntityIndex": 136,
       "TargetType": 27
     },
-    {
-      "X": 59904,
-      "Y": 0,
-      "Z": 51200,
-      "Room": 100,
-      "Angle": 0,
-      "EntityIndex": 137,
-      "TargetType": 26
-    },
     {
       "X": 59904,
       "Y": 0,
@@ -6282,15 +3613,6 @@
     }
   ],
   "EMPRTOMB.TR2": [
-    {
-      "X": 19968,
-      "Y": 18688,
-      "Z": 30720,
-      "Room": 6,
-      "Angle": -32768,
-      "EntityIndex": 1,
-      "TargetType": 26
-    },
     {
       "X": 19968,
       "Y": 18688,
@@ -6300,14 +3622,6 @@
       "EntityIndex": 1,
       "TargetType": 27
     },
-    {
-      "X": 14335,
-      "Y": 18944,
-      "Z": 24064,
-      "Room": 6,
-      "EntityIndex": 5,
-      "TargetType": 26
-    },
     {
       "X": 14335,
       "Y": 18944,
@@ -6316,15 +3630,6 @@
       "EntityIndex": 5,
       "TargetType": 27
     },
-    {
-      "X": 24255,
-      "Y": 11008,
-      "Z": 51712,
-      "Room": 8,
-      "Angle": -16384,
-      "EntityIndex": 7,
-      "TargetType": 26
-    },
     {
       "X": 24255,
       "Y": 11008,
@@ -6334,15 +3639,6 @@
       "EntityIndex": 7,
       "TargetType": 27
     },
-    {
-      "X": 43520,
-      "Y": 20480,
-      "Z": 51200,
-      "Room": 14,
-      "Angle": -32768,
-      "EntityIndex": 11,
-      "TargetType": 26
-    },
     {
       "X": 43520,
       "Y": 20480,
@@ -6352,15 +3648,6 @@
       "EntityIndex": 11,
       "TargetType": 27
     },
-    {
-      "X": 43520,
-      "Y": 20480,
-      "Z": 38912,
-      "Room": 14,
-      "Angle": 0,
-      "EntityIndex": 12,
-      "TargetType": 26
-    },
     {
       "X": 43520,
       "Y": 20480,
@@ -6370,14 +3657,6 @@
       "EntityIndex": 12,
       "TargetType": 27
     },
-    {
-      "X": 19455,
-      "Y": 24320,
-      "Z": 45568,
-      "Room": 13,
-      "EntityIndex": 19,
-      "TargetType": 26
-    },
     {
       "X": 19455,
       "Y": 24320,
@@ -6386,15 +3665,6 @@
       "EntityIndex": 19,
       "TargetType": 27
     },
-    {
-      "X": 21503,
-      "Y": 20992,
-      "Z": 34304,
-      "Room": 22,
-      "Angle": -16384,
-      "EntityIndex": 29,
-      "TargetType": 26
-    },
     {
       "X": 21503,
       "Y": 20992,
@@ -6404,15 +3674,6 @@
       "EntityIndex": 29,
       "TargetType": 27
     },
-    {
-      "X": 21503,
-      "Y": 19968,
-      "Z": 34304,
-      "Room": 22,
-      "Angle": -16384,
-      "EntityIndex": 32,
-      "TargetType": 26
-    },
     {
       "X": 21503,
       "Y": 19968,
@@ -6422,15 +3683,6 @@
       "EntityIndex": 32,
       "TargetType": 27
     },
-    {
-      "X": 25088,
-      "Y": -3328,
-      "Z": 67584,
-      "Room": 90,
-      "Angle": -32768,
-      "EntityIndex": 48,
-      "TargetType": 26
-    },
     {
       "X": 25088,
       "Y": -3328,
@@ -6440,15 +3692,6 @@
       "EntityIndex": 48,
       "TargetType": 27
     },
-    {
-      "X": 49664,
-      "Y": 13824,
-      "Z": 11264,
-      "Room": 62,
-      "Angle": 0,
-      "EntityIndex": 50,
-      "TargetType": 26
-    },
     {
       "X": 49664,
       "Y": 13824,
@@ -6458,15 +3701,6 @@
       "EntityIndex": 50,
       "TargetType": 27
     },
-    {
-      "X": 47616,
-      "Y": 13824,
-      "Z": 11264,
-      "Room": 62,
-      "Angle": 0,
-      "EntityIndex": 51,
-      "TargetType": 26
-    },
     {
       "X": 47616,
       "Y": 13824,
@@ -6476,14 +3710,6 @@
       "EntityIndex": 51,
       "TargetType": 27
     },
-    {
-      "X": 45055,
-      "Y": 12288,
-      "Z": 31232,
-      "Room": 122,
-      "EntityIndex": 56,
-      "TargetType": 26
-    },
     {
       "X": 45055,
       "Y": 12288,
@@ -6492,15 +3718,6 @@
       "EntityIndex": 56,
       "TargetType": 27
     },
-    {
-      "X": 42496,
-      "Y": 18176,
-      "Z": 49152,
-      "Room": 38,
-      "Angle": -32768,
-      "EntityIndex": 60,
-      "TargetType": 26
-    },
     {
       "X": 42496,
       "Y": 18176,
@@ -6510,15 +3727,6 @@
       "EntityIndex": 60,
       "TargetType": 27
     },
-    {
-      "X": 25599,
-      "Y": 25600,
-      "Z": 42496,
-      "Room": 13,
-      "Angle": -16384,
-      "EntityIndex": 61,
-      "TargetType": 26
-    },
     {
       "X": 25599,
       "Y": 25600,
@@ -6528,15 +3736,6 @@
       "EntityIndex": 61,
       "TargetType": 27
     },
-    {
-      "X": 25599,
-      "Y": 26112,
-      "Z": 45568,
-      "Room": 13,
-      "Angle": -16384,
-      "EntityIndex": 62,
-      "TargetType": 26
-    },
     {
       "X": 25599,
       "Y": 26112,
@@ -6546,15 +3745,6 @@
       "EntityIndex": 62,
       "TargetType": 27
     },
-    {
-      "X": 73216,
-      "Y": 24320,
-      "Z": 34816,
-      "Room": 83,
-      "Angle": 0,
-      "EntityIndex": 92,
-      "TargetType": 26
-    },
     {
       "X": 73216,
       "Y": 24320,
@@ -6564,15 +3754,6 @@
       "EntityIndex": 92,
       "TargetType": 27
     },
-    {
-      "X": 62463,
-      "Y": 17664,
-      "Z": 45568,
-      "Room": 66,
-      "Angle": -16384,
-      "EntityIndex": 106,
-      "TargetType": 26
-    },
     {
       "X": 62463,
       "Y": 17664,
@@ -6582,15 +3763,6 @@
       "EntityIndex": 106,
       "TargetType": 27
     },
-    {
-      "X": 62463,
-      "Y": 17664,
-      "Z": 44544,
-      "Room": 66,
-      "Angle": -16384,
-      "EntityIndex": 111,
-      "TargetType": 26
-    },
     {
       "X": 62463,
       "Y": 17664,
@@ -6600,15 +3772,6 @@
       "EntityIndex": 111,
       "TargetType": 27
     },
-    {
-      "X": 69631,
-      "Y": 14848,
-      "Z": 53760,
-      "Room": 80,
-      "Angle": -16384,
-      "EntityIndex": 122,
-      "TargetType": 26
-    },
     {
       "X": 69631,
       "Y": 14848,
@@ -6618,14 +3781,6 @@
       "EntityIndex": 122,
       "TargetType": 27
     },
-    {
-      "X": 74751,
-      "Y": 29440,
-      "Z": 44544,
-      "Room": 101,
-      "EntityIndex": 172,
-      "TargetType": 26
-    },
     {
       "X": 74751,
       "Y": 29440,
@@ -6634,14 +3789,6 @@
       "EntityIndex": 172,
       "TargetType": 27
     },
-    {
-      "X": 34815,
-      "Y": 17152,
-      "Z": 53760,
-      "Room": 104,
-      "EntityIndex": 173,
-      "TargetType": 26
-    },
     {
       "X": 34815,
       "Y": 17152,
@@ -6650,14 +3797,6 @@
       "EntityIndex": 173,
       "TargetType": 27
     },
-    {
-      "X": 34815,
-      "Y": 17152,
-      "Z": 51712,
-      "Room": 104,
-      "EntityIndex": 174,
-      "TargetType": 26
-    },
     {
       "X": 34815,
       "Y": 17152,
@@ -6666,15 +3805,6 @@
       "EntityIndex": 174,
       "TargetType": 27
     },
-    {
-      "X": 48640,
-      "Y": 15616,
-      "Z": 41984,
-      "Room": 143,
-      "Angle": -32768,
-      "EntityIndex": 207,
-      "TargetType": 26
-    },
     {
       "X": 48640,
       "Y": 15616,
@@ -6684,15 +3814,6 @@
       "EntityIndex": 207,
       "TargetType": 27
     },
-    {
-      "X": 15359,
-      "Y": 19968,
-      "Z": 7680,
-      "Room": 155,
-      "Angle": -16384,
-      "EntityIndex": 214,
-      "TargetType": 26
-    },
     {
       "X": 15359,
       "Y": 19968,
@@ -6702,15 +3823,6 @@
       "EntityIndex": 214,
       "TargetType": 27
     },
-    {
-      "X": 15872,
-      "Y": 16384,
-      "Z": 13312,
-      "Room": 148,
-      "Angle": -32768,
-      "EntityIndex": 215,
-      "TargetType": 26
-    },
     {
       "X": 15872,
       "Y": 16384,
@@ -6720,15 +3832,6 @@
       "EntityIndex": 215,
       "TargetType": 27
     },
-    {
-      "X": 18944,
-      "Y": 16384,
-      "Z": 13312,
-      "Room": 148,
-      "Angle": -32768,
-      "EntityIndex": 216,
-      "TargetType": 26
-    },
     {
       "X": 18944,
       "Y": 16384,
@@ -6738,14 +3841,6 @@
       "EntityIndex": 216,
       "TargetType": 27
     },
-    {
-      "X": 51199,
-      "Y": 20736,
-      "Z": 43520,
-      "Room": 41,
-      "EntityIndex": 225,
-      "TargetType": 26
-    },
     {
       "X": 51199,
       "Y": 20736,
@@ -6754,14 +3849,6 @@
       "EntityIndex": 225,
       "TargetType": 27
     },
-    {
-      "X": 51199,
-      "Y": 20736,
-      "Z": 46592,
-      "Room": 41,
-      "EntityIndex": 226,
-      "TargetType": 26
-    },
     {
       "X": 51199,
       "Y": 20736,
@@ -6868,15 +3955,6 @@
     }
   ],
   "FLOATING.TR2": [
-    {
-      "X": 74240,
-      "Y": -4096,
-      "Z": 52224,
-      "Room": 1,
-      "Angle": -32768,
-      "EntityIndex": 2,
-      "TargetType": 26
-    },
     {
       "X": 74240,
       "Y": -4096,
@@ -6886,14 +3964,6 @@
       "EntityIndex": 2,
       "TargetType": 27
     },
-    {
-      "X": 50175,
-      "Y": -8192,
-      "Z": 54784,
-      "Room": 21,
-      "EntityIndex": 17,
-      "TargetType": 26
-    },
     {
       "X": 50175,
       "Y": -8192,
@@ -6902,14 +3972,6 @@
       "EntityIndex": 17,
       "TargetType": 27
     },
-    {
-      "X": 50175,
-      "Y": -8192,
-      "Z": 59904,
-      "Room": 21,
-      "EntityIndex": 18,
-      "TargetType": 26
-    },
     {
       "X": 50175,
       "Y": -8192,
@@ -6918,14 +3980,6 @@
       "EntityIndex": 18,
       "TargetType": 27
     },
-    {
-      "X": 25599,
-      "Y": 1280,
-      "Z": 96768,
-      "Room": 129,
-      "EntityIndex": 25,
-      "TargetType": 26
-    },
     {
       "X": 25599,
       "Y": 1280,
@@ -6934,15 +3988,6 @@
       "EntityIndex": 25,
       "TargetType": 27
     },
-    {
-      "X": 47616,
-      "Y": -3584,
-      "Z": 64512,
-      "Room": 29,
-      "Angle": -32768,
-      "EntityIndex": 33,
-      "TargetType": 26
-    },
     {
       "X": 47616,
       "Y": -3584,
@@ -6952,15 +3997,6 @@
       "EntityIndex": 33,
       "TargetType": 27
     },
-    {
-      "X": 46592,
-      "Y": -3584,
-      "Z": 64512,
-      "Room": 29,
-      "Angle": -32768,
-      "EntityIndex": 34,
-      "TargetType": 26
-    },
     {
       "X": 46592,
       "Y": -3584,
@@ -6970,15 +4006,6 @@
       "EntityIndex": 34,
       "TargetType": 27
     },
-    {
-      "X": 48640,
-      "Y": -3584,
-      "Z": 64512,
-      "Room": 29,
-      "Angle": -32768,
-      "EntityIndex": 35,
-      "TargetType": 26
-    },
     {
       "X": 48640,
       "Y": -3584,
@@ -6988,14 +4015,6 @@
       "EntityIndex": 35,
       "TargetType": 27
     },
-    {
-      "X": 35839,
-      "Y": -8704,
-      "Z": 46592,
-      "Room": 60,
-      "EntityIndex": 43,
-      "TargetType": 26
-    },
     {
       "X": 35839,
       "Y": -8704,
@@ -7004,14 +4023,6 @@
       "EntityIndex": 43,
       "TargetType": 27
     },
-    {
-      "X": 26623,
-      "Y": -2304,
-      "Z": 82432,
-      "Room": 86,
-      "EntityIndex": 70,
-      "TargetType": 26
-    },
     {
       "X": 26623,
       "Y": -2304,
@@ -7020,15 +4031,6 @@
       "EntityIndex": 70,
       "TargetType": 27
     },
-    {
-      "X": 36863,
-      "Y": -2304,
-      "Z": 82432,
-      "Room": 86,
-      "Angle": -16384,
-      "EntityIndex": 71,
-      "TargetType": 26
-    },
     {
       "X": 36863,
       "Y": -2304,
@@ -7038,15 +4040,6 @@
       "EntityIndex": 71,
       "TargetType": 27
     },
-    {
-      "X": 22016,
-      "Y": -7680,
-      "Z": 73728,
-      "Room": 124,
-      "Angle": -32768,
-      "EntityIndex": 75,
-      "TargetType": 26
-    },
     {
       "X": 22016,
       "Y": -7680,
@@ -7056,15 +4049,6 @@
       "EntityIndex": 75,
       "TargetType": 27
     },
-    {
-      "X": 74240,
-      "Y": -5376,
-      "Z": 64512,
-      "Room": 105,
-      "Angle": -32768,
-      "EntityIndex": 85,
-      "TargetType": 26
-    },
     {
       "X": 74240,
       "Y": -5376,
@@ -7074,15 +4058,6 @@
       "EntityIndex": 85,
       "TargetType": 27
     },
-    {
-      "X": 73216,
-      "Y": -5376,
-      "Z": 64512,
-      "Room": 105,
-      "Angle": -32768,
-      "EntityIndex": 87,
-      "TargetType": 26
-    },
     {
       "X": 73216,
       "Y": -5376,
@@ -7092,15 +4067,6 @@
       "EntityIndex": 87,
       "TargetType": 27
     },
-    {
-      "X": 72192,
-      "Y": -5376,
-      "Z": 64512,
-      "Room": 105,
-      "Angle": -32768,
-      "EntityIndex": 88,
-      "TargetType": 26
-    },
     {
       "X": 72192,
       "Y": -5376,
@@ -7110,15 +4076,6 @@
       "EntityIndex": 88,
       "TargetType": 27
     },
-    {
-      "X": 71168,
-      "Y": -5376,
-      "Z": 64512,
-      "Room": 105,
-      "Angle": -32768,
-      "EntityIndex": 86,
-      "TargetType": 26
-    },
     {
       "X": 71168,
       "Y": -5376,
@@ -7135,28 +4092,10 @@
       "Room": 145,
       "Angle": -16384,
       "EntityIndex": 108,
-      "TargetType": 26
+      "TargetType": 27
     },
     {
-      "X": 38911,
-      "Y": 3584,
-      "Z": 81408,
-      "Room": 145,
-      "Angle": -16384,
-      "EntityIndex": 108,
-      "TargetType": 27
-    },
-    {
-      "X": 38400,
-      "Y": 3584,
-      "Z": 82944,
-      "Room": 145,
-      "Angle": 0,
-      "EntityIndex": 110,
-      "TargetType": 26
-    },
-    {
-      "X": 38400,
+      "X": 38400,
       "Y": 3584,
       "Z": 82944,
       "Room": 145,
@@ -7164,15 +4103,6 @@
       "EntityIndex": 110,
       "TargetType": 27
     },
-    {
-      "X": 36352,
-      "Y": 3584,
-      "Z": 75776,
-      "Room": 145,
-      "Angle": 0,
-      "EntityIndex": 111,
-      "TargetType": 26
-    },
     {
       "X": 36352,
       "Y": 3584,
@@ -7182,15 +4112,6 @@
       "EntityIndex": 111,
       "TargetType": 27
     },
-    {
-      "X": 26112,
-      "Y": 3584,
-      "Z": 81920,
-      "Room": 146,
-      "Angle": 0,
-      "EntityIndex": 115,
-      "TargetType": 26
-    },
     {
       "X": 26112,
       "Y": 3584,
@@ -7200,14 +4121,6 @@
       "EntityIndex": 115,
       "TargetType": 27
     },
-    {
-      "X": 25599,
-      "Y": 3584,
-      "Z": 80384,
-      "Room": 146,
-      "EntityIndex": 116,
-      "TargetType": 26
-    },
     {
       "X": 25599,
       "Y": 3584,
@@ -7216,15 +4129,6 @@
       "EntityIndex": 116,
       "TargetType": 27
     },
-    {
-      "X": 31232,
-      "Y": 3328,
-      "Z": 88064,
-      "Room": 147,
-      "Angle": -32768,
-      "EntityIndex": 120,
-      "TargetType": 26
-    },
     {
       "X": 31232,
       "Y": 3328,
@@ -7234,15 +4138,6 @@
       "EntityIndex": 120,
       "TargetType": 27
     },
-    {
-      "X": 33280,
-      "Y": 3328,
-      "Z": 88064,
-      "Room": 147,
-      "Angle": -32768,
-      "EntityIndex": 121,
-      "TargetType": 26
-    },
     {
       "X": 33280,
       "Y": 3328,
@@ -7252,15 +4147,6 @@
       "EntityIndex": 121,
       "TargetType": 27
     },
-    {
-      "X": 32256,
-      "Y": 3584,
-      "Z": 83968,
-      "Room": 147,
-      "Angle": 0,
-      "EntityIndex": 122,
-      "TargetType": 26
-    },
     {
       "X": 32256,
       "Y": 3584,
@@ -7320,15 +4206,6 @@
     }
   ],
   "XIAN.TR2": [
-    {
-      "X": 54784,
-      "Y": -9984,
-      "Z": 72704,
-      "Room": 1,
-      "Angle": -32768,
-      "EntityIndex": 7,
-      "TargetType": 26
-    },
     {
       "X": 54784,
       "Y": -9984,
@@ -7338,15 +4215,6 @@
       "EntityIndex": 7,
       "TargetType": 27
     },
-    {
-      "X": 54784,
-      "Y": -9984,
-      "Z": 59392,
-      "Room": 1,
-      "Angle": 0,
-      "EntityIndex": 8,
-      "TargetType": 26
-    },
     {
       "X": 54784,
       "Y": -9984,
@@ -7356,15 +4224,6 @@
       "EntityIndex": 8,
       "TargetType": 27
     },
-    {
-      "X": 57856,
-      "Y": -9984,
-      "Z": 59392,
-      "Room": 1,
-      "Angle": 0,
-      "EntityIndex": 9,
-      "TargetType": 26
-    },
     {
       "X": 57856,
       "Y": -9984,
@@ -7374,15 +4233,6 @@
       "EntityIndex": 9,
       "TargetType": 27
     },
-    {
-      "X": 57856,
-      "Y": -9984,
-      "Z": 72704,
-      "Room": 1,
-      "Angle": -32768,
-      "EntityIndex": 10,
-      "TargetType": 26
-    },
     {
       "X": 57856,
       "Y": -9984,
@@ -7392,15 +4242,6 @@
       "EntityIndex": 10,
       "TargetType": 27
     },
-    {
-      "X": 65024,
-      "Y": -9984,
-      "Z": 72704,
-      "Room": 1,
-      "Angle": -32768,
-      "EntityIndex": 11,
-      "TargetType": 26
-    },
     {
       "X": 65024,
       "Y": -9984,
@@ -7410,15 +4251,6 @@
       "EntityIndex": 11,
       "TargetType": 27
     },
-    {
-      "X": 65024,
-      "Y": -9984,
-      "Z": 59392,
-      "Room": 1,
-      "Angle": 0,
-      "EntityIndex": 12,
-      "TargetType": 26
-    },
     {
       "X": 65024,
       "Y": -9984,
@@ -7428,15 +4260,6 @@
       "EntityIndex": 12,
       "TargetType": 27
     },
-    {
-      "X": 78847,
-      "Y": -9984,
-      "Z": 70144,
-      "Room": 3,
-      "Angle": -16384,
-      "EntityIndex": 25,
-      "TargetType": 26
-    },
     {
       "X": 78847,
       "Y": -9984,
@@ -7446,15 +4269,6 @@
       "EntityIndex": 25,
       "TargetType": 27
     },
-    {
-      "X": 73216,
-      "Y": -9984,
-      "Z": 64512,
-      "Room": 3,
-      "Angle": 0,
-      "EntityIndex": 26,
-      "TargetType": 26
-    },
     {
       "X": 73216,
       "Y": -9984,
@@ -7464,14 +4278,6 @@
       "EntityIndex": 26,
       "TargetType": 27
     },
-    {
-      "X": 68096,
-      "Y": -9984,
-      "Z": 70144,
-      "Room": 3,
-      "EntityIndex": 27,
-      "TargetType": 26
-    },
     {
       "X": 68096,
       "Y": -9984,
@@ -7487,16 +4293,1578 @@
       "Room": 3,
       "Angle": -32768,
       "EntityIndex": 28,
-      "TargetType": 26
+      "TargetType": 27
+    }
+  ],
+  "LEVEL1.TR2": [
+    {
+      "X": 46592,
+      "Y": -17256,
+      "Z": 40960,
+      "Room": 0,
+      "Angle": 0,
+      "EntityIndex": 4,
+      "TargetType": 27
     },
     {
-      "X": 73216,
-      "Y": -9984,
-      "Z": 75264,
+      "X": 51712,
+      "Y": -13952,
+      "Z": 54784,
+      "Room": 2,
+      "Angle": 0,
+      "EntityIndex": 5,
+      "TargetType": 27
+    },
+    {
+      "X": 51712,
+      "Y": -13952,
+      "Z": 52736,
+      "Room": 2,
+      "Angle": -32768,
+      "EntityIndex": 7,
+      "TargetType": 27
+    },
+    {
+      "X": 76288,
+      "Y": -3328,
+      "Z": 72192,
       "Room": 3,
+      "Angle": 0,
+      "EntityIndex": 13,
+      "TargetType": 27
+    },
+    {
+      "X": 65024,
+      "Y": -4625,
+      "Z": 65598,
+      "Room": 4,
+      "Angle": 0,
+      "EntityIndex": 15,
+      "TargetType": 27
+    },
+    {
+      "X": 38400,
+      "Y": -18176,
+      "Z": 38400,
+      "Room": 5,
+      "Angle": -16384,
+      "EntityIndex": 20,
+      "TargetType": 27
+    },
+    {
+      "X": 38400,
+      "Y": -15366,
+      "Z": 54216,
+      "Room": 10,
       "Angle": -32768,
+      "EntityIndex": 27,
+      "TargetType": 27
+    },
+    {
+      "X": 37376,
+      "Y": -14336,
+      "Z": 56832,
+      "Room": 10,
+      "Angle": -16384,
       "EntityIndex": 28,
       "TargetType": 27
+    },
+    {
+      "X": 32256,
+      "Y": -15582,
+      "Z": 61384,
+      "Room": 10,
+      "Angle": -32768,
+      "EntityIndex": 29,
+      "TargetType": 27
+    },
+    {
+      "X": 35328,
+      "Y": -15582,
+      "Z": 61384,
+      "Room": 10,
+      "Angle": -32768,
+      "EntityIndex": 35,
+      "TargetType": 27
+    },
+    {
+      "X": 35328,
+      "Y": -11241,
+      "Z": 59392,
+      "Room": 12,
+      "Angle": -32768,
+      "EntityIndex": 37,
+      "TargetType": 27
+    },
+    {
+      "X": 34304,
+      "Y": -11802,
+      "Z": 41984,
+      "Room": 13,
+      "Angle": 0,
+      "EntityIndex": 38,
+      "TargetType": 27
+    },
+    {
+      "X": 34304,
+      "Y": -5932,
+      "Z": 46102,
+      "Room": 14,
+      "Angle": 0,
+      "EntityIndex": 41,
+      "TargetType": 27
+    },
+    {
+      "X": 66048,
+      "Y": -3072,
+      "Z": 58880,
+      "Room": 21,
+      "Angle": -32768,
+      "EntityIndex": 54,
+      "TargetType": 27
+    },
+    {
+      "X": 24064,
+      "Y": -15936,
+      "Z": 44073,
+      "Room": 57,
+      "Angle": 0,
+      "EntityIndex": 63,
+      "TargetType": 27
+    },
+    {
+      "X": 76288,
+      "Y": -3638,
+      "Z": 65510,
+      "Room": 33,
+      "Angle": -32768,
+      "EntityIndex": 83,
+      "TargetType": 27
+    },
+    {
+      "X": 34304,
+      "Y": -11802,
+      "Z": 38926,
+      "Room": 43,
+      "Angle": 0,
+      "EntityIndex": 96,
+      "TargetType": 27
+    },
+    {
+      "X": 28160,
+      "Y": -18308,
+      "Z": 62496,
+      "Room": 44,
+      "Angle": 0,
+      "EntityIndex": 98,
+      "TargetType": 27
+    },
+    {
+      "X": 19968,
+      "Y": -18308,
+      "Z": 62496,
+      "Room": 44,
+      "Angle": 0,
+      "EntityIndex": 100,
+      "TargetType": 27
+    },
+    {
+      "X": 48640,
+      "Y": -20206,
+      "Z": 23040,
+      "Room": 50,
+      "Angle": -16384,
+      "EntityIndex": 109,
+      "TargetType": 27
+    },
+    {
+      "X": 50688,
+      "Y": -20206,
+      "Z": 27136,
+      "Room": 51,
+      "Angle": -16384,
+      "EntityIndex": 112,
+      "TargetType": 27
+    },
+    {
+      "X": 39600,
+      "Y": -17974,
+      "Z": 53296,
+      "Room": 63,
+      "Angle": 0,
+      "EntityIndex": 123,
+      "TargetType": 27
+    },
+    {
+      "X": 40448,
+      "Y": -19127,
+      "Z": 36827,
+      "Room": 64,
+      "Angle": -32768,
+      "EntityIndex": 129,
+      "TargetType": 27
+    },
+    {
+      "X": 41959,
+      "Y": -19360,
+      "Z": 31232,
+      "Room": 69,
+      "Angle": -16384,
+      "EntityIndex": 134,
+      "TargetType": 27
+    },
+    {
+      "X": 22016,
+      "Y": -12032,
+      "Z": 14848,
+      "Room": 80,
+      "EntityIndex": 153,
+      "TargetType": 27
+    },
+    {
+      "X": 26112,
+      "Y": -3733,
+      "Z": 19968,
+      "Room": 81,
+      "Angle": 0,
+      "EntityIndex": 165,
+      "TargetType": 27
+    },
+    {
+      "X": 28160,
+      "Y": -4863,
+      "Z": 15872,
+      "Room": 81,
+      "Angle": 0,
+      "EntityIndex": 166,
+      "TargetType": 27
+    },
+    {
+      "X": 28160,
+      "Y": -3682,
+      "Z": 25088,
+      "Room": 81,
+      "Angle": -32768,
+      "EntityIndex": 167,
+      "TargetType": 27
+    },
+    {
+      "X": 16896,
+      "Y": -5014,
+      "Z": 27586,
+      "Room": 81,
+      "Angle": -32768,
+      "EntityIndex": 168,
+      "TargetType": 27
+    },
+    {
+      "X": 17920,
+      "Y": -5014,
+      "Z": 26602,
+      "Room": 81,
+      "Angle": -32768,
+      "EntityIndex": 169,
+      "TargetType": 27
+    },
+    {
+      "X": 18944,
+      "Y": -5014,
+      "Z": 27600,
+      "Room": 81,
+      "Angle": -32768,
+      "EntityIndex": 170,
+      "TargetType": 27
+    },
+    {
+      "X": 66048,
+      "Y": -7936,
+      "Z": 47616,
+      "Room": 84,
+      "Angle": -32768,
+      "EntityIndex": 178,
+      "TargetType": 27
+    },
+    {
+      "X": 16896,
+      "Y": -3712,
+      "Z": 28160,
+      "Room": 94,
+      "Angle": -16384,
+      "EntityIndex": 184,
+      "TargetType": 27
+    },
+    {
+      "X": 18390,
+      "Y": -16718,
+      "Z": 57856,
+      "Room": 102,
+      "Angle": -16384,
+      "EntityIndex": 188,
+      "TargetType": 27
+    }
+  ],
+  "LEVEL2.TR2": [
+    {
+      "X": 56832,
+      "Y": -4683,
+      "Z": 37846,
+      "Room": 0,
+      "Angle": -32768,
+      "EntityIndex": 0,
+      "TargetType": 27
+    },
+    {
+      "X": 66048,
+      "Y": -4232,
+      "Z": 50186,
+      "Room": 0,
+      "Angle": -32768,
+      "EntityIndex": 1,
+      "TargetType": 27
+    },
+    {
+      "X": 54268,
+      "Y": -4414,
+      "Z": 42496,
+      "Room": 0,
+      "EntityIndex": 2,
+      "TargetType": 27
+    },
+    {
+      "X": 65024,
+      "Y": -2116,
+      "Z": 36891,
+      "Room": 0,
+      "Angle": 0,
+      "EntityIndex": 4,
+      "TargetType": 27
+    },
+    {
+      "X": 67566,
+      "Y": -2116,
+      "Z": 38400,
+      "Room": 0,
+      "Angle": -16384,
+      "EntityIndex": 5,
+      "TargetType": 27
+    },
+    {
+      "X": 65024,
+      "Y": -920,
+      "Z": 50169,
+      "Room": 4,
+      "Angle": -32768,
+      "EntityIndex": 14,
+      "TargetType": 27
+    },
+    {
+      "X": 54324,
+      "Y": -1150,
+      "Z": 40448,
+      "Room": 5,
+      "EntityIndex": 18,
+      "TargetType": 27
+    },
+    {
+      "X": 48640,
+      "Y": -478,
+      "Z": 41970,
+      "Room": 8,
+      "Angle": -32768,
+      "EntityIndex": 25,
+      "TargetType": 27
+    },
+    {
+      "X": 50202,
+      "Y": -598,
+      "Z": 41472,
+      "Room": 8,
+      "EntityIndex": 27,
+      "TargetType": 27
+    },
+    {
+      "X": 73774,
+      "Y": -242,
+      "Z": 42496,
+      "Room": 12,
+      "EntityIndex": 35,
+      "TargetType": 27
+    },
+    {
+      "X": 75782,
+      "Y": -2836,
+      "Z": 45096,
+      "Room": 13,
+      "Angle": 0,
+      "EntityIndex": 36,
+      "TargetType": 27
+    },
+    {
+      "X": 86528,
+      "Y": 2272,
+      "Z": 24573,
+      "Room": 59,
+      "Angle": -32768,
+      "EntityIndex": 38,
+      "TargetType": 27
+    },
+    {
+      "X": 53304,
+      "Y": -3850,
+      "Z": 40448,
+      "Room": 10,
+      "EntityIndex": 42,
+      "TargetType": 27
+    },
+    {
+      "X": 54310,
+      "Y": -3658,
+      "Z": 36352,
+      "Room": 0,
+      "EntityIndex": 44,
+      "TargetType": 27
+    },
+    {
+      "X": 42496,
+      "Y": -3830,
+      "Z": 30637,
+      "Room": 27,
+      "Angle": 0,
+      "EntityIndex": 48,
+      "TargetType": 27
+    },
+    {
+      "X": 50162,
+      "Y": -3514,
+      "Z": 33280,
+      "Room": 29,
+      "Angle": -16384,
+      "EntityIndex": 50,
+      "TargetType": 27
+    },
+    {
+      "X": 50162,
+      "Y": -3514,
+      "Z": 35328,
+      "Room": 30,
+      "Angle": -16384,
+      "EntityIndex": 56,
+      "TargetType": 27
+    },
+    {
+      "X": 45568,
+      "Y": -1536,
+      "Z": 37860,
+      "Room": 28,
+      "Angle": -32768,
+      "EntityIndex": 57,
+      "TargetType": 27
+    },
+    {
+      "X": 23560,
+      "Y": -1016,
+      "Z": 36352,
+      "Room": 32,
+      "EntityIndex": 58,
+      "TargetType": 27
+    },
+    {
+      "X": 71700,
+      "Y": 1636,
+      "Z": 55808,
+      "Room": 2,
+      "EntityIndex": 61,
+      "TargetType": 27
+    },
+    {
+      "X": 75264,
+      "Y": 1688,
+      "Z": 58336,
+      "Room": 2,
+      "Angle": -32768,
+      "EntityIndex": 62,
+      "TargetType": 27
+    },
+    {
+      "X": 70144,
+      "Y": -2430,
+      "Z": 58348,
+      "Room": 35,
+      "Angle": -32768,
+      "EntityIndex": 66,
+      "TargetType": 27
+    },
+    {
+      "X": 65550,
+      "Y": -2430,
+      "Z": 54784,
+      "Room": 35,
+      "EntityIndex": 67,
+      "TargetType": 27
+    },
+    {
+      "X": 71168,
+      "Y": -2430,
+      "Z": 58348,
+      "Room": 35,
+      "Angle": -32768,
+      "EntityIndex": 68,
+      "TargetType": 27
+    },
+    {
+      "X": 77312,
+      "Y": 2200,
+      "Z": 64498,
+      "Room": 36,
+      "Angle": -32768,
+      "EntityIndex": 70,
+      "TargetType": 27
+    },
+    {
+      "X": 70144,
+      "Y": 2092,
+      "Z": 65520,
+      "Room": 36,
+      "Angle": -32768,
+      "EntityIndex": 71,
+      "TargetType": 27
+    },
+    {
+      "X": 77810,
+      "Y": 2222,
+      "Z": 59904,
+      "Room": 36,
+      "Angle": -16384,
+      "EntityIndex": 73,
+      "TargetType": 27
+    },
+    {
+      "X": 70694,
+      "Y": 437,
+      "Z": 65024,
+      "Room": 39,
+      "EntityIndex": 74,
+      "TargetType": 27
+    },
+    {
+      "X": 73216,
+      "Y": 440,
+      "Z": 58356,
+      "Room": 31,
+      "Angle": -32768,
+      "EntityIndex": 76,
+      "TargetType": 27
+    },
+    {
+      "X": 80384,
+      "Y": 504,
+      "Z": 33820,
+      "Room": 56,
+      "Angle": 0,
+      "EntityIndex": 86,
+      "TargetType": 27
+    },
+    {
+      "X": 53760,
+      "Y": -138,
+      "Z": 54247,
+      "Room": 22,
+      "Angle": -32768,
+      "EntityIndex": 93,
+      "TargetType": 27
+    },
+    {
+      "X": 53760,
+      "Y": -132,
+      "Z": 45103,
+      "Room": 7,
+      "Angle": 0,
+      "EntityIndex": 94,
+      "TargetType": 27
+    },
+    {
+      "X": 94188,
+      "Y": -4732,
+      "Z": 50688,
+      "Room": 47,
+      "Angle": -16384,
+      "EntityIndex": 101,
+      "TargetType": 27
+    },
+    {
+      "X": 94188,
+      "Y": -4732,
+      "Z": 52736,
+      "Room": 47,
+      "Angle": -16384,
+      "EntityIndex": 102,
+      "TargetType": 27
+    },
+    {
+      "X": 78336,
+      "Y": -4732,
+      "Z": 45086,
+      "Room": 47,
+      "Angle": 0,
+      "EntityIndex": 110,
+      "TargetType": 27
+    },
+    {
+      "X": 84480,
+      "Y": -5486,
+      "Z": 36930,
+      "Room": 47,
+      "Angle": 0,
+      "EntityIndex": 111,
+      "TargetType": 27
+    },
+    {
+      "X": 93696,
+      "Y": -4704,
+      "Z": 39962,
+      "Room": 47,
+      "Angle": 0,
+      "EntityIndex": 112,
+      "TargetType": 27
+    },
+    {
+      "X": 73763,
+      "Y": -202,
+      "Z": 36352,
+      "Room": 55,
+      "EntityIndex": 122,
+      "TargetType": 27
+    },
+    {
+      "X": 89600,
+      "Y": 2609,
+      "Z": 20516,
+      "Room": 59,
+      "Angle": 0,
+      "EntityIndex": 127,
+      "TargetType": 27
+    },
+    {
+      "X": 19968,
+      "Y": 10718,
+      "Z": 34856,
+      "Room": 93,
+      "Angle": 0,
+      "EntityIndex": 140,
+      "TargetType": 27
+    },
+    {
+      "X": 18944,
+      "Y": 10718,
+      "Z": 34856,
+      "Room": 93,
+      "Angle": 0,
+      "EntityIndex": 141,
+      "TargetType": 27
+    },
+    {
+      "X": 20992,
+      "Y": 10718,
+      "Z": 34856,
+      "Room": 93,
+      "Angle": 0,
+      "EntityIndex": 142,
+      "TargetType": 27
+    },
+    {
+      "X": 52206,
+      "Y": -1276,
+      "Z": 43520,
+      "Room": 73,
+      "Angle": -16384,
+      "EntityIndex": 144,
+      "TargetType": 27
+    },
+    {
+      "X": 45568,
+      "Y": -4512,
+      "Z": 41958,
+      "Room": 75,
+      "Angle": -32768,
+      "EntityIndex": 150,
+      "TargetType": 27
+    },
+    {
+      "X": 45026,
+      "Y": -4512,
+      "Z": 42496,
+      "Room": 78,
+      "Angle": -16384,
+      "EntityIndex": 151,
+      "TargetType": 27
+    },
+    {
+      "X": 35882,
+      "Y": 184,
+      "Z": 45568,
+      "Room": 81,
+      "EntityIndex": 153,
+      "TargetType": 27
+    },
+    {
+      "X": 30208,
+      "Y": 494,
+      "Z": 29748,
+      "Room": 79,
+      "Angle": 0,
+      "EntityIndex": 160,
+      "TargetType": 27
+    },
+    {
+      "X": 30208,
+      "Y": 494,
+      "Z": 45004,
+      "Room": 79,
+      "Angle": -32768,
+      "EntityIndex": 161,
+      "TargetType": 27
+    },
+    {
+      "X": 37862,
+      "Y": 378,
+      "Z": 40448,
+      "Room": 79,
+      "Angle": -16384,
+      "EntityIndex": 164,
+      "TargetType": 27
+    },
+    {
+      "X": 37862,
+      "Y": 378,
+      "Z": 39424,
+      "Room": 79,
+      "Angle": -16384,
+      "EntityIndex": 165,
+      "TargetType": 27
+    },
+    {
+      "X": 35328,
+      "Y": -296,
+      "Z": 44028,
+      "Room": 79,
+      "Angle": -32768,
+      "EntityIndex": 166,
+      "TargetType": 27
+    },
+    {
+      "X": 37862,
+      "Y": 378,
+      "Z": 41472,
+      "Room": 79,
+      "Angle": -16384,
+      "EntityIndex": 167,
+      "TargetType": 27
+    },
+    {
+      "X": 36844,
+      "Y": 378,
+      "Z": 37376,
+      "Room": 79,
+      "Angle": -16384,
+      "EntityIndex": 168,
+      "TargetType": 27
+    },
+    {
+      "X": 37376,
+      "Y": -1202,
+      "Z": 45094,
+      "Room": 81,
+      "EntityIndex": 170,
+      "TargetType": 27
+    },
+    {
+      "X": 36844,
+      "Y": 378,
+      "Z": 38400,
+      "Room": 79,
+      "Angle": -16384,
+      "EntityIndex": 167,
+      "TargetType": 27
+    },
+    {
+      "X": 36785,
+      "Y": 378,
+      "Z": 34304,
+      "Room": 79,
+      "Angle": -16384,
+      "EntityIndex": 171,
+      "TargetType": 27
+    },
+    {
+      "X": 22510,
+      "Y": 280,
+      "Z": 37376,
+      "Room": 90,
+      "Angle": -16384,
+      "EntityIndex": 177,
+      "TargetType": 27
+    },
+    {
+      "X": 22510,
+      "Y": 280,
+      "Z": 35328,
+      "Room": 90,
+      "Angle": -16384,
+      "EntityIndex": 178,
+      "TargetType": 27
+    },
+    {
+      "X": 28650,
+      "Y": 410,
+      "Z": 39424,
+      "Room": 91,
+      "Angle": -16384,
+      "EntityIndex": 181,
+      "TargetType": 27
+    },
+    {
+      "X": 22510,
+      "Y": 280,
+      "Z": 36352,
+      "Room": 90,
+      "Angle": -16384,
+      "EntityIndex": 182,
+      "TargetType": 27
+    },
+    {
+      "X": 28658,
+      "Y": 418,
+      "Z": 33280,
+      "Room": 92,
+      "Angle": -16384,
+      "EntityIndex": 183,
+      "TargetType": 27
+    },
+    {
+      "X": 14364,
+      "Y": 10592,
+      "Z": 38400,
+      "Room": 95,
+      "EntityIndex": 186,
+      "TargetType": 27
+    },
+    {
+      "X": 14364,
+      "Y": 10592,
+      "Z": 35328,
+      "Room": 95,
+      "EntityIndex": 187,
+      "TargetType": 27
+    }
+  ],
+  "LEVEL3.TR2": [
+    {
+      "X": 50160,
+      "Y": -3048,
+      "Z": 36352,
+      "Room": 0,
+      "Angle": -16384,
+      "EntityIndex": 0,
+      "TargetType": 27
+    },
+    {
+      "X": 45568,
+      "Y": -3648,
+      "Z": 41986,
+      "Room": 0,
+      "Angle": -32768,
+      "EntityIndex": 1,
+      "TargetType": 27
+    },
+    {
+      "X": 39424,
+      "Y": -4428,
+      "Z": 33790,
+      "Room": 0,
+      "Angle": -32768,
+      "EntityIndex": 2,
+      "TargetType": 27
+    },
+    {
+      "X": 40448,
+      "Y": -3576,
+      "Z": 35880,
+      "Room": 0,
+      "Angle": 0,
+      "EntityIndex": 4,
+      "TargetType": 27
+    },
+    {
+      "X": 39932,
+      "Y": -3408,
+      "Z": 40448,
+      "Room": 0,
+      "EntityIndex": 5,
+      "TargetType": 27
+    },
+    {
+      "X": 39932,
+      "Y": -3408,
+      "Z": 41472,
+      "Room": 0,
+      "EntityIndex": 6,
+      "TargetType": 27
+    },
+    {
+      "X": 68096,
+      "Y": -1304,
+      "Z": 41944,
+      "Room": 66,
+      "Angle": -32768,
+      "EntityIndex": 8,
+      "TargetType": 27
+    },
+    {
+      "X": 73706,
+      "Y": -1500,
+      "Z": 38400,
+      "Room": 67,
+      "Angle": -16384,
+      "EntityIndex": 16,
+      "TargetType": 27
+    },
+    {
+      "X": 73706,
+      "Y": -1500,
+      "Z": 37376,
+      "Room": 67,
+      "Angle": -16384,
+      "EntityIndex": 17,
+      "TargetType": 27
+    },
+    {
+      "X": 67072,
+      "Y": -1304,
+      "Z": 41944,
+      "Room": 66,
+      "Angle": -32768,
+      "EntityIndex": 18,
+      "TargetType": 27
+    },
+    {
+      "X": 46592,
+      "Y": 4864,
+      "Z": 5632,
+      "Room": 11,
+      "EntityIndex": 27,
+      "TargetType": 27
+    },
+    {
+      "X": 50688,
+      "Y": 4864,
+      "Z": 5632,
+      "Room": 11,
+      "Angle": -16384,
+      "EntityIndex": 28,
+      "TargetType": 27
+    },
+    {
+      "X": 50688,
+      "Y": 4864,
+      "Z": 11776,
+      "Room": 11,
+      "Angle": -16384,
+      "EntityIndex": 34,
+      "TargetType": 27
+    },
+    {
+      "X": 47616,
+      "Y": 4864,
+      "Z": 5632,
+      "Room": 11,
+      "EntityIndex": 37,
+      "TargetType": 27
+    },
+    {
+      "X": 49664,
+      "Y": 4864,
+      "Z": 5632,
+      "Room": 11,
+      "Angle": -16384,
+      "EntityIndex": 38,
+      "TargetType": 27
+    },
+    {
+      "X": 28160,
+      "Y": -3012,
+      "Z": 63470,
+      "Room": 24,
+      "Angle": -32768,
+      "EntityIndex": 63,
+      "TargetType": 27
+    },
+    {
+      "X": 30208,
+      "Y": -3012,
+      "Z": 63470,
+      "Room": 24,
+      "Angle": -32768,
+      "EntityIndex": 64,
+      "TargetType": 27
+    },
+    {
+      "X": 32728,
+      "Y": -3046,
+      "Z": 60928,
+      "Room": 24,
+      "Angle": -16384,
+      "EntityIndex": 65,
+      "TargetType": 27
+    },
+    {
+      "X": 29684,
+      "Y": -12500,
+      "Z": 64000,
+      "Room": 33,
+      "Angle": -16384,
+      "EntityIndex": 80,
+      "TargetType": 27
+    },
+    {
+      "X": 24064,
+      "Y": -14226,
+      "Z": 66460,
+      "Room": 34,
+      "Angle": -32768,
+      "EntityIndex": 86,
+      "TargetType": 27
+    },
+    {
+      "X": 48640,
+      "Y": 5726,
+      "Z": 27645,
+      "Room": 35,
+      "Angle": -32768,
+      "EntityIndex": 90,
+      "TargetType": 27
+    },
+    {
+      "X": 67072,
+      "Y": -12665,
+      "Z": 59904,
+      "Room": 37,
+      "EntityIndex": 94,
+      "TargetType": 27
+    },
+    {
+      "X": 67072,
+      "Y": -12478,
+      "Z": 57334,
+      "Room": 37,
+      "Angle": -32768,
+      "EntityIndex": 95,
+      "TargetType": 27
+    },
+    {
+      "X": 61450,
+      "Y": -15104,
+      "Z": 61952,
+      "Room": 39,
+      "EntityIndex": 101,
+      "TargetType": 27
+    },
+    {
+      "X": 74742,
+      "Y": -14404,
+      "Z": 57856,
+      "Room": 38,
+      "Angle": -16384,
+      "EntityIndex": 104,
+      "TargetType": 27
+    },
+    {
+      "X": 61450,
+      "Y": -15104,
+      "Z": 56832,
+      "Room": 39,
+      "EntityIndex": 107,
+      "TargetType": 27
+    },
+    {
+      "X": 74240,
+      "Y": -15606,
+      "Z": 57356,
+      "Room": 39,
+      "Angle": 0,
+      "EntityIndex": 109,
+      "TargetType": 27
+    },
+    {
+      "X": 67072,
+      "Y": -19074,
+      "Z": 29668,
+      "Room": 51,
+      "Angle": -32768,
+      "EntityIndex": 119,
+      "TargetType": 27
+    },
+    {
+      "X": 67072,
+      "Y": -14080,
+      "Z": 32780,
+      "Room": 52,
+      "Angle": 0,
+      "EntityIndex": 121,
+      "TargetType": 27
+    },
+    {
+      "X": 67648,
+      "Y": -17170,
+      "Z": 23040,
+      "Room": 79,
+      "EntityIndex": 146,
+      "TargetType": 27
+    }
+  ],
+  "LEVEL4.TR2": [
+    {
+      "X": 49158,
+      "Y": 1618,
+      "Z": 48640,
+      "Room": 10,
+      "Angle": -16384,
+      "EntityIndex": 13,
+      "TargetType": 27
+    },
+    {
+      "X": 49135,
+      "Y": 1456,
+      "Z": 43520,
+      "Room": 10,
+      "Angle": -16384,
+      "EntityIndex": 14,
+      "TargetType": 27
+    },
+    {
+      "X": 45568,
+      "Y": -270,
+      "Z": 45568,
+      "Room": 10,
+      "Angle": 0,
+      "EntityIndex": 15,
+      "TargetType": 27
+    },
+    {
+      "X": 45568,
+      "Y": 1268,
+      "Z": 51204,
+      "Room": 10,
+      "Angle": 0,
+      "EntityIndex": 16,
+      "TargetType": 27
+    },
+    {
+      "X": 46592,
+      "Y": 2194,
+      "Z": 60394,
+      "Room": 19,
+      "Angle": -32768,
+      "EntityIndex": 27,
+      "TargetType": 27
+    },
+    {
+      "X": 46592,
+      "Y": 8014,
+      "Z": 70648,
+      "Room": 27,
+      "Angle": -32768,
+      "EntityIndex": 43,
+      "TargetType": 27
+    },
+    {
+      "X": 44050,
+      "Y": 8014,
+      "Z": 70144,
+      "Room": 27,
+      "EntityIndex": 45,
+      "TargetType": 27
+    },
+    {
+      "X": 51228,
+      "Y": 7888,
+      "Z": 59904,
+      "Room": 32,
+      "EntityIndex": 52,
+      "TargetType": 27
+    },
+    {
+      "X": 70144,
+      "Y": 402,
+      "Z": 70672,
+      "Room": 45,
+      "Angle": 0,
+      "EntityIndex": 65,
+      "TargetType": 27
+    },
+    {
+      "X": 72192,
+      "Y": 1312,
+      "Z": 74762,
+      "Room": 45,
+      "Angle": -32768,
+      "EntityIndex": 66,
+      "TargetType": 27
+    },
+    {
+      "X": 76288,
+      "Y": 3060,
+      "Z": 69675,
+      "Room": 46,
+      "Angle": 0,
+      "EntityIndex": 74,
+      "TargetType": 27
+    },
+    {
+      "X": 73216,
+      "Y": -464,
+      "Z": 59450,
+      "Room": 50,
+      "Angle": 0,
+      "EntityIndex": 79,
+      "TargetType": 27
+    },
+    {
+      "X": 70144,
+      "Y": 1598,
+      "Z": 43016,
+      "Room": 53,
+      "Angle": 0,
+      "EntityIndex": 105,
+      "TargetType": 27
+    },
+    {
+      "X": 74746,
+      "Y": 1598,
+      "Z": 47616,
+      "Room": 53,
+      "Angle": -16384,
+      "EntityIndex": 106,
+      "TargetType": 27
+    },
+    {
+      "X": 65514,
+      "Y": 1598,
+      "Z": 47616,
+      "Room": 53,
+      "EntityIndex": 107,
+      "TargetType": 27
+    },
+    {
+      "X": 70144,
+      "Y": 798,
+      "Z": 41472,
+      "Room": 60,
+      "EntityIndex": 112,
+      "TargetType": 27
+    },
+    {
+      "X": 72708,
+      "Y": -2332,
+      "Z": 35328,
+      "Room": 64,
+      "Angle": -16384,
+      "EntityIndex": 122,
+      "TargetType": 27
+    },
+    {
+      "X": 72708,
+      "Y": -2332,
+      "Z": 36352,
+      "Room": 64,
+      "Angle": -16384,
+      "EntityIndex": 123,
+      "TargetType": 27
+    },
+    {
+      "X": 46034,
+      "Y": -3490,
+      "Z": 35328,
+      "Room": 65,
+      "Angle": -16384,
+      "EntityIndex": 127,
+      "TargetType": 27
+    },
+    {
+      "X": 44004,
+      "Y": 1894,
+      "Z": 33280,
+      "Room": 66,
+      "Angle": -16384,
+      "EntityIndex": 135,
+      "TargetType": 27
+    },
+    {
+      "X": 39852,
+      "Y": 1610,
+      "Z": 32256,
+      "Room": 66,
+      "Angle": -16384,
+      "EntityIndex": 136,
+      "TargetType": 27
+    },
+    {
+      "X": 31232,
+      "Y": 3526,
+      "Z": 38878,
+      "Room": 68,
+      "Angle": -32768,
+      "EntityIndex": 144,
+      "TargetType": 27
+    },
+    {
+      "X": 60928,
+      "Y": 6026,
+      "Z": 30768,
+      "Room": 71,
+      "Angle": 0,
+      "EntityIndex": 150,
+      "TargetType": 27
+    },
+    {
+      "X": 57856,
+      "Y": 6892,
+      "Z": 31766,
+      "Room": 72,
+      "Angle": 0,
+      "EntityIndex": 153,
+      "TargetType": 27
+    },
+    {
+      "X": 51214,
+      "Y": 7366,
+      "Z": 32256,
+      "Room": 73,
+      "EntityIndex": 155,
+      "TargetType": 27
+    },
+    {
+      "X": 62450,
+      "Y": 1915,
+      "Z": 48640,
+      "Room": 89,
+      "Angle": -16384,
+      "EntityIndex": 175,
+      "TargetType": 27
+    }
+  ],
+  "LEVEL5.TR2": [
+    {
+      "X": 42980,
+      "Y": -2731,
+      "Z": 62976,
+      "Room": 2,
+      "Angle": -16384,
+      "EntityIndex": 2,
+      "TargetType": 27
+    },
+    {
+      "X": 30744,
+      "Y": -2824,
+      "Z": 57856,
+      "Room": 6,
+      "EntityIndex": 6,
+      "TargetType": 27
+    },
+    {
+      "X": 50688,
+      "Y": -2368,
+      "Z": 52268,
+      "Room": 7,
+      "Angle": 0,
+      "EntityIndex": 9,
+      "TargetType": 27
+    },
+    {
+      "X": 42016,
+      "Y": -1332,
+      "Z": 45568,
+      "Room": 10,
+      "EntityIndex": 25,
+      "TargetType": 27
+    },
+    {
+      "X": 51162,
+      "Y": -1332,
+      "Z": 45568,
+      "Room": 10,
+      "Angle": -16384,
+      "EntityIndex": 26,
+      "TargetType": 27
+    },
+    {
+      "X": 39424,
+      "Y": -1242,
+      "Z": 46100,
+      "Room": 29,
+      "Angle": 0,
+      "EntityIndex": 41,
+      "TargetType": 27
+    },
+    {
+      "X": 45568,
+      "Y": 13250,
+      "Z": 51158,
+      "Room": 37,
+      "Angle": -32768,
+      "EntityIndex": 69,
+      "TargetType": 27
+    },
+    {
+      "X": 45568,
+      "Y": 13250,
+      "Z": 47146,
+      "Room": 37,
+      "Angle": 0,
+      "EntityIndex": 70,
+      "TargetType": 27
+    },
+    {
+      "X": 53760,
+      "Y": 11026,
+      "Z": 46078,
+      "Room": 36,
+      "Angle": 0,
+      "EntityIndex": 71,
+      "TargetType": 27
+    },
+    {
+      "X": 69120,
+      "Y": 11572,
+      "Z": 46090,
+      "Room": 46,
+      "Angle": 0,
+      "EntityIndex": 87,
+      "TargetType": 27
+    },
+    {
+      "X": 70644,
+      "Y": 11634,
+      "Z": 55808,
+      "Room": 47,
+      "Angle": -16384,
+      "EntityIndex": 88,
+      "TargetType": 27
+    },
+    {
+      "X": 60928,
+      "Y": 11390,
+      "Z": 47114,
+      "Room": 48,
+      "Angle": 0,
+      "EntityIndex": 92,
+      "TargetType": 27
+    },
+    {
+      "X": 66548,
+      "Y": 10906,
+      "Z": 38400,
+      "Room": 49,
+      "Angle": -16384,
+      "EntityIndex": 95,
+      "TargetType": 27
+    },
+    {
+      "X": 43520,
+      "Y": 10682,
+      "Z": 28692,
+      "Room": 51,
+      "Angle": 0,
+      "EntityIndex": 96,
+      "TargetType": 27
+    },
+    {
+      "X": 41988,
+      "Y": 10754,
+      "Z": 38400,
+      "Room": 51,
+      "EntityIndex": 101,
+      "TargetType": 27
+    },
+    {
+      "X": 55808,
+      "Y": -1292,
+      "Z": 63457,
+      "Room": 65,
+      "Angle": -32768,
+      "EntityIndex": 115,
+      "TargetType": 27
+    },
+    {
+      "X": 50688,
+      "Y": 10408,
+      "Z": 63490,
+      "Room": 72,
+      "Angle": 0,
+      "EntityIndex": 130,
+      "TargetType": 27
+    },
+    {
+      "X": 48640,
+      "Y": 9932,
+      "Z": 85932,
+      "Room": 74,
+      "Angle": -32768,
+      "EntityIndex": 137,
+      "TargetType": 27
+    },
+    {
+      "X": 49664,
+      "Y": 9932,
+      "Z": 85932,
+      "Room": 74,
+      "Angle": -32768,
+      "EntityIndex": 138,
+      "TargetType": 27
+    },
+    {
+      "X": 45568,
+      "Y": 9984,
+      "Z": 87034,
+      "Room": 74,
+      "Angle": -32768,
+      "EntityIndex": 139,
+      "TargetType": 27
+    },
+    {
+      "X": 53760,
+      "Y": 9984,
+      "Z": 87034,
+      "Room": 74,
+      "Angle": -32768,
+      "EntityIndex": 140,
+      "TargetType": 27
+    },
+    {
+      "X": 52736,
+      "Y": 9984,
+      "Z": 87034,
+      "Room": 74,
+      "Angle": -32768,
+      "EntityIndex": 146,
+      "TargetType": 27
+    },
+    {
+      "X": 44544,
+      "Y": 9984,
+      "Z": 87034,
+      "Room": 74,
+      "Angle": -32768,
+      "EntityIndex": 147,
+      "TargetType": 27
+    },
+    {
+      "X": 54264,
+      "Y": 7065,
+      "Z": 60928,
+      "Room": 33,
+      "Angle": -16384,
+      "EntityIndex": 159,
+      "TargetType": 27
     }
   ]
 }
\ No newline at end of file
diff --git a/TRRandomizerCore/Resources/TR2/Locations/locations.json b/TRRandomizerCore/Resources/TR2/Locations/locations.json
index fb43a0a45..e76874c51 100644
--- a/TRRandomizerCore/Resources/TR2/Locations/locations.json
+++ b/TRRandomizerCore/Resources/TR2/Locations/locations.json
@@ -1669,6 +1669,7 @@
       "Z": 32665,
       "Room": 104,
       "Difficulty": "Hard",
+      "EntityIndex": 78,
       "PackID": "Eycore"
     },
     {
@@ -7307,6 +7308,33 @@
       "Z": 58266,
       "Room": 32
     },
+    {
+      "X": 82362,
+      "Y": -1890,
+      "Z": 68569,
+      "Room": 32,
+      "RequiresGlitch": true
+    },
+    {
+      "X": 93696,
+      "Y": -2176,
+      "Z": 66048,
+      "Room": 32,
+      "RequiresGlitch": true
+    },
+    {
+      "X": 94117,
+      "Y": -1282,
+      "Z": 54305,
+      "Room": 32,
+      "RequiresGlitch": true
+    },
+    {
+      "X": 51153,
+      "Y": -14332,
+      "Z": 31973,
+      "Room": 17
+    },
     {
       "X": 70580,
       "Y": -1536,
@@ -7627,6 +7655,13 @@
       "Y": 17920,
       "Z": 36864,
       "Room": 96
+    },
+    {
+      "X": 23489,
+      "Y": 2363,
+      "Z": 37940,
+      "Room": 33,
+      "Difficulty": "Hard"
     }
   ],
   "LEVEL3.TR2": [
@@ -7643,6 +7678,15 @@
       "Z": 22464,
       "Room": 64
     },
+    {
+      "X": 66621,
+      "Y": -1024,
+      "Z": 36799,
+      "Room": 1,
+      "Difficulty": "Hard",
+      "RequiresDamage": true,
+      "RequiresGlitch": true
+    },
     {
       "X": 30752,
       "Y": -1536,
@@ -7711,6 +7755,13 @@
       "Z": 59483,
       "Room": 24
     },
+    {
+      "X": 11214,
+      "Y": -2636,
+      "Z": 55335,
+      "Room": 30,
+      "RequiresDamage": true
+    },
     {
       "X": 30622,
       "Y": -11520,
diff --git a/TRRandomizerCore/Resources/TR2/Locations/vehicle_locations.json b/TRRandomizerCore/Resources/TR2/Locations/vehicle_locations.json
index d0cff404e..94f88eb07 100644
--- a/TRRandomizerCore/Resources/TR2/Locations/vehicle_locations.json
+++ b/TRRandomizerCore/Resources/TR2/Locations/vehicle_locations.json
@@ -1317,5 +1317,53 @@
       "Room": 37,
       "TargetType": 14
     }
+  ],
+  "HOUSE.TR2": [
+    {
+      "X": 32256,
+      "Y": -256,
+      "Z": 66048,
+      "Room": 57,
+      "Angle": 0,
+      "TargetType": 13
+    },
+    {
+      "X": 38400,
+      "Y": 2560,
+      "Z": 65024,
+      "Room": 70,
+      "Angle": -32768,
+      "TargetType": 13
+    },
+    {
+      "X": 35328,
+      "Y": 256,
+      "Z": 64000,
+      "Room": 52,
+      "Angle": -32768,
+      "TargetType": 13
+    },
+    {
+      "X": 22016,
+      "Y": 3584,
+      "Z": 56832,
+      "Room": 39,
+      "TargetType": 14
+    },
+    {
+      "X": 30208,
+      "Y": 3840,
+      "Z": 56832,
+      "Room": 40,
+      "Angle": -16384,
+      "TargetType": 14
+    },
+    {
+      "X": 49664,
+      "Y": 2560,
+      "Z": 71168,
+      "Room": 48,
+      "TargetType": 13
+    }
   ]
 }
\ No newline at end of file
diff --git a/TRRandomizerCore/Resources/TR2/Restrictions/enemy_restrictions_default.json b/TRRandomizerCore/Resources/TR2/Restrictions/enemy_restrictions_default.json
index 299adc79b..81f151cad 100644
--- a/TRRandomizerCore/Resources/TR2/Restrictions/enemy_restrictions_default.json
+++ b/TRRandomizerCore/Resources/TR2/Restrictions/enemy_restrictions_default.json
@@ -115,5 +115,79 @@
       43,
       48
     ]
+  },
+  "LEVEL1.TR2": {
+    "52": [
+      1,
+      2,
+      3,
+      4,
+      6,
+      10,
+      14,
+      21,
+      30,
+      43,
+      44,
+      45,
+      50,
+      51,
+      66,
+      80,
+      81,
+      94,
+      102
+    ]
+  },
+  "LEVEL2.TR2": {
+    "52": [
+      0,
+      4,
+      5,
+      12,
+      13,
+      35,
+      43,
+      47,
+      55,
+      79
+    ]
+  },
+  "LEVEL3.TR2": {
+    "52": [
+      0,
+      24,
+      34,
+      38,
+      39,
+      108,
+      109
+    ]
+  },
+  "LEVEL4.TR2": {
+    "52": [
+      0,
+      10,
+      19,
+      45,
+      46,
+      50,
+      65,
+      66,
+      68,
+      89
+    ]
+  },
+  "LEVEL5.TR2": {
+    "52": [
+      2,
+      6,
+      10,
+      29,
+      36,
+      46,
+      49,
+      51
+    ]
   }
 }
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Mapping/LEVEL1.TR2-Textures.json b/TRRandomizerCore/Resources/TR2/Textures/Mapping/LEVEL1.TR2-Textures.json
index bb3e88315..b37608401 100644
--- a/TRRandomizerCore/Resources/TR2/Textures/Mapping/LEVEL1.TR2-Textures.json
+++ b/TRRandomizerCore/Resources/TR2/Textures/Mapping/LEVEL1.TR2-Textures.json
@@ -1,4 +1,15 @@
 {
+  "Landmarks": {
+    "Landmarks.ReptiliaDraconia": {
+      "0": [
+        {
+          "RoomNumber": 17,
+          "RectangleIndices": [ 43 ],
+          "BackgroundIndex": 1494
+        }
+      ]
+    }
+  },
   "Static": {
     "ColdWar.Sky": [
       {
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Mapping/RIG.TR2-Textures.json b/TRRandomizerCore/Resources/TR2/Textures/Mapping/RIG.TR2-Textures.json
index e78888a73..9941c246a 100644
--- a/TRRandomizerCore/Resources/TR2/Textures/Mapping/RIG.TR2-Textures.json
+++ b/TRRandomizerCore/Resources/TR2/Textures/Mapping/RIG.TR2-Textures.json
@@ -7,6 +7,24 @@
           "RectangleIndices": [ 22 ]
         }
       ]
+    },
+    "Landmarks.XeNoN3560": {
+      "0": [
+        {
+          "RoomNumber": 0,
+          "RectangleIndices": [ 3 ],
+          "BackgroundIndex": 1622
+        }
+      ]
+    },
+    "Landmarks.GMSryBut": {
+      "0": [
+        {
+          "RoomNumber": 22,
+          "RectangleIndices": [ 15 ],
+          "BackgroundIndex": 1624
+        }
+      ]
     }
   },
 
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Mapping/VENICE.TR2-Textures.json b/TRRandomizerCore/Resources/TR2/Textures/Mapping/VENICE.TR2-Textures.json
index 9ec175015..4195d0684 100644
--- a/TRRandomizerCore/Resources/TR2/Textures/Mapping/VENICE.TR2-Textures.json
+++ b/TRRandomizerCore/Resources/TR2/Textures/Mapping/VENICE.TR2-Textures.json
@@ -7,6 +7,15 @@
           "RectangleIndices": [ 60 ]
         }
       ]
+    },
+    "Landmarks.chreden": {
+      "0": [
+        {
+          "RoomNumber": 106,
+          "RectangleIndices": [ 21 ],
+          "BackgroundIndex": 1552
+        }
+      ]
     }
   },
 
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/HSH/Paintings/Segments.png b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/HSH/Paintings/Segments.png
index f7951e0c9..e848751ee 100644
Binary files a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/HSH/Paintings/Segments.png and b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/HSH/Paintings/Segments.png differ
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/GMSryBut/Data.json b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/GMSryBut/Data.json
new file mode 100644
index 000000000..8f06eacf3
--- /dev/null
+++ b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/GMSryBut/Data.json
@@ -0,0 +1,8 @@
+{
+  "PNGPath": "Resources/TR1/Textures/Source/Static/Landmarks/GMSryBut/Segments.png",
+  "VariantMap": {
+    "Default": [
+      "0, 0, 64, 64"
+    ]
+  }
+}
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/ReptiliaDraconia/Data.json b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/ReptiliaDraconia/Data.json
new file mode 100644
index 000000000..fca17f888
--- /dev/null
+++ b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/ReptiliaDraconia/Data.json
@@ -0,0 +1,7 @@
+{
+  "VariantMap": {
+    "Default": [
+      "0, 0, 64, 64"
+    ]
+  }
+}
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/ReptiliaDraconia/Segments.png b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/ReptiliaDraconia/Segments.png
new file mode 100644
index 000000000..d457292fe
Binary files /dev/null and b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/ReptiliaDraconia/Segments.png differ
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/XeNoN3560/Data.json b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/XeNoN3560/Data.json
new file mode 100644
index 000000000..3f0160573
--- /dev/null
+++ b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/XeNoN3560/Data.json
@@ -0,0 +1,8 @@
+{
+  "Info": "https://www.twitch.tv/XeNoN3560",
+  "VariantMap": {
+    "Default": [
+      "0, 0, 64, 64"
+    ]
+  }
+}
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/XeNoN3560/Segments.png b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/XeNoN3560/Segments.png
new file mode 100644
index 000000000..6de2a6c74
Binary files /dev/null and b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/XeNoN3560/Segments.png differ
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/chreden/Data.json b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/chreden/Data.json
new file mode 100644
index 000000000..47ff9ac15
--- /dev/null
+++ b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Landmarks/chreden/Data.json
@@ -0,0 +1,8 @@
+{
+  "PNGPath": "Resources/TR1/Textures/Source/Static/Landmarks/chreden/Segments.png",
+  "VariantMap": {
+    "Default": [
+      "0, 0, 64, 64"
+    ]
+  }
+}
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Tibet/Bell/Data.json b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Tibet/Bell/Data.json
index c229d7b09..657ec7ac5 100644
--- a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Tibet/Bell/Data.json
+++ b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Tibet/Bell/Data.json
@@ -20,13 +20,17 @@
       "256, 0, 64, 64",
       "256, 64, 24, 24"
     ],
-    "Yellow": [
+    "Purple": [
       "320, 0, 64, 64",
       "320, 64, 24, 24"
     ],
     "Zen": [
       "384, 0, 64, 64",
       "384, 64, 24, 24"
+    ],
+    "Lilly": [
+      "448, 0, 64, 64",
+      "448, 64, 24, 24"
     ]
   }
 }
\ No newline at end of file
diff --git a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Tibet/Bell/Segments.png b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Tibet/Bell/Segments.png
index 7c4cdfedd..7ef690e96 100644
Binary files a/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Tibet/Bell/Segments.png and b/TRRandomizerCore/Resources/TR2/Textures/Source/Static/Tibet/Bell/Segments.png differ
diff --git a/TRRandomizerCore/Textures/Landmarks/AbstractLandmarkImporter.cs b/TRRandomizerCore/Textures/Landmarks/AbstractLandmarkImporter.cs
index 9305699fb..f9ce3342c 100644
--- a/TRRandomizerCore/Textures/Landmarks/AbstractLandmarkImporter.cs
+++ b/TRRandomizerCore/Textures/Landmarks/AbstractLandmarkImporter.cs
@@ -10,14 +10,11 @@ namespace TRRandomizerCore.Textures;
 
 public abstract class AbstractLandmarkImporter<E, L>
     where E : Enum
-    where L : class
+    where L : TRLevelBase
 {
-    public bool IsCommunityPatch { get; set; }
-
     protected abstract int MaxTextures { get; }
 
     protected abstract TRTexturePacker CreatePacker(L level);
-    protected abstract List<TRObjectTexture> GetObjectTextures(L level);
     protected abstract void SetRoomTexture(L level, int roomIndex, int rectangleIndex, ushort textureIndex);
     protected abstract short? GetRoomFromPortal(L level, PortalSector portalSector, bool isLevelMirrored);
 
@@ -27,7 +24,7 @@ public bool Import(L level, AbstractTextureMapping<E, L> mapping, bool isLevelMi
         mapping.CommitGraphics();
 
         // If we are already at the maximum number of textures, bail out.
-        List<TRObjectTexture> textures = GetObjectTextures(level);
+        var textures = level.ObjectTextures;
         if (textures.Count == MaxTextures)
         {
             return false;
diff --git a/TRRandomizerCore/Textures/Landmarks/TR1LandmarkImporter.cs b/TRRandomizerCore/Textures/Landmarks/TR1LandmarkImporter.cs
index 2c232213e..fdaee0ee1 100644
--- a/TRRandomizerCore/Textures/Landmarks/TR1LandmarkImporter.cs
+++ b/TRRandomizerCore/Textures/Landmarks/TR1LandmarkImporter.cs
@@ -6,16 +6,11 @@ namespace TRRandomizerCore.Textures;
 
 public class TR1LandmarkImporter : AbstractLandmarkImporter<TR1Type, TR1Level>
 {
-    protected override int MaxTextures => IsCommunityPatch ? 8192 : 2048;
+    protected override int MaxTextures => int.MaxValue;
 
     protected override TRTexturePacker CreatePacker(TR1Level level)
     {
-        return new TR1TexturePacker(level);
-    }
-
-    protected override List<TRObjectTexture> GetObjectTextures(TR1Level level)
-    {
-        return level.ObjectTextures;
+        return new TR1TexturePacker(level, maximumTiles: short.MaxValue);
     }
 
     protected override void SetRoomTexture(TR1Level level, int roomIndex, int rectangleIndex, ushort textureIndex)
diff --git a/TRRandomizerCore/Textures/Landmarks/TR2LandmarkImporter.cs b/TRRandomizerCore/Textures/Landmarks/TR2LandmarkImporter.cs
index e89f4ccb2..6b958f2ec 100644
--- a/TRRandomizerCore/Textures/Landmarks/TR2LandmarkImporter.cs
+++ b/TRRandomizerCore/Textures/Landmarks/TR2LandmarkImporter.cs
@@ -6,16 +6,11 @@ namespace TRRandomizerCore.Textures;
 
 public class TR2LandmarkImporter : AbstractLandmarkImporter<TR2Type, TR2Level>
 {
-    protected override int MaxTextures => 2048;
+    protected override int MaxTextures => int.MaxValue;
 
     protected override TRTexturePacker CreatePacker(TR2Level level)
     {
-        return new TR2TexturePacker(level);
-    }
-
-    protected override List<TRObjectTexture> GetObjectTextures(TR2Level level)
-    {
-        return level.ObjectTextures;
+        return new TR2TexturePacker(level, maximumTiles: short.MaxValue);
     }
 
     protected override void SetRoomTexture(TR2Level level, int roomIndex, int rectangleIndex, ushort textureIndex)
diff --git a/TRRandomizerCore/Textures/Landmarks/TR3LandmarkImporter.cs b/TRRandomizerCore/Textures/Landmarks/TR3LandmarkImporter.cs
index 026a92b90..889c23ccb 100644
--- a/TRRandomizerCore/Textures/Landmarks/TR3LandmarkImporter.cs
+++ b/TRRandomizerCore/Textures/Landmarks/TR3LandmarkImporter.cs
@@ -13,11 +13,6 @@ protected override TRTexturePacker CreatePacker(TR3Level level)
         return new TR3TexturePacker(level);
     }
 
-    protected override List<TRObjectTexture> GetObjectTextures(TR3Level level)
-    {
-        return level.ObjectTextures;
-    }
-
     protected override void SetRoomTexture(TR3Level level, int roomIndex, int rectangleIndex, ushort textureIndex)
     {
         level.Rooms[roomIndex].Mesh.Rectangles[rectangleIndex].Texture = textureIndex;