From b8059c05281e4f9887ce7a9e613b1704c20fb405 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Thu, 16 Mar 2023 14:41:00 +0100
Subject: [PATCH] new linepattern Tri Walls

---
 expansion.cpp | 19 +++++++++++++++----
 pattern2.cpp  | 30 ++++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/expansion.cpp b/expansion.cpp
index 1f156075..84d98b36 100644
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -439,16 +439,27 @@ EX bool mod_allowed() {
   return cheater || autocheat || arcm::in() || arb::in() || tour::on;
   }
 
+EX bool distances_legal(cell *c) {
+  if(mod_allowed()) return true;
+  switch(distance_from) {
+    case dfPlayer:
+      return true;
+    case dfStart:
+      return bt::in();
+    case dfWorld:
+      return c && among(c->land, laOcean, laIvoryTower, laEndorian, laDungeon, laTemple, laWhirlpool, laCanvas);
+    }
+  return false;
+  }
+
 EX int curr_dist(cell *c) {
+  if(!distances_legal(c)) return 0;
   switch(distance_from) {
     case dfPlayer:
       return c->cpdist < INFD ? c->cpdist : celldistance(cwt.at, c);
     case dfStart:
-      if(!mod_allowed()) return 0;
       return celldist(c);
     case dfWorld:
-      if(!mod_allowed() && !among(c->land, laOcean, laIvoryTower, laEndorian, laDungeon, laTemple, laWhirlpool, laCanvas))
-        return 0;
       if((isCyclic(c->land) || among(c->land, laCanvas, laCaribbean, laStorms, laRlyeh))) {
         if(eubinary || c->master->alt) return celldistAlt(c);
         return UNKNOWN;
@@ -1060,7 +1071,7 @@ EX int hyperbolic_celldistance(cell *c1, cell *c2) {
       else {
         if(cl1 == cr2 || cr1 == cl2) found_distance = d;
         }
-      }    
+      }
     
     if(d >= found_distance) {
       if(sl_used == sibling_limit && IRREGULAR) { 
diff --git a/pattern2.cpp b/pattern2.cpp
index d864d666..8935859a 100644
--- a/pattern2.cpp
+++ b/pattern2.cpp
@@ -2890,7 +2890,12 @@ EX namespace linepatterns {
         }
       )
     );
-  EX linepattern patTriRings = linepattern("lines of equal distance", 0xFFFFFF00, trees_known,
+
+  bool trees_legal() {
+    return (bt::in() || trees_known()) && distances_legal(nullptr);
+    }
+
+  EX linepattern patTriRings = linepattern("lines of equal distance", 0xFFFFFF00, trees_legal,
     ALLCELLS(
       if(valence() == 3) {
         forCellIdEx(c2, i, c) {
@@ -2907,7 +2912,7 @@ EX namespace linepatterns {
         }
       )
     );
-  EX linepattern patTriTree = linepattern("tessellation tree", 0xFFFFFF00, trees_known,
+  EX linepattern patTriTree = linepattern("tessellation tree", 0xFFFFFF00, trees_legal,
     ALLCELLS(
       cell *parent = ts::right_parent(c, curr_dist);
       if(gmatrix.count(parent)) {
@@ -2918,6 +2923,23 @@ EX namespace linepatterns {
       )
     );
 
+  EX linepattern patTriWalls = linepattern("tessellation walls", 0xFF000000, trees_legal,
+    ALLCELLS(
+      if(gmatrix.count(c)) {
+        celldrawer cd;
+        cd.c = c;
+        cd.V = V;
+        for(int t=0; t<c->type; t++) {
+          cell *c1 = c->move(t);
+          if(!c1) continue;
+          if(c1 == ts::right_parent(c, curr_dist)) continue;
+          if(c == ts::right_parent(c1, curr_dist)) continue;
+          cd.draw_grid_edge(t, col, 2 + vid.linequality);
+          }
+        }
+      )
+    );
+
   linepattern patCircles("circles", 0xFFFFFF00, always_available, 
     ATCENTER(
       for(int i=15; i<=180; i+=15) {
@@ -2991,7 +3013,7 @@ EX namespace linepatterns {
     );
   
   #if HDR
-  extern linepattern patTriTree, patTriRings, patDual;
+  extern linepattern patTriTree, patTriRings, patTriWalls, patDual;
   #endif
   
   EX vector<linepattern*> patterns = { 
@@ -2999,7 +3021,7 @@ EX namespace linepatterns {
     
     &patTree, &patAltTree, &patZebraTriangles, &patZebraLines,
     &patVine, &patPalacelike, &patPalace, &patPower, &patHorocycles,
-    &patTriRings, &patTriTree,
+    &patTriRings, &patTriTree, &patTriWalls,
     &patGoldbergTree, &patIrregularMaster, &patGoldbergSep, &patHeawood, &patArcm,
     &patCircles, &patRadii, &patMeridians, &patParallels, &patSublines, &patUltra
     };