5 files changed, 84 insertions, 79 deletions

@@ -64,6 +64,8 @@ public:
                 ThrowError();
         }
 
+        void ClearOffsets() {_computedAddresses = std::map<uintptr_t, uintptr_t>();}
+
 private:
 
         void ThrowError();
@@ -1,16 +1,13 @@
 /*
  * BUGS:
- * Shipwreck vault is solved reversed?
- * Swamp <-> symmetry has non-invisible background
- * Tutorial sounds don't always play
+ * Shipwreck vault is solved reversed? -> Not reversed, just "half", you can normally solve orange. Seems to need pattern name.
+ * Tutorial sounds don't always play -> Unsure. Not controlled by pattern name.
  * FEATURES:
- * Clear "Randomized" button after short delay
  * Randomize audio logs -- Hard, seem to be unloaded some times?
  * Swap sounds in jungle (along with panels) -- maybe impossible
- * Make orange 7 (all of oranges?) hard. Like big = hard.
+ * Make orange 7 (all of oranges?) hard. Like big = hard. (See: HARD_MODE)
  * Start the game if it isn't running?
  * Stop swapping colors in desert
- * Allow users to enter seed after randomly generating seed (aka detect user input in the text box)
 */
 #include "Memory.h"
 #include "Randomizer.h"
@@ -29,15 +26,21 @@ int find(const std::vector<T> &data, T search, size_t startIndex = 0) {
         exit(-1);
 }
 
