From b26aba48e3693b869e8b56a3fec2470cfcb63581 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Wed, 6 Aug 2008 19:04:18 -0500
Subject: [PATCH] cfdg.models.game1-turn6: Use new macros

---
 .../models/game1-turn6/game1-turn6.factor     | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/extra/cfdg/models/game1-turn6/game1-turn6.factor b/extra/cfdg/models/game1-turn6/game1-turn6.factor
index 3e0994112a..5e512cd74a 100644
--- a/extra/cfdg/models/game1-turn6/game1-turn6.factor
+++ b/extra/cfdg/models/game1-turn6/game1-turn6.factor
@@ -6,29 +6,35 @@ IN: cfdg.models.game1-turn6
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: f-triangles ( -- ) iterate? [
-[ 0.1 x 0.1 y -0.33 alpha 20 hue 0.7 sat 0.8 b triangle ] do
-[ 10 hue 0.9 sat 0.33 b triangle ] do
-[ 0.9 s 10 hue 0.5 sat 1 b triangle ] do
-[ 0.8 s 5 r f-triangles ] do
-] when ;
+: f-triangles ( -- )
+  {
+    [ 0.1 x 0.1 y -0.33 alpha 20 hue 0.7 sat 0.80 b triangle ]
+    [                         10 hue 0.9 sat 0.33 b triangle ]
+    [ 0.9 s                   10 hue 0.5 sat 1.00 b triangle ]
+    [ 0.8 s 5 r f-triangles ]
+  }
+  rule ;
 
-: f-squares ( -- ) iterate? [
-[ 0.1 x 0.1 y -0.33 alpha 250 hue 0.7 sat 0.8 b square ] do
-[ 220 hue 0.9 sat 0.33 b square ] do
-[ 0.9 s 220 hue 0.25 sat 1 b square ] do
-[ 0.8 s 5 r f-squares ] do
-] when ;
+: f-squares ( -- )
+  {
+    [ 0.1 x 0.1 y -0.33 alpha 250 hue 0.70 sat 0.80 b square ]
+    [                         220 hue 0.90 sat 0.33 b square ]
+    [ 0.9 s                   220 hue 0.25 sat 1.00 b square ]
+    [ 0.8 s 5 r f-squares ]
+  }
+  rule ;
 
 DEFER: start
 
-: spiral ( -- ) iterate? [
-  { { 1 [ f-squares
-          [ 0.5 x 0.5 y 45 r f-triangles ] do
-          [ 1 y 25 r 0.9 s spiral ] do ] }
-    { 0.022 [ [ 90 flip 50 hue start ] do ] } }
-  call-random-weighted
-] when ;
+: spiral ( -- )
+  {
+    { 1 [ f-squares ]
+        [ 0.5 x 0.5 y 45 r f-triangles ]
+        [ 1 y 25 r 0.9 s spiral ] }
+            
+    { 0.022 [ 90 flip 50 hue start ] }
+  }
+  rules ;
 
 : start ( -- )
   [       spiral ] do