From 996466e43ea6b7ec5b538bb99c18f88f70673d21 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 28 Mar 2020 13:43:10 +0000
Subject: [PATCH] quacks-ingredients: make tower further away

nozzle slightly damages a counter

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 quacks-ingredients-counts      |  2 +-
 quacks-ingredients-counts.scad | 64 +++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/quacks-ingredients-counts b/quacks-ingredients-counts
index a1e5f27..746ea8a 100755
--- a/quacks-ingredients-counts
+++ b/quacks-ingredients-counts
@@ -39,7 +39,7 @@ sub wrtoplevel () {
 	my $c = $cs->{$nspots};
 	print <<END;
   union(){
-    Frame(\$phase, token_pitch * [ $rowsz + 0.5, $nrows ]);
+    Frame(\$phase, token_pitch * [ $rowsz + 0.75, $nrows ]);
     \$nspots = $nspots;
 END
 	while ($c--) {
diff --git a/quacks-ingredients-counts.scad b/quacks-ingredients-counts.scad
index 844d6f5..e70d563 100644
--- a/quacks-ingredients-counts.scad
+++ b/quacks-ingredients-counts.scad
@@ -4,7 +4,7 @@
 module Black(){ ////toplevel
 // total=18, rowsz=5, nrows=4
   union(){
-    Frame($phase, token_pitch * [ 5 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 5 + 0.75, 4 ]);
     $nspots = 1;
     translate(token_pitch * [  -2.0,  -1.5 ]) Token_L();
     translate(token_pitch * [  -2.0,  -0.5 ]) Token_L();
@@ -26,22 +26,22 @@ module Black(){ ////toplevel
     translate(token_pitch * [   2.0,  -0.5 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 5 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 5 + 0.75, 4 ]);
     $nspots = 2;
   };
   union(){
-    Frame($phase, token_pitch * [ 5 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 5 + 0.75, 4 ]);
     $nspots = 3;
   };
   union(){
-    Frame($phase, token_pitch * [ 5 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 5 + 0.75, 4 ]);
     $nspots = 4;
   };
 }
 module Blue(){ ////toplevel
 // total=34, rowsz=6, nrows=6
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 6 ]);
     $nspots = 1;
     translate(token_pitch * [  -2.5,  -2.5 ]) Token_L();
     translate(token_pitch * [  -2.5,  -1.5 ]) Token_L();
@@ -59,7 +59,7 @@ module Blue(){ ////toplevel
     translate(token_pitch * [  -0.5,  -1.5 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 6 ]);
     $nspots = 2;
     translate(token_pitch * [  -0.5,  -0.5 ]) Token_L();
     translate(token_pitch * [  -0.5,   0.5 ]) Token_L();
@@ -73,11 +73,11 @@ module Blue(){ ////toplevel
     translate(token_pitch * [   0.5,   2.5 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 6 ]);
     $nspots = 3;
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 6 ]);
     $nspots = 4;
     translate(token_pitch * [   1.5,  -2.5 ]) Token_L();
     translate(token_pitch * [   1.5,  -1.5 ]) Token_L();
@@ -94,7 +94,7 @@ module Blue(){ ////toplevel
 module Green(){ ////toplevel
 // total=38, rowsz=7, nrows=6
   union(){
-    Frame($phase, token_pitch * [ 7 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 7 + 0.75, 6 ]);
     $nspots = 1;
     translate(token_pitch * [  -3.0,  -2.5 ]) Token_L();
     translate(token_pitch * [  -3.0,  -1.5 ]) Token_L();
@@ -113,7 +113,7 @@ module Green(){ ////toplevel
     translate(token_pitch * [  -1.0,  -0.5 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 7 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 7 + 0.75, 6 ]);
     $nspots = 2;
     translate(token_pitch * [  -1.0,   0.5 ]) Token_L();
     translate(token_pitch * [  -1.0,   1.5 ]) Token_L();
@@ -127,11 +127,11 @@ module Green(){ ////toplevel
     translate(token_pitch * [   1.0,  -2.5 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 7 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 7 + 0.75, 6 ]);
     $nspots = 3;
   };
   union(){
-    Frame($phase, token_pitch * [ 7 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 7 + 0.75, 6 ]);
     $nspots = 4;
     translate(token_pitch * [   1.0,  -1.5 ]) Token_L();
     translate(token_pitch * [   1.0,  -0.5 ]) Token_L();
@@ -151,7 +151,7 @@ module Green(){ ////toplevel
 module Orange(){ ////toplevel
 // total=20, rowsz=5, nrows=4
   union(){
-    Frame($phase, token_pitch * [ 5 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 5 + 0.75, 4 ]);
     $nspots = 1;
     translate(token_pitch * [  -2.0,  -1.5 ]) Token_L();
     translate(token_pitch * [  -2.0,  -0.5 ]) Token_L();
@@ -175,22 +175,22 @@ module Orange(){ ////toplevel
     translate(token_pitch * [   2.0,   1.5 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 5 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 5 + 0.75, 4 ]);
     $nspots = 2;
   };
   union(){
-    Frame($phase, token_pitch * [ 5 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 5 + 0.75, 4 ]);
     $nspots = 3;
   };
   union(){
-    Frame($phase, token_pitch * [ 5 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 5 + 0.75, 4 ]);
     $nspots = 4;
   };
 }
 module Purple(){ ////toplevel
 // total=15, rowsz=4, nrows=4
   union(){
-    Frame($phase, token_pitch * [ 4 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 4 + 0.75, 4 ]);
     $nspots = 1;
     translate(token_pitch * [  -1.5,  -1.5 ]) Token_L();
     translate(token_pitch * [  -1.5,  -0.5 ]) Token_L();
@@ -209,22 +209,22 @@ module Purple(){ ////toplevel
     translate(token_pitch * [   1.5,   0.5 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 4 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 4 + 0.75, 4 ]);
     $nspots = 2;
   };
   union(){
-    Frame($phase, token_pitch * [ 4 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 4 + 0.75, 4 ]);
     $nspots = 3;
   };
   union(){
-    Frame($phase, token_pitch * [ 4 + 0.5, 4 ]);
+    Frame($phase, token_pitch * [ 4 + 0.75, 4 ]);
     $nspots = 4;
   };
 }
 module Red(){ ////toplevel
 // total=30, rowsz=6, nrows=5
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 5 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 5 ]);
     $nspots = 1;
     translate(token_pitch * [  -2.5,  -2.0 ]) Token_L();
     translate(token_pitch * [  -2.5,  -1.0 ]) Token_L();
@@ -240,7 +240,7 @@ module Red(){ ////toplevel
     translate(token_pitch * [  -0.5,  -1.0 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 5 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 5 ]);
     $nspots = 2;
     translate(token_pitch * [  -0.5,   0.0 ]) Token_L();
     translate(token_pitch * [  -0.5,   1.0 ]) Token_L();
@@ -252,11 +252,11 @@ module Red(){ ////toplevel
     translate(token_pitch * [   0.5,   2.0 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 5 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 5 ]);
     $nspots = 3;
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 5 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 5 ]);
     $nspots = 4;
     translate(token_pitch * [   1.5,  -2.0 ]) Token_L();
     translate(token_pitch * [   1.5,  -1.0 ]) Token_L();
@@ -273,7 +273,7 @@ module Red(){ ////toplevel
 module White(){ ////toplevel
 // total=32, rowsz=6, nrows=6
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 6 ]);
     $nspots = 1;
     translate(token_pitch * [  -2.5,  -2.5 ]) Token_L();
     translate(token_pitch * [  -2.5,  -1.5 ]) Token_L();
@@ -297,7 +297,7 @@ module White(){ ////toplevel
     translate(token_pitch * [   0.5,  -1.5 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 6 ]);
     $nspots = 2;
     translate(token_pitch * [   0.5,  -0.5 ]) Token_L();
     translate(token_pitch * [   0.5,   0.5 ]) Token_L();
@@ -309,7 +309,7 @@ module White(){ ////toplevel
     translate(token_pitch * [   1.5,   0.5 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 6 ]);
     $nspots = 3;
     translate(token_pitch * [   1.5,   1.5 ]) Token_L();
     translate(token_pitch * [   1.5,   2.5 ]) Token_L();
@@ -317,14 +317,14 @@ module White(){ ////toplevel
     translate(token_pitch * [   2.5,  -1.5 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 6 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 6 ]);
     $nspots = 4;
   };
 }
 module Yellow(){ ////toplevel
 // total=29, rowsz=6, nrows=5
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 5 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 5 ]);
     $nspots = 1;
     translate(token_pitch * [  -2.5,  -2.0 ]) Token_L();
     translate(token_pitch * [  -2.5,  -1.0 ]) Token_L();
@@ -341,7 +341,7 @@ module Yellow(){ ////toplevel
     translate(token_pitch * [  -0.5,   0.0 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 5 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 5 ]);
     $nspots = 2;
     translate(token_pitch * [  -0.5,   1.0 ]) Token_L();
     translate(token_pitch * [  -0.5,   2.0 ]) Token_L();
@@ -351,11 +351,11 @@ module Yellow(){ ////toplevel
     translate(token_pitch * [   0.5,   1.0 ]) Token_L();
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 5 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 5 ]);
     $nspots = 3;
   };
   union(){
-    Frame($phase, token_pitch * [ 6 + 0.5, 5 ]);
+    Frame($phase, token_pitch * [ 6 + 0.75, 5 ]);
     $nspots = 4;
     translate(token_pitch * [   0.5,   2.0 ]) Token_L();
     translate(token_pitch * [   1.5,  -2.0 ]) Token_L();
-- 
2.30.2