X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=reprap-play.git;a=blobdiff_plain;f=pandemic-counter.scad;h=4d427af52de035aa10cfa5c28c6c16892efdad22;hp=316093210a1b86b79ebbc44636083b97d89fe8ce;hb=9755520a70fa4b32fc1ee8c6e3d6012cdd108a5f;hpb=2601060e2190c116ad7a3d743cef43a60afc9ad8

diff --git a/pandemic-counter.scad b/pandemic-counter.scad
index 3160932..4d427af 100644
--- a/pandemic-counter.scad
+++ b/pandemic-counter.scad
@@ -1,7 +1,7 @@
 // -*- C -*-
 
 tokenrad=13;
-tokenthick=1.8;
+tokenthick=1.9;
 
 joinwidth=1.0;
 
@@ -13,6 +13,7 @@ module Letter(depth) {
 }
 
 module Token(depth) {
+  rotate([0,180,0])
   linear_extrude(height=tokenthick) union(){
     difference(){
       circle(tokenrad);
@@ -37,15 +38,15 @@ module Token_Act(){ ////toplevel
 module Token_Spec(){ ////toplevel
   Token(33){};
 }
-module Token_Terr(){ ////toplevel
-  Token(34){};
-}
-module Token_TerrMove(){ ////toplevel
-  Token(35){
-    translate([-tokenrad*.75, -1])
-      square([tokenrad*.75, joinwidth]);
-  };
-}
+//module Token_Terr(){ ////toplevel
+//  Token(34){};
+//}
+//module Token_TerrMove(){ ////toplevel
+//  Token(35){
+//    translate([-tokenrad*.75, -1])
+//      square([tokenrad*.75, joinwidth]);
+//  };
+//}
 
 spacing = tokenrad * 2 + 2;
 
@@ -56,45 +57,59 @@ module Tokens(rows=1,cols=1) {
 	child(0);
 }
 
-module Tokens_Act(){ //// toplevel
-  // Print *twice*, LAPIS BLUE
+module Tokens_Act(){ ////toplevel
+  // Print *twice*, LAPIS BLUE or SQUEEZED ORANGE
   // ordinary actions
   //  up to 4 for 5 players, plus 2 for Borrowed Time plus 1 for Generalist
   //  so need 23, make 24
   Tokens(4,3) Token_Act();
 }
 
-module Tokens_CDC(){ //// toplevel
+module Tokens_Spec(){ ////toplevel
+  // ELECTRIC BLUE or MELLOW YELLOW
+  // once-per-turn special action, one each for 5 players
+  Tokens(3) Token_Spec();
+  translate([spacing,0,0]) Tokens(2) Token_Spec();
+}
+
+module Tokens_CDC(){ ////toplevel
   // STORM GREY
   // CDC
   // 1 action per turn + 2 Borrowed Time
   Tokens(3) Token_CDC();
 }
 
-module Tokens_Lab(){ //// toplevel
+module Tokens_Lab(){ ////toplevel
   // WHITE
   // free Lab action (on building research station, etc)
   // make 2 (probably want less than that)
   Tokens(2) Token_Lab();
 }
 
-module Tokens_Spec(){ //// toplevel
-  // ELECTRIC BLUE
-  // once-per-turn special action, one each for 5 players
-  Tokens(5) Token_Spec();
-}
+//module Tokens_Terr(){ ////toplevel
+//  // FIRE TRUCK RED
+//  // Bioterrorist general actions
+//  Tokens(2) Token_Terr();
+//}
 
-module Tokens_Terr(){ //// toplevel
-  // FIRE TRUCK RED
-  // Bioterrorist general actions
-  Tokens(2) Token_Terr();
-}
+//module Tokens_TerrMove(){ ////toplevel
+//  // CLASSIC BLACK
+//  // Bioterrorist drive/ferry
+//  Tokens(1) Token_TerrMove();
+//}
 
-module Tokens_TerrMove(){ //// toplevel
-  // CLASSIC BLACK
-  // Bioterrorist drive/ferry
-  Tokens(1) Token_TerrMove();
+module PosToken(i,j){
+  translate([j*spacing, i*spacing, 0]) child();
 }
 
-Tokens_TerrMove();
+module Demo(){ ////toplevel
+  PosToken(0,0) Token_CDC();
+  PosToken(1,0) Token_Lab();
+  PosToken(2,0) Token_Act();
+  PosToken(3,0) Token_Spec();
+//  PosToken(1,1) Token_Terr();
+//  PosToken(2,1) Token_TerrMove();
+}
 
+//Tokens_Act();
+//Demo();