-short Randomizer::Randomize(int seed)
-{
-        short metadata = _core.ReadMetadata();
-        if (metadata & 0x1) {
-                // Already randomized -- exit.
-                return metadata;
+bool Randomizer::GameIsRandomized() {
+        int currentFrame = _core.GetCurrentFrame();
+        if (currentFrame >= _lastRandomizedFrame) {
+                // Time went forwards, presumably we're still on the same save
+                _lastRandomizedFrame = currentFrame;
+                return true;
         }
-        _core.WriteMetadata(metadata | 0x1);
-        Random::SetSeed(seed);
+        // Otherwise, time has gone backwards, so assume new game
+        return false;
+}
+
+void Randomizer::Randomize()
+{
+        if (GameIsRandomized()) return;  // Nice sanity check, but should be unnecessary (since Main checks anyways)
+        _lastRandomizedFrame = _core.GetCurrentFrame();
 
         // Content swaps -- must happen before squarePanels
         _core.Randomize(upDownPanels, SWAP_LINES);
@@ -61,24 +64,23 @@ short Randomizer::Randomize(int seed)
         RandomizeMountain();
         // RandomizeChallenge();
         // RandomizeAudioLogs();
-        return metadata;
 }
 
 void Randomizer::AdjustSpeed() {
         // Desert Surface Final Control
-        _core._memory.WritePanelData<float>(0x09F95, OPEN_RATE, {0.04f}); // 4x
+        _core._memory->WritePanelData<float>(0x09F95, OPEN_RATE, {0.04f}); // 4x
         // Swamp Sliding Bridge
-        _core._memory.WritePanelData<float>(0x0061A, OPEN_RATE, {0.1f}); // 4x
+        _core._memory->WritePanelData<float>(0x0061A, OPEN_RATE, {0.1f}); // 4x
         // Mountain 2 Elevator
-        _core._memory.WritePanelData<float>(0x09EEC, OPEN_RATE, {0.075f}); // 3x
+        _core._memory->WritePanelData<float>(0x09EEC, OPEN_RATE, {0.075f}); // 3x
 }
 
 void Randomizer::RandomizeTutorial() {
         // Disable tutorial cursor speed modifications (not working?)
-        _core._memory.WritePanelData<float>(0x00295, CURSOR_SPEED_SCALE, {1.0});
-        _core._memory.WritePanelData<float>(0x0C373, CURSOR_SPEED_SCALE, {1.0});
-        _core._memory.WritePanelData<float>(0x00293, CURSOR_SPEED_SCALE, {1.0});
-        _core._memory.WritePanelData<float>(0x002C2, CURSOR_SPEED_SCALE, {1.0});
+        _core._memory->WritePanelData<float>(0x00295, CURSOR_SPEED_SCALE, {1.0});
+        _core._memory->WritePanelData<float>(0x0C373, CURSOR_SPEED_SCALE, {1.0});
+        _core._memory->WritePanelData<float>(0x00293, CURSOR_SPEED_SCALE, {1.0});
+        _core._memory->WritePanelData<float>(0x002C2, CURSOR_SPEED_SCALE, {1.0});
 }
 
 void Randomizer::RandomizeSymmetry() {
@@ -88,11 +90,11 @@ void Randomizer::RandomizeDesert() {
         _core.Randomize(desertPanels, SWAP_LINES);
 
         // Turn off desert surface 8
-        _core._memory.WritePanelData<float>(0x09F94, POWER, {0.0, 0.0});
+        _core._memory->WritePanelData<float>(0x09F94, POWER, {0.0, 0.0});
         // Turn off desert flood final
-        _core._memory.WritePanelData<float>(0x18076, POWER, {0.0, 0.0});
+        _core._memory->WritePanelData<float>(0x18076, POWER, {0.0, 0.0});
         // Change desert floating target to desert flood final
-        _core._memory.WritePanelData<int>(0x17ECA, TARGET, {0x18077});
+        _core._memory->WritePanelData<int>(0x17ECA, TARGET, {0x18077});
 }
 
 void Randomizer::RandomizeQuarry() {
@@ -100,14 +102,14 @@ void Randomizer::RandomizeQuarry() {
 
 void Randomizer::RandomizeTreehouse() {
         // Ensure that whatever pivot panels we have are flagged as "pivotable"
-        int panelFlags = _core._memory.ReadPanelData<int>(0x17DD1, STYLE_FLAGS, 1)[0];
-        _core._memory.WritePanelData<int>(0x17DD1, STYLE_FLAGS, {panelFlags | 0x8000});
-        panelFlags = _core._memory.ReadPanelData<int>(0x17CE3, STYLE_FLAGS, 1)[0];
-        _core._memory.WritePanelData<int>(0x17CE3, STYLE_FLAGS, {panelFlags | 0x8000});
-        panelFlags = _core._memory.ReadPanelData<int>(0x17DB7, STYLE_FLAGS, 1)[0];
-        _core._memory.WritePanelData<int>(0x17DB7, STYLE_FLAGS, {panelFlags | 0x8000});
-        panelFlags = _core._memory.ReadPanelData<int>(0x17E52, STYLE_FLAGS, 1)[0];
-        _core._memory.WritePanelData<int>(0x17E52, STYLE_FLAGS, {panelFlags | 0x8000});
+        int panelFlags = _core._memory->ReadPanelData<int>(0x17DD1, STYLE_FLAGS, 1)[0];
+        _core._memory->WritePanelData<int>(0x17DD1, STYLE_FLAGS, {panelFlags | 0x8000});
+        panelFlags = _core._memory->ReadPanelData<int>(0x17CE3, STYLE_FLAGS, 1)[0];
+        _core._memory->WritePanelData<int>(0x17CE3, STYLE_FLAGS, {panelFlags | 0x8000});
+        panelFlags = _core._memory->ReadPanelData<int>(0x17DB7, STYLE_FLAGS, 1)[0];
+        _core._memory->WritePanelData<int>(0x17DB7, STYLE_FLAGS, {panelFlags | 0x8000});
+        panelFlags = _core._memory->ReadPanelData<int>(0x17E52, STYLE_FLAGS, 1)[0];
+        _core._memory->WritePanelData<int>(0x17E52, STYLE_FLAGS, {panelFlags | 0x8000});
 }
 
 void Randomizer::RandomizeKeep() {
@@ -115,11 +117,11 @@ void Randomizer::RandomizeKeep() {
 
 void Randomizer::RandomizeShadows() {
         // Distance-gate shadows laser to prevent sniping through the bars
-        _core._memory.WritePanelData<float>(0x19650, MAX_BROADCAST_DISTANCE, {2.5});
+        _core._memory->WritePanelData<float>(0x19650, MAX_BROADCAST_DISTANCE, {2.5});
         // Change the shadows tutorial cable to only activate avoid
-        _core._memory.WritePanelData<int>(0x319A8, CABLE_TARGET_2, {0});
+        _core._memory->WritePanelData<int>(0x319A8, CABLE_TARGET_2, {0});
         // Change shadows avoid 8 to power shadows follow
-        _core._memory.WritePanelData<int>(0x1972F, TARGET, {0x1C34C});
+        _core._memory->WritePanelData<int>(0x1972F, TARGET, {0x1C34C});
 
         std::vector<int> randomOrder(shadowsPanels.size(), 0);
         std::iota(randomOrder.begin(), randomOrder.end(), 0);
@@ -128,9 +130,9 @@ void Randomizer::RandomizeShadows() {
         _core.RandomizeRange(randomOrder, SWAP_NONE, 16, 21); // Follow
         _core.ReassignTargets(shadowsPanels, randomOrder);
         // Turn off original starting panel
-        _core._memory.WritePanelData<float>(shadowsPanels[0], POWER, {0.0f, 0.0f});
+        _core._memory->WritePanelData<float>(shadowsPanels[0], POWER, {0.0f, 0.0f});
         // Turn on new starting panel
-        _core._memory.WritePanelData<float>(shadowsPanels[randomOrder[0]], POWER, {1.0f, 1.0f});
+        _core._memory->WritePanelData<float>(shadowsPanels[randomOrder[0]], POWER, {1.0f, 1.0f});
 }
 
 void Randomizer::RandomizeTown() {
@@ -167,7 +169,7 @@ void Randomizer::RandomizeJungle() {
 
 void Randomizer::RandomizeSwamp() {
         // Distance-gate swamp snipe 1 to prevent RNG swamp snipe
-        _core._memory.WritePanelData<float>(0x17C05, MAX_BROADCAST_DISTANCE, {15.0});
+        _core._memory->WritePanelData<float>(0x17C05, MAX_BROADCAST_DISTANCE, {15.0});
 }
 
 void Randomizer::RandomizeMountain() {
@@ -178,7 +180,7 @@ void Randomizer::RandomizeMountain() {
         // Randomize final pillars order
         std::vector<int> targets = {pillars[0] + 1};
         for (const int pillar : pillars) {
-                int target = _core._memory.ReadPanelData<int>(pillar, TARGET, 1)[0];
+                int target = _core._memory->ReadPanelData<int>(pillar, TARGET, 1)[0];
                 targets.push_back(target);
         }
         targets[5] = pillars[5] + 1;
@@ -189,27 +191,27 @@ void Randomizer::RandomizeMountain() {
         _core.RandomizeRange(randomOrder, SWAP_NONE, 5, 9); // Right Pillars 1-4
         _core.ReassignTargets(pillars, randomOrder, targets);
         // Turn off original starting panels
-        _core._memory.WritePanelData<float>(pillars[0], POWER, {0.0f, 0.0f});
-        _core._memory.WritePanelData<float>(pillars[5], POWER, {0.0f, 0.0f});
+        _core._memory->WritePanelData<float>(pillars[0], POWER, {0.0f, 0.0f});
+        _core._memory->WritePanelData<float>(pillars[5], POWER, {0.0f, 0.0f});
         // Turn on new starting panels
-        _core._memory.WritePanelData<float>(pillars[randomOrder[0]], POWER, {1.0f, 1.0f});
-        _core._memory.WritePanelData<float>(pillars[randomOrder[5]], POWER, {1.0f, 1.0f});
+        _core._memory->WritePanelData<float>(pillars[randomOrder[0]], POWER, {1.0f, 1.0f});
+        _core._memory->WritePanelData<float>(pillars[randomOrder[5]], POWER, {1.0f, 1.0f});
 
         // Read the target of keep front laser, and write it to keep back laser.
-        std::vector<int> keepFrontLaserTarget = _core._memory.ReadPanelData<int>(0x0360E, TARGET, 1);
-        _core._memory.WritePanelData<int>(0x03317, TARGET, keepFrontLaserTarget);
+        std::vector<int> keepFrontLaserTarget = _core._memory->ReadPanelData<int>(0x0360E, TARGET, 1);
+        _core._memory->WritePanelData<int>(0x03317, TARGET, keepFrontLaserTarget);
 }
 
 void Randomizer::RandomizeChallenge() {
         std::vector<int> randomOrder(challengePanels.size(), 0);
         std::iota(randomOrder.begin(), randomOrder.end(), 0);
         _core.RandomizeRange(randomOrder, SWAP_NONE, 1, 9); // Easy maze - Triple 2
-        std::vector<int> triple1Target = _core._memory.ReadPanelData<int>(0x00C80, TARGET, 1);
-        _core._memory.WritePanelData<int>(0x00CA1, TARGET, triple1Target);
-        _core._memory.WritePanelData<int>(0x00CB9, TARGET, triple1Target);
-        std::vector<int> triple2Target = _core._memory.ReadPanelData<int>(0x00C22, TARGET, 1);
-        _core._memory.WritePanelData<int>(0x00C59, TARGET, triple2Target);
-        _core._memory.WritePanelData<int>(0x00C68, TARGET, triple2Target);
+        std::vector<int> triple1Target = _core._memory->ReadPanelData<int>(0x00C80, TARGET, 1);
+        _core._memory->WritePanelData<int>(0x00CA1, TARGET, triple1Target);
+        _core._memory->WritePanelData<int>(0x00CB9, TARGET, triple1Target);
+        std::vector<int> triple2Target = _core._memory->ReadPanelData<int>(0x00C22, TARGET, 1);
+        _core._memory->WritePanelData<int>(0x00C59, TARGET, triple2Target);
+        _core._memory->WritePanelData<int>(0x00C68, TARGET, triple2Target);
         _core.ReassignTargets(challengePanels, randomOrder);
 }
 
@@ -3,10 +3,16 @@
 
 class Randomizer {
 public:
-        short Randomize(int seed);
+        void Randomize();
+        bool GameIsRandomized();
+
         void AdjustSpeed();
 
+        void ClearOffsets() {_core.ClearOffsets();}
+
 private:
+
+        int _lastRandomizedFrame = 1 << 30;
         void RandomizeTutorial();
         void RandomizeSymmetry();
         void RandomizeDesert();
@@ -3,17 +3,6 @@
 #include "Random.h"
 #include <sstream>
 
-static int lastKnownFrame = 1 << 30;
-
-RandomizerCore::RandomizerCore() {
-        int currentFrame = _memory.ReadData<int>({SCRIPT_FRAMES}, 1)[0];
-        if (currentFrame < lastKnownFrame) {
-                // Time went backwards, indicates new game
-                WriteMetadata(0);
-        }
-        lastKnownFrame = currentFrame;
-}
-
 void RandomizerCore::Randomize(std::vector<int>& panels, int flags) {
         return RandomizeRange(panels, flags, 0, panels.size());
 }
@@ -47,7 +36,7 @@ void RandomizerCore::SwapPanels(int panel1, int panel2, int flags) {
                 offsets[REFLECTION_PATH_COLOR] = 16;
                 offsets[DOT_COLOR] = 16;
                 offsets[ACTIVE_COLOR] = 16;
-                offsets[BACKGROUND_REGION_COLOR] = 16;
+                offsets[BACKGROUND_REGION_COLOR] = 12; // Not copying alpha to preserve transparency.
                 offsets[SUCCESS_COLOR_A] = 16;
                 offsets[SUCCESS_COLOR_B] = 16;
                 offsets[STROBE_COLOR_A] = 16;
@@ -101,10 +90,10 @@ void RandomizerCore::SwapPanels(int panel1, int panel2, int flags) {
         }
 
         for (auto const& [offset, size] : offsets) {
-                std::vector<byte> panel1data = _memory.ReadPanelData<byte>(panel1, offset, size);
-                std::vector<byte> panel2data = _memory.ReadPanelData<byte>(panel2, offset, size);
-                _memory.WritePanelData<byte>(panel2, offset, panel1data);
-                _memory.WritePanelData<byte>(panel1, offset, panel2data);
+                std::vector<byte> panel1data = _memory->ReadPanelData<byte>(panel1, offset, size);
+                std::vector<byte> panel2data = _memory->ReadPanelData<byte>(panel2, offset, size);
+                _memory->WritePanelData<byte>(panel2, offset, panel1data);
+                _memory->WritePanelData<byte>(panel1, offset, panel2data);
         }
 }
 
@@ -114,7 +103,7 @@ void RandomizerCore::ReassignTargets(const std::vector<int>& panels, const std::
                 // The first panel may not have a wire to power it, so we use the panel ID itself.
                 targets = {panels[0] + 1};
                 for (const int panel : panels) {
-                        int target = _memory.ReadPanelData<int>(panel, TARGET, 1)[0];
+                        int target = _memory->ReadPanelData<int>(panel, TARGET, 1)[0];
                         targets.push_back(target);
                 }
         }
@@ -122,25 +111,29 @@ void RandomizerCore::ReassignTargets(const std::vector<int>& panels, const std::
         for (size_t i=0; i<order.size() - 1; i++) {
                 // Set the target of order[i] to order[i+1], using the "real" target as determined above.
                 const int panelTarget = targets[order[i+1]];
-                _memory.WritePanelData<int>(panels[order[i]], TARGET, {panelTarget});
+                _memory->WritePanelData<int>(panels[order[i]], TARGET, {panelTarget});
         }
 }
 
 void RandomizerCore::ReassignNames(const std::vector<int>& panels, const std::vector<int>& order) {
         std::vector<int64_t> names;
         for (const int panel : panels) {
-                names.push_back(_memory.ReadPanelData<int64_t>(panel, AUDIO_LOG_NAME, 1)[0]);
+                names.push_back(_memory->ReadPanelData<int64_t>(panel, AUDIO_LOG_NAME, 1)[0]);
         }
 
         for (int i=0; i<panels.size(); i++) {
-                _memory.WritePanelData<int64_t>(panels[i], AUDIO_LOG_NAME, {names[order[i]]});
+                _memory->WritePanelData<int64_t>(panels[i], AUDIO_LOG_NAME, {names[order[i]]});
         }
 }
 
 short RandomizerCore::ReadMetadata() {
-        return _memory.ReadData<short>({GLOBALS + METADATA}, 1)[0];
+        return _memory->ReadData<short>({GLOBALS + METADATA}, 1)[0];
 }
 
 void RandomizerCore::WriteMetadata(short metadata) {
-        return _memory.WriteData<short>({GLOBALS + METADATA}, {metadata});
-}
\ No newline at end of file
+        return _memory->WriteData<short>({GLOBALS + METADATA}, {metadata});
+}
+
+int RandomizerCore::GetCurrentFrame() {
+        return _memory->ReadData<int>({SCRIPT_FRAMES}, 1)[0];
+}
@@ -1,5 +1,6 @@
 #pragma once
 #include "Memory.h"
+#include <memory>
 
 __declspec(selectany) int SWAP_NONE = 0x0;
 __declspec(selectany) int SWAP_TARGETS = 0x1;
@@ -9,8 +10,6 @@ __declspec(selectany) int SWAP_AUDIO_NAMES = 0x4;
 class RandomizerCore
 {
 public:
-        RandomizerCore();
-
         void Randomize(std::vector<int>& panels, int flags);
         void RandomizeRange(std::vector<int> &panels, int flags, size_t startIndex, size_t endIndex);
         void SwapPanels(int panel1, int panel2, int flags);
@@ -19,9 +18,12 @@ public:
 
         short ReadMetadata();
         void WriteMetadata(short metadata);
+        int GetCurrentFrame();
+
+        void ClearOffsets() {_memory->ClearOffsets();}
 
 // private:
-        Memory _memory = Memory("witness64_d3d11.exe");
+        std::shared_ptr<Memory> _memory = std::make_shared<Memory>("witness64_d3d11.exe");
 };
 
 #if GLOBALS == 0x5B28C0