# HG changeset patch
# User dmcc
# Date 2003-07-10 02:51:32
# Node ID e3300d32b5f3db2ac235351d383a077bb35686e4
# Parent  e2c9919b3797337bea606f374d0075ad104f34bc

- dolly subs renamed
- dolly subs renamed
- colors prefixed with 'zip_'
- downfill and sill removed

diff --git a/flax/subs/1-1 b/flax/subs/1-1
--- a/flax/subs/1-1
+++ b/flax/subs/1-1
@@ -1,3 +1,4 @@
+42 : 0.25
 44 : 0.25
 c-scp : 0.68
 diag : 0.61
diff --git a/flax/subs/1-1_sill b/flax/subs/1-1_sill
--- a/flax/subs/1-1_sill
+++ b/flax/subs/1-1_sill
@@ -1,4 +1,4 @@
-c-scp : 0.66
+c-scp : 0.885
 downfill-left : 0.245
 downfill-right : 0.245
 f1 : 0.33
@@ -9,5 +9,5 @@ f4 : 0.14
 f5 : 0.1
 f6 : 0.23
 f7 : 0.14
-l-scp : 0.805
-r-scp : 0.8
+l-scp : 1
+r-scp : 1
diff --git a/flax/subs/1-2 b/flax/subs/1-2
--- a/flax/subs/1-2
+++ b/flax/subs/1-2
@@ -1,3 +1,4 @@
+42 : 1.0
 44 : 1.0
 c-scp : 0.765
 dayback : 0.52
@@ -12,5 +13,5 @@ main-r-blue : 0.555
 main-r-red : 0.78
 r-scp : 0.755
 ramp9-stairs : 0.57
-storefill : 0.9
+storefill : 1.0
 upstairs above : 0.44
diff --git a/flax/subs/1-2_outside b/flax/subs/1-2_outside
--- a/flax/subs/1-2_outside
+++ b/flax/subs/1-2_outside
@@ -1,3 +1,4 @@
+42 : 0.36
 44 : 0.36
 blue1 : 0.47
 blue2 : 0.47
@@ -6,9 +7,6 @@ blue4 : 0.47
 dayback : 0.36
 downfill-left : 0.43
 downfill-right : 0.25
-f1 : 0.39
 f1.5 : 0.25
-main-l-blue : 0.94
-main-l-red : 0.48
-main-lc-fill : 0.135
+main-l-blue : 0.65
 storefill : 0.36
diff --git a/flax/subs/1-2_song_downstairs b/flax/subs/1-2_song_downstairs
--- a/flax/subs/1-2_song_downstairs
+++ b/flax/subs/1-2_song_downstairs
@@ -1,3 +1,4 @@
+42 : 0.35
 44 : 0.35
 diag-back : 0.85
 f3 : 0.32
diff --git a/flax/subs/1-3_inside b/flax/subs/1-3_inside
--- a/flax/subs/1-3_inside
+++ b/flax/subs/1-3_inside
@@ -1,3 +1,4 @@
+42 : 0.16
 44 : 0.16
 blue1 : 0.47
 blue2 : 0.47
@@ -17,8 +18,8 @@ l-scp : 0.54
 main-c1 : 0.92
 main-c2 : 1.0
 main-c3 : 0.78
-main-lc-fill : 0.76
-main-r-blue : 0.49
+main-lc-fill : 0.86
+main-r-blue : 0.45
 main-r-red : 0.39
 r-scp : 0.48
 storefill : 0.16
diff --git a/flax/subs/1-3_outside b/flax/subs/1-3_outside
--- a/flax/subs/1-3_outside
+++ b/flax/subs/1-3_outside
@@ -1,3 +1,4 @@
+42 : 0.36
 44 : 0.36
 blue1 : 0.47
 blue2 : 0.47
diff --git a/flax/subs/2-1_darker b/flax/subs/2-1_darker
--- a/flax/subs/2-1_darker
+++ b/flax/subs/2-1_darker
@@ -1,16 +1,15 @@
 18 : 0.18
+38 : 0.18
 blue1 : 1.0
 blue2 : 1.0
 blue3 : 1.0
 blue4 : 1.0
