Cleanup packaging story, add more settings

5 files changed, 150 insertions, 109 deletions

@@ -16,116 +16,33 @@ int find(const std::vector<byte> &data, const std::vector<byte>& search, size_t
         return -1;
 }
 
+// Reads the (relative!) address of the RNG, then shifts it to point at RNG2
 void ChallengeRandomizer::AdjustRng(int offset) {
         int currentRng = _memory->ReadData<int>({offset}, 0x1)[0];
         _memory->WriteData<int>({offset}, {currentRng + 0x20});
 }
 
+// Overwrite the pointer for the lightmap_generator (which is unused, afaict) to point to a secondary RNG.
+// Then, adjust all the RNG functions in challenge/doors to use this RNG.
 ChallengeRandomizer::ChallengeRandomizer(const std::shared_ptr<Memory>& memory, int seed) : _memory(memory)
 {
-        int RNG_ADDR = _memory->ReadData<int>({GLOBALS + 0x10}, 1)[0];
-        int RNG2_ADDR = _memory->ReadData<int>({GLOBALS + 0x30}, 1)[0];
-        _memory->WriteData<int>({GLOBALS + 0x30}, {RNG_ADDR + 4});
-        if (RNG2_ADDR == RNG_ADDR + 4) return; // Already applied hack
+        RNG_ADDR = _memory->ReadData<int>({GLOBALS + 0x10}, 1)[0];
+        RNG2_ADDR = _memory->ReadData<int>({GLOBALS + 0x30}, 1)[0];
+        bool alreadyInjected = (RNG2_ADDR == RNG_ADDR + 4);
+
+        if (!alreadyInjected) _memory->WriteData<int>({GLOBALS + 0x30}, {RNG_ADDR + 4});
+        _memory->WriteData<int>({GLOBALS + 0x30, 0}, {seed});
 
-        int shuffle_integers = -1;
-        int cut_random_edges = -1;
-        int get_empty_decoration_slot = -1;
-        int get_empty_dot_spot = -1;
-        int add_exactly_this_many_bisection_dots = -1;
-        int make_a_shaper = -1;
-        int init_pattern_data_lotus = -1;
-        int reroll_lotus_eater_stuff = -1;
-        int do_lotus_minutes = -1;
-        int do_lotus_eighths = -1;
         int do_success_side_effects = -1;
 
         for (int i=0; i<0x200000; i+=0x1000) {
                 std::vector<byte> data = _memory->ReadData<byte>({i}, 0x1100);
                 std::cout << data.size() << std::endl;
 
-                if (shuffle_integers == -1) {
-                        int index = find(data, {0x48, 0x89, 0x5C, 0x24, 0x10, 0x56, 0x48, 0x83, 0xEC, 0x20, 0x48, 0x63, 0xDA, 0x48, 0x8B, 0xF1, 0x83, 0xFB, 0x01});
-                        if (index != -1) {
-                                shuffle_integers = i + index;
-                                AdjustRng(shuffle_integers + 0x23);
-                        }
-                }
-                if (cut_random_edges == -1) {
-                        int index = find(data, {0x89, 0x44, 0x24, 0x3C, 0x33, 0xC0, 0x85, 0xC0, 0x75, 0xFA});
-                        if (index != -1) {
-                                cut_random_edges = i + index - 0x22;
-                                AdjustRng(cut_random_edges + 0x5D);
-                        }
-                }
-                if (get_empty_decoration_slot == -1) {
-                        int index = find(data, {0x57, 0x48, 0x83, 0xEC, 0x20, 0x8B, 0xB9, 0x38, 0x04}); // TODO: Sync versions
-                        if (index != -1) {
-                                get_empty_decoration_slot = i + index - 0x5;
-                                AdjustRng(get_empty_decoration_slot + 0x16);
-                        }
-                }
-                if (get_empty_dot_spot == -1) {
-                        int index = find(data, {0xF7, 0xF3, 0x85, 0xD2, 0x74, 0xEC}); // TODO: Sync versions
-                        if (index != -1) {
-                                get_empty_dot_spot = i + index - 0x2E;
-                                AdjustRng(get_empty_dot_spot + 0x23);
-                        }
-                }
-                if (add_exactly_this_many_bisection_dots == -1) {
-                        int index = find(data, {0x48, 0x8B, 0xB4, 0x24, 0xB8, 0x00, 0x00, 0x00, 0x48, 0x8B, 0xBC, 0x24, 0xB0, 0x00, 0x00, 0x00}); // TODO: Sync versions
-                        if (index != -1) {
-                                add_exactly_this_many_bisection_dots = i + index - 0x20;
-                                AdjustRng(add_exactly_this_many_bisection_dots + 0x1C);
-                        }
-                }
-                if (make_a_shaper == -1) {
-                        int index = find(data, {0xF7, 0xE3, 0xD1, 0xEA, 0x8D, 0x0C, 0x52}); // TODO: Sync versions
-                        if (index != -1) {
-                                make_a_shaper = i + index - 0x19;
-                                AdjustRng(make_a_shaper + 0x9);
-                                AdjustRng(make_a_shaper + 0x35);
-                                AdjustRng(make_a_shaper + 0x62);
-                        }
-                }
-                if (/*Entity_Machine_Panel::*/init_pattern_data_lotus == -1) {
-                        int index = find(data, {0x40, 0x55, 0x56, 0x48, 0x8D, 0x6C, 0x24, 0xB1}); // TODO: Sync versions
-                        if (index != -1) {
-                                init_pattern_data_lotus = i + index;
-                                AdjustRng(init_pattern_data_lotus + 0x433);
-                                AdjustRng(init_pattern_data_lotus + 0x45B);
-                                AdjustRng(init_pattern_data_lotus + 0x5A7);
-                                AdjustRng(init_pattern_data_lotus + 0x5D6);
-                                AdjustRng(init_pattern_data_lotus + 0x6F6);
-                                AdjustRng(init_pattern_data_lotus + 0xD17);
-                                AdjustRng(init_pattern_data_lotus + 0xFDA);
-                        }
-                }
-                if (/*Entity_Record_Player::*/reroll_lotus_eater_stuff == -1) {
-                        int index = find(data, {0xB8, 0xAB, 0xAA, 0xAA, 0xAA, 0x41, 0xC1, 0xE8}); // TODO: Sync versions
-                        if (index != -1) {
-                                reroll_lotus_eater_stuff = i + index - 0x37;
-                                AdjustRng(reroll_lotus_eater_stuff + 0x24);
-                                AdjustRng(reroll_lotus_eater_stuff + 0x6B);
-                        }
-                }
-                // These disable the random locations on timer panels, which would otherwise increment the RNG.
-                if (do_lotus_minutes == -1) {
-                        int index = find(data, {0x0F, 0xBE, 0x6C, 0x08, 0xFF, 0x45}); // TODO: Sync versions
-                        if (index != -1) {
-                                do_lotus_minutes = i + index - 0x2B;
-                                _memory->WriteData<byte>({do_lotus_minutes + 0x43B}, {0x31, 0xC0, 0x90, 0x90, 0x90}); // xor eax, eax ;RNG returns 0
-                                _memory->WriteData<byte>({do_lotus_minutes + 0x5B3}, {0x31, 0xC0, 0x90, 0x90, 0x90}); // xor eax, eax ;RNG returns 0
-                        }
-                }
-                if (do_lotus_eighths == -1) {
-                        int index = find(data, {0x75, 0xF5, 0x0F, 0xBE, 0x44, 0x08, 0xFF}); // TODO: Sync versions
-                        if (index != -1) {
-                                do_lotus_eighths = i + index - 0x39;
-                                _memory->WriteData<byte>({do_lotus_eighths + 0x1E7}, {0x31, 0xC0, 0x90, 0x90, 0x90}); // xor eax, eax ;RNG returns 0
-                        }
-                }
+                if (!alreadyInjected) HandleSigScans(i, data);
+
                 // This injection ensures that the seed is set every time the challenge is started.
+                // We always do this sigscan since it affects the seed.
                 if (do_success_side_effects == -1) {
                         int index = find(data, {0xFF, 0xC8, 0x99, 0x2B, 0xC2, 0xD1, 0xF8, 0x8B, 0xD0});
                         if (index != -1) {
@@ -144,3 +61,114 @@ ChallengeRandomizer::ChallengeRandomizer(const std::shared_ptr<Memory>& memory,
                 }
         }
 }
+
+void ChallengeRandomizer::HandleSigScans(int i, const std::vector<byte>& data) {
+        static int shuffle_integers = -1;
+        static int shuffle_int = -1;
+        static int cut_random_edges = -1;
+        static int get_empty_decoration_slot = -1;
+        static int get_empty_dot_spot = -1;
+        static int add_exactly_this_many_bisection_dots = -1;
+        static int make_a_shaper = -1;
+        static int init_pattern_data_lotus = -1;
+        static int reroll_lotus_eater_stuff = -1;
+        static int do_lotus_minutes = -1;
+        static int do_lotus_tenths = -1;
+        static int do_lotus_eighths = -1;
+
+        if (shuffle_integers == -1) {
+                int index = find(data, {0x48, 0x89, 0x5C, 0x24, 0x10, 0x56, 0x48, 0x83, 0xEC, 0x20, 0x48, 0x63, 0xDA, 0x48, 0x8B, 0xF1, 0x83, 0xFB, 0x01});
+                if (index != -1) {
+                        shuffle_integers = i + index;
+                        AdjustRng(shuffle_integers + 0x23);
+                }
+        }
+        // shuffle<int>
+        if (shuffle_int == -1) {
+                int index = find(data, {0x33, 0xF6, 0x48, 0x8B, 0xD9, 0x39, 0x31, 0x7E, 0x51});
+                if (index != -1) {
+                        shuffle_int = i + index - 0x16;
+                        AdjustRng(shuffle_int + 0x12);
+                }
+        }
+        if (cut_random_edges == -1) {
+                int index = find(data, {0x89, 0x44, 0x24, 0x3C, 0x33, 0xC0, 0x85, 0xC0, 0x75, 0xFA});
+                if (index != -1) {
+                        cut_random_edges = i + index - 0x22;
+                        AdjustRng(cut_random_edges + 0x5D);
+                }
+        }
+        if (get_empty_decoration_slot == -1) {
+                int index = find(data, {0x42, 0x83, 0x3C, 0x80, 0x00, 0x75, 0xDF});
+                if (index != -1) {
+                        get_empty_decoration_slot = i + index - 0x2D;
+                        AdjustRng(get_empty_decoration_slot + 0x16);
+                }
+        }
+        if (get_empty_dot_spot == -1) {
+                int index = find(data, {0xF7, 0xF3, 0x85, 0xD2, 0x74, 0xEC});
+                if (index != -1) {
+                        get_empty_dot_spot = i + index - 0x2E;
+                        AdjustRng(get_empty_dot_spot + 0x23);
+                }
+        }
+        if (add_exactly_this_many_bisection_dots == -1) {
+                int index = find(data, {0x48, 0x8B, 0xB4, 0x24, 0xB8, 0x00, 0x00, 0x00, 0x48, 0x8B, 0xBC, 0x24, 0xB0, 0x00, 0x00, 0x00});
+                if (index != -1) {
+                        add_exactly_this_many_bisection_dots = i + index - 0x20;
+                        AdjustRng(add_exactly_this_many_bisection_dots + 0x1C);
+                }
+        }
+        if (make_a_shaper == -1) {
+                int index = find(data, {0xF7, 0xE3, 0xD1, 0xEA, 0x8D, 0x0C, 0x52});
+                if (index != -1) {
+                        make_a_shaper = i + index - 0x19;
+                        AdjustRng(make_a_shaper + 0x9);
+                        AdjustRng(make_a_shaper + 0x35);
+                        AdjustRng(make_a_shaper + 0x62);
+                }
+        }
+        if (/*Entity_Machine_Panel::*/init_pattern_data_lotus == -1) {
+                int index = find(data, {0x40, 0x55, 0x56, 0x48, 0x8D, 0x6C, 0x24, 0xB1});
+                if (index != -1) {
+                        init_pattern_data_lotus = i + index;
+                        AdjustRng(init_pattern_data_lotus + 0x433);
+                        AdjustRng(init_pattern_data_lotus + 0x45B);
+                        AdjustRng(init_pattern_data_lotus + 0x5A7);
+                        AdjustRng(init_pattern_data_lotus + 0x5D6);
+                        AdjustRng(init_pattern_data_lotus + 0x6F6);
+                        AdjustRng(init_pattern_data_lotus + 0xD17);
+                        AdjustRng(init_pattern_data_lotus + 0xFDA);
+                }
+        }
+        if (/*Entity_Record_Player::*/reroll_lotus_eater_stuff == -1) {
+                int index = find(data, {0xB8, 0xAB, 0xAA, 0xAA, 0xAA, 0x41, 0xC1, 0xE8});
+                if (index != -1) {
+                        reroll_lotus_eater_stuff = i + index - 0x37;
+                        AdjustRng(reroll_lotus_eater_stuff + 0x24);
+                        AdjustRng(reroll_lotus_eater_stuff + 0x6B);
+                }
+        }
+                        // These disable the random locations on timer panels, which would otherwise increment the RNG.
+        if (do_lotus_minutes == -1) {
+                int index = find(data, {0x0F, 0xBE, 0x6C, 0x08, 0xFF, 0x45});
+                if (index != -1) {
+                        do_lotus_minutes = i + index - 0x2B;
+                        _memory->WriteData<byte>({do_lotus_minutes + 0x43B}, {0x31, 0xC0, 0x90, 0x90, 0x90}); // xor eax, eax ;RNG returns 0
+                }
+        }
+        if (do_lotus_tenths == -1) {
+                int index = find(data, {0x00, 0x04, 0x00, 0x00, 0x41, 0x8D, 0x50, 0x09});
+                if (index != -1) {
+                        do_lotus_tenths = i + index - 0x61;
+                        _memory->WriteData<byte>({do_lotus_tenths + 0x103}, {0x31, 0xC0, 0x90, 0x90, 0x90}); // xor eax, eax ;RNG returns 0
+                }
+        }
+        if (do_lotus_eighths == -1) {
+                int index = find(data, {0x75, 0xF5, 0x0F, 0xBE, 0x44, 0x08, 0xFF});
+                if (index != -1) {
+                        do_lotus_eighths = i + index - 0x39;
+                        _memory->WriteData<byte>({do_lotus_eighths + 0x1E7}, {0x31, 0xC0, 0x90, 0x90, 0x90}); // xor eax, eax ;RNG returns 0
+                }
+        }
+}
\ No newline at end of file
@@ -7,6 +7,11 @@ public:
         ChallengeRandomizer(const std::shared_ptr<Memory>& memory, int seed);
 
 private:
+        void HandleSigScans(int i, const std::vector<byte>& data);
+
         void AdjustRng(int offset);
         std::shared_ptr<Memory> _memory;
+
+        int RNG_ADDR;
+        int RNG2_ADDR;
 };
@@ -3,8 +3,8 @@
 #include <map>
 #include <windows.h>
 
-#define GLOBALS 0x5B28C0
-// #define GLOBALS 0x62A080
+// #define GLOBALS 0x5B28C0
+#define GLOBALS 0x62A080
 
 // https://github.com/erayarslan/WriteProcessMemory-Example
 // http://stackoverflow.com/q/32798185
@@ -89,6 +89,22 @@ void Randomizer::AdjustSpeed() {
         _memory->WritePanelData<float>(0x09EEC, OPEN_RATE, {0.075f}); // 3x
 }
 
+void Randomizer::RandomizeLasers() {
+        Randomize(lasers, SWAP::TARGETS);
+        // Read the target of keep front laser, and write it to keep back laser.
+        std::vector<int> keepFrontLaserTarget = _memory->ReadPanelData<int>(0x0360E, TARGET, 1);
+        _memory->WritePanelData<int>(0x03317, TARGET, keepFrontLaserTarget);
+}
+
+void Randomizer::PreventSnipes()
+{
+        // Distance-gate swamp snipe 1 to prevent RNG swamp snipe
+        _memory->WritePanelData<float>(0x17C05, MAX_BROADCAST_DISTANCE, {15.0});
+        // Distance-gate shadows laser to prevent sniping through the bars
+        _memory->WritePanelData<float>(0x19650, MAX_BROADCAST_DISTANCE, {2.5});
+}
+
+// Private methods
 void Randomizer::RandomizeTutorial() {
         // Disable tutorial cursor speed modifications (not working?)
         _memory->WritePanelData<float>(0x00295, CURSOR_SPEED_SCALE, {1.0});
@@ -130,8 +146,6 @@ void Randomizer::RandomizeKeep() {
 }
 
 void Randomizer::RandomizeShadows() {
-        // Distance-gate shadows laser to prevent sniping through the bars
-        _memory->WritePanelData<float>(0x19650, MAX_BROADCAST_DISTANCE, {2.5});
         // Change the shadows tutorial cable to only activate avoid
         _memory->WritePanelData<int>(0x319A8, CABLE_TARGET_2, {0});
         // Change shadows avoid 8 to power shadows follow
@@ -182,13 +196,10 @@ void Randomizer::RandomizeJungle() {
 }
 
 void Randomizer::RandomizeSwamp() {
-        // Distance-gate swamp snipe 1 to prevent RNG swamp snipe
-        _memory->WritePanelData<float>(0x17C05, MAX_BROADCAST_DISTANCE, {15.0});
 }
 
 void Randomizer::RandomizeMountain() {
-        // Randomize lasers & some of mountain
-        Randomize(lasers, SWAP::TARGETS);
+        // Randomize multipanel
         Randomize(mountainMultipanel, SWAP::LINES);
 
         // Randomize final pillars order
@@ -210,14 +221,10 @@ void Randomizer::RandomizeMountain() {
         // Turn on new starting panels
         _memory->WritePanelData<float>(pillars[randomOrder[0]], POWER, {1.0f, 1.0f});
         _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 = _memory->ReadPanelData<int>(0x0360E, TARGET, 1);
-        _memory->WritePanelData<int>(0x03317, TARGET, keepFrontLaserTarget);
 }
 
 void Randomizer::RandomizeChallenge() {
-        ChallengeRandomizer cr(_memory, Random::RandInt(1, 0x1000));
+        ChallengeRandomizer cr(_memory, Random::RandInt(1, 0x7FFFFFFF)); // 0 will trigger an "RNG not initialized" block
 }
 
 void Randomizer::RandomizeAudioLogs() {
@@ -8,6 +8,8 @@ public:
         bool GameIsRandomized();
 
         void AdjustSpeed();
+        void RandomizeLasers();
+        void PreventSnipes();
 
         void ClearOffsets() {_memory->ClearOffsets();}
 
@@ -19,7 +21,6 @@ public:
         };
 
 private:
-
         int _lastRandomizedFrame = 1 << 30;
         void RandomizeTutorial();
         void RandomizeSymmetry();