From 464393e1d4791949c2e0e265047c06a681240ce2 Mon Sep 17 00:00:00 2001 From: lahm86 <33758420+lahm86@users.noreply.github.com> Date: Tue, 14 May 2024 15:16:25 +0100 Subject: [PATCH] Fix static mesh angles --- .../Environment/EGYPT.PHD-Environment.json | 46 +++++++++---------- .../Environment/LEVEL1.PHD-Environment.json | 12 +++-- .../Environment/LEVEL10A.PHD-Environment.json | 9 ++-- .../Environment/LEVEL3B.PHD-Environment.json | 46 +++++++++---------- .../Environment/LEVEL5.PHD-Environment.json | 3 +- .../Environment/LEVEL7A.PHD-Environment.json | 6 +-- .../Environment/LEVEL8A.PHD-Environment.json | 14 +++--- .../Environment/LEVEL8B.PHD-Environment.json | 2 +- .../Environment/LEVEL8C.PHD-Environment.json | 12 ++--- .../SecretMapping/CAT.PHD-SecretMapping.json | 6 ++- .../EGYPT.PHD-SecretMapping.json | 4 +- 11 files changed, 82 insertions(+), 78 deletions(-) diff --git a/TRRandomizerCore/Resources/TR1/Environment/EGYPT.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/EGYPT.PHD-Environment.json index 12acbadc..605efce7 100644 --- a/TRRandomizerCore/Resources/TR1/Environment/EGYPT.PHD-Environment.json +++ b/TRRandomizerCore/Resources/TR1/Environment/EGYPT.PHD-Environment.json @@ -2183,28 +2183,28 @@ "Y": -3328, "Z": 10752, "Room": -1, - "Angle": -16384 + "Angle": 16384 }, { "X": 22016, "Y": -3328, "Z": 13824, "Room": -1, - "Angle": -16384 + "Angle": 16384 }, { "X": 22016, "Y": -3328, "Z": 14848, "Room": -1, - "Angle": -16384 + "Angle": 16384 }, { "X": 22016, "Y": -3328, "Z": 17920, "Room": -1, - "Angle": -16384 + "Angle": 16384 } ] }, @@ -4303,110 +4303,110 @@ "X": 77312, "Y": -1280, "Z": 5632, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 78336, "Y": -1280, "Z": 5632, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 79360, "Y": -1280, "Z": 5632, - "Room": -1, - "Angle": -32768 + "Room": -1 }, { "X": 79360, "Y": -1280, "Z": 5632, "Room": -1, - "Angle": -16384 + "Angle": 16384 }, { "X": 79360, "Y": -1280, "Z": 4608, "Room": -1, - "Angle": -16384 + "Angle": 16384 }, { "X": 79360, "Y": -1280, "Z": 3584, "Room": -1, - "Angle": -16384 + "Angle": 16384 }, { "X": 79360, "Y": -1280, "Z": 2560, "Room": -1, - "Angle": -16384 + "Angle": 16384 }, { "X": 79360, "Y": -1280, "Z": 1536, "Room": -1, - "Angle": -16384 + "Angle": 16384 }, { "X": 79360, "Y": -1280, "Z": 1536, - "Room": -1 + "Room": -1, + "Angle": -32768 }, { "X": 77312, "Y": -1280, "Z": 1536, - "Room": -1 + "Room": -1, + "Angle": -32768 }, { "X": 76288, "Y": -1280, "Z": 1536, - "Room": -1 + "Room": -1, + "Angle": -32768 }, { "X": 76288, "Y": -1280, "Z": 1536, "Room": -1, - "Angle": 16384 + "Angle": -16384 }, { "X": 76288, "Y": -1280, "Z": 2560, "Room": -1, - "Angle": 16384 + "Angle": -16384 }, { "X": 76288, "Y": -1280, "Z": 3584, "Room": -1, - "Angle": 16384 + "Angle": -16384 }, { "X": 76288, "Y": -1280, "Z": 4608, "Room": -1, - "Angle": 16384 + "Angle": -16384 }, { "X": 76288, "Y": -1280, "Z": 5632, "Room": -1, - "Angle": 16384 + "Angle": -16384 } ] }, diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL1.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL1.PHD-Environment.json index 9c5dc677..3060b7d9 100644 --- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL1.PHD-Environment.json +++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL1.PHD-Environment.json @@ -1695,21 +1695,21 @@ "Y": 7680, "Z": 87552, "Room": -3, - "Angle": 16384 + "Angle": -16384 }, { "X": 41984, "Y": 7680, "Z": 88576, "Room": -3, - "Angle": -16384 + "Angle": 16384 }, { "X": 41984, "Y": 7680, "Z": 91648, "Room": -3, - "Angle": 16384 + "Angle": -16384 } ] }, @@ -3499,13 +3499,15 @@ "X": 50688, "Y": 7168, "Z": 102912, - "Room": -2 + "Room": -2, + "Angle": -32768 }, { "X": 34304, "Y": 7168, "Z": 92672, - "Room": -2 + "Room": -2, + "Angle": -32768 } ] }, diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json index ab4122ea..281aa7b4 100644 --- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json +++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL10A.PHD-Environment.json @@ -686,19 +686,22 @@ "X": 55808, "Y": -3072, "Z": 54784, - "Room": 17 + "Room": 17, + "Angle": -32768 }, { "X": 54784, "Y": -3072, "Z": 54784, - "Room": 17 + "Room": 17, + "Angle": -32768 }, { "X": 56832, "Y": -3072, "Z": 54784, - "Room": 17 + "Room": 17, + "Angle": -32768 } ], "IgnoreSectorEntities": true diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL3B.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL3B.PHD-Environment.json index afe79014..9dc77a33 100644 --- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL3B.PHD-Environment.json +++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL3B.PHD-Environment.json @@ -1483,8 +1483,7 @@ "X": 60928, "Y": 12032, "Z": 34304, - "Room": -1, - "Angle": -32768 + "Room": -1 } ] }, @@ -1498,7 +1497,7 @@ "Y": 12032, "Z": 32256, "Room": -1, - "Angle": -16384 + "Angle": 16384 } ] }, @@ -3832,14 +3831,14 @@ "Y": 5632, "Z": 39936, "Room": -2, - "Angle": -16384 + "Angle": 16384 }, { "X": 53248, "Y": 5632, "Z": 39936, "Room": -2, - "Angle": 16384 + "Angle": -16384 } ] }, @@ -4644,83 +4643,81 @@ "X": 65024, "Y": 6656, "Z": 48640, - "Room": 43 + "Room": 43, + "Angle": -32768 }, { "X": 65024, "Y": 6656, "Z": 48640, "Room": 43, - "Angle": -16384 + "Angle": 16384 }, { "X": 65024, "Y": 6656, "Z": 50688, "Room": 43, - "Angle": -16384 + "Angle": 16384 }, { "X": 65024, "Y": 6656, "Z": 51712, "Room": 43, - "Angle": -16384 + "Angle": 16384 }, { "X": 65024, "Y": 6656, "Z": 51712, - "Room": 43, - "Angle": -32768 + "Room": 43 }, { "X": 64000, "Y": 6656, "Z": 51712, - "Room": 43, - "Angle": -32768 + "Room": 43 }, { "X": 62976, "Y": 6656, "Z": 51712, - "Room": 43, - "Angle": -32768 + "Room": 43 }, { "X": 62976, "Y": 6656, "Z": 50688, "Room": 43, - "Angle": 16384 + "Angle": -16384 }, { "X": 62976, "Y": 6656, "Z": 49664, "Room": 43, - "Angle": 16384 + "Angle": -16384 }, { "X": 62976, "Y": 6656, "Z": 48640, "Room": 43, - "Angle": 16384 + "Angle": -16384 }, { "X": 66048, "Y": 6656, "Z": 49664, - "Room": 43 + "Room": 43, + "Angle": -32768 }, { "X": 66048, "Y": 6656, "Z": 49664, - "Room": 43, - "Angle": -32768 + "Room": 43 } ] } @@ -5842,7 +5839,8 @@ "X": 54784, "Y": 4096, "Z": 45568, - "Room": 35 + "Room": 35, + "Angle": -32768 } ] }, @@ -5906,14 +5904,14 @@ "Y": 4864, "Z": 55808, "Room": 11, - "Angle": -16384 + "Angle": 16384 }, { "X": 39424, "Y": 4864, "Z": 55808, "Room": 40, - "Angle": -16384 + "Angle": 16384 } ], "IgnoreSectorEntities": true diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL5.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL5.PHD-Environment.json index f22fb7d6..e5fc3bd7 100644 --- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL5.PHD-Environment.json +++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL5.PHD-Environment.json @@ -866,8 +866,7 @@ "X": 39269, "Y": -4608, "Z": 45538, - "Room": 81, - "Angle": -32768 + "Room": 81 } ], "IgnoreSectorEntities": true diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL7A.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL7A.PHD-Environment.json index ff59e013..c5d8a8b0 100644 --- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL7A.PHD-Environment.json +++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL7A.PHD-Environment.json @@ -2619,7 +2619,8 @@ "X": 40448, "Y": -4864, "Z": 14848, - "Room": -1 + "Room": -1, + "Angle": -32768 } ] }, @@ -3472,8 +3473,7 @@ "X": 38400, "Y": -5632, "Z": 20992, - "Room": -1, - "Angle": -32768 + "Room": -1 } ] }, diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL8A.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL8A.PHD-Environment.json index d36a1085..2b1cea92 100644 --- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL8A.PHD-Environment.json +++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL8A.PHD-Environment.json @@ -2873,28 +2873,28 @@ "Y": 5888, "Z": 7680, "Room": -1, - "Angle": 16384 + "Angle": -16384 }, { "X": 33280, "Y": 5888, "Z": 7680, "Room": -1, - "Angle": 16384 + "Angle": -16384 }, { "X": 34304, "Y": 5888, "Z": 5632, "Room": -1, - "Angle": -16384 + "Angle": 16384 }, { "X": 36352, "Y": 5888, "Z": 5632, "Room": -1, - "Angle": -16384 + "Angle": 16384 } ] }, @@ -2908,14 +2908,14 @@ "X": 32256, "Y": 5888, "Z": 7680, - "Room": -1 + "Room": -1, + "Angle": -32768 }, { "X": 35328, "Y": 5888, "Z": 5632, - "Room": -1, - "Angle": -32768 + "Room": -1 } ] }, diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL8B.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL8B.PHD-Environment.json index 544dd825..285c0cac 100644 --- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL8B.PHD-Environment.json +++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL8B.PHD-Environment.json @@ -855,7 +855,7 @@ "X": 46592, "Z": 33280, "Room": -2, - "Angle": -16384 + "Angle": 16384 } ] }, diff --git a/TRRandomizerCore/Resources/TR1/Environment/LEVEL8C.PHD-Environment.json b/TRRandomizerCore/Resources/TR1/Environment/LEVEL8C.PHD-Environment.json index 6232ebc1..2cb48d07 100644 --- a/TRRandomizerCore/Resources/TR1/Environment/LEVEL8C.PHD-Environment.json +++ b/TRRandomizerCore/Resources/TR1/Environment/LEVEL8C.PHD-Environment.json @@ -2479,7 +2479,7 @@ "Y": 12800, "Z": 49664, "Room": -1, - "Angle": -16384 + "Angle": 16384 } ] }, @@ -2965,21 +2965,21 @@ "Y": 12544, "Z": 48640, "Room": -1, - "Angle": -16384 + "Angle": 16384 }, { "X": 19968, "Y": 12544, "Z": 45568, "Room": -1, - "Angle": -16384 + "Angle": 16384 }, { "X": 22016, "Y": 12544, "Z": 48640, "Room": -1, - "Angle": 16384 + "Angle": -16384 }, { "X": 22016, @@ -3001,14 +3001,14 @@ "Y": 12032, "Z": 47104, "Room": -1, - "Angle": 16384 + "Angle": -16384 }, { "X": 19968, "Y": 12032, "Z": 47104, "Room": -1, - "Angle": -16384 + "Angle": 16384 } ] }, diff --git a/TRRandomizerCore/Resources/TR1/SecretMapping/CAT.PHD-SecretMapping.json b/TRRandomizerCore/Resources/TR1/SecretMapping/CAT.PHD-SecretMapping.json index aa733114..787a01fd 100644 --- a/TRRandomizerCore/Resources/TR1/SecretMapping/CAT.PHD-SecretMapping.json +++ b/TRRandomizerCore/Resources/TR1/SecretMapping/CAT.PHD-SecretMapping.json @@ -358,13 +358,15 @@ "X": 27136, "Y": -18944, "Z": 74240, - "Room": -1 + "Room": -1, + "Angle": -32768 }, { "X": 31232, "Y": -18944, "Z": 74240, - "Room": -1 + "Room": -1, + "Angle": -32768 } ] }, diff --git a/TRRandomizerCore/Resources/TR1/SecretMapping/EGYPT.PHD-SecretMapping.json b/TRRandomizerCore/Resources/TR1/SecretMapping/EGYPT.PHD-SecretMapping.json index d06bd229..7545986c 100644 --- a/TRRandomizerCore/Resources/TR1/SecretMapping/EGYPT.PHD-SecretMapping.json +++ b/TRRandomizerCore/Resources/TR1/SecretMapping/EGYPT.PHD-SecretMapping.json @@ -278,14 +278,14 @@ "Y": 1792, "Z": 74240, "Room": -1, - "Angle": 16384 + "Angle": -16384 }, { "X": 74240, "Y": 1792, "Z": 72192, "Room": -1, - "Angle": 16384 + "Angle": -16384 } ] },