diff --git a/TRDataControl/Data/TR3DataProvider.cs b/TRDataControl/Data/TR3DataProvider.cs index 30cb13d5d..2843bee87 100644 --- a/TRDataControl/Data/TR3DataProvider.cs +++ b/TRDataControl/Data/TR3DataProvider.cs @@ -180,13 +180,15 @@ public IEnumerable GetHardcodedSounds(TR3Type type) = new() { TR3Type.Quest2_M_H }, [TR3Type.Pistols_P] = - new() { TR3Type.LaraPistolAnimation_H, TR3Type.Gunflare_H, TR3Type.Pistols_M_H, TR3Type.PistolAmmo_P, TR3Type.PistolAmmo_M_H }, + new() { TR3Type.Gunflare_H, TR3Type.Pistols_M_H, TR3Type.PistolAmmo_P }, + [TR3Type.PistolAmmo_P] = + new() { TR3Type.PistolAmmo_M_H }, [TR3Type.Shotgun_P] = new() { TR3Type.LaraShotgunAnimation_H, TR3Type.Gunflare_H, TR3Type.Shotgun_M_H, TR3Type.ShotgunAmmo_P, TR3Type.ShotgunAmmo_M_H }, [TR3Type.Deagle_P] = - new() { TR3Type.LaraDeagleAnimation_H, TR3Type.Gunflare_H, TR3Type.Deagle_M_H, TR3Type.DeagleAmmo_P, TR3Type.DeagleAmmo_M_H }, + new() { TR3Type.Gunflare_H, TR3Type.Deagle_M_H, TR3Type.DeagleAmmo_P, TR3Type.DeagleAmmo_M_H }, [TR3Type.Uzis_P] = - new() { TR3Type.LaraUziAnimation_H, TR3Type.Gunflare_H, TR3Type.Uzis_M_H, TR3Type.UziAmmo_P, TR3Type.UziAmmo_M_H }, + new() { TR3Type.Gunflare_H, TR3Type.Uzis_M_H, TR3Type.UziAmmo_P, TR3Type.UziAmmo_M_H }, [TR3Type.Harpoon_P] = new() { TR3Type.LaraHarpoonAnimation_H, TR3Type.Harpoon_M_H, TR3Type.Harpoons_P, TR3Type.Harpoons_M_H, TR3Type.HarpoonSingle2 }, [TR3Type.MP5_P] = @@ -195,6 +197,10 @@ public IEnumerable GetHardcodedSounds(TR3Type type) new() { TR3Type.LaraRocketAnimation_H, TR3Type.RocketLauncher_M_H, TR3Type.Rockets_P, TR3Type.Rockets_M_H, TR3Type.RocketSingle }, [TR3Type.GrenadeLauncher_P] = new() { TR3Type.LaraGrenadeAnimation_H, TR3Type.GrenadeLauncher_M_H, TR3Type.Grenades_P, TR3Type.Grenades_M_H, TR3Type.GrenadeSingle }, + [TR3Type.SmallMed_P] = + new() { TR3Type.SmallMed_M_H }, + [TR3Type.LargeMed_P] = + new() { TR3Type.LargeMed_M_H }, }; private static readonly Dictionary> _typeAliases = new() diff --git a/TRDataControl/Transport/TR3/TR3DataExporter.cs b/TRDataControl/Transport/TR3/TR3DataExporter.cs index 0021abcc9..5266bf3d1 100644 --- a/TRDataControl/Transport/TR3/TR3DataExporter.cs +++ b/TRDataControl/Transport/TR3/TR3DataExporter.cs @@ -59,4 +59,21 @@ protected override TRDictionary SpriteSequences protected override List CinematicFrames => Level.CinematicFrames; + + protected override void PreCreation(TR3Level level, TR3Type type, TRBlobType blobType) + { + switch (type) + { + case TR3Type.Quest1_P: + case TR3Type.Quest1_M_H: + level.Models.ChangeKey(TR3Type.Puzzle1_P, TR3Type.Quest1_P); + level.Models.ChangeKey(TR3Type.Puzzle1_M_H, TR3Type.Quest1_M_H); + break; + case TR3Type.Quest2_P: + case TR3Type.Quest2_M_H: + level.Models.ChangeKey(TR3Type.Puzzle1_P, TR3Type.Quest2_P); + level.Models.ChangeKey(TR3Type.Puzzle1_M_H, TR3Type.Quest2_M_H); + break; + } + } } diff --git a/TRDataControl/Transport/TR3/TR3MassExporter.cs b/TRDataControl/Transport/TR3/TR3MassExporter.cs index d4957e30f..1f326ea76 100644 --- a/TRDataControl/Transport/TR3/TR3MassExporter.cs +++ b/TRDataControl/Transport/TR3/TR3MassExporter.cs @@ -18,7 +18,10 @@ protected override TR3Level ReadLevel(string path) { [TR3LevelNames.JUNGLE] = new() { - TR3Type.LaraIndia, TR3Type.Monkey, TR3Type.Tiger, TR3Type.Door1 + TR3Type.LaraIndia, TR3Type.Monkey, TR3Type.Tiger, TR3Type.Door1, + TR3Type.Pistols_P, TR3Type.PistolAmmo_P, TR3Type.Shotgun_P, TR3Type.Deagle_P, TR3Type.Uzis_P, + TR3Type.MP5_P, TR3Type.Harpoon_P, TR3Type.RocketLauncher_P, TR3Type.GrenadeLauncher_P, + TR3Type.SmallMed_P, TR3Type.LargeMed_P, }, [TR3LevelNames.RUINS] = new() { @@ -34,7 +37,7 @@ protected override TR3Level ReadLevel(string path) }, [TR3LevelNames.COASTAL] = new() { - TR3Type.LaraCoastal, TR3Type.Croc, TR3Type.TribesmanAxe, TR3Type.TribesmanDart + TR3Type.LaraCoastal, TR3Type.Croc, TR3Type.TribesmanAxe, TR3Type.TribesmanDart, TR3Type.Quest1_P }, [TR3LevelNames.CRASH] = new() { @@ -93,9 +96,9 @@ protected override TR3Level ReadLevel(string path) { TR3Type.Willie, TR3Type.RXGunLad }, - [TR3LevelNames.HALLOWS] = new() + [TR3LevelNames.MADHOUSE] = new() { - + TR3Type.Quest2_P }, [TR3LevelNames.ASSAULT] = new() { diff --git a/TRImageControl/Palette/TRPalette16Control.cs b/TRImageControl/Palette/TRPalette16Control.cs index 55759ecc8..53026513e 100644 --- a/TRImageControl/Palette/TRPalette16Control.cs +++ b/TRImageControl/Palette/TRPalette16Control.cs @@ -33,6 +33,11 @@ public int Import(TRColour4 colour) { int index = _palette.FindIndex(c => c.Red == colour.Red && c.Green == colour.Green && c.Blue == colour.Blue); + if (_freeIndices.Contains(index)) + { + // Avoid assigning and then later repurposing the same index. + index = -1; + } if (index == -1) { diff --git a/TRLevelControl/Model/Common/TRObjectTexture.cs b/TRLevelControl/Model/Common/TRObjectTexture.cs index 355a3f9b4..61fa36f68 100644 --- a/TRLevelControl/Model/Common/TRObjectTexture.cs +++ b/TRLevelControl/Model/Common/TRObjectTexture.cs @@ -98,63 +98,23 @@ public List GetExtendedPoints() public void FlipHorizontal() { - switch (UVMode) + (Vertices[1], Vertices[0]) = (Vertices[0], Vertices[1]); + if (!HasTriangleVertex) { - case TRUVMode.NW_Clockwise: - UVMode = TRUVMode.NE_AntiClockwise; - break; - case TRUVMode.NE_AntiClockwise: - UVMode = TRUVMode.NW_Clockwise; - break; - case TRUVMode.SW_AntiClockwise: - UVMode = TRUVMode.SE_Clockwise; - break; - case TRUVMode.SE_Clockwise: - UVMode = TRUVMode.SW_AntiClockwise; - break; - case TRUVMode.NE_Clockwise: - UVMode = TRUVMode.NW_AntiClockwise; - break; - case TRUVMode.NW_AntiClockwise: - UVMode = TRUVMode.NE_Clockwise; - break; - case TRUVMode.SW_Clockwise: - UVMode = TRUVMode.SE_AntiClockwise; - break; - case TRUVMode.SE_AntiClockwise: - UVMode = TRUVMode.SW_Clockwise; - break; + (Vertices[3], Vertices[2]) = (Vertices[2], Vertices[3]); } } public void FlipVertical() { - switch (UVMode) + if (HasTriangleVertex) { - case TRUVMode.NW_Clockwise: - UVMode = TRUVMode.SW_AntiClockwise; - break; - case TRUVMode.SW_AntiClockwise: - UVMode = TRUVMode.NW_Clockwise; - break; - case TRUVMode.NE_Clockwise: - UVMode = TRUVMode.SE_AntiClockwise; - break; - case TRUVMode.SE_AntiClockwise: - UVMode = TRUVMode.NE_Clockwise; - break; - case TRUVMode.SE_Clockwise: - UVMode = TRUVMode.NE_AntiClockwise; - break; - case TRUVMode.NE_AntiClockwise: - UVMode = TRUVMode.SE_Clockwise; - break; - case TRUVMode.SW_Clockwise: - UVMode = TRUVMode.NW_AntiClockwise; - break; - case TRUVMode.NW_AntiClockwise: - UVMode = TRUVMode.SW_Clockwise; - break; + (Vertices[2], Vertices[0]) = (Vertices[0], Vertices[2]); + } + else + { + (Vertices[3], Vertices[0]) = (Vertices[0], Vertices[3]); + (Vertices[2], Vertices[1]) = (Vertices[1], Vertices[2]); } } diff --git a/TRLevelControlTests/Common/TextureTests.cs b/TRLevelControlTests/Common/TextureTests.cs index dcf142202..8bc8b4c58 100644 --- a/TRLevelControlTests/Common/TextureTests.cs +++ b/TRLevelControlTests/Common/TextureTests.cs @@ -689,12 +689,12 @@ static void Test(TRObjectTexture texture, TRUVMode expected) } Test(MakeNWClockwiseQuad(), TRUVMode.NE_AntiClockwise); - Test(MakeNEClockwiseQuad(), TRUVMode.NW_AntiClockwise); + Test(MakeNEClockwiseQuad(), TRUVMode.SE_AntiClockwise); Test(MakeSEClockwiseQuad(), TRUVMode.SW_AntiClockwise); - Test(MakeSWClockwiseQuad(), TRUVMode.SE_AntiClockwise); - Test(MakeNWAntiClockwiseQuad(), TRUVMode.NE_Clockwise); + Test(MakeSWClockwiseQuad(), TRUVMode.NW_AntiClockwise); + Test(MakeNWAntiClockwiseQuad(), TRUVMode.SW_Clockwise); Test(MakeNEAntiClockwiseQuad(), TRUVMode.NW_Clockwise); - Test(MakeSEAntiClockwiseQuad(), TRUVMode.SW_Clockwise); + Test(MakeSEAntiClockwiseQuad(), TRUVMode.NE_Clockwise); Test(MakeSWAntiClockwiseQuad(), TRUVMode.SE_Clockwise); } @@ -708,12 +708,12 @@ static void Test(TRObjectTexture texture, TRUVMode expected) } Test(MakeNWClockwiseQuad(), TRUVMode.SW_AntiClockwise); - Test(MakeNEClockwiseQuad(), TRUVMode.SE_AntiClockwise); + Test(MakeNEClockwiseQuad(), TRUVMode.NW_AntiClockwise); Test(MakeSEClockwiseQuad(), TRUVMode.NE_AntiClockwise); - Test(MakeSWClockwiseQuad(), TRUVMode.NW_AntiClockwise); - Test(MakeNWAntiClockwiseQuad(), TRUVMode.SW_Clockwise); + Test(MakeSWClockwiseQuad(), TRUVMode.SE_AntiClockwise); + Test(MakeNWAntiClockwiseQuad(), TRUVMode.NE_Clockwise); Test(MakeNEAntiClockwiseQuad(), TRUVMode.SE_Clockwise); - Test(MakeSEAntiClockwiseQuad(), TRUVMode.NE_Clockwise); + Test(MakeSEAntiClockwiseQuad(), TRUVMode.SW_Clockwise); Test(MakeSWAntiClockwiseQuad(), TRUVMode.NW_Clockwise); } diff --git a/TRRandomizerCore/Randomizers/TR3/TR3ItemRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/TR3ItemRandomizer.cs index e6d89bba0..0be9fc0d2 100644 --- a/TRRandomizerCore/Randomizers/TR3/TR3ItemRandomizer.cs +++ b/TRRandomizerCore/Randomizers/TR3/TR3ItemRandomizer.cs @@ -13,6 +13,22 @@ namespace TRRandomizerCore.Randomizers; public class TR3ItemRandomizer : BaseTR3Randomizer { + private static readonly List _assaultPickupModels = new() + { + TR3Type.PistolAmmo_P, + TR3Type.Shotgun_P, + TR3Type.Deagle_P, + TR3Type.Uzis_P, + TR3Type.MP5_P, + TR3Type.RocketLauncher_P, + TR3Type.GrenadeLauncher_P, + TR3Type.Harpoon_P, + TR3Type.SmallMed_P, + TR3Type.LargeMed_P, + TR3Type.LaraDeagleAnimation_H_Nevada, + TR3Type.LaraUziAnimation_H_Nevada, + }; + private readonly Dictionary> _excludedLocations; private readonly Dictionary> _pistolLocations; @@ -92,41 +108,11 @@ public void RandomizeKeyItems() private bool ImportAssaultModels(TR3CombinedLevel level) { - // #312 We need all item models plus Lara's associated weapon animations for the - // assault course. The DEagle and Uzi anims will match Lara's default home outfit - // - outfit rando will take care of replacing these if it's enabled. TR3DataImporter importer = new() { Level = level.Data, LevelName = level.Name, - ClearUnusedSprites = false, - TypesToImport = new List - { - TR3Type.LaraShotgunAnimation_H, - TR3Type.LaraDeagleAnimation_H_Home, - TR3Type.LaraUziAnimation_H_Home, - TR3Type.LaraMP5Animation_H, - TR3Type.LaraRocketAnimation_H, - TR3Type.LaraGrenadeAnimation_H, - TR3Type.LaraHarpoonAnimation_H, - TR3Type.PistolAmmo_P, - TR3Type.Shotgun_P, TR3Type.Shotgun_M_H, - TR3Type.ShotgunAmmo_P, TR3Type.ShotgunAmmo_M_H, - TR3Type.Deagle_P, TR3Type.Deagle_M_H, - TR3Type.DeagleAmmo_P, TR3Type.DeagleAmmo_M_H, - TR3Type.Uzis_P, TR3Type.Uzis_M_H, - TR3Type.UziAmmo_P, TR3Type.UziAmmo_M_H, - TR3Type.MP5_P, TR3Type.MP5_M_H, - TR3Type.MP5Ammo_P, TR3Type.MP5Ammo_M_H, - TR3Type.RocketLauncher_M_H, TR3Type.RocketLauncher_P, - TR3Type.Rockets_M_H, TR3Type.Rockets_P, - TR3Type.GrenadeLauncher_M_H, TR3Type.GrenadeLauncher_P, - TR3Type.Grenades_M_H, TR3Type.Grenades_P, - TR3Type.Harpoon_M_H, TR3Type.Harpoon_P, - TR3Type.Harpoons_M_H, TR3Type.Harpoons_P, - TR3Type.SmallMed_P, TR3Type.SmallMed_M_H, - TR3Type.LargeMed_P, TR3Type.LargeMed_M_H - }, + TypesToImport = _assaultPickupModels, DataFolder = GetResourcePath(@"TR3\Objects") }; @@ -138,8 +124,28 @@ private bool ImportAssaultModels(TR3CombinedLevel level) try { - // Try to import the selected models into the level. importer.Import(); + + // Manipulate the Nevada leg meshes to match the home outfit. + // Anything using vertex 26 and above is a holstered gun face. + TRModel pistolModel = level.Data.Models[TR3Type.LaraPistolAnimation_H]; + TRModel deagleModel = level.Data.Models[TR3Type.LaraDeagleAnimation_H]; + TRModel uzisModel = level.Data.Models[TR3Type.LaraUziAnimation_H]; + + static void CopyFaces(TRMesh baseMesh, TRMesh targetMesh) + { + static bool regularFace(TRMeshFace f) => f.Vertices.All(v => v < 26); + targetMesh.TexturedRectangles.RemoveAll(regularFace); + targetMesh.TexturedTriangles.RemoveAll(regularFace); + targetMesh.TexturedRectangles.AddRange(baseMesh.TexturedRectangles.FindAll(regularFace)); + targetMesh.TexturedTriangles.AddRange(baseMesh.TexturedTriangles.FindAll(regularFace)); + } + + deagleModel.Meshes[1] = pistolModel.Meshes[1]; + CopyFaces(pistolModel.Meshes[4], deagleModel.Meshes[4]); + CopyFaces(pistolModel.Meshes[1], uzisModel.Meshes[1]); + CopyFaces(pistolModel.Meshes[4], uzisModel.Meshes[4]); + return true; } catch (PackingException) diff --git a/TRRandomizerCore/Randomizers/TR3/TR3SecretRandomizer.cs b/TRRandomizerCore/Randomizers/TR3/TR3SecretRandomizer.cs index 5bbc5b80c..55884568e 100644 --- a/TRRandomizerCore/Randomizers/TR3/TR3SecretRandomizer.cs +++ b/TRRandomizerCore/Randomizers/TR3/TR3SecretRandomizer.cs @@ -276,6 +276,10 @@ private static void CreateTrapdoorTrigger(TR3Entity door, short doorIndex, TR3Le private void PlaceAllSecrets(TR3CombinedLevel level, List pickupTypes, TRSecretRoom rewardRoom) { + if (!_locations.ContainsKey(level.Name)) + { + return; + } List locations = _locations[level.Name]; TRSecretPlacement secret = new(); diff --git a/TRRandomizerCore/Resources/TR2/Textures/wireframing.json b/TRRandomizerCore/Resources/TR2/Textures/wireframing.json index 4a270c400..e359d743b 100644 --- a/TRRandomizerCore/Resources/TR2/Textures/wireframing.json +++ b/TRRandomizerCore/Resources/TR2/Textures/wireframing.json @@ -68,7 +68,7 @@ "ExcludedTextures": [ 1437, 1505, 1506, 1507 ] }, "HOUSE.TR2": { - "ExcludedTextures": [ 93, 96, 97, 125 ] + "ExcludedTextures": [ 1283, 1284, 1285, 1286 ] }, "ASSAULT.TR2": { "ExcludedTextures": [ 799, 800, 801, 802 ] diff --git a/TRRandomizerCore/Resources/TR3/Environment/JUNGLE.TR2-Environment.json b/TRRandomizerCore/Resources/TR3/Environment/JUNGLE.TR2-Environment.json index 759e22b82..9b58e7f6d 100644 --- a/TRRandomizerCore/Resources/TR3/Environment/JUNGLE.TR2-Environment.json +++ b/TRRandomizerCore/Resources/TR3/Environment/JUNGLE.TR2-Environment.json @@ -869,195 +869,183 @@ "X": 26112, "Y": 14080, "Z": 28288, - "Room": -2, - "Angle": -32768 + "Room": -2 }, { "X": 26112, "Y": 13056, "Z": 28288, - "Room": -2, - "Angle": -32768 + "Room": -2 }, { "X": 26112, "Y": 12032, "Z": 28288, - "Room": -2, - "Angle": -32768 + "Room": -2 }, { "X": 26112, "Y": 11008, "Z": 28288, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 26112, "Y": 9984, "Z": 28288, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 26112, "Y": 8960, "Z": 28288, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 26112, "Y": 7936, "Z": 28288, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 26112, "Y": 6912, "Z": 28288, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 26112, "Y": 5888, "Z": 28288, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 26112, "Y": 4864, "Z": 28288, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 26112, "Y": 3840, "Z": 28288, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 26112, "Y": 2816, "Z": 28288, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 26112, "Y": 1792, "Z": 28288, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 26112, "Y": 768, "Z": 28288, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 25984, "Y": 26624, "Z": 39424, "Room": -4, - "Angle": 16384 + "Angle": -16384 }, { "X": 25984, "Y": 25600, "Z": 39424, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 25984, "Y": 24576, "Z": 39424, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 25984, "Y": 23552, "Z": 39424, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 25984, "Y": 22528, "Z": 39424, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 25984, "Y": 21504, "Z": 39424, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 25984, "Y": 20480, "Z": 39424, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 25984, "Y": 19456, "Z": 39424, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 25984, "Y": 18432, "Z": 39424, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 25984, "Y": 17408, "Z": 39424, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 25984, "Y": 16384, "Z": 39424, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 25984, "Y": 15360, "Z": 39424, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 25088, "Y": 26112, "Z": 58752, - "Room": -5 + "Room": -5, + "Angle": -32768 }, { "X": 25088, "Y": 25088, "Z": 58752, - "Room": -5 + "Room": -5, + "Angle": -32768 } ] }, diff --git a/TRRandomizerCore/Resources/TR3/Environment/SHORE.TR2-Environment.json b/TRRandomizerCore/Resources/TR3/Environment/SHORE.TR2-Environment.json index 7a7afffff..c66a066a7 100644 --- a/TRRandomizerCore/Resources/TR3/Environment/SHORE.TR2-Environment.json +++ b/TRRandomizerCore/Resources/TR3/Environment/SHORE.TR2-Environment.json @@ -28,36 +28,42 @@ "X": 15872, "Y": 2048, "Z": 50560, - "Room": 20 + "Room": 20, + "Angle": -32768 }, { "X": 15872, "Y": 1024, "Z": 50560, - "Room": 20 + "Room": 20, + "Angle": -32768 }, { "X": 15872, "Z": 50560, - "Room": 2 + "Room": 2, + "Angle": -32768 }, { "X": 15872, "Y": -1024, "Z": 50560, - "Room": 2 + "Room": 2, + "Angle": -32768 }, { "X": 15872, "Y": -2048, "Z": 50560, - "Room": 2 + "Room": 2, + "Angle": -32768 }, { "X": 15872, "Y": -3072, "Z": 50560, - "Room": 2 + "Room": 2, + "Angle": -32768 } ] }, diff --git a/TRRandomizerCore/Resources/TR3/Environment/TONYBOSS.TR2-Environment.json b/TRRandomizerCore/Resources/TR3/Environment/TONYBOSS.TR2-Environment.json index 37099237e..fc16a3d93 100644 --- a/TRRandomizerCore/Resources/TR3/Environment/TONYBOSS.TR2-Environment.json +++ b/TRRandomizerCore/Resources/TR3/Environment/TONYBOSS.TR2-Environment.json @@ -59,28 +59,28 @@ "Y": -8960, "Z": 56832, "Room": 4, - "Angle": -16384 + "Angle": 16384 }, { "X": 23168, "Y": -9984, "Z": 56832, "Room": 4, - "Angle": -16384 + "Angle": 16384 }, { "X": 39552, "Y": -4864, "Z": 52736, "Room": 24, - "Angle": -16384 + "Angle": 16384 }, { "X": 39552, "Y": -5888, "Z": 52736, "Room": 24, - "Angle": -16384 + "Angle": 16384 } ] } diff --git a/TRRandomizerCore/Resources/TR3/Locations/locations.json b/TRRandomizerCore/Resources/TR3/Locations/locations.json index ed7867b58..cdd1cd692 100644 --- a/TRRandomizerCore/Resources/TR3/Locations/locations.json +++ b/TRRandomizerCore/Resources/TR3/Locations/locations.json @@ -1496,9 +1496,9 @@ "Room": 84 }, { - "X": 53443, - "Y": 28877, - "Z": 72603, + "X": 53436, + "Y": 28823, + "Z": 72534, "Room": 81 }, { diff --git a/TRRandomizerCore/Resources/TR3/Objects/DEAGLEAMMO_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/DEAGLEAMMO_M_H.TRB new file mode 100644 index 000000000..e4372bd44 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/DEAGLEAMMO_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/DEAGLEAMMO_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/DEAGLEAMMO_P.TRB new file mode 100644 index 000000000..a1b32f9ac Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/DEAGLEAMMO_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/DEAGLE_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/DEAGLE_M_H.TRB new file mode 100644 index 000000000..0dfb4f705 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/DEAGLE_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/DEAGLE_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/DEAGLE_P.TRB new file mode 100644 index 000000000..445d31609 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/DEAGLE_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/ELEMENT115_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/ELEMENT115_M_H.TRB index ab89a9b68..b695e8434 100644 Binary files a/TRRandomizerCore/Resources/TR3/Objects/ELEMENT115_M_H.TRB and b/TRRandomizerCore/Resources/TR3/Objects/ELEMENT115_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/ELEMENT115_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/ELEMENT115_P.TRB index b9ad3268b..6e10ade12 100644 Binary files a/TRRandomizerCore/Resources/TR3/Objects/ELEMENT115_P.TRB and b/TRRandomizerCore/Resources/TR3/Objects/ELEMENT115_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/EYEOFISIS_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/EYEOFISIS_M_H.TRB index e1387b66a..bc8c35b01 100644 Binary files a/TRRandomizerCore/Resources/TR3/Objects/EYEOFISIS_M_H.TRB and b/TRRandomizerCore/Resources/TR3/Objects/EYEOFISIS_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/EYEOFISIS_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/EYEOFISIS_P.TRB index aacb1eb13..82c8f82d7 100644 Binary files a/TRRandomizerCore/Resources/TR3/Objects/EYEOFISIS_P.TRB and b/TRRandomizerCore/Resources/TR3/Objects/EYEOFISIS_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/GRENADELAUNCHER_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/GRENADELAUNCHER_M_H.TRB new file mode 100644 index 000000000..588449ded Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/GRENADELAUNCHER_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/GRENADELAUNCHER_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/GRENADELAUNCHER_P.TRB new file mode 100644 index 000000000..95e8bd7d9 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/GRENADELAUNCHER_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/GRENADESINGLE.TRB b/TRRandomizerCore/Resources/TR3/Objects/GRENADESINGLE.TRB new file mode 100644 index 000000000..eb47e095a Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/GRENADESINGLE.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/GRENADES_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/GRENADES_M_H.TRB new file mode 100644 index 000000000..30718cacf Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/GRENADES_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/GRENADES_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/GRENADES_P.TRB new file mode 100644 index 000000000..ceaaeadfe Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/GRENADES_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/GUNFLAREMP5_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/GUNFLAREMP5_H.TRB new file mode 100644 index 000000000..74b2f1477 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/GUNFLAREMP5_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/GUNFLARE_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/GUNFLARE_H.TRB new file mode 100644 index 000000000..ba2c45c5d Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/GUNFLARE_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/HARPOONSINGLE2.TRB b/TRRandomizerCore/Resources/TR3/Objects/HARPOONSINGLE2.TRB new file mode 100644 index 000000000..b664c38de Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/HARPOONSINGLE2.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/HARPOONS_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/HARPOONS_M_H.TRB new file mode 100644 index 000000000..d931cceb8 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/HARPOONS_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/HARPOONS_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/HARPOONS_P.TRB new file mode 100644 index 000000000..ecd1c6e73 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/HARPOONS_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/HARPOON_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/HARPOON_M_H.TRB new file mode 100644 index 000000000..ffa2ca773 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/HARPOON_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/HARPOON_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/HARPOON_P.TRB new file mode 100644 index 000000000..4424cc6b5 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/HARPOON_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/INFADA_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/INFADA_M_H.TRB index b815969f6..0909bc6c0 100644 Binary files a/TRRandomizerCore/Resources/TR3/Objects/INFADA_M_H.TRB and b/TRRandomizerCore/Resources/TR3/Objects/INFADA_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/INFADA_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/INFADA_P.TRB index 89bbfe691..86dbfa627 100644 Binary files a/TRRandomizerCore/Resources/TR3/Objects/INFADA_P.TRB and b/TRRandomizerCore/Resources/TR3/Objects/INFADA_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/LARAGRENADEANIMATION_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/LARAGRENADEANIMATION_H.TRB new file mode 100644 index 000000000..973b2404d Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/LARAGRENADEANIMATION_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/LARAHARPOONANIMATION_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/LARAHARPOONANIMATION_H.TRB new file mode 100644 index 000000000..0fe7fe70d Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/LARAHARPOONANIMATION_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/LARAMP5ANIMATION_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/LARAMP5ANIMATION_H.TRB new file mode 100644 index 000000000..f2f4dd447 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/LARAMP5ANIMATION_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/LARAROCKETANIMATION_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/LARAROCKETANIMATION_H.TRB new file mode 100644 index 000000000..f5922408f Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/LARAROCKETANIMATION_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/LARASHOTGUNANIMATION_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/LARASHOTGUNANIMATION_H.TRB new file mode 100644 index 000000000..0e45fb127 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/LARASHOTGUNANIMATION_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/LARGEMED_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/LARGEMED_M_H.TRB new file mode 100644 index 000000000..484dc5791 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/LARGEMED_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/LARGEMED_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/LARGEMED_P.TRB new file mode 100644 index 000000000..4bf5a8781 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/LARGEMED_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/MP5AMMO_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/MP5AMMO_M_H.TRB new file mode 100644 index 000000000..885437418 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/MP5AMMO_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/MP5AMMO_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/MP5AMMO_P.TRB new file mode 100644 index 000000000..7d7d30cf5 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/MP5AMMO_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/MP5_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/MP5_M_H.TRB new file mode 100644 index 000000000..3418c9c0d Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/MP5_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/MP5_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/MP5_P.TRB new file mode 100644 index 000000000..6479c831e Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/MP5_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/ORADAGGER_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/ORADAGGER_M_H.TRB index c7e2fb8f1..0a21b1fcb 100644 Binary files a/TRRandomizerCore/Resources/TR3/Objects/ORADAGGER_M_H.TRB and b/TRRandomizerCore/Resources/TR3/Objects/ORADAGGER_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/ORADAGGER_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/ORADAGGER_P.TRB index 7bd2e7485..67b74d394 100644 Binary files a/TRRandomizerCore/Resources/TR3/Objects/ORADAGGER_P.TRB and b/TRRandomizerCore/Resources/TR3/Objects/ORADAGGER_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/PISTOLAMMO_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/PISTOLAMMO_M_H.TRB new file mode 100644 index 000000000..32dbe7778 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/PISTOLAMMO_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/PISTOLAMMO_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/PISTOLAMMO_P.TRB new file mode 100644 index 000000000..aeb52b24c Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/PISTOLAMMO_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/PISTOLS_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/PISTOLS_M_H.TRB new file mode 100644 index 000000000..43cb81f99 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/PISTOLS_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/PISTOLS_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/PISTOLS_P.TRB new file mode 100644 index 000000000..e93a4043d Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/PISTOLS_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/QUEST1_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/QUEST1_M_H.TRB new file mode 100644 index 000000000..07eb4a30c Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/QUEST1_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/QUEST1_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/QUEST1_P.TRB new file mode 100644 index 000000000..4327e6e61 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/QUEST1_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/QUEST2_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/QUEST2_M_H.TRB new file mode 100644 index 000000000..7f74c83bf Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/QUEST2_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/QUEST2_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/QUEST2_P.TRB new file mode 100644 index 000000000..31e9e7a9c Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/QUEST2_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/ROCKETLAUNCHER_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/ROCKETLAUNCHER_M_H.TRB new file mode 100644 index 000000000..ab9984c52 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/ROCKETLAUNCHER_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/ROCKETLAUNCHER_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/ROCKETLAUNCHER_P.TRB new file mode 100644 index 000000000..338f431e6 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/ROCKETLAUNCHER_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/ROCKETSINGLE.TRB b/TRRandomizerCore/Resources/TR3/Objects/ROCKETSINGLE.TRB new file mode 100644 index 000000000..be12397fc Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/ROCKETSINGLE.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/ROCKETS_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/ROCKETS_M_H.TRB new file mode 100644 index 000000000..ecf43e436 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/ROCKETS_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/ROCKETS_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/ROCKETS_P.TRB new file mode 100644 index 000000000..f5a73e035 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/ROCKETS_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/SHOTGUNAMMO_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/SHOTGUNAMMO_M_H.TRB new file mode 100644 index 000000000..3a851818c Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/SHOTGUNAMMO_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/SHOTGUNAMMO_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/SHOTGUNAMMO_P.TRB new file mode 100644 index 000000000..9950e69b3 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/SHOTGUNAMMO_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/SHOTGUN_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/SHOTGUN_M_H.TRB new file mode 100644 index 000000000..3ffe842fc Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/SHOTGUN_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/SHOTGUN_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/SHOTGUN_P.TRB new file mode 100644 index 000000000..1270de77f Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/SHOTGUN_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/SMALLMED_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/SMALLMED_M_H.TRB new file mode 100644 index 000000000..72a8d63ba Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/SMALLMED_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/SMALLMED_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/SMALLMED_P.TRB new file mode 100644 index 000000000..15a7eece0 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/SMALLMED_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/UZIAMMO_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/UZIAMMO_M_H.TRB new file mode 100644 index 000000000..a6b22ba4d Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/UZIAMMO_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/UZIAMMO_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/UZIAMMO_P.TRB new file mode 100644 index 000000000..7b29a3c6f Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/UZIAMMO_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/UZIS_M_H.TRB b/TRRandomizerCore/Resources/TR3/Objects/UZIS_M_H.TRB new file mode 100644 index 000000000..e6490106e Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/UZIS_M_H.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Objects/UZIS_P.TRB b/TRRandomizerCore/Resources/TR3/Objects/UZIS_P.TRB new file mode 100644 index 000000000..9b2a8e875 Binary files /dev/null and b/TRRandomizerCore/Resources/TR3/Objects/UZIS_P.TRB differ diff --git a/TRRandomizerCore/Resources/TR3/Textures/Mapping/CUT6.TR2-Textures.json b/TRRandomizerCore/Resources/TR3/Textures/Mapping/CUT6.TR2-Textures.json index ee512b2b3..36886543b 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Mapping/CUT6.TR2-Textures.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Mapping/CUT6.TR2-Textures.json @@ -134,13 +134,13 @@ "Y": 48 }, { - "Segment": 19, + "Segment": 20, "Tile": 6, "X": 164, "Y": 14 }, { - "Segment": 20, + "Segment": 19, "Tile": 5, "X": 92, "Y": 246 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Mapping/CUT9.TR2-Textures.json b/TRRandomizerCore/Resources/TR3/Textures/Mapping/CUT9.TR2-Textures.json index 1253c0152..801203e4b 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Mapping/CUT9.TR2-Textures.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Mapping/CUT9.TR2-Textures.json @@ -134,13 +134,13 @@ "Y": 56 }, { - "Segment": 19, + "Segment": 20, "Tile": 4, "X": 112, "Y": 32 }, { - "Segment": 20, + "Segment": 19, "Tile": 4, "X": 80, "Y": 32 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Mapping/JUNGLE.TR2-Textures.json b/TRRandomizerCore/Resources/TR3/Textures/Mapping/JUNGLE.TR2-Textures.json index 324091701..ab04ea9bd 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Mapping/JUNGLE.TR2-Textures.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Mapping/JUNGLE.TR2-Textures.json @@ -140,13 +140,13 @@ "Y": 38 }, { - "Segment": 19, + "Segment": 20, "Tile": 9, "X": 0, "Y": 174 }, { - "Segment": 20, + "Segment": 19, "Tile": 9, "X": 64, "Y": 172 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Mapping/QUADCHAS.TR2-Textures.json b/TRRandomizerCore/Resources/TR3/Textures/Mapping/QUADCHAS.TR2-Textures.json index 5da8198ff..077e1edc9 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Mapping/QUADCHAS.TR2-Textures.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Mapping/QUADCHAS.TR2-Textures.json @@ -140,13 +140,13 @@ "Y": 72 }, { - "Segment": 19, + "Segment": 20, "Tile": 7, "X": 32, "Y": 214 }, { - "Segment": 20, + "Segment": 19, "Tile": 7, "X": 0, "Y": 212 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Mapping/TEMPLE.TR2-Textures.json b/TRRandomizerCore/Resources/TR3/Textures/Mapping/TEMPLE.TR2-Textures.json index ebd6c1b3d..776318ba1 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Mapping/TEMPLE.TR2-Textures.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Mapping/TEMPLE.TR2-Textures.json @@ -293,13 +293,13 @@ "Y": 124 }, { - "Segment": 19, + "Segment": 20, "Tile": 7, "X": 96, "Y": 206 }, { - "Segment": 20, + "Segment": 19, "Tile": 7, "X": 32, "Y": 206 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Mapping/TONYBOSS.TR2-Textures.json b/TRRandomizerCore/Resources/TR3/Textures/Mapping/TONYBOSS.TR2-Textures.json index dff671a99..ebdd618d7 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Mapping/TONYBOSS.TR2-Textures.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Mapping/TONYBOSS.TR2-Textures.json @@ -140,13 +140,13 @@ "Y": 160 }, { - "Segment": 19, + "Segment": 20, "Tile": 8, "X": 208, "Y": 48 }, { - "Segment": 20, + "Segment": 19, "Tile": 8, "X": 176, "Y": 48 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Compsognathus/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Compsognathus/Data.json index ce112dd2d..f03dd8c58 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Compsognathus/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Compsognathus/Data.json @@ -12,11 +12,11 @@ "EntityTextureMap": { "34": { - "397": 0, - "414": 1, - "418": 2, - "410": 3, - "408": 4 + "393": 0, + "410": 1, + "414": 2, + "405": 3, + "403": 4 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Crawler/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Crawler/Data.json index aa965f212..02c432573 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Crawler/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Crawler/Data.json @@ -16,24 +16,24 @@ "EntityTextureMap": { "42": { - "511": 0, - "505": 1, - "506": 2, - "514": 3, - "510": 4, + "529": 0, + "503": 1, + "504": 2, + "512": 3, + "508": 4, "525": 5, - "529": 6, - "488": 7, - "481": 8, - "517": 9, - "501": 10, - "504": 11, - "562": 12, - "499": 13, - "564": 14, - "484": 15, - "483": 16, - "515": 17 + "527": 6, + "486": 7, + "470": 8, + "515": 9, + "499": 10, + "502": 11, + "560": 12, + "497": 13, + "562": 14, + "485": 15, + "472": 16, + "513": 17 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/LondonGuard/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/LondonGuard/Data.json index 64205e40c..0fe3df078 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/LondonGuard/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/LondonGuard/Data.json @@ -11,9 +11,9 @@ "EntityTextureMap": { "56": { - "686": 0, - "725": 1, - "670": 2 + "684": 0, + "723": 1, + "681": 2 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Punk/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Punk/Data.json index 0888395de..daca88abf 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Punk/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Punk/Data.json @@ -12,26 +12,26 @@ "EntityTextureMap": { "53": { - "558": 0, - "556": 1, - "592": 2, - "580": 3, - "668": 4, - "673": 5, - "600": 6, - "591": 7, - "590": 8, - "586": 9, - "585": 10, - "554": 11, - "589": 12, - "612": 13, - "606": 14, - "615": 15, - "587": 16, - "622": 17, - "616": 18, - "620": 19 + "551": 0, + "559": 1, + "590": 2, + "578": 3, + "666": 4, + "659": 5, + "598": 6, + "589": 7, + "588": 8, + "584": 9, + "583": 10, + "552": 11, + "586": 12, + "607": 13, + "605": 14, + "613": 15, + "585": 16, + "620": 17, + "621": 18, + "611": 19 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/RXRedBoi/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/RXRedBoi/Data.json index 1956021b5..0e9c64eb0 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/RXRedBoi/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/RXRedBoi/Data.json @@ -12,17 +12,17 @@ "EntityTextureMap": { "39": { - "612": 0, - "610": 1, - "611": 2, - "631": 3, - "620": 4, - "621": 5, - "619": 6, - "622": 7, - "624": 8, - "628": 9, - "633": 10 + "625": 0, + "608": 1, + "609": 2, + "629": 3, + "618": 4, + "619": 5, + "616": 6, + "620": 7, + "622": 8, + "623": 9, + "631": 10 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Raptor/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Raptor/Data.json index 29cf3c79e..d12160196 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Raptor/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Raptor/Data.json @@ -12,25 +12,25 @@ "EntityTextureMap": { "288": { - "589": 0, - "608": 1, - "553": 2, - "547": 3, - "598": 4, - "633": 5, - "621": 6, - "605": 7, - "628": 8, - "1479": 9, - "1477": 10, - "613": 11, - "602": 12, - "596": 13, - "597": 14, - "625": 15, - "595": 16, - "637": 17, - "564": 18 + "585": 0, + "607": 1, + "569": 2, + "543": 3, + "594": 4, + "632": 5, + "620": 6, + "601": 7, + "624": 8, + "1475": 9, + "1474": 10, + "610": 11, + "598": 12, + "592": 13, + "593": 14, + "621": 15, + "591": 16, + "587": 17, + "560": 18 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Shiva/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Shiva/Data.json index 37678dbb4..c592a0406 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Shiva/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/Shiva/Data.json @@ -12,24 +12,24 @@ "EntityTextureMap": { "70": { - "438": 0, - "441": 1, - "443": 2, - "459": 3, - "464": 4, - "472": 5, - "450": 6, - "435": 7, - "448": 8, - "429": 9, - "433": 10, - "432": 11, - "444": 12, - "456": 13, - "451": 14, - "471": 15, - "462": 16, - "455": 17 + "431": 0, + "434": 1, + "436": 2, + "452": 3, + "456": 4, + "454": 5, + "443": 6, + "420": 7, + "435": 8, + "422": 9, + "426": 10, + "425": 11, + "438": 12, + "447": 13, + "444": 14, + "453": 15, + "455": 16, + "450": 17 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/TRex/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/TRex/Data.json index c2a69e33a..caf4983b0 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/TRex/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Enemies/TRex/Data.json @@ -12,34 +12,34 @@ "EntityTextureMap": { "287": { - "1005": 0, - "1012": 1, - "1048": 2, - "1049": 3, - "1091": 4, - "1076": 5, - "1028": 6, - "1037": 7, - "1098": 8, - "1109": 9, - "1111": 10, - "1014": 11, - "1056": 12, - "1078": 13, - "1072": 14, - "1095": 15, - "1093": 16, - "1067": 17, - "1086": 18, - "1082": 19, - "1088": 20, - "1061": 21, - "1054": 22, - "1025": 23, - "1092": 24, - "1055": 25, - "1029": 26, - "1087": 27 + "1039": 0, + "1008": 1, + "1042": 2, + "1045": 3, + "1087": 4, + "1072": 5, + "1023": 6, + "1033": 7, + "1097": 8, + "1104": 9, + "1102": 10, + "1010": 11, + "1052": 12, + "1064": 13, + "1057": 14, + "1099": 15, + "1089": 16, + "1063": 17, + "1082": 18, + "1078": 19, + "1084": 20, + "1069": 21, + "1050": 22, + "1021": 23, + "1088": 24, + "1051": 25, + "1025": 26, + "1083": 27 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Antarctica/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Antarctica/Data.json index c075657b6..567be1eeb 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Antarctica/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Antarctica/Data.json @@ -11,26 +11,26 @@ "EntityTextureMap": { "7001": { - "1408": 0, - "1393": 1, - "1410": 2, - "1311": 3, - "1365": 4, - "1310": 5, - "1176": 6, - "1321": 7, - "1373": 8, - "1387": 9, - "1318": 10, - "1341": 11, - "1333": 12, - "1337": 13, - "1383": 14, - "1348": 15, - "1359": 16, - "1378": 17, - "1193": 18, - "1375": 19 + "1390": 0, + "1391": 1, + "1393": 2, + "1309": 3, + "1363": 4, + "1329": 5, + "1174": 6, + "1319": 7, + "1371": 8, + "1385": 9, + "1360": 10, + "1338": 11, + "1331": 12, + "1335": 13, + "1381": 14, + "1347": 15, + "1354": 16, + "1334": 17, + "1191": 18, + "1373": 19 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Bobble/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Bobble/Data.json index c6f58c013..6d286f057 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Bobble/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Bobble/Data.json @@ -7,7 +7,7 @@ "EntityTextureMap": { "3001": { - "1238": 0 + "1228": 0 }, "4001": { "228": 0 @@ -16,7 +16,7 @@ "316": 0 }, "6001": { - "329": 1 + "326": 1 }, "7001": { "323": 2 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Coastal/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Coastal/Data.json index 05ecd5475..ecc925aaa 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Coastal/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Coastal/Data.json @@ -5,42 +5,42 @@ "EntityTextureMap": { "4001": { - "960": 0, - "962": 1, - "980": 2, - "957": 3, - "1034": 4, - "963": 5, - "1064": 6, - "958": 7, - "1093": 8, - "961": 9, - "1033": 10, - "959": 11, - "1037": 12, - "1085": 13, + "961": 0, + "958": 1, + "968": 2, + "953": 3, + "1030": 4, + "959": 5, + "1090": 6, + "954": 7, + "1057": 8, + "957": 9, + "1029": 10, + "955": 11, + "1033": 12, + "1074": 13, "14": 14, - "100": 15, - "0": 16, - "91": 17, + "88": 15, + "84": 16, + "90": 17, "13": 18, - "978": 19, - "969": 20, - "1032": 21, - "1043": 22, - "1035": 23, - "1036": 24, - "1083": 25, - "1081": 26, - "1087": 27, - "1062": 28, - "1054": 29, - "967": 30, - "1046": 31, - "1050": 32, - "1055": 33, - "1045": 34, - "15": 35 + "966": 19, + "964": 20, + "1028": 21, + "1039": 22, + "1031": 23, + "1032": 24, + "1072": 25, + "1077": 26, + "1083": 27, + "1058": 28, + "1050": 29, + "963": 30, + "1044": 31, + "1048": 32, + "1065": 33, + "1041": 34, + "4": 35 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/India/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/India/Data.json index 4cbddccff..6de439adf 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/India/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/India/Data.json @@ -7,33 +7,33 @@ "EntityTextureMap": { "3001": { - "1000": 0, - "1113": 1, - "1116": 2, - "1112": 3, - "1117": 4, - "1178": 5, - "1138": 6, - "1173": 8, - "1129": 9, - "1111": 10, - "1151": 11, - "1115": 12, - "1127": 13, - "1167": 14, - "1120": 15, - "1169": 16, - "1119": 17, - "1165": 18, - "1126": 19, - "1110": 20, - "1118": 21, - "1170": 22, - "1172": 23, - "1145": 24, - "1133": 25, - "1146": 26, - "1001": 27 + "993": 0, + "1104": 1, + "1107": 2, + "1103": 3, + "1108": 4, + "1139": 5, + "1144": 6, + "1133": 8, + "1123": 9, + "1102": 10, + "1128": 11, + "1106": 12, + "1119": 13, + "1157": 14, + "1111": 15, + "1154": 16, + "1110": 17, + "1156": 18, + "1101": 19, + "1117": 20, + "1109": 21, + "1127": 22, + "1134": 23, + "1168": 24, + "1126": 25, + "1137": 26, + "994": 27 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Nevada/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Nevada/Data.json index 34bada1b8..90eb7b055 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Nevada/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Nevada/Data.json @@ -11,57 +11,57 @@ "EntityTextureMap": { "6001": { - "1220": 0, - "1132": 1, - "1158": 2, - "1209": 3, - "1211": 4, - "1205": 5, - "1204": 6, + "1219": 0, + "1187": 1, + "1188": 2, + "1208": 3, + "1209": 4, + "1203": 5, + "1201": 6, "12": 7, - "7": 8, - "60": 9, - "14": 10, - "1192": 11, - "1133": 12, - "1113": 13, - "1122": 14, - "1154": 15, - "1145": 16, - "1182": 17, - "21": 18, - "5": 19, + "58": 8, + "59": 9, + "61": 10, + "1190": 11, + "1189": 12, + "1111": 13, + "1120": 14, + "1153": 15, + "1144": 16, + "15": 17, + "13": 18, + "1123": 19, "68": 20, - "10": 21, - "8": 22, - "1114": 23, - "1102": 24, - "1106": 25, - "1101": 26, - "1194": 27, - "1219": 28, - "1130": 29, - "1104": 30, - "1137": 31, - "1160": 32, - "1135": 33, - "1120": 34, - "1150": 35, - "1215": 36, - "66": 37, + "11": 21, + "1124": 22, + "1110": 23, + "1100": 24, + "1104": 25, + "1099": 26, + "1192": 27, + "1154": 28, + "1186": 29, + "1102": 30, + "1135": 31, + "1158": 32, + "1133": 33, + "1118": 34, + "1185": 35, + "1213": 36, + "1": 37, "57": 38, - "54": 39, + "53": 39, "55": 40, "2": 41, "3": 42, "50": 43, "56": 44, "52": 45, - "1136": 46, - "1124": 47, + "1151": 46, + "1113": 47, "51": 48, - "1103": 49, - "1107": 50 + "1101": 49, + "1105": 50 }, "6002": { "64": 51 diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Socks/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Socks/Data.json index e83b24c2c..e70894f7a 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Socks/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Lara/Socks/Data.json @@ -7,14 +7,14 @@ "EntityTextureMap": { "3001": { - "1042": 2, - "1053": 1, - "1057": 0 + "1033": 2, + "1043": 1, + "1048": 0 }, "4001": { - "981": 2, - "986": 1, - "987": 0 + "977": 2, + "981": 1, + "986": 0 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/Element115/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/Element115/Data.json index 1eea0b339..1ae7639d3 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/Element115/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/Element115/Data.json @@ -3,10 +3,7 @@ "EntityTextureMap": { "241": { - "1283": 0 - }, - "245": { - "1283": 0 + "1305": 0 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/EyeOfIsis/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/EyeOfIsis/Data.json index 5c3584380..2ca88f3d0 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/EyeOfIsis/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/EyeOfIsis/Data.json @@ -3,12 +3,8 @@ "EntityTextureMap": { "242": { - "770": 0, - "791": 1 - }, - "246": { - "770": 0, - "791": 1 + "768": 0, + "789": 1 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/HandOfRathmore/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/HandOfRathmore/Data.json index eca9bc27a..68da31e05 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/HandOfRathmore/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/HandOfRathmore/Data.json @@ -3,10 +3,7 @@ "EntityTextureMap": { "237": { - "1177": 0 - }, - "239": { - "1177": 0 + "1169": 0 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/InfadaStone/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/InfadaStone/Data.json index 2d5b1716c..21cebd164 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/InfadaStone/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/InfadaStone/Data.json @@ -12,20 +12,12 @@ "EntityTextureMap": { "240": { - "794": 0, - "796": 1, - "807": 2, - "802": 3, - "793": 4, - "801": 5 - }, - "244": { - "794": 0, - "796": 1, - "807": 2, - "802": 3, - "793": 4, - "801": 5 + "787": 0, + "789": 1, + "793": 2, + "795": 3, + "797": 4, + "794": 5 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/OraDagger/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/OraDagger/Data.json index a9b70ef84..4257adc14 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/OraDagger/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/OraDagger/Data.json @@ -3,12 +3,8 @@ "EntityTextureMap": { "243": { - "970": 0, - "954": 1 - }, - "247": { - "970": 0, - "954": 1 + "966": 0, + "960": 1 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/SerpentStone/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/SerpentStone/Data.json index 243c0736b..8a58da4b9 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/SerpentStone/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Pickups/Artefacts/SerpentStone/Data.json @@ -3,10 +3,7 @@ "EntityTextureMap": { "236": { - "870": 0 - }, - "238": { - "870": 0 + "846": 0 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Boat/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Boat/Data.json index 2f340943f..aa2a34f55 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Boat/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Boat/Data.json @@ -7,18 +7,18 @@ "EntityTextureMap": { "15": { - "466": 0, - "460": 1, - "485": 2, - "459": 3, - "479": 4, + "464": 0, + "458": 1, + "425": 2, + "463": 3, + "453": 4, "461": 5, - "457": 6, - "467": 7, - "458": 8, - "490": 9, - "489": 10, - "487": 11 + "455": 6, + "465": 7, + "456": 8, + "488": 9, + "487": 10, + "485": 11 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Kayak/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Kayak/Data.json index 63f493c66..a92ade0ce 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Kayak/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Kayak/Data.json @@ -8,11 +8,11 @@ "EntityTextureMap": { "14": { - "357": 0, - "355": 1, - "371": 2, - "366": 3, - "360": 4 + "359": 0, + "358": 1, + "365": 2, + "363": 3, + "356": 4 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Quad/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Quad/Data.json index 545029a5f..03c41d522 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Quad/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/Quad/Data.json @@ -1,18 +1,18 @@ { "EntityTextureMap": { "16": { - "366": 0, - "361": 1, - "402": 2, - "382": 3, - "392": 4, - "386": 5, - "404": 6, - "373": 7, - "370": 8, - "372": 9, - "364": 10, - "380": 11 + "359": 0, + "354": 1, + "395": 2, + "375": 3, + "385": 4, + "384": 5, + "397": 6, + "366": 7, + "362": 8, + "364": 9, + "356": 10, + "371": 11 } }, diff --git a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/UPV/Data.json b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/UPV/Data.json index fb47c6684..28c4672cf 100644 --- a/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/UPV/Data.json +++ b/TRRandomizerCore/Resources/TR3/Textures/Source/Static/Vehicles/UPV/Data.json @@ -9,15 +9,15 @@ "EntityTextureMap": { "19": { - "712": 2, - "684": 3, - "700": 4, - "702": 5, - "719": 6, - "686": 7, - "689": 8, - "710": 9, - "706": 10 + "708": 2, + "689": 3, + "697": 4, + "699": 5, + "717": 6, + "690": 7, + "682": 8, + "706": 9, + "703": 10 } }, diff --git a/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs b/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs index 51db65e22..81b283c49 100644 --- a/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs +++ b/TRRandomizerCore/Textures/Wireframing/AbstractTRWireframer.cs @@ -398,6 +398,9 @@ protected TRTextileSegment CreateSegment(Rectangle rectangle) return new() { Texture = new TRObjectTexture(rectangle) + { + BlendingMode = TRBlendingMode.AlphaTesting + } }; } diff --git a/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs b/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs index 945744639..b22588de4 100644 --- a/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs +++ b/TRRandomizerCore/Textures/Wireframing/TR3Wireframer.cs @@ -153,7 +153,7 @@ private TRTextileRegion CreateCrashPad(Pen pen, SpecialTextureMode mode) switch (mode) { case SpecialTextureMode.CrashPadCircle: - graphics.FillEllipse(pen.Brush, new Rectangle(16, 16, 46, 46)); + graphics.FillEllipse(pen.Brush, new Rectangle(9, 9, 46, 46)); break; case SpecialTextureMode.CrashPadDiamond: graphics.FillPolygon(pen.Brush, new Point[]