1 files changed, 114 insertions, 2 deletions

@@ -420,7 +420,7 @@ Rice::Object wittle_generator_generate_easy(Rice::Object /* self */) {
 Rice::Object wittle_generator_generate_medium(Rice::Object /* self */) {
   Generate generator;
 
-  int choice = Random::rand() % 66;
+  int choice = Random::rand() % 69;
   std::cout << "Generate MEDIUM: choice " << std::dec << choice << std::endl;
 
   switch (choice) {
@@ -1015,6 +1015,33 @@ Rice::Object wittle_generator_generate_medium(Rice::Object /* self */) {
                            {Decoration::Dot_Intersection, 25}}});
       break;
     }
+    case 66: {
+      generator.setSymmetry(Panel::Symmetry::FlipNegXY);
+      generator.generate(7, 7,
+                         {{{Decoration::Gap, 10},
+                           {Decoration::Dot_Intersection, 8},
+                           {Decoration::Start, 2},
+                           {Decoration::Exit, 1}}});
+      break;
+    }
+    case 67: {
+      generator.setSymmetry(Panel::Symmetry::ParallelV);
+      generator.generate(7, 7,
+                         {{{Decoration::Gap, 12},
+                           {Decoration::Dot_Intersection, 10},
+                           {Decoration::Start, 2},
+                           {Decoration::Exit, 1}}});
+      break;
+    }
+    case 68: {
+      generator.setSymmetry(Panel::Symmetry::ParallelHFlip);
+      generator.generate(7, 7,
+                         {{{Decoration::Gap, 12},
+                           {Decoration::Dot_Intersection, 10},
+                           {Decoration::Start, 2},
+                           {Decoration::Exit, 1}}});
+      break;
+    }
   }
 
   Rice::String str(generator.AsCode());
@@ -1024,7 +1051,7 @@ Rice::Object wittle_generator_generate_medium(Rice::Object /* self */) {
 Rice::Object wittle_generator_generate_expert(Rice::Object /* self */) {
   Generate generator;
 
-  int choice = Random::rand() % 40;
+  int choice = Random::rand() % 46;
   std::cout << "Generate EXPERT: choice " << std::dec << choice << std::endl;
 
   switch (choice) {
@@ -1497,6 +1524,91 @@ Rice::Object wittle_generator_generate_expert(Rice::Object /* self */) {
                            {Decoration::Dot_Intersection, 36}}});
       break;
     }
+    case 40: {
+      generator.setGridSize(7, 7);
+      generator.setFlag(Generate::RequireCombineShapes);
+      generator.setSymmetry(Panel::ParallelV);
+      generator.setSymbol(Decoration::Start, 0, 14);
+      generator.setSymbol(Decoration::Start, 8, 14);
+      generator.setSymbol(Decoration::Exit, 6, 0);
+      generator.setSymbol(Decoration::Exit, 14, 0);
+      generator.generate(7, 7,
+                         {{{Decoration::Poly | Decoration::Color::Orange, 5}}});
+      break;
+    }
+    case 41: {
+      generator.setGridSize(7, 7);
+      generator.setFlag(Generate::RequireCombineShapes);
+      generator.setSymmetry(Panel::ParallelHFlip);
+      generator.setSymbol(Decoration::Start, 0, 14);
+      generator.setSymbol(Decoration::Start, 14, 6);
+      generator.setSymbol(Decoration::Exit, 0, 0);
+      generator.setSymbol(Decoration::Exit, 14, 8);
+      generator.generate(7, 7,
+                         {{{Decoration::Poly | Decoration::Color::Orange, 5}}});
+      break;
+    }
+    case 42: {
+      generator.setGridSize(7, 7);
+      generator.setFlag(Generate::RequireCombineShapes);
+      generator.setSymmetry(Panel::ParallelVFlip);
+      generator.setSymbol(Decoration::Start, 0, 14);
+      generator.setSymbol(Decoration::Start, 8, 0);
+      generator.setSymbol(Decoration::Exit, 6, 0);
+      generator.setSymbol(Decoration::Exit, 14, 14);
+      generator.generate(7, 7,
+                         {{{Decoration::Poly | Decoration::Color::Orange, 5}}});
+      break;
+    }
+    case 43: {
+      generator.setSymmetry(Panel::Symmetry::RotateLeft);
+      generator.setSymbol(Decoration::Start, 4, 4);
+      generator.setSymbol(Decoration::Start, 10, 4);
+      generator.setSymbol(Decoration::Start, 4, 10);
+      generator.setSymbol(Decoration::Start, 10, 10);
+      generator.setSymbol(Decoration::Exit, 4, 0);
+      generator.setSymbol(Decoration::Exit, 14, 4);
+      generator.setSymbol(Decoration::Exit, 0, 10);
+      generator.setSymbol(Decoration::Exit, 10, 14);
+      generator.generate(
+          7, 7,
+          {{{Decoration::Triangle4 | Decoration::Color::Orange, 1},
+            {Decoration::Triangle | Decoration::Color::Orange, 4}}});
+      break;
+    }
+    case 44: {
+      generator.setFlag(Generate::WriteInvisible);
+      generator.setFlag(Generate::StartEdgeOnly);
+      generator.setSymmetry(Panel::Symmetry::FlipXY);
+      generator.setSymbol(Decoration::Exit, 0, 8);
+      generator.setSymbol(Decoration::Exit, 8, 0);
+      generator.generate(7, 7,
+                         {{{Decoration::Dot | Decoration::Color::Blue, 2},
+                           {Decoration::Dot | Decoration::Color::Yellow, 2},
+                           {Decoration::Dot, 8},
+                           {Decoration::Eraser | Decoration::Color::White, 1},
+                           {Decoration::Start, 1}}});
+      break;
+    }
+    case 45: {
+      generator.setFlag(Generate::WriteInvisible);
+      generator.setSymmetry(Panel::Symmetry::FlipXY);
+      generator.setSymbol(Decoration::Start, 0, 16);
+      generator.setSymbol(Decoration::Start, 16, 0);
+      generator.setSymbol(Decoration::Exit, 8, 0);
+      generator.setSymbol(Decoration::Exit, 8, 16);
+      generator.setSymbol(Decoration::Exit, 0, 8);
+      generator.setSymbol(Decoration::Exit, 16, 8);
+      generator.generate(
+          8, 8,
+          {{{Decoration::Triangle | Decoration::Color::Cyan, 3},
+            {Decoration::Triangle | Decoration::Color::Yellow, 2},
+            {Decoration::Star | Decoration::Color::Cyan, 3},
+            {Decoration::Star | Decoration::Color::Yellow, 3},
+            {Decoration::Stone | Decoration::Color::Cyan, 2},
+            {Decoration::Stone | Decoration::Color::Yellow, 3}}});
+      break;
+    }
   }
 
   Rice::String str(generator.AsCode());