From 37705e4f767ab2f77ce9ab8cc444e744b914c0a5 Mon Sep 17 00:00:00 2001 From: Tow Date: Wed, 4 Oct 2023 01:58:00 +0200 Subject: [PATCH 1/2] Tow's "normal Pack" 99.9% sure it's all what i placed myself --- .../Resources/Shared/randomizer.json | 3 +- .../Resources/TR2/Locations/locations.json | 162 ++++++++++++------ 2 files changed, 110 insertions(+), 55 deletions(-) diff --git a/TRRandomizerCore/Resources/Shared/randomizer.json b/TRRandomizerCore/Resources/Shared/randomizer.json index eff946eab..96ee4cdab 100644 --- a/TRRandomizerCore/Resources/Shared/randomizer.json +++ b/TRRandomizerCore/Resources/Shared/randomizer.json @@ -65,7 +65,8 @@ "apel", "Danza", "Eycore", - "Lahm" + "Lahm", + "TowandAA" ], "type": "string" } diff --git a/TRRandomizerCore/Resources/TR2/Locations/locations.json b/TRRandomizerCore/Resources/TR2/Locations/locations.json index 8c7f46069..38b684fdb 100644 --- a/TRRandomizerCore/Resources/TR2/Locations/locations.json +++ b/TRRandomizerCore/Resources/TR2/Locations/locations.json @@ -40,19 +40,22 @@ "X": 54066, "Y": 972, "Z": 31433, - "Room": 33 + "Room": 33, + "PackID": "TowandAA" }, { "X": 19321, "Y": -256, "Z": 35075, - "Room": 42 + "Room": 42, + "PackID": "TowandAA" }, { "X": 9102, "Y": 2787, "Z": 56428, - "Room": 52 + "Room": 52, + "PackID": "TowandAA" }, { "X": 49668, @@ -501,19 +504,22 @@ "X": 55405, "Y": -3328, "Z": 42098, - "Room": 36 + "Room": 36, + "PackID": "TowandAA" }, { "X": 24695, "Y": 1703, "Z": 50728, - "Room": 106 + "Room": 106, + "PackID": "TowandAA" }, { "X": 61372, "Y": -1792, "Z": 63464, - "Room": 91 + "Room": 91, + "PackID": "TowandAA" }, { "X": 54373, @@ -1141,13 +1147,15 @@ "X": 56513, "Y": -511, "Z": 25518, - "Room": 96 + "Room": 96, + "PackID": "TowandAA" }, { "X": 44256, "Y": 343, "Z": 29101, - "Room": 140 + "Room": 140, + "PackID": "TowandAA" }, { "X": 34230, @@ -1408,7 +1416,8 @@ "X": 65664, "Y": 2120, "Z": 20766, - "Room": 78 + "Room": 78, + "PackID": "TowandAA" }, { "X": 66016, @@ -1668,13 +1677,15 @@ "X": 82919, "Y": 3087, "Z": 35819, - "Room": 32 + "Room": 32, + "PackID": "TowandAA" }, { "X": 70610, "Y": 3584, "Z": 52280, - "Room": 114 + "Room": 114, + "PackID": "TowandAA" }, { "X": 86761, @@ -1853,7 +1864,8 @@ "X": 85074, "Y": 1087, "Z": 49236, - "Room": 108 + "Room": 108, + "PackID": "TowandAA" }, { "X": 79780, @@ -2139,19 +2151,22 @@ "X": 33844, "Y": -1280, "Z": 86924, - "Room": 97 + "Room": 97, + "PackID": "TowandAA" }, { "X": 25564, "Y": -6647, "Z": 71668, - "Room": 24 + "Room": 24, + "PackID": "TowandAA" }, { "X": 29879, "Y": 2560, "Z": 54395, - "Room": 101 + "Room": 101, + "PackID": "TowandAA" }, { "X": 48604, @@ -2492,19 +2507,22 @@ "X": 47049, "Y": -9216, "Z": 66631, - "Room": 22 + "Room": 22, + "PackID": "TowandAA" }, { "X": 36683, "Y": 5120, "Z": 51700, - "Room": 45 + "Room": 45, + "PackID": "TowandAA" }, { "X": 53184, "Y": 5632, "Z": 55394, - "Room": 78 + "Room": 78, + "PackID": "TowandAA" }, { "X": 35941, @@ -2818,7 +2836,8 @@ "X": 67768, "Y": -1792, "Z": 69404, - "Room": 18 + "Room": 18, + "PackID": "TowandAA" }, { "X": 40250, @@ -3164,13 +3183,15 @@ "X": 76959, "Y": -5632, "Z": 68478, - "Room": 67 + "Room": 67, + "PackID": "TowandAA" }, { "X": 86889, "Y": -12032, "Z": 36720, - "Room": 27 + "Room": 27, + "PackID": "TowandAA" }, { "X": 83459, @@ -3205,7 +3226,8 @@ "X": 61879, "Y": 4352, "Z": 43519, - "Room": 45 + "Room": 45, + "PackID": "TowandAA" }, { "X": 62971, @@ -3644,13 +3666,15 @@ "X": 56469, "Y": 5888, "Z": 41844, - "Room": 79 + "Room": 79, + "PackID": "TowandAA" }, { "X": 46229, "Y": 4864, "Z": 11157, - "Room": 84 + "Room": 84, + "PackID": "TowandAA" }, { "X": 48099, @@ -3680,19 +3704,22 @@ "X": 68023, "Y": -3584, "Z": 54768, - "Room": 18 + "Room": 18, + "PackID": "TowandAA" }, { "X": 45075, "Y": -2048, "Z": 26596, - "Room": 66 + "Room": 66, + "PackID": "TowandAA" }, { "X": 73153, "Y": -4096, "Z": 87650, - "Room": 1 + "Room": 1, + "PackID": "TowandAA" }, { "X": 78949, @@ -4082,19 +4109,22 @@ "X": 34759, "Y": -1792, "Z": 41103, - "Room": 30 + "Room": 30, + "PackID": "TowandAA" }, { "X": 52170, "Y": 5888, "Z": 49252, - "Room": 17 + "Room": 17, + "PackID": "TowandAA" }, { "X": 39347, "Y": -15403, "Z": 68783, - "Room": 61 + "Room": 61, + "PackID": "TowandAA" }, { "X": 46903, @@ -4447,19 +4477,22 @@ "X": 72733, "Y": -2033, "Z": 9513, - "Room": 78 + "Room": 78, + "PackID": "TowandAA" }, { "X": 84128, "Y": -3328, "Z": 90246, - "Room": 56 + "Room": 56, + "PackID": "TowandAA" }, { "X": 44194, "Y": 1736, "Z": 7108, - "Room": 103 + "Room": 103, + "PackID": "TowandAA" }, { "X": 91029, @@ -5204,19 +5237,22 @@ "X": 91074, "Y": -512, "Z": 23515, - "Room": 23 + "Room": 23, + "PackID": "TowandAA" }, { "X": 31775, "Y": -1083, "Z": 40960, - "Room": 53 + "Room": 53, + "PackID": "TowandAA" }, { "X": 10230, "Y": -12800, "Z": 13343, - "Room": 145 + "Room": 145, + "PackID": "TowandAA" }, { "X": 27620, @@ -5492,7 +5528,8 @@ "X": 15314, "Y": -4683, "Z": 42204, - "Room": 5 + "Room": 5, + "PackID": "TowandAA" }, { "X": 42978, @@ -5540,13 +5577,15 @@ "X": 20066, "Y": 10925, "Z": 55460, - "Room": 67 + "Room": 67, + "PackID": "TowandAA" }, { "X": 30817, "Y": 4801, "Z": 64429, - "Room": 38 + "Room": 38, + "PackID": "TowandAA" }, { "X": 31296, @@ -5609,19 +5648,22 @@ "X": 62573, "Y": 5888, "Z": 68679, - "Room": 46 + "Room": 46, + "PackID": "TowandAA" }, { "X": 53164, "Y": 7936, "Z": 54140, - "Room": 130 + "Room": 130, + "PackID": "TowandAA" }, { "X": 58428, "Y": 11520, "Z": 31844, - "Room": 127 + "Room": 127, + "PackID": "TowandAA" }, { "X": 60517, @@ -5963,13 +6005,15 @@ "X": 9165, "Y": -22784, "Z": 82876, - "Room": 190 + "Room": 190, + "PackID": "TowandAA" }, { "X": 50325, "Y": 14848, "Z": 21636, - "Room": 121 + "Room": 121, + "PackID": "TowandAA" }, { "X": 60315, @@ -6397,7 +6441,8 @@ "X": 33718, "Y": 14774, "Z": 53166, - "Room": 145 + "Room": 145, + "PackID": "TowandAA" }, { "X": 18533, @@ -6426,13 +6471,15 @@ "X": 44963, "Y": -3072, "Z": 49079, - "Room": 63 + "Room": 63, + "PackID": "TowandAA" }, { "X": 40611, "Y": 3840, "Z": 68535, - "Room": 79 + "Room": 79, + "PackID": "TowandAA" }, { "X": 74703, @@ -6444,7 +6491,8 @@ "X": 73819, "Y": -5632, "Z": 64672, - "Room": 2 + "Room": 2, + "PackID": "TowandAA" }, { "X": 76329, @@ -6740,13 +6788,15 @@ "X": 73696, "Y": -9472, "Z": 79930, - "Room": 17 + "Room": 17, + "PackID": "TowandAA" }, { "X": 52033, "Y": -4864, "Z": 38428, - "Room": 13 + "Room": 13, + "PackID": "TowandAA" }, { "X": 53110, @@ -6800,7 +6850,8 @@ "X": 53792, "Y": -6648, "Z": 14235, - "Room": 21 + "Room": 21, + "PackID": "TowandAA" }, { "X": 54171, @@ -6838,19 +6889,22 @@ "X": 54391, "Y": 2816, "Z": 79962, - "Room": 33 + "Room": 33, + "PackID": "TowandAA" }, { "X": 50243, "Y": 2560, "Z": 62383, - "Room": 49 + "Room": 49, + "PackID": "TowandAA" }, { "X": 33948, "Y": 2560, "Z": 86143, - "Room": 83 + "Room": 83, + "PackID": "TowandAA" }, { "X": 29595, From 18656928f3b057ab578010d203ebcd933f27534f Mon Sep 17 00:00:00 2001 From: Tow Date: Wed, 4 Oct 2023 19:55:03 +0200 Subject: [PATCH 2/2] Corrections on 2 secrets in dragon's lair and bartholy's --- .../Resources/TR2/Locations/locations.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TRRandomizerCore/Resources/TR2/Locations/locations.json b/TRRandomizerCore/Resources/TR2/Locations/locations.json index 38b684fdb..5728053e4 100644 --- a/TRRandomizerCore/Resources/TR2/Locations/locations.json +++ b/TRRandomizerCore/Resources/TR2/Locations/locations.json @@ -1161,7 +1161,8 @@ "X": 34230, "Y": -2048, "Z": 34750, - "Room": 135 + "Room": 135, + "PackID": "TowandAA" }, { "X": 73527, @@ -1416,8 +1417,7 @@ "X": 65664, "Y": 2120, "Z": 20766, - "Room": 78, - "PackID": "TowandAA" + "Room": 78 }, { "X": 66016, @@ -6802,7 +6802,8 @@ "X": 53110, "Y": -6176, "Z": 9086, - "Room": 21 + "Room": 21, + "PackID": "TowandAA" }, { "X": 67483, @@ -6850,8 +6851,7 @@ "X": 53792, "Y": -6648, "Z": 14235, - "Room": 21, - "PackID": "TowandAA" + "Room": 21 }, { "X": 54171,