-c-scp : 0.18
-downfill-left : 0.325
-downfill-right : 0.335
 f1.5 : 0.46
 f2 : 0.54
 f3 : 0.59
 f4 : 0.66
 f5 : 0.42
+c-scp : 0.15
 l-scp : 0.15
 main-c1 : 0.27
 main-c2 : 0.52
diff --git a/flax/subs/2-1_outside b/flax/subs/2-1_outside
--- a/flax/subs/2-1_outside
+++ b/flax/subs/2-1_outside
@@ -1,16 +1,15 @@
 18 : 0.18
+38 : 0.18
 blue1 : 1.0
 blue2 : 1.0
 blue3 : 1.0
 blue4 : 1.0
-c-scp : 0.18
-downfill-left : 0.4
-downfill-right : 0.405
 f1.5 : 0.46
 f2 : 0.54
 f3 : 0.59
 f4 : 0.66
 f5 : 0.42
+c-scp : 0.15
 l-scp : 0.15
 main-c1 : 0.27
 main-c2 : 0.52
diff --git a/flax/subs/2-2_all b/flax/subs/2-2_all
--- a/flax/subs/2-2_all
+++ b/flax/subs/2-2_all
@@ -1,3 +1,4 @@
+42 : 0.87
 44 : 0.87
 blue1 : 0.63
 blue2 : 0.63
diff --git a/flax/subs/2-3_brighter b/flax/subs/2-3_brighter
--- a/flax/subs/2-3_brighter
+++ b/flax/subs/2-3_brighter
@@ -1,3 +1,4 @@
+42 : 0.49
 44 : 0.49
 blue1 : 0.47
 blue2 : 0.47
diff --git a/flax/subs/2-3_cold b/flax/subs/2-3_cold
--- a/flax/subs/2-3_cold
+++ b/flax/subs/2-3_cold
@@ -1,3 +1,4 @@
+42 : 0.49
 44 : 0.49
 blue1 : 0.47
 blue2 : 0.47
diff --git a/flax/subs/dolly165 b/flax/subs/dolly165
deleted file mode 100644
--- a/flax/subs/dolly165
+++ /dev/null
@@ -1,8 +0,0 @@
-diag : 1.0
-diag-back : 1.0
-f1.5 : 1.0
-f2 : 1.0
-f3 : 1.0
-f4 : 1.0
-f5 : 1.0
-f6 : 1.0
diff --git a/flax/subs/dolly166 b/flax/subs/dolly166
deleted file mode 100644
--- a/flax/subs/dolly166
+++ /dev/null
@@ -1,19 +0,0 @@
-blue1 : 0.89
-blue2 : 0.89
-blue3 : 0.89
-diag : 1.0
-diag-back : 1.0
-downfill-left : 1.0
-downfill-right : 1.0
-f1.5 : 1.0
-f2 : 1.0
-f3 : 1.0
-f4 : 1.0
-f5 : 1.0
-f6 : 1.0
-main-c1 : 1.0
-main-c2 : 1.0
-main-l-blue : 1.0
-main-lc-fill : 1.0
-main-r-red : 1.0
-ramp9-stairs : 1.0
diff --git a/flax/subs/dolly167 b/flax/subs/dolly167
deleted file mode 100644
--- a/flax/subs/dolly167
+++ /dev/null
@@ -1,19 +0,0 @@
-42 : 0.25
-44 : 0.25
-downfill-left : 0.49
-downfill-right : 0.49
-f2 : 0.99
-f3 : 1.0
-f4 : 0.82
-f5 : 0.67
-l-scp : 0.68
-main-c1 : 0.29
-main-c2 : 0.33
-main-c3 : 0.51
-main-l-blue : 0.41
-main-l-red : 0.38
-main-lc-fill : 0.29
-main-r-blue : 0.41
-main-r-red : 0.32
-r-scp : 0.68
-storefill : 0.25
diff --git a/flax/subs/dolly168 b/flax/subs/dolly168
deleted file mode 100644
--- a/flax/subs/dolly168
+++ /dev/null
@@ -1,14 +0,0 @@
-42 : 1.0
-44 : 1.0
-dayback : 0.52
-main-c1 : 0.84
-main-c2 : 1.0
-main-c3 : 1.0
-main-l-blue : 0.09
-main-l-red : 0.52
-main-lc-fill : 0.8
-main-r-blue : 1.0
-main-r-red : 0.78
-ramp9-stairs : 0.57
-storefill : 1.0
-upstairs above : 0.44
diff --git a/flax/subs/dolly169 b/flax/subs/dolly169
deleted file mode 100644
--- a/flax/subs/dolly169
+++ /dev/null
@@ -1,3 +0,0 @@
-ramp7 : 0.57
-ramp8 : 0.43
-ramp9-stairs : 0.84
diff --git a/flax/subs/dolly170 b/flax/subs/dolly170
deleted file mode 100644
--- a/flax/subs/dolly170
+++ /dev/null
@@ -1,5 +0,0 @@
-43 : 0.64
-ramp7 : 0.12
-ramp9-stairs : 0.12
-upstairs above : 0.72
-upstairs front : 0.64
diff --git a/flax/subs/dolly171 b/flax/subs/dolly171
deleted file mode 100644
--- a/flax/subs/dolly171
+++ /dev/null
@@ -1,10 +0,0 @@
-42 : 0.35
-44 : 0.35
-diag-back : 0.85
-f3 : 0.32
-f4 : 0.55
-f5 : 0.48
-f6 : 0.6
-main-c1 : 0.44
-main-c2 : 0.52
-storefill : 0.35
diff --git a/flax/subs/dolly172 b/flax/subs/dolly172
deleted file mode 100644
--- a/flax/subs/dolly172
+++ /dev/null
@@ -1,12 +0,0 @@
-42 : 0.36
-44 : 0.36
-blue1 : 0.47
-blue2 : 0.47
-blue3 : 0.47
-blue4 : 0.47
-dayback : 0.36
-downfill-left : 0.43
-downfill-right : 0.25
-f1.5 : 0.25
-main-l-blue : 0.65
-storefill : 0.36
diff --git a/flax/subs/dolly173 b/flax/subs/dolly173
deleted file mode 100644
--- a/flax/subs/dolly173
+++ /dev/null
@@ -1,24 +0,0 @@
-42 : 0.16
-44 : 0.16
-blue1 : 0.47
-blue2 : 0.47
-blue3 : 0.47
-blue4 : 0.47
-dayback : 0.36
-downfill-left : 0.23
-downfill-right : 0.22
-f1.5 : 0.25
-f2 : 0.94
-f3 : 0.96
-f4 : 0.49
-f5 : 0.46
-f6 : 0.46
-l-scp : 0.54
-main-c1 : 0.92
-main-c2 : 1.0
-main-c3 : 0.78
-main-lc-fill : 0.86
-main-r-blue : 0.45
-main-r-red : 0.39
-r-scp : 0.27
-storefill : 0.16
diff --git a/flax/subs/dolly174 b/flax/subs/dolly174
deleted file mode 100644
--- a/flax/subs/dolly174
+++ /dev/null
@@ -1,25 +0,0 @@
-2 : 0.18
-blue1 : 0.86
-blue2 : 0.86
-blue3 : 0.86
-blue4 : 0.86
-dayback : 0.1
-diag : 0.18
-diag-back : 0.18
-downfill-left : 0.39
-downfill-right : 0.4
-f1.5 : 0.18
-f2 : 0.18
-f3 : 0.18
-f4 : 0.18
-f5 : 0.18
-f6 : 0.35
-f7 : 0.4
-l-scp : 0.1
-main-c1 : 0.18
-main-c2 : 0.18
-main-l-blue : 0.18
-main-lc-fill : 0.18
-main-r-red : 0.18
-r-scp : 0.16
-ramp9-stairs : 0.18
diff --git a/flax/subs/dolly175 b/flax/subs/dolly175
deleted file mode 100644
--- a/flax/subs/dolly175
+++ /dev/null
@@ -1,34 +0,0 @@
-2 : 0.79
-blue1 : 0.7
-blue2 : 0.7
-blue3 : 0.7
-blue4 : 0.7
-diag : 0.79
-diag-back : 0.79
-downfill-left : 0.79
-downfill-right : 0.79
-f1.5 : 0.79
-f2 : 0.79
-f3 : 0.79
-f4 : 0.79
-f5 : 0.79
-f6 : 0.79
-l-scp : 0.7
-main-c1 : 0.79
-main-c2 : 0.79
-main-l-blue : 0.79
-main-lc-fill : 0.79
-main-r-red : 0.79
-r-scp : 0.67
-ramp0-stairs : 1.0
-ramp1 : 1.0
-ramp2 : 1.0
-ramp3 : 1.0
-ramp4 : 1.0
-ramp5 : 1.0
-ramp6 : 1.0
-ramp7 : 1.0
-ramp8 : 1.0
-ramp9-stairs : 0.79
-side l : 0.45
-side r : 0.45
diff --git a/flax/subs/dolly176 b/flax/subs/dolly176
deleted file mode 100644
--- a/flax/subs/dolly176
+++ /dev/null
@@ -1,1 +0,0 @@
-67 : 1.0
diff --git a/flax/subs/dolly177 b/flax/subs/dolly177
deleted file mode 100644
--- a/flax/subs/dolly177
+++ /dev/null
@@ -1,20 +0,0 @@
-18 : 0.18
-38 : 0.18
-blue1 : 1.0
-blue2 : 1.0
-blue3 : 1.0
-blue4 : 1.0
-f1.5 : 0.46
-f2 : 0.54
-f3 : 0.59
-f4 : 0.66
-f5 : 0.42
-l-scp : 0.15
-main-c1 : 0.27
-main-c2 : 0.52
-main-c3 : 0.36
-main-lc-fill : 0.18
-main-r-blue : 0.26
-main-r-red : 0.23
-oran1 : 0.81
-r-scp : 0.11
diff --git a/flax/subs/dolly178 b/flax/subs/dolly178
deleted file mode 100644
--- a/flax/subs/dolly178
+++ /dev/null
@@ -1,27 +0,0 @@
-42 : 0.87
-44 : 0.87
-blue1 : 0.63
-blue2 : 0.63
-blue3 : 0.63
-blue4 : 0.63
-downfill-left : 0.23
-downfill-right : 0.24
-f1 : 0.36
-f1.5 : 0.3
-f2 : 0.4
-f3 : 0.37
-f4 : 0.25
-f5 : 0.26
-f6 : 0.24
-f7 : 0.26
-l-scp : 0.49
-main-c1 : 0.87
-main-c2 : 0.87
-main-c3 : 0.69
-main-l-blue : 0.34
-main-l-red : 0.63
-main-lc-fill : 0.59
-main-r-blue : 0.65
-main-r-red : 0.6
-r-scp : 0.34
-storefill : 0.87
diff --git a/flax/subs/dolly179 b/flax/subs/dolly179
deleted file mode 100644
--- a/flax/subs/dolly179
+++ /dev/null
@@ -1,11 +0,0 @@
-43 : 0.8
-blue1 : 0.63
-blue2 : 0.63
-blue3 : 0.63
-blue4 : 0.63
-downfill-right : 0.46
-main-r-blue : 0.71
-main-r-red : 0.48
-r-scp : 0.63
-upstairs above : 0.3
-upstairs front : 0.8
diff --git a/flax/subs/dolly180 b/flax/subs/dolly180
deleted file mode 100644
--- a/flax/subs/dolly180
+++ /dev/null
@@ -1,8 +0,0 @@
-blue1 : 0.63
-blue2 : 0.63
-blue3 : 0.63
-blue4 : 0.63
-downfill-left : 0.57
-l-scp : 0.6
-main-l-red : 1.0
-main-lc-fill : 0.84
diff --git a/flax/subs/dolly181 b/flax/subs/dolly181
deleted file mode 100644
--- a/flax/subs/dolly181
+++ /dev/null
@@ -1,9 +0,0 @@
-ramp0-stairs : 1.0
-ramp1 : 1.0
-ramp2 : 1.0
-ramp3 : 1.0
-ramp4 : 1.0
-ramp5 : 1.0
-ramp6 : 1.0
-ramp7 : 1.0
-ramp8 : 1.0
diff --git a/flax/subs/dolly182 b/flax/subs/dolly182
deleted file mode 100644
--- a/flax/subs/dolly182
+++ /dev/null
@@ -1,7 +0,0 @@
-f1 : 0.62
-f2 : 0.86
-f3 : 0.83
-f4 : 0.79
-f5 : 0.79
-f6 : 0.87
-f7 : 0.54
diff --git a/flax/subs/dolly183 b/flax/subs/dolly183
deleted file mode 100644
--- a/flax/subs/dolly183
+++ /dev/null
@@ -1,21 +0,0 @@
-42 : 0.49
-44 : 0.49
-blue1 : 0.47
-blue2 : 0.47
-blue3 : 0.47
-blue4 : 0.47
-dayback : 0.28
-diag : 0.46
-diag-back : 0.5
-downfill-left : 0.23
-downfill-right : 0.4
-f1 : 0.34
-f1.5 : 0.4
-f2 : 0.41
-f3 : 0.38
-f4 : 0.44
-f5 : 0.37
-judge : 0.74
-main-l-red : 0.36
-main-lc-fill : 0.12
-storefill : 0.49
diff --git a/flax/subs/dolly184 b/flax/subs/dolly184
deleted file mode 100644
--- a/flax/subs/dolly184
+++ /dev/null
@@ -1,21 +0,0 @@
-42 : 0.49
-44 : 0.49
-blue1 : 0.47
-blue2 : 0.47
-blue3 : 0.47
-blue4 : 0.47
-dayback : 0.28
-diag : 0.68
-diag-back : 0.5
-downfill-left : 0.23
-downfill-right : 0.4
-f1 : 0.35
-f1.5 : 0.51
-f2 : 0.5
-f3 : 0.45
-f4 : 0.63
-f5 : 0.52
-judge : 1.0
-main-l-red : 0.5
-main-lc-fill : 0.35
-storefill : 0.49
diff --git a/flax/subs/dolly185 b/flax/subs/dolly185
deleted file mode 100644
--- a/flax/subs/dolly185
+++ /dev/null
@@ -1,38 +0,0 @@
-42 : 0.28
-43 : 0.12
-44 : 0.28
-blue1 : 0.85
-blue2 : 0.85
-blue3 : 0.85
-blue4 : 0.85
-diag : 0.61
-diag-back : 0.68
-f1 : 0.65
-f1.5 : 0.74
-f2 : 0.8
-f3 : 0.7
-f4 : 0.77
-f5 : 0.44
-f6 : 0.68
-f7 : 0.73
-gree1 : 0.85
-gree2 : 0.85
-gree3 : 0.85
-gree4 : 0.85
-judge : 1.0
-l-scp : 1.0
-main-c1 : 0.93
-main-c2 : 0.89
-main-l-blue : 0.27
-main-l-red : 0.83
-main-lc-fill : 0.92
-main-r-blue : 0.94
-main-r-red : 0.79
-r-scp : 0.6
-red1 : 0.91
-red2 : 0.91
-red3 : 0.91
-red4 : 0.91
-storefill : 0.28
-upstairs above : 0.13
-upstairs front : 0.12
diff --git a/flax/subs/dolly186 b/flax/subs/dolly186
deleted file mode 100644
--- a/flax/subs/dolly186
+++ /dev/null
@@ -1,36 +0,0 @@
-42 : 0.81
-44 : 0.81
-blue1 : 1.0
-blue2 : 1.0
-blue3 : 1.0
-blue4 : 1.0
-diag : 1.0
-diag-back : 1.0
-downfill-right : 0.27
-f1 : 1.0
-f1.5 : 0.93
-f2 : 1.0
-f3 : 1.0
-f4 : 1.0
-f5 : 0.83
-f6 : 1.0
-f7 : 1.0
-gree1 : 1.0
-gree2 : 1.0
-gree3 : 1.0
-gree4 : 1.0
-judge : 1.0
-l-scp : 1.0
-main-c1 : 1.0
-main-c2 : 1.0
-main-l-blue : 0.51
-main-l-red : 1.0
-main-lc-fill : 1.0
-main-r-blue : 1.0
-main-r-red : 1.0
-r-scp : 0.81
-red1 : 1.0
-red2 : 1.0
-red3 : 1.0
-red4 : 1.0
-storefill : 0.81
diff --git a/flax/subs/dolly187 b/flax/subs/dolly187
deleted file mode 100644
--- a/flax/subs/dolly187
+++ /dev/null
@@ -1,20 +0,0 @@
-18 : 0.17
-2 : 0.17
-38 : 0.17
-diag : 0.17
-downfill-left : 0.17
-downfill-right : 0.17
-f1 : 0.17
-f1.5 : 0.17
-f2 : 0.17
-f3 : 0.17
-f4 : 0.17
-f5 : 0.17
-f6 : 0.17
-f7 : 0.17
-l-scp : 0.17
-oran1 : 1.0
-oran2 : 1.0
-oran4 : 1.0
-r-scp : 0.17
-upstairs above : 0.17
diff --git a/flax/subs/dolly188 b/flax/subs/dolly188
deleted file mode 100644
--- a/flax/subs/dolly188
+++ /dev/null
@@ -1,10 +0,0 @@
-2 : 0.16
-diag-back : 0.43
-downfill-left : 0.76
-downfill-right : 0.77
-f1.5 : 0.24
-f2 : 0.19
-f3 : 0.52
-f4 : 0.14
-f5 : 0.25
-f7 : 0.47
diff --git a/flax/subs/dolly191 b/flax/subs/dolly191
deleted file mode 100644
--- a/flax/subs/dolly191
+++ /dev/null
@@ -1,10 +0,0 @@
-2 : 1.0
-diag : 1.0
-diag-back : 1.0
-f1.5 : 1.0
-f2 : 1.0
-f3 : 1.0
-f4 : 1.0
-f5 : 1.0
-f6 : 1.0
-main-c2 : 0.32
diff --git a/flax/subs/dolly192 b/flax/subs/dolly192
deleted file mode 100644
--- a/flax/subs/dolly192
+++ /dev/null
@@ -1,24 +0,0 @@
-2 : 1.0
-blue1 : 0.24
-blue2 : 0.24
-blue3 : 0.24
-blue4 : 0.24
-diag : 1.0
-diag-back : 1.0
-downfill-left : 0.27
-downfill-right : 0.27
-f1.5 : 1.0
-f2 : 1.0
-f3 : 1.0
-f4 : 1.0
-f5 : 1.0
-f6 : 1.0
-judge : 1.0
-l-scp : 0.42
-main-c1 : 0.27
-main-c2 : 1.0
-main-l-blue : 0.27
-main-lc-fill : 0.27
-main-r-red : 0.27
-r-scp : 0.43
-ramp9-stairs : 0.27
diff --git a/flax/subs/dolly193 b/flax/subs/dolly193
deleted file mode 100644
--- a/flax/subs/dolly193
+++ /dev/null
@@ -1,13 +0,0 @@
-2 : 1.0
-43 : 0.59
-diag : 1.0
-diag-back : 1.0
-f1.5 : 1.0
-f2 : 1.0
-f3 : 1.0
-f4 : 1.0
-f5 : 1.0
-f6 : 1.0
-l-scp : 0.55
-upstairs above : 0.39
-upstairs front : 0.59
diff --git a/flax/subs/downfill b/flax/subs/downfill
deleted file mode 100644
--- a/flax/subs/downfill
+++ /dev/null
@@ -1,2 +0,0 @@
-sidefill1 : 1
-sidefill2 : 1
diff --git a/flax/subs/finale b/flax/subs/finale
--- a/flax/subs/finale
+++ b/flax/subs/finale
@@ -1,3 +1,4 @@
+42 : 0.28
 43 : 0.12
 44 : 0.28
 blue1 : 0.85
diff --git a/flax/subs/finale_with_dolly b/flax/subs/finale_with_dolly
--- a/flax/subs/finale_with_dolly
+++ b/flax/subs/finale_with_dolly
@@ -1,3 +1,4 @@
+42 : 0.81
 44 : 0.81
 blue1 : 1.0
 blue2 : 1.0
diff --git a/flax/subs/sill b/flax/subs/sill
deleted file mode 100644
--- a/flax/subs/sill
+++ /dev/null
@@ -1,2 +0,0 @@
-42 : 1.0
-43 : 1.0