diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2021-08-23 10:56:11 -0400 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2021-08-23 10:56:11 -0400 |
commit | 0b45b2454931d01da1a6ad2264ec02f3ea3d02f9 (patch) | |
tree | 4e82616b35ad66b8c976d295eb0ebbcd7f9907f4 | |
parent | 78809be80ff69c0dd134b6fa16350ce3afc00812 (diff) | |
download | witness-tutorializer-0b45b2454931d01da1a6ad2264ec02f3ea3d02f9.tar.gz witness-tutorializer-0b45b2454931d01da1a6ad2264ec02f3ea3d02f9.tar.bz2 witness-tutorializer-0b45b2454931d01da1a6ad2264ec02f3ea3d02f9.zip |
Replaced Mountain Blue 1&2 with Glass Factory Entry
Now Glass Factory Entry isn't replaced, though.
-rw-r--r-- | Source/Panels.h | 2 | ||||
-rw-r--r-- | Source/Randomizer.cpp | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/Source/Panels.h b/Source/Panels.h index f6eebd7..a5da348 100644 --- a/Source/Panels.h +++ b/Source/Panels.h | |||
@@ -149,7 +149,7 @@ std::vector<int> squarePanels = { | |||
149 | 0x04CA4, // Tutorial Optional Door 2 | 149 | 0x04CA4, // Tutorial Optional Door 2 |
150 | 0x17CFB, // Outside Tutorial Discard | 150 | 0x17CFB, // Outside Tutorial Discard |
151 | 0x3C12B, // Glass Factory Discard | 151 | 0x3C12B, // Glass Factory Discard |
152 | 0x01A54, // Glass Factory Entry | 152 | //0x01A54, // Glass Factory Entry |
153 | 0x00086, // Glass Factory Vertical Symmetry 1 | 153 | 0x00086, // Glass Factory Vertical Symmetry 1 |
154 | 0x00087, // Glass Factory Vertical Symmetry 2 | 154 | 0x00087, // Glass Factory Vertical Symmetry 2 |
155 | 0x00059, // Glass Factory Vertical Symmetry 3 | 155 | 0x00059, // Glass Factory Vertical Symmetry 3 |
diff --git a/Source/Randomizer.cpp b/Source/Randomizer.cpp index f355743..26c3416 100644 --- a/Source/Randomizer.cpp +++ b/Source/Randomizer.cpp | |||
@@ -126,7 +126,9 @@ void Randomizer::Randomize() { | |||
126 | 126 | ||
127 | _memory->ExecuteSigScans(); | 127 | _memory->ExecuteSigScans(); |
128 | 128 | ||
129 | //Tutorialise(0x33AF5, 0x0A3B2); | 129 | // Glass Factory Entry (for Mountain Blue 1 and 2) |
130 | Tutorialise(0x33AF5, 0x01A54); | ||
131 | Tutorialise(0x33AF7, 0x01A54); | ||
130 | 132 | ||
131 | // Tutorial Bend | 133 | // Tutorial Bend |
132 | for (int panel : utmPerspective) { | 134 | for (int panel : utmPerspective) { |
@@ -194,8 +196,12 @@ void Randomizer::Tutorialise(int panel1, int tutorialStraight) { | |||
194 | _memory->CopyArrayDynamicSize<int>(tutorialStraight, panel1, DECORATIONS, NUM_DECORATIONS); | 196 | _memory->CopyArrayDynamicSize<int>(tutorialStraight, panel1, DECORATIONS, NUM_DECORATIONS); |
195 | _memory->CopyArrayDynamicSize<int>(tutorialStraight, panel1, DECORATION_FLAGS, NUM_DECORATIONS); | 197 | _memory->CopyArrayDynamicSize<int>(tutorialStraight, panel1, DECORATION_FLAGS, NUM_DECORATIONS); |
196 | _memory->CopyArrayDynamicSize<int>(tutorialStraight, panel1, DECORATION_COLORS, NUM_DECORATIONS); | 198 | _memory->CopyArrayDynamicSize<int>(tutorialStraight, panel1, DECORATION_COLORS, NUM_DECORATIONS); |
197 | //_memory->CopyArrayDynamicSize<int>(tutorialStraight, panel1, REFLECTION_DATA, NUM_DOTS); | 199 | if (_memory->ReadPanelData<int>(tutorialStraight, REFLECTION_DATA)) { |
198 | _memory->WritePanelData<long long>(panel1, REFLECTION_DATA, { 0 }); | 200 | _memory->CopyArrayDynamicSize<int>(tutorialStraight, panel1, REFLECTION_DATA, NUM_DOTS); |
201 | } | ||
202 | else { | ||
203 | _memory->WritePanelData<long long>(panel1, REFLECTION_DATA, { 0 }); | ||
204 | } | ||
199 | _memory->CopyEntityData<byte>(tutorialStraight, panel1, SEQUENCE_LEN, sizeof(int)); | 205 | _memory->CopyEntityData<byte>(tutorialStraight, panel1, SEQUENCE_LEN, sizeof(int)); |
200 | _memory->CopyArrayDynamicSize<int>(tutorialStraight, panel1, SEQUENCE, SEQUENCE_LEN); | 206 | _memory->CopyArrayDynamicSize<int>(tutorialStraight, panel1, SEQUENCE, SEQUENCE_LEN); |
201 | _memory->CopyEntityData<byte>(tutorialStraight, panel1, DOT_SEQUENCE_LEN, sizeof(int)); | 207 | _memory->CopyEntityData<byte>(tutorialStraight, panel1, DOT_SEQUENCE_LEN, sizeof(int)); |