From 2132efba59634024b51ec9c19eb40a490081cfc9 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 31 Mar 2020 16:12:09 +0100 Subject: [PATCH] quacks-ingredients: -counts: Include spares in Base_White The original counts were just the ones you actually need, but let's reproduce the thing from the official set where you get 1 spare of each. Signed-off-by: Ian Jackson --- quacks-ingredients-counts | 6 +++--- quacks-ingredients-counts.scad | 26 ++++++++++++++++---------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/quacks-ingredients-counts b/quacks-ingredients-counts index b59a58a..fefbc72 100755 --- a/quacks-ingredients-counts +++ b/quacks-ingredients-counts @@ -104,8 +104,8 @@ STDOUT->error and die $!; __DATA__ White Green Blue Red Yellow Purple Black Orange Orange6 Loco 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 +21+6 15+10 14+8 12+6 13+6 15+8 18+8 20+12 1+0 +9+3 10+5 10+5 8+5 6+5 1+0 +5+2 1+0 13+5 10+5 10+5 10+5 0+20 0+25 diff --git a/quacks-ingredients-counts.scad b/quacks-ingredients-counts.scad index c144072..e7699be 100644 --- a/quacks-ingredients-counts.scad +++ b/quacks-ingredients-counts.scad @@ -595,7 +595,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 +623,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 +635,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 +730,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=246 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 +1199,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 +1233,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 +1248,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 +1361,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 -- 2.30.2