5 files changed, 70 insertions, 11 deletions

@@ -6,11 +6,13 @@
 #include "Solver.h"
 #include "Windows.h"
 
-Randomizer2::Randomizer2(const PuzzleSerializer& serializer) : _serializer(serializer) {}
+Randomizer2::Randomizer2(const PuzzleSerializer& serializer) : _serializer(serializer) {
+}
 
 void Randomizer2::Randomize() {
-    RandomizeTutorial();
-    RandomizeSymmetry();
+    // RandomizeTutorial();
+    // RandomizeGlassFactory();
+    RandomizeSymmetryIsland();
     // RandomizeKeep();
 }
 
@@ -144,7 +146,7 @@ void Randomizer2::RandomizeTutorial() {
     }
 }
 
-void Randomizer2::RandomizeSymmetry() {
+void Randomizer2::RandomizeGlassFactory() {
     { // Back wall 1
         Puzzle p;
         p.NewGrid(3, 3);
@@ -359,6 +361,55 @@ void Randomizer2::RandomizeSymmetry() {
     }
 }
 
+void Randomizer2::RandomizeSymmetryIsland() {
+    { // Entry door
+        Puzzle p;
+        p.NewGrid(4, 3);
+        p.grid[0][6].start = true;
+        p.grid[8][0].end = Cell::Dir::RIGHT;
+        p.grid[4][3].gap = Cell::Gap::FULL;
+
+        std::vector<Pos> corners;
+        std::vector<Pos> cells;
+        std::vector<Pos> edges;
+        for (int x=0; x<p.width; x++) {
+            for (int y=0; y<p.height; y++) {
+                if (x%2 == 0 && y%2 == 0) corners.emplace_back(Pos{x, y});
+                else if (x%2 == 1 && y%2 == 1) cells.emplace_back(Pos{x, y});
+                else edges.emplace_back(Pos{x, y});
+            }
+        }
+
+        for (int j=0;; j++) {
+            auto edgesCopy = edges;
+
+            std::vector<Pos> dots;
+            for (int i=0; i<4; i++) {
+                int edge = Random::RandInt(0, static_cast<int>(edgesCopy.size() - 1));
+                dots.emplace_back(edgesCopy[edge]);
+                edgesCopy.erase(edgesCopy.begin() + edge);
+            }
+
+            for (Pos pos : dots) {
+                p.grid[pos.x][pos.y].dot = Cell::Dot::BLACK;
+            }
+
+            auto solutions = Solver::Solve(p);
+            if (solutions.size() > 0 && solutions.size() < 10) {
+                std::string text = std::to_string(solutions.size()) + "\n";
+                OutputDebugStringA(text.c_str());
+                break;
+            }
+
+            for (Pos pos : dots) {
+                p.grid[pos.x][pos.y].dot = Cell::Dot::NONE;
+            }
+        }
+
+        _serializer.WritePuzzle(p, 0xB0);
+    }
+}
+
 void Randomizer2::RandomizeKeep() {
     { // Hedges 1
         Puzzle p;
@@ -6,7 +6,8 @@ public:
     Randomizer2(const PuzzleSerializer& serializer);
     void Randomize();
     void RandomizeTutorial();
-    void RandomizeSymmetry();
+    void RandomizeGlassFactory();
+    void RandomizeSymmetryIsland();
     void RandomizeKeep();
     
 private:
@@ -84,7 +84,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Create</PrecompiledHeader>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
@@ -101,7 +101,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <PrecompiledHeader>Create</PrecompiledHeader>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
@@ -119,7 +119,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Create</PrecompiledHeader>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -140,7 +140,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>Create</PrecompiledHeader>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -178,6 +178,12 @@
   <ItemGroup>
     <ClCompile Include="ChallengeRandomizer.cpp" />
     <ClCompile Include="Memory.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="Puzzle.cpp" />
     <ClCompile Include="PuzzleSerializer.cpp" />
     <ClCompile Include="Random.cpp" />
@@ -13,8 +13,8 @@ void Validator::Validate(Puzzle& p) {
     // Validate gap failures as an early exit.
     for (int x = 0; x < p.width; x++) {
         for (int y = 0; y < p.height; y++) {
-            Cell cell = p.grid[x][y];
-            auto decoration = cell.decoration;
+            const Cell& cell = p.grid[x][y];
+            const auto& decoration = cell.decoration;
             if (decoration) {
                 if (decoration->type == Type::Stone ||
                     decoration->type == Type::Star ||
@@ -0,0 +1 @@
+#include "pch.h"
\ No newline at end of file