From a5187864e69902d69cbb051ace4106b8315078d8 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 12 Apr 2018 20:53:50 +0200
Subject: [PATCH] gp:: improved patterns

---
 goldberg.cpp | 12 +++++++++
 landgen.cpp  | 73 ++++++++++++++++++++++++++++++++++------------------
 landlock.cpp |  8 ++++--
 pattern2.cpp | 67 +++++++++++++++++++++++------------------------
 4 files changed, 100 insertions(+), 60 deletions(-)

diff --git a/goldberg.cpp b/goldberg.cpp
index 967c8d4e..b1c1b53d 100644
--- a/goldberg.cpp
+++ b/goldberg.cpp
@@ -577,6 +577,18 @@ namespace gp {
     return dmain + length(centerloc-at) - length(centerloc);
     }
   
+  array<cell*, 3> get_masters(cell *c) {
+    if(gp::on) {
+      auto li = get_local_info(c);
+      be_in_triangle(li);      
+      auto cm = c->master;
+      int i = li.last_dir;
+      return make_array(cm->c7, createStep(cm, i)->c7, createStep(cm, fix7(i+1))->c7);
+      }
+    else 
+      return make_array(c->mov[0], c->mov[2], c->mov[4]);    
+    }
+  
   int compute_dist(cell *c, int master_function(cell*)) {
     auto li = get_local_info(c);
     be_in_triangle(li);
diff --git a/landgen.cpp b/landgen.cpp
index a1e470c1..bad025bd 100644
--- a/landgen.cpp
+++ b/landgen.cpp
@@ -184,12 +184,23 @@ void giantLandSwitch(cell *c, int d, cell *from) {
         }
 
       if(d == 9) {
-        if(cdist50(c) == 3 && polarb50(c) == 1)
+        cell *c2 = gp::on ? c->master->c7 : c;
+        if(cdist50(c2) == 3 && polarb50(c2) == 1)
           c->wall = waPalace;
         }
     
       if(d == 8 && sphere) {
         int gs = getHemisphere(c,0);
+        if(gp::on) {
+          int v = 1;
+          forCellEx(c2, c) if(getHemisphere(c2, 0) != gs)
+            v = 2;
+          if(v == 2)
+            c->wall = pick(waClosedGate, waOpenGate, waPalace);
+          else if(hrand(100) < 10)
+            c->wall = pick(waClosePlate, waOpenPlate, waTrapdoor);
+          }
+        else 
         if(gs == 1)
           c->wall = waPalace;
         if(gs == 3)
@@ -211,13 +222,13 @@ void giantLandSwitch(cell *c, int d, cell *from) {
         
         bool pgate = false;
         if(nonbitrunc) {
-          int i = fiftyval049(c);
-          if(i >= 8 && i <= 14 && !polarb50(c)) pgate = true;
+          int i = fiftyval049(c->master->c7);
+          if(i >= 8 && i <= 14 && !polarb50(c->master->c7)) pgate = true;
           if(gp::on) {
             bool good = false;
             forCellEx(c2, c) {
-              int i2 = fiftyval049(c2);
-              if((i2 < 8) && polarb50(c2)) good = true;
+              int i2 = fiftyval049(c2->master->c7);
+              if((i2 < 8) && polarb50(c2->master->c7)) good = true;
               }
             pgate = pgate && good;
             }
@@ -227,30 +238,32 @@ void giantLandSwitch(cell *c, int d, cell *from) {
           switch(princess::generating ? 0 : hrand(2)) {
             case 0: 
               c->wall = waClosedGate;
+              toggleGates(c, waClosePlate, 1);
               break;
             case 1:
               c->wall = waOpenGate;
+              toggleGates(c, waOpenPlate, 1);
               break;
             }
-          for(int s=0; s<7; s++) if(c->mov[s] && 
-            (c->mov[s]->wall == waClosedGate || c->mov[s]->wall == waOpenGate))
-              c->wall = c->mov[s]->wall;
           }
-        else if(cdist50(c) == 3 && polarb50(c) == 1) {
-          int q = 0, s = 0;
-          if(!ishept(c)) for(int i=0; i<6; i++)
-            if(cdist50(c->mov[i]) == 3 && polarb50(c->mov[i]) == 1 && !ishept(c->mov[i]))
-              q++, s += i;
-          if(q == 1 && c->mov[s]->land == laPalace) {
-            switch(princess::generating ? 0 : hrand(2)) {
-              case 0: 
-                c->wall = waClosedGate;
-                c->mov[s]->wall = waClosedGate;
-                break;
-              case 1:
-                c->wall = waOpenGate;
-                c->mov[s]->wall = waOpenGate;
-                break;
+        else if(cdist50(c) == 3 && polarb50(c) == 1 && !ishept(c)) {
+          if(gp::on) ; 
+          else {
+            int q = 0, s = 0;
+            if(!ishept(c)) for(int i=0; i<6; i++)
+              if(cdist50(c->mov[i]) == 3 && polarb50(c->mov[i]) == 1 && !ishept(c->mov[i]))
+                q++, s += i;
+            if(q == 1 && c->mov[s]->land == laPalace) {
+              switch(princess::generating ? 0 : hrand(2)) {
+                case 0: 
+                  c->wall = waClosedGate;
+                  c->mov[s]->wall = waClosedGate;
+                  break;
+                case 1:
+                  c->wall = waOpenGate;
+                  c->mov[s]->wall = waOpenGate;
+                  break;
+                }
               }
             }
           }
@@ -428,7 +441,12 @@ void giantLandSwitch(cell *c, int d, cell *from) {
           v = RANDPAT ? 24 : 0;
         else if(sphere) {
           int gs = getHemisphere(c, 0);
-          if(gs == -3 || gs == -1 || gs == 1 || gs == 3)
+          if(gp::on) {
+            v = 6;
+            forCellEx(c2, c) if(getHemisphere(c2, 0) != gs)
+              v = 24;
+            }
+          else if(gs == -3 || gs == -1 || gs == 1 || gs == 3)
             v = 24;
           else
             v = 6;
@@ -520,7 +538,7 @@ void giantLandSwitch(cell *c, int d, cell *from) {
           int dy = gmod(y, 3);
           if(dy == 1) c->wall = waVinePlant;
           }
-        else if(a4)
+        else if(a4 || sphere)
           c->wall = hrand(100) < 50 ? waNone : waVinePlant;
         else {
           int v = emeraldval(c);
@@ -536,6 +554,11 @@ void giantLandSwitch(cell *c, int d, cell *from) {
             else if(v == 25 || v == 59 || v == 27 || v == 57)
               c->wall = waVineHalfB;
             else c->wall = waNone;
+            if(gp::on && cellHalfvine(c)) {
+              c->wall = waNone;
+              forCellCM(c2, c) if(emeraldval(c2) == (v^1))
+                c->wall = waVinePlant;
+              }
             }
           }
         }
diff --git a/landlock.cpp b/landlock.cpp
index 6fc39443..43102816 100644
--- a/landlock.cpp
+++ b/landlock.cpp
@@ -1211,10 +1211,14 @@ int isLandValid(eLand l) {
     return 0;
     }
   
-  // laPower and laEmerald and laPalace -> [partial] in quotients and weirdhyperbolic
-  if((l == laPower || l == laEmerald || l == laPalace) && !stdeuc && !bigsphere)
+  // laPower and laEmerald and laPalace -> [partial] in quotients and hyperbolic_non37
+  if((l == laPower || l == laEmerald || l == laPalace) && !euclid && !bigsphere && (quotient || !hyperbolic_37))
     return 1;
 
+  // ... wineyard pattern is GOOD only in the standard geometry or Euclidean
+  if(l == laWineyard && (gp::on || sphere))
+    return 1;
+  
   if(l == laDragon && !stdeuc)
     return 1;
 
diff --git a/pattern2.cpp b/pattern2.cpp
index 16a2e030..c7f54e0c 100644
--- a/pattern2.cpp
+++ b/pattern2.cpp
@@ -50,13 +50,14 @@ bool ishex2(cell *c) {
 int emeraldval(cell *c) {
   if(euclid) return eupattern(c);
   if(sphere) return 0;
-  if(ctof(c) || gp::on)
+  if(ctof(c))
     return c->master->emeraldval >> 3;
   else {
+    auto ar = gp::get_masters(c);
     return emerald_hexagon(
-      emeraldval(createMov(c,0)),
-      emeraldval(createMov(c,2)),
-      emeraldval(createMov(c,4))
+      emeraldval(ar[0]),
+      emeraldval(ar[1]),
+      emeraldval(ar[2])
       );
     }
   }
@@ -91,10 +92,11 @@ int fiftyval(cell *c) {
   if(ctof(c))
     return c->master->fiftyval;
   else {
+    auto ar = gp::get_masters(c);
     return bitmajority(
-      fiftyval(createMov(c,0)), 
-      fiftyval(createMov(c,2)), 
-      fiftyval(createMov(c,4))) + 512;
+      fiftyval(ar[0]), 
+      fiftyval(ar[1]), 
+      fiftyval(ar[2])) + 512;
     }
   }
 
@@ -106,10 +108,10 @@ int cdist50(cell *c) {
     else return "012333321112322232222321123"[eufifty(c)] - '0';
     }
   if(c->type != 6) return cdist50(fiftyval(c));
-  if(gp::on) return cdist50(c->master->c7);
-  int a0 = cdist50(createMov(c,0));
-  int a1 = cdist50(createMov(c,2));
-  int a2 = cdist50(createMov(c,4));
+  auto ar = gp::get_masters(c);
+  int a0 = cdist50(ar[0]);
+  int a1 = cdist50(ar[1]);
+  int a2 = cdist50(ar[2]);
   if(a0 == 0 || a1 == 0 || a2 == 0) return 1;
   return a0+a1+a2-5;
   }
@@ -118,9 +120,9 @@ int land50(cell *c) {
   if(c->type != 6) return land50(fiftyval(c));
   else if(sphere || euclid) return 0;
   else {
-    if(cdist50(createMov(c,0)) < 3) return land50(createMov(c,0));
-    if(cdist50(createMov(c,2)) < 3) return land50(createMov(c,2));
-    if(cdist50(createMov(c,4)) < 3) return land50(createMov(c,4));
+    auto ar = gp::get_masters(c);
+    for(int i=0; i<3; i++)
+      if(cdist50(ar[i]) < 3) return land50(ar[i]);
     return 0;
     }
   }
@@ -130,9 +132,9 @@ int polara50(cell *c) {
   else if(sphere || euclid || S7>7 || S6>6) return 0;
   else if(gp::on) return polara50(fiftyval(c->master->c7));
   else {
-    if(cdist50(createMov(c,0)) < 3) return polara50(createMov(c,0));
-    if(cdist50(createMov(c,2)) < 3) return polara50(createMov(c,2));
-    if(cdist50(createMov(c,4)) < 3) return polara50(createMov(c,4));
+    auto ar = gp::get_masters(c);
+    for(int i=0; i<3; i++)
+      if(cdist50(ar[i]) < 3) return polara50(ar[i]);
     return 0;
     }
   }
@@ -143,9 +145,9 @@ int polarb50(cell *c) {
   else if(sphere || euclid || S7>7 || S6>6) return true;
   else if(gp::on) return polarb50(fiftyval(c->master->c7));
   else {
-    if(cdist50(createMov(c,0)) < 3) return polarb50(createMov(c,0));
-    if(cdist50(createMov(c,2)) < 3) return polarb50(createMov(c,2));
-    if(cdist50(createMov(c,4)) < 3) return polarb50(createMov(c,4));
+    auto ar = gp::get_masters(c);
+    for(int i=0; i<3; i++)
+      if(cdist50(ar[i]) < 3) return polarb50(ar[i]);
     return 0;
     }
   }
@@ -170,16 +172,14 @@ int fiftyval049(cell *c) {
     // printf("%d,%d: %d\n", allcodes[0], allcodes[1], allcodes[0] + 7);
     return allcodes[0] + 7;
     }
-  else if(gp::on) return fiftyval049(c->master->c7);
   else if(sphere) return 0;
   else {
     int a[3], qa=0;
     int pa = polara50(c), pb = polarb50(c);
-    for(int i=0; i<6; i+=2) {
-      cell *c2 = c->mov[i];
-      if(polara50(c2) == pa && polarb50(c2) == pb)
-        a[qa++] = fiftyval049(c2);
-      }
+    auto ar = gp::get_masters(c);
+    for(int i=0; i<3; i++)
+      if(polara50(ar[i]) == pa && polarb50(ar[i]) == pb)
+        a[qa++] = fiftyval049(ar[i]);
     // 0-1-2
     sort(a, a+qa);
     if(qa == 1) return 43+a[0]-1;
@@ -250,7 +250,6 @@ int zebra40(cell *c) {
     else return 4+(v-4)/2;
     }
   else if(ctof(c)) return (c->master->zebraval/10);
-  else if(gp::on) return zebra40(c->master->c7);
   else if(a4) {
     int ws = dir_bitrunc457(c);
     if(ws < 0) return -ws;
@@ -280,9 +279,10 @@ int zebra40(cell *c) {
     }
   else {
     int ii[3], z;
-    ii[0] = (c->mov[0]->master->zebraval/10);
-    ii[1] = (c->mov[2]->master->zebraval/10);
-    ii[2] = (c->mov[4]->master->zebraval/10);
+    auto ar = gp::get_masters(c);
+    ii[0] = (ar[0]->master->zebraval/10);
+    ii[1] = (ar[1]->master->zebraval/10);
+    ii[2] = (ar[2]->master->zebraval/10);
     for(int r=0; r<2; r++) 
       if(ii[1] < ii[0] || ii[2] < ii[0]) 
         z = ii[0], ii[0] = ii[1], ii[1] = ii[2], ii[2] = z;
@@ -304,9 +304,10 @@ int zebra3(cell *c) {
   else if(gp::on) return zebra40(c->master->c7);
   else { 
     int ii[3];
-    ii[0] = (c->mov[0]->master->zebraval/10)/4;
-    ii[1] = (c->mov[2]->master->zebraval/10)/4;
-    ii[2] = (c->mov[4]->master->zebraval/10)/4;
+    auto ar = gp::get_masters(c);
+    ii[0] = (ar[0]->master->zebraval/10)/4;
+    ii[1] = (ar[1]->master->zebraval/10)/4;
+    ii[2] = (ar[2]->master->zebraval/10)/4;
     if(ii[0] == ii[1]) return ii[0];
     if(ii[1] == ii[2]) return ii[1];
     if(ii[2] == ii[0]) return ii[2];