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=c0e5517918ca8cf5bb94a77f216173d0767c4471;hb=3b881416eb2ed7158174df0e1c66ede1bc3606a7;hpb=3d2f6f796f2413cf44ed1d8115efc78a6ed1e422

diff --git a/pandemic-counter.scad b/pandemic-counter.scad
index c0e5517..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,7 +57,7 @@ module Tokens(rows=1,cols=1) {
 	child(0);
 }
 
-module Tokens_Act(){ //// toplevel
+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
@@ -64,33 +65,34 @@ module Tokens_Act(){ //// toplevel
   Tokens(4,3) Token_Act();
 }
 
-module Tokens_Spec(){ //// toplevel
+module Tokens_Spec(){ ////toplevel
   // ELECTRIC BLUE or MELLOW YELLOW
   // once-per-turn special action, one each for 5 players
-  Tokens(5) Token_Spec();
+  Tokens(3) Token_Spec();
+  translate([spacing,0,0]) Tokens(2) Token_Spec();
 }
 
-module Tokens_CDC(){ //// toplevel
+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_Terr(){ //// toplevel
+//module Tokens_Terr(){ ////toplevel
 //  // FIRE TRUCK RED
 //  // Bioterrorist general actions
 //  Tokens(2) Token_Terr();
 //}
 
-//module Tokens_TerrMove(){ //// toplevel
+//module Tokens_TerrMove(){ ////toplevel
 //  // CLASSIC BLACK
 //  // Bioterrorist drive/ferry
 //  Tokens(1) Token_TerrMove();
@@ -100,7 +102,7 @@ module PosToken(i,j){
   translate([j*spacing, i*spacing, 0]) child();
 }
 
-module Demo(){ //// toplevel
+module Demo(){ ////toplevel
   PosToken(0,0) Token_CDC();
   PosToken(1,0) Token_Lab();
   PosToken(2,0) Token_Act();