From 84e3ee3619ce43a9088006134c93cb980f198e22 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Mar 2020 15:49:28 +0100 Subject: [PATCH] quacks-ingredients: -counts: Add WhiteSpare Signed-off-by: Ian Jackson --- quacks-ingredients-counts | 8 +++--- quacks-ingredients-counts.scad | 49 ++++++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/quacks-ingredients-counts b/quacks-ingredients-counts index ae55648..6f15df0 100755 --- a/quacks-ingredients-counts +++ b/quacks-ingredients-counts @@ -103,8 +103,8 @@ END STDOUT->error and die $!; __DATA__ -White Green Blue Red Yellow Purple Black Orange -20+6 15+10 14+8 12+6 13+6 15+8 18+8 20+12 -8+3 10+5 10+5 8+5 6+5 -4+2 +White Green Blue Red Yellow Purple Black Orange WhiteSpare +20+6 15+10 14+8 12+6 13+6 15+8 18+8 20+12 1+0 +8+3 10+5 10+5 8+5 6+5 1+0 +4+2 1+0 13+5 10+5 10+5 10+5 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(){ -- 2.30.2