X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=quacks-ingredients-counts.scad;h=87d311bf8ff2455aabeead0455364fe1360e575c;hb=84e3ee3619ce43a9088006134c93cb980f198e22;hp=7bd679f10aedc6798d2f663ec8be81651d839d9e;hpb=f7fdb2d34bc0d799836e6c7e0f724d98a592a25a;p=reprap-play.git diff --git a/quacks-ingredients-counts.scad b/quacks-ingredients-counts.scad index 7bd679f..87d311b 100644 --- a/quacks-ingredients-counts.scad +++ b/quacks-ingredients-counts.scad @@ -573,6 +573,28 @@ module Base_White(){ ////toplevel $nspots = 4; }; } +module Base_WhiteSpare(){ ////toplevel +// Base WhiteSpare total= 3 rowsz=2 nrows=2 + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 1; + translate(token_pitch * [ -0.5, -0.5 ]) Token_L(); + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 2; + translate(token_pitch * [ -0.5, 0.5 ]) Token_L(); + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 3; + translate(token_pitch * [ 0.5, -0.5 ]) Token_L(); + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 4; + }; +} module Base_Yellow(){ ////toplevel // Base Yellow total=29 rowsz=6 nrows=5 union(){ @@ -621,7 +643,7 @@ module Base_Yellow(){ ////toplevel translate(token_pitch * [ 2.5, 1.0 ]) Token_L(); }; } -// Base total_count=240 total_real_count=216 +// Base total_count=243 total_real_count=216 // Base max_rowsz=7 max_nrows=6 module All_Black(){ ////toplevel // All Black total=26 rowsz=6 nrows=5 @@ -1036,6 +1058,28 @@ module All_White(){ ////toplevel $nspots = 4; }; } +module All_WhiteSpare(){ ////toplevel +// All WhiteSpare total= 3 rowsz=2 nrows=2 + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 1; + translate(token_pitch * [ -0.5, -0.5 ]) Token_L(); + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 2; + translate(token_pitch * [ -0.5, 0.5 ]) Token_L(); + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 3; + translate(token_pitch * [ 0.5, -0.5 ]) Token_L(); + }; + union(){ + Frame($phase, token_pitch * [ 2 + 1.00, 2 + 0.50 ]); + $nspots = 4; + }; +} module All_Yellow(){ ////toplevel // All Yellow total=45 rowsz=7 nrows=7 union(){ @@ -1100,7 +1144,7 @@ module All_Yellow(){ ////toplevel translate(token_pitch * [ 3.0, -1.0 ]) Token_L(); }; } -// All total_count=325 total_real_count=325 +// All total_count=328 total_real_count=325 // All max_rowsz=8 max_nrows=8 module Witches_Black(){ ////toplevel // Witches Black total= 8 rowsz=3 nrows=3 @@ -1328,6 +1372,7 @@ module Witches_White(){ ////toplevel $nspots = 4; }; } +module Witches_WhiteSpare(){ ////toplevel module Witches_Yellow(){ ////toplevel // Witches Yellow total=16 rowsz=4 nrows=4 union(){