9 files changed, 85 insertions, 94 deletions

@@ -8,18 +8,8 @@
 #include <thread>
 
 #include "Memory.h"
-#include <Random.h>
-class Randomizer {
-public:
-    Randomizer(const std::shared_ptr<Memory>&) {}
-    void Randomize(int seed) {
-        std::this_thread::sleep_for(std::chrono::milliseconds(1000));
-    }
-    
-    void RandomizeChallenge(int seed) {
-        Randomize(seed);
-    }
-};
+#include "Random.h"
+#include "Randomizer.h"
 
 // Heartbeat is defined to 0x401 by Memory.h
 #define RANDOMIZE_READY 0x402
@@ -45,7 +35,10 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                 switch ((ProcStatus)lParam) {
                     case ProcStatus::NotRunning:
                         // Shut down randomizer, wait for startup
-                        if (g_randomizer) g_randomizer = nullptr;
+                        if (g_randomizer) {
+                            g_randomizer = nullptr;
+                            EnableWindow(g_randomizerStatus, FALSE);
+                        }
                         break;
                     case ProcStatus::Running:
                         if (!g_randomizer) {
@@ -85,14 +78,15 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
                         SetWindowText(g_seed, std::to_wstring(seed).c_str());
                                         RedrawWindow(g_seed, NULL, NULL, RDW_UPDATENOW);
                     }
-                    std::thread([hwnd, seed]{
+                    Random::SetSeed(seed);
+                    std::thread([hwnd]{
                         if (IsDlgButtonChecked(hwnd, CHALLENGE_ONLY)) {
                             SetWindowText(g_randomizerStatus, L"Randomizing Challenge...");
-                            g_randomizer->RandomizeChallenge(seed);
+                            g_randomizer->RandomizeChallenge();
                             PostMessage(g_hwnd, WM_COMMAND, RANDOMIZE_CHALLENGE_DONE, NULL);
                         } else {
                             SetWindowText(g_randomizerStatus, L"Randomizing...");
-                            g_randomizer->Randomize(seed);
+                            g_randomizer->Randomize();
                             PostMessage(g_hwnd, WM_COMMAND, RANDOMIZE_DONE, NULL);
                         }
                     }).detach();
@@ -1,7 +1,7 @@
 #include "ChallengeRandomizer.h"
 #include <iostream>
 
-// Reads the (relative!) address of the RNG, then shifts it to point at RNG2
+// Modify an opcode to use RNG2 instead of main RNG
 void ChallengeRandomizer::AdjustRng(int offset) {
         int currentRng = _memory->ReadData<int>({offset}, 0x1)[0];
         _memory->WriteData<int>({offset}, {currentRng + 0x20});
@@ -39,22 +39,6 @@ ChallengeRandomizer::ChallengeRandomizer(const std::shared_ptr<Memory>& memory,
         });
 
         if (!alreadyInjected) {
-                // reveal_exit_hall
-                _memory->AddSigScan({0x45, 0x8B, 0xF7, 0x48, 0x8B, 0x4D}, [&](int index){
-                        _memory->WriteData<byte>({index + 0x15}, {0xEB});
-                });
-
-                // begin_endgame_1
-                _memory->AddSigScan({0x83, 0x7C, 0x01, 0xD0, 0x04}, [&](int index){
-                        if (GLOBALS == 0x5B28C0) { // Version differences.
-                                index += 0x75;
-                        } else if (GLOBALS == 0x62D0A0) {
-                                index += 0x86;
-                        }
-                        // Overwriting a 74 12 opcode
-                        _memory->WriteData<byte>({index}, {0xEB});
-                });
-
                 // shuffle_integers
                 _memory->AddSigScan({0x48, 0x89, 0x5C, 0x24, 0x10, 0x56, 0x48, 0x83, 0xEC, 0x20, 0x48, 0x63, 0xDA, 0x48, 0x8B, 0xF1, 0x83, 0xFB, 0x01}, [&](int index) {
                         AdjustRng(index + 0x23);
@@ -59,6 +59,8 @@ void Memory::Heartbeat(HWND window) {
     int frameDelta = currentFrame - _previousFrame;
     _previousFrame = currentFrame;
     if (frameDelta < 0 && currentFrame < 250) {
+        // Some addresses (e.g. Entity Manager) may get re-allocated on newgame.
+        _computedAddresses.clear();
         PostMessage(window, WM_COMMAND, HEARTBEAT, (LPARAM)ProcStatus::NewGame);
         return;
     }
@@ -171,9 +173,6 @@ void* Memory::ComputeOffset(std::vector<int> offsets) {
                         // If the address is not yet computed, then compute it.
                         uintptr_t computedAddress = 0;
                         if (bool result = !ReadProcessMemory(_handle, reinterpret_cast<LPVOID>(cumulativeAddress), &computedAddress, sizeof(uintptr_t), NULL)) {
-                if (GetLastError() == ERROR_PARTIAL_COPY) {
-                    int k = 1;
-                }
                                 ThrowError();
                         }
                         _computedAddresses[cumulativeAddress] = computedAddress;
@@ -109,23 +109,26 @@ int find(const std::vector<T> &data, T search, size_t startIndex = 0) {
         throw std::exception("Couldn't find value in data!");
 }
 
-bool Randomizer::GameIsRandomized() {
-        int currentFrame = _memory->GetCurrentFrame();
-        if (currentFrame >= _lastRandomizedFrame) {
-                // Time went forwards, presumably we're still on the same save
-                _lastRandomizedFrame = currentFrame;
-                return true;
-        }
-        // 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 = _memory->GetCurrentFrame();
+Randomizer::Randomizer(const std::shared_ptr<Memory>& memory) : _memory(memory) {}
+
+void Randomizer::Randomize() {
+        // reveal_exit_hall - Prevent actually ending the game (EEE)
+        _memory->AddSigScan({0x45, 0x8B, 0xF7, 0x48, 0x8B, 0x4D}, [&](int index){
+                _memory->WriteData<byte>({index + 0x15}, {0xEB}); // jz -> jmp
+        });
+
+        // begin_endgame_1 - Prevent actually ending the game (Wonkavator)
+        _memory->AddSigScan({0x83, 0x7C, 0x01, 0xD0, 0x04}, [&](int index){
+                if (GLOBALS == 0x5B28C0) { // Version differences.
+                        index += 0x75;
+                } else if (GLOBALS == 0x62D0A0) {
+                        index += 0x86;
+                }
+                _memory->WriteData<byte>({index}, {0xEB}); // jz -> jmp
+        });
+    // Sig scans will be run during challenge randomization.
 
-        // Seed challenge first for future-proofing (?)
+        // Seed challenge first for future-proofing
         RandomizeChallenge();
 
         // Content swaps -- must happen before squarePanels
@@ -4,15 +4,14 @@
 
 class Randomizer {
 public:
+    Randomizer(const std::shared_ptr<Memory>& memory);
         void Randomize();
-        bool GameIsRandomized();
+        void RandomizeChallenge();
 
         void AdjustSpeed();
         void RandomizeLasers();
         void PreventSnipes();
 
-        void ClearOffsets() {_memory->ClearOffsets();}
-
         enum SWAP {
                 NONE = 0,
                 TARGETS = 1,
@@ -36,7 +35,6 @@ private:
         void RandomizeJungle();
         void RandomizeSwamp();
         void RandomizeMountain();
-        void RandomizeChallenge();
         void RandomizeAudioLogs();
 
         void Randomize(std::vector<int>& panels, int flags);
@@ -45,7 +43,7 @@ private:
         void ReassignTargets(const std::vector<int>& panels, const std::vector<int>& order, std::vector<int> targets = {});
         void ReassignNames(const std::vector<int>& panels, const std::vector<int>& order);
 
-        std::shared_ptr<Memory> _memory = std::make_shared<Memory>(L"witness64_d3d11.exe");
+        std::shared_ptr<Memory> _memory;
 
         friend class SwapTests_Shipwreck_Test;
 };
@@ -157,12 +157,17 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="ChallengeRandomizer.h" />
     <ClInclude Include="Memory.h" />
+    <ClInclude Include="Panels.h" />
     <ClInclude Include="Random.h" />
+    <ClInclude Include="Randomizer.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="ChallengeRandomizer.cpp" />
     <ClCompile Include="Memory.cpp" />
     <ClCompile Include="Random.cpp" />
+    <ClCompile Include="Randomizer.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
@@ -6,45 +6,45 @@
 class Temp : public testing::Test
 {
 protected:
-        std::vector<char> ReadSubtitles(int size) {
-                Memory memory("witness64_d3d11.exe");
-                std::vector<char> data;
-                data.resize(size);
-                ReadProcessMemory(memory._handle, (LPVOID)0x3D89F000, &data[0], sizeof(char) * size, nullptr);
-                return data;
-        }
+    std::shared_ptr<Memory> _memory = std::make_shared<Memory>("witness64_d3d11.exe");
+    // std::vector<char> ReadSubtitles(int size) {
+    //      Memory memory("witness64_d3d11.exe");
+    //      std::vector<char> data;
+    //      data.resize(size);
+    //      ReadProcessMemory(memory._handle, (LPVOID)0x3D89F000, &data[0], sizeof(char) * size, nullptr);
+    //      return data;
+    // }
 };
 
-TEST(SwapTests, Shipwreck) {
-        Randomizer randomizer;
-        int shipwreck = 0xAFB;
-        int thEntry = 0x288C;
-        int si1 = 0x00000022;
-        int bu1 = 0x6;
-        int td1 = 0x5D;
-        int ypp = 0x33EA;
-        int ramp_activation_shapers = 0x21D5;
-        int mill_upper_5 = 0x146C;
-        int mill_entry_left = 0x1E5A;
-        int mill_upper_7 = 0x03686;
-
-        randomizer.SwapPanels(ypp, mill_upper_7, Randomizer::SWAP::LINES);
-
-}
+// TEST_F(Temp, Shipwreck) {
+//     Randomizer randomizer(_memory);
+//     int shipwreck = 0xAFB;
+//     int thEntry = 0x288C;
+//     int si1 = 0x00000022;
+//     int bu1 = 0x6;
+//     int td1 = 0x5D;
+//     int ypp = 0x33EA;
+//     int ramp_activation_shapers = 0x21D5;
+//     int mill_upper_5 = 0x146C;
+//     int mill_entry_left = 0x1E5A;
+//     int mill_upper_7 = 0x03686;
+// 
+//     randomizer.SwapPanels(ypp, mill_upper_7, Randomizer::SWAP::LINES);
+// }
 
 /*
 TEST_F(Temp, Extract) {
-//      std::vector<byte> data = ReadSubtitles(166480);
-        std::vector<char> data = ReadSubtitles(166480);
-        std::ofstream file("raw.txt");
-        ASSERT_TRUE(file.is_open());
+//    std::vector<byte> data = ReadSubtitles(166480);
+    std::vector<char> data = ReadSubtitles(166480);
+    std::ofstream file("raw.txt");
+    ASSERT_TRUE(file.is_open());
 
-        std::string hex = "0123456789ABCDEF";
-        for (int i=0; i<data.size(); i++) {
-                if (data[i] == '\r') continue;
-                file << data[i];
+    std::string hex = "0123456789ABCDEF";
+    for (int i=0; i<data.size(); i++) {
+        if (data[i] == '\r') continue;
+        file << data[i];
 
-        }
+    }
     file.close();
 }
 */
\ No newline at end of file
@@ -38,12 +38,16 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="RandomTests.cpp" />
+    <ClCompile Include="Temp.cpp" />
+  </ItemGroup>
+  <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemDefinitionGroup />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
+    <Import Project="..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets" Condition="Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" />
   </ImportGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -51,7 +55,8 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -70,7 +75,8 @@
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <MinimalRebuild>
+      </MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -94,6 +100,7 @@
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -113,6 +120,7 @@
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
       <TreatWarningAsError>true</TreatWarningAsError>
+      <MinimalRebuild />
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -125,6 +133,6 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.0\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.1.8.1\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.0" targetFramework="native" />
+  <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-static" version="1.8.1" targetFramework="native" />
 </packages>
\ No newline at end of file