X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=quacks-ingredients-counts.scad;h=c2a8d084f9e9d770ad9b8feeaf81db8ef3565934;hb=6a319b7ceeca0d02fbeac92c0737e976919d87a1;hp=c1440721ece2a06e04421ff5e4aeb26f1477a163;hpb=db8458414df3e70cf14c8fa370908250b555190d;p=reprap-play.git

diff --git a/quacks-ingredients-counts.scad b/quacks-ingredients-counts.scad
index c144072..c2a8d08 100644
--- a/quacks-ingredients-counts.scad
+++ b/quacks-ingredients-counts.scad
@@ -97,6 +97,30 @@ module Base_1xTwo(){ ////toplevel
     $nspots = 4;
   };
 }
+module Base_1xZero(){ ////toplevel
+// Base  1xZero      total= 1  rowsz=1  nrows=1
+  union(){
+    Frame($phase, token_pitch * [ 1 + 1.00, 1 + 0.50 ]);
+    $nspots = 0;
+    translate(token_pitch * [   0.0,   0.0 ]) Token_L();
+  };
+  union(){
+    Frame($phase, token_pitch * [ 1 + 1.00, 1 + 0.50 ]);
+    $nspots = 1;
+  };
+  union(){
+    Frame($phase, token_pitch * [ 1 + 1.00, 1 + 0.50 ]);
+    $nspots = 2;
+  };
+  union(){
+    Frame($phase, token_pitch * [ 1 + 1.00, 1 + 0.50 ]);
+    $nspots = 3;
+  };
+  union(){
+    Frame($phase, token_pitch * [ 1 + 1.00, 1 + 0.50 ]);
+    $nspots = 4;
+  };
+}
 module Base_2xFour(){ ////toplevel
 // Base  2xFour      total= 2  rowsz=2  nrows=1
   union(){
@@ -197,6 +221,31 @@ module Base_2xTwo(){ ////toplevel
     $nspots = 4;
   };
 }
+module Base_2xZero(){ ////toplevel
+// Base  2xZero      total= 2  rowsz=2  nrows=1
+  union(){
+    Frame($phase, token_pitch * [ 2 + 1.00, 1 + 0.50 ]);
+    $nspots = 0;
+    translate(token_pitch * [  -0.5,   0.0 ]) Token_L();
+    translate(token_pitch * [   0.5,   0.0 ]) Token_L();
+  };
+  union(){
+    Frame($phase, token_pitch * [ 2 + 1.00, 1 + 0.50 ]);
+    $nspots = 1;
+  };
+  union(){
+    Frame($phase, token_pitch * [ 2 + 1.00, 1 + 0.50 ]);
+    $nspots = 2;
+  };
+  union(){
+    Frame($phase, token_pitch * [ 2 + 1.00, 1 + 0.50 ]);
+    $nspots = 3;
+  };
+  union(){
+    Frame($phase, token_pitch * [ 2 + 1.00, 1 + 0.50 ]);
+    $nspots = 4;
+  };
+}
 module Base_3xFour(){ ////toplevel
 // Base  3xFour      total= 3  rowsz=2  nrows=2
   union(){
@@ -301,6 +350,32 @@ module Base_3xTwo(){ ////toplevel
     $nspots = 4;
   };
 }
+module Base_3xZero(){ ////toplevel
+// Base  3xZero      total= 3  rowsz=2  nrows=2
+  union(){
+    Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]);
+    $nspots = 0;
+    translate(token_pitch * [  -0.5,  -0.5 ]) Token_L();
+    translate(token_pitch * [  -0.5,   0.5 ]) Token_L();
+    translate(token_pitch * [   0.5,  -0.5 ]) Token_L();
+  };
+  union(){
+    Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]);
+    $nspots = 1;
+  };
+  union(){
+    Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]);
+    $nspots = 2;
+  };
+  union(){
+    Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]);
+    $nspots = 3;
+  };
+  union(){
+    Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]);
+    $nspots = 4;
+  };
+}
 module Base_Black(){ ////toplevel
 // Base  Black       total=18  rowsz=5  nrows=4
   union(){
@@ -595,7 +670,7 @@ module Base_Red(){ ////toplevel
   };
 }
 module Base_White(){ ////toplevel
-// Base  White       total=32  rowsz=6  nrows=6
+// Base  White       total=35  rowsz=6  nrows=6
   union(){
     Frame($phase, token_pitch * [ 6 + 1.00, 6 + 0.50 ]);
     $nspots = 0;
@@ -623,11 +698,11 @@ module Base_White(){ ////toplevel
     translate(token_pitch * [  -0.5,   2.5 ]) Token_L();
     translate(token_pitch * [   0.5,  -2.5 ]) Token_L();
     translate(token_pitch * [   0.5,  -1.5 ]) Token_L();
+    translate(token_pitch * [   0.5,  -0.5 ]) Token_L();
   };
   union(){
     Frame($phase, token_pitch * [ 6 + 1.00, 6 + 0.50 ]);
     $nspots = 2;
-    translate(token_pitch * [   0.5,  -0.5 ]) Token_L();
     translate(token_pitch * [   0.5,   0.5 ]) Token_L();
     translate(token_pitch * [   0.5,   1.5 ]) Token_L();
     translate(token_pitch * [   0.5,   2.5 ]) Token_L();
@@ -635,14 +710,17 @@ module Base_White(){ ////toplevel
     translate(token_pitch * [   1.5,  -1.5 ]) Token_L();
     translate(token_pitch * [   1.5,  -0.5 ]) Token_L();
     translate(token_pitch * [   1.5,   0.5 ]) Token_L();
+    translate(token_pitch * [   1.5,   1.5 ]) Token_L();
+    translate(token_pitch * [   1.5,   2.5 ]) Token_L();
   };
   union(){
     Frame($phase, token_pitch * [ 6 + 1.00, 6 + 0.50 ]);
     $nspots = 3;
-    translate(token_pitch * [   1.5,   1.5 ]) Token_L();
-    translate(token_pitch * [   1.5,   2.5 ]) Token_L();
     translate(token_pitch * [   2.5,  -2.5 ]) Token_L();
     translate(token_pitch * [   2.5,  -1.5 ]) Token_L();
+    translate(token_pitch * [   2.5,  -0.5 ]) Token_L();
+    translate(token_pitch * [   2.5,   0.5 ]) Token_L();
+    translate(token_pitch * [   2.5,   1.5 ]) Token_L();
   };
   union(){
     Frame($phase, token_pitch * [ 6 + 1.00, 6 + 0.50 ]);
@@ -727,7 +805,7 @@ module Base_Yellow(){ ////toplevel
     translate(token_pitch * [   2.5,   1.0 ]) Token_L();
   };
 }
-// Base  total_count=243   total_real_count=216
+// Base  total_count=252   total_real_count=219
 // Base  max_rowsz=7       max_nrows=6
 module All_Black(){ ////toplevel
 // All  Black       total=26  rowsz=6  nrows=5
@@ -1196,7 +1274,7 @@ module All_Red(){ ////toplevel
   };
 }
 module All_White(){ ////toplevel
-// All  White       total=43  rowsz=7  nrows=7
+// All  White       total=46  rowsz=7  nrows=7
   union(){
     Frame($phase, token_pitch * [ 7 + 1.00, 7 + 0.50 ]);
     $nspots = 0;
@@ -1230,11 +1308,11 @@ module All_White(){ ////toplevel
     translate(token_pitch * [   0.0,  -1.0 ]) Token_L();
     translate(token_pitch * [   0.0,   0.0 ]) Token_L();
     translate(token_pitch * [   0.0,   1.0 ]) Token_L();
+    translate(token_pitch * [   0.0,   2.0 ]) Token_L();
   };
   union(){
     Frame($phase, token_pitch * [ 7 + 1.00, 7 + 0.50 ]);
     $nspots = 2;
-    translate(token_pitch * [   0.0,   2.0 ]) Token_L();
     translate(token_pitch * [   0.0,   3.0 ]) Token_L();
     translate(token_pitch * [   1.0,  -3.0 ]) Token_L();
     translate(token_pitch * [   1.0,  -2.0 ]) Token_L();
@@ -1245,16 +1323,19 @@ module All_White(){ ////toplevel
     translate(token_pitch * [   1.0,   3.0 ]) Token_L();
     translate(token_pitch * [   2.0,  -3.0 ]) Token_L();
     translate(token_pitch * [   2.0,  -2.0 ]) Token_L();
+    translate(token_pitch * [   2.0,  -1.0 ]) Token_L();
+    translate(token_pitch * [   2.0,   0.0 ]) Token_L();
   };
   union(){
     Frame($phase, token_pitch * [ 7 + 1.00, 7 + 0.50 ]);
     $nspots = 3;
-    translate(token_pitch * [   2.0,  -1.0 ]) Token_L();
-    translate(token_pitch * [   2.0,   0.0 ]) Token_L();
     translate(token_pitch * [   2.0,   1.0 ]) Token_L();
     translate(token_pitch * [   2.0,   2.0 ]) Token_L();
     translate(token_pitch * [   2.0,   3.0 ]) Token_L();
     translate(token_pitch * [   3.0,  -3.0 ]) Token_L();
+    translate(token_pitch * [   3.0,  -2.0 ]) Token_L();
+    translate(token_pitch * [   3.0,  -1.0 ]) Token_L();
+    translate(token_pitch * [   3.0,   0.0 ]) Token_L();
   };
   union(){
     Frame($phase, token_pitch * [ 7 + 1.00, 7 + 0.50 ]);
@@ -1355,7 +1436,7 @@ module All_Yellow(){ ////toplevel
     translate(token_pitch * [   3.0,  -1.0 ]) Token_L();
   };
 }
-// All  total_count=373   total_real_count=350
+// All  total_count=376   total_real_count=353
 // All  max_rowsz=8       max_nrows=8
 module Witches_Black(){ ////toplevel
 // Witches  Black       total= 8  rowsz=3  nrows=3