changeset 64:871da71fc254

new config with a sub for each look
author drewp
date Tue, 09 Jul 2002 08:52:52 +0000
parents e5d14320fbd5
children 67a1fa40924f
files light8/Config.py light8/ConfigDummy.py
diffstat 2 files changed, 103 insertions(+), 625 deletions(-) [+]
line wrap: on
line diff
--- a/light8/Config.py	Tue Jul 09 08:48:44 2002 +0000
+++ b/light8/Config.py	Tue Jul 09 08:52:52 2002 +0000
@@ -4,6 +4,8 @@
 from Subs import *
 from Cue import *
 
+from Configeffects import *
+
 f1 = Fade('bogus sub, i hope', 0, 2, 0.1)
 
 cues = [
@@ -72,190 +74,6 @@
 def levs(chans,levs):
     return dict([(c,v) for c,v in zip(chans,levs)])
 
-def strobe(params, slideradjuster):
-    patterns = {
-        'blue' : fulls((23,27,31,35,'b0 4 b','b2 3 b')),
-        'cyc' : {42:FL,43:FL},
-        'scp all' : fulls((13,16,18,19,39)),
-        '1-5' : fulls(range(1, 6)),
-    }
-    params.add_param('offtime',SliderParam(range=(0.1,0.3), res=0.001,
-                                           initial=0.11, length=100))
-    params.add_param('ontime',SliderParam(range=(0.0,0.8), res=0.001, 
-                                          length=100))
-    params.add_param('pattern',ListParam(patterns.keys()))
-    params.add_param('current',LabelParam('none'))
-    params.add_param('count',SliderParam(range=(0, 10), res=1, initial=0))
-    lastchanged = time()
-    state = 0
-    blinkcounter = 0
-    my_pattern = None
-
-    while 1:
-        if params['count'] and blinkcounter > params['count']:
-            blinkcounter = 0
-            slideradjuster.set(0)
-
-        if params['pattern'] != None:
-            params['current'] = params['pattern']
-            my_pattern = params['pattern']
-
-        if state == 0:
-            delay = params['offtime']
-        else:
-            delay = params['ontime']
-            
-        if time() > (lastchanged + delay):
-            # ready for change
-            state = not state
-            lastchanged = time()
-            blinkcounter += 0.5
-
-        try: # protect against keyerrors (and possibly everything else)
-            if state:
-                yield patterns[my_pattern]
-            else:
-                yield scaledict(patterns[my_pattern], .1)
-        except:
-            yield {}
-
-def chase(params, slideradjuster):
-    patterns = {
-        'all': ( fulls(('b01','b21')),
-                 fulls(('b02','b22')),
-                 fulls(('b03','b23')),
-                 fulls(('b04','b24')),
-                 fulls(('b05','b25')),
-                 fulls(('b06','b26')),
-                 ),
-        'red':( fulls(('b0 1 r','b2 2 r')),
-                fulls(('b0 5 r','b2 6 r'))),
-        'randcol':([fulls((x,)) for x
-                    in ("b21 b23 b25 b03 b06 b24 b22 "+
-                        "b24 b03 b23 b01 b04 b05 b22 "+
-                        "b02 b02 b26 b21 b06 b25 b26 "+
-                        "b01 b04 b05").split()]),
-        'ctrpong':[fulls((x,)) for x in (
-                   "b11 b12 b13 b14 b15 b16 b15 b14 b13 b12".split())],
-        'l-r': ( fulls(('b01','b11','b21')),
-                 fulls(('b02','b12','b22')),
-                 fulls(('b03','b13','b23')),
-                 fulls(('b04','b14','b24')),
-                 fulls(('b05','b15','b25')),
-                 fulls(('b06','b16','b26'))),
-        'flutter':(
-        fulls(('main 6','b15')),
-        fulls(('main 1','b12')),
-        fulls(('main 2','b11')),
-        fulls(('b12',   'main 3')),
-        fulls(('b15',   'main 9')),
-        fulls(('b16',   'main 4')),
-        fulls(('main 4','b13')),
-        fulls(('main 3','b11')),
-        fulls(('main 8','b15')),
-        fulls(('main 9','b12')),
-        fulls(('b11',   'main 1')),
-        fulls(('main 5','b15')),
-        fulls(('b13',   'main 6')),
-        fulls(('b14',   'main 2')),
-        fulls(('main 7','b16')),
-        ),
-        'randstage':([fulls((x,)) for x
-                    in ("""
-b22 27 b04 26 b26 21 28 b25 23 b02 31 b05 32 34 b03 24 b01 25
-b23 29 22 35 30 b24 33 36 """).split()]),
-
-        }
-
-    params.add_param('steptime',SliderParam(range=(.1,3),
-                                            initial=.4,length=150))
-    params.add_param('overlap',SliderParam(range=(0,8),initial=1.5))
-    params.add_param('pattern',ListParam(options=patterns.keys(),
-                                         initial='all'))
-    params.add_param('current',LabelParam('none'))
-    
-    steps=()
-    
-    def fn(x):
-        warm=.1
-        # the _/\_ wave for each step. input 0..1, output 0..1
-        if x<0 or x>1:
-            return warm
-        if x<.5:
-            return warm+(1.0-warm)*(x*2)
-        else:
-            return warm+(1.0-warm)*(2-(x*2))
-
-    def stepbrightness(stepnum,numsteps,overlap,pos):
-        startpos = stepnum/numsteps
-        p=( (pos-startpos)*(1.0+overlap) )%1.0
-        ret=fn( p )
-        #print "step %(stepnum)i/%(numsteps)i pos %(pos)f ,p=%(p)f is %(ret)f" % locals()
-        return ret
-
-    queued=[] # list of steps, each step is starttime,stepcue
-    lastaddtime=time()-100
-    currentpattern='all'
-    steps=patterns[currentpattern]
-    stepsiter=iter(())
-    while 1:
-        params['current'] = params['pattern']
-
-        # changed pattern?
-        if params['pattern']!=currentpattern and params['pattern'] in patterns:
-            currentpattern=params['pattern']
-            steps=patterns[currentpattern]
-            stepsiter=iter(steps) # restart iterator
-
-        # time to put a new step in the queue?
-        if time()>lastaddtime+params['steptime']:
-            lastaddtime=time()
-            try:
-                nextstep = stepsiter.next()
-            except StopIteration:
-                stepsiter=iter(steps)
-                nextstep=stepsiter.next()
-            queued.append( (time(),nextstep) )
-
-        # loop over queue, putting still-active (scaled) steps in shiftedsteps
-        keepers=[]
-        shiftedsteps=[]
-        for started,s in queued:
-            steptime = time()-started
-            finish = started+(1.0+params['overlap'])*params['steptime']
-            pos = (time()-started)/(finish-started)
-            if time()<finish:
-                keepers.append((started,s))
-                shiftedsteps.append( scaledict(s,fn(pos)) )
-
-        if len(keepers)>30:
-            print "too many steps in chase - dumping some"
-            queued=keepers[:20]
-        else:
-            queued=keepers
-            
-            
-#        pos=(time()%params['steptime'])/params['steptime'] # 0..1 animated variable
-#        shiftedsteps=[]
-#        for i,s in zip(range(0,len(steps)),steps):
-#            shiftedsteps.append( scaledict(s, stepbrightness(i,len(steps),params['overlap'],pos)) )
-        yield maxes(shiftedsteps)
-
-    
-def randomdimmer(params, slideradjuster):
-    params.add_param('magic', CheckboxParam())
-    params.add_param('cheese', TextParam())
-    params.add_param('stuff', ListParam(('a', 'b', 'c')))
-
-    curtime = time()
-    dim = 1
-    while 4:
-        if time() - curtime > 1:
-            dim = randrange(1, 64)
-            curtime = time()
-        yield {dim : 100, 20 : params.get_param_value('magic')}
-
-
 subs = {
     ('house', 'black') : { 68:100 },
     ('col oran', '#EEEE99'):fulls('oran1 oran2 oran3 oran4'.split()),
@@ -340,24 +158,7 @@
     "upfill2" : 66, "main 3" : 57, "main 2" : 0, "main 5" : 70, "main 4" : 100,
     "main 7" : 100, "main 9" : 100, "main 8" : 100, "rock" : 52,
     "marry2" : 100, "marry1" : 61, "cuba1" : 0, "cuba2" : 78,}
-subs["*hotbox dance"] = { "red3" : 100, "sidefill2" : 46, "red1" : 100,
-    "cycright" : 19, "upfill3" : 32, "upfill2" : 46, "upfill1" : 26,
-    "red2" : 100, "side l" : 46, "b25" : 46, "cycleft" : 19, "sidefill1" : 46,
-    "desk2" : 36, "b22" : 46, "phone" : 37, "hotbox1" : 46, "upfill4" : 26,
-    "b24" : 46, "side r" : 46, "main 11" : 46, "main 10" : 46, "main 3" : 46,
-    "main 2" : 46, "main 5" : 46, "main 4" : 46, "main 7" : 46, "hotbox2" : 46,
-    "main 9" : 46, "main 8" : 46, "red4" : 100, "b34" : 46, "edge" : 37,
-    "god" : 100, "marry2" : 46, "marry1" : 46,}
-subs["*hotbox dance"] = { "cycright" : 19, "upfill3" : 32, "upfill2" : 46,
-    "upfill1" : 26, "sidefill2" : 0, "b25" : 0, "side l" : 46, "b23" : 0,
-    "desk1" : 0, "desk2" : 0, "upfill4" : 26, "side r" : 46, "main 11" : 46,
-    "main 10" : 46, "god" : 100, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0,
-    "marry2" : 0, "marry1" : 0, "cuba1" : 0, "cuba2" : 0, "b13" : 0,
-    "red3" : 100, "red2" : 100, "sidefill1" : 0, "b24" : 0, "red4" : 100,
-    "b34" : 30, "cycleft" : 19, "b32" : 43, "b22" : 0, "phone" : 0,
-    "hotbox1" : 42, "main 3" : 46, "main 2" : 46, "main 5" : 46,
-    "main 4" : 46, "main 7" : 100, "hotbox2" : 78, "main 9" : 46,
-    "main 8" : 46, "hotback" : 100, "rock" : 0, "red1" : 100,}
+
 subs["*hotbox dance"] = { "cycright" : 19, "upfill3" : 32, "upfill2" : 46,
     "upfill1" : 26, "sidefill2" : 0, "b25" : 0, "side l" : 46, "b23" : 0,
     "desk1" : 0, "desk2" : 24, "upfill4" : 26, "side r" : 46, "main 11" : 46,
@@ -389,14 +190,7 @@
     "main 5" : 0, "main 4" : 0, "main 7" : 0, "phone" : 0, "main 9" : 11,
     "main 8" : 0, "god" : 100, "edge" : 0, "rock" : 0, "marry2" : 0,
     "marry1" : 0, "hotback" : 0, "cuba1" : 0, "cuba2" : 0,}
-subs["*ext mission"] = { "sidefill2" : 100, "sidefill1" : 100,
-    "cycright" : 41, "upfill3" : 69, "upfill2" : 100, "upfill1" : 56,
-    "side l" : 100, "b25" : 100, "cycleft" : 41, "b22" : 100, "desk2" : 78,
-    "phone" : 80, "hotbox1" : 100, "upfill4" : 56, "b24" : 100, "side r" : 100,
-    "main 11" : 100, "main 10" : 100, "main 3" : 100, "main 2" : 100,
-    "main 5" : 100, "main 4" : 100, "main 7" : 100, "hotbox2" : 100,
-    "main 9" : 100, "main 8" : 100, "b34" : 100, "edge" : 80, "god" : 100,
-    "marry2" : 100, "marry1" : 100,}
+
 subs["*ext mission"] = { "sidefill2" : 100, "sidefill1" : 59,
     "cycright" : 53, "upfill3" : 0, "upfill2" : 0, "upfill1" : 0,
     "b34" : 100, "b25" : 100, "side l" : 100, "b23" : 100, "b22" : 49,
@@ -406,28 +200,7 @@
     "hotbox2" : 100, "main 9" : 100, "main 8" : 100, "god" : 100,
     "cycleft" : 0, "edge" : 0, "b13" : 0, "rock" : 60, "marry2" : 100,
     "marry1" : 0, "side r" : 100,}
-subs["*broadway night 1-7"] = { "sidefill2" : 37, "sidefill1" : 37,
-    "cycright" : 15, "upfill3" : 25, "upfill2" : 37, "upfill1" : 20,
-    "side l" : 37, "b25" : 37, "cycleft" : 15, "b22" : 37, "desk2" : 28,
-    "phone" : 29, "hotbox1" : 37, "upfill4" : 20, "b24" : 37, "side r" : 37,
-    "main 11" : 37, "main 10" : 37, "main 3" : 37, "main 2" : 37,
-    "main 5" : 37, "main 4" : 37, "main 7" : 37, "hotbox2" : 37,
-    "main 9" : 37, "main 8" : 37, "b34" : 37, "edge" : 29, "god" : 100,
-    "marry2" : 37, "marry1" : 37,}
-subs["*broadway night 1-7"] = { "sidefill2" : 37, "sidefill1" : 37,
-    "upfill3" : 11, "upfill2" : 23, "b34" : 37, "b25" : 37, "b24" : 94,
-    "b23" : 100, "b22" : 61, "desk2" : 28, "hotbox2" : 37, "hotbox1" : 37,
-    "blue1" : 93, "main 11" : 37, "blue3" : 93, "blue2" : 93, "blue4" : 93,
-    "main 10" : 37, "main 3" : 25, "main 2" : 37, "main 5" : 37,
-    "main 4" : 37, "main 7" : 37, "main 9" : 37, "main 8" : 37, "edge" : 12,
-    "god" : 100, "marry2" : 37, "marry1" : 37,}
-subs["*broadway night 1-7"] = { "sidefill2" : 37, "sidefill1" : 37,
-    "upfill3" : 11, "upfill2" : 23, "b34" : 37, "b25" : 37, "b24" : 94,
-    "b23" : 100, "b22" : 61, "desk2" : 0, "desk1" : 0, "hotbox2" : 37,
-    "hotbox1" : 0, "blue1" : 93, "main 11" : 37, "blue3" : 93, "blue2" : 93,
-    "blue4" : 93, "main 10" : 37, "main 3" : 25, "main 2" : 37, "main 5" : 37,
-    "main 4" : 37, "main 7" : 37, "main 9" : 37, "main 8" : 37, "edge" : 12,
-    "god" : 100, "marry2" : 37, "marry1" : 37,}
+
 subs["*broadway night 1-7"] = { "sidefill2" : 37, "sidefill1" : 37,
     "upfill3" : 11, "upfill2" : 23, "b34" : 28, "b25" : 37, "b24" : 94,
     "b23" : 100, "b22" : 82, "desk2" : 0, "desk1" : 0, "hotbox2" : 11,
@@ -446,27 +219,7 @@
     "main 7" : 100, "main 9" : 100, "main 8" : 100, "edge" : 100,
     "god" : 100, "marry2" : 100, "marry1" : 100, "hotback" : 100,
     "cuba1" : 100, "cuba2" : 100,}
-subs["*cuba love"] = { "sidefill2" : 0, "sidefill1" : 0, "upfill4" : 61,
-    "main 11" : 100, "main 10" : 100, "upfill1" : 61, "b25" : 100,
-    "b24" : 100, "b23" : 100, "b22" : 100, "desk2" : 0, "desk1" : 0,
-    "phone" : 0, "hotbox1" : 0, "upfill3" : 61, "upfill2" : 61, "main 3" : 0,
-    "main 2" : 100, "main 5" : 100, "main 4" : 100, "main 7" : 100,
-    "main 9" : 73, "main 8" : 100, "edge" : 0, "hotback" : 0, "marry2" : 0,
-    "marry1" : 0, "cuba1" : 0, "cuba2" : 0,}
-subs["*cuba love"] = { "sidefill2" : 0, "sidefill1" : 0, "upfill4" : 0,
-    "main 11" : 28, "main 10" : 28, "upfill1" : 0, "b34" : 9, "b25" : 100,
-    "b24" : 59, "b23" : 59, "b22" : 100, "desk2" : 0, "desk1" : 0,
-    "phone" : 0, "hotbox1" : 0, "upfill3" : 43, "upfill2" : 43, "main 3" : 0,
-    "main 2" : 100, "main 5" : 16, "main 4" : 16, "main 7" : 0, "main 9" : 73,
-    "main 8" : 100, "edge" : 0, "marry2" : 9, "marry1" : 0, "hotback" : 0,
-    "cuba1" : 0, "cuba2" : 0,}
-subs["*cuba love"] = { "sidefill2" : 0, "sidefill1" : 0, "upfill4" : 0,
-    "main 11" : 28, "main 10" : 28, "upfill1" : 0, "b34" : 9, "b25" : 100,
-    "b24" : 59, "b23" : 59, "b22" : 100, "desk2" : 0, "desk1" : 0,
-    "phone" : 0, "hotbox1" : 0, "upfill3" : 43, "upfill2" : 43, "main 3" : 0,
-    "main 2" : 100, "main 5" : 16, "main 4" : 16, "main 7" : 0, "main 9" : 65,
-    "main 8" : 74, "edge" : 0, "marry2" : 9, "marry1" : 0, "hotback" : 0,
-    "cuba1" : 0, "cuba2" : 0,}
+
 subs["*cuba love"] = { "sidefill2" : 0, "sidefill1" : 0, "upfill4" : 0,
     "main 11" : 28, "main 10" : 28, "upfill1" : 0, "b34" : 9, "b25" : 100,
     "b24" : 59, "b23" : 59, "b22" : 100, "desk2" : 16, "desk1" : 0,
@@ -502,62 +255,14 @@
     "desk2" : 26, "hotbox2" : 34, "upfill4" : 8, "b24" : 34, "side r" : 34,
     "main 2" : 34, "main 5" : 34, "main 4" : 25, "main 7" : 34, "main 9" : 34,
     "main 8" : 34, "rock" : 20, "god" : 100, "marry2" : 34, "cuba1" : 5,}
-subs["*2-2"] = { "b32" : 27, "sidefill2" : 34, "sidefill1" : 20,
-    "cycright" : 18, "main 11" : 34, "main 10" : 34, "upfill1" : 70,
-    "b34" : 34, "b25" : 34, "side l" : 34, "b23" : 34, "b22" : 16,
-    "desk2" : 26, "hotbox2" : 34, "upfill4" : 70, "b24" : 34, "side r" : 34,
-    "main 2" : 34, "main 5" : 34, "main 4" : 25, "main 7" : 34, "main 9" : 34,
-    "main 8" : 34, "rock" : 20, "god" : 100, "marry2" : 34, "cuba1" : 5,}
-subs["*2-2"] = { "sidefill2" : 0, "sidefill1" : 0, "cycright" : 18,
-    "main 11" : 5, "main 10" : 5, "upfill1" : 70, "b34" : 34, "b25" : 71,
-    "side l" : 34, "b23" : 67, "b22" : 50, "b32" : 57, "desk1" : 0,
-    "hotbox2" : 59, "upfill4" : 70, "b24" : 67, "desk2" : 26, "main 3" : 0,
-    "main 2" : 5, "main 5" : 5, "main 4" : 0, "main 7" : 5, "main 9" : 5,
-    "main 8" : 5, "rock" : 20, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0,
-    "god" : 100, "marry2" : 50, "cuba1" : 0, "side r" : 34,}
-subs["*sewer"] = { "main 10" : 71, "upfill4" : 100, "main 11" : 66,
-    "main 4" : 71, "upfill1" : 88, "main 8" : 71, "main 7" : 71,
-    "main 5" : 100, "hotbox1" : 88, "hotback" : 66, "marry2" : 66,
-    "upfill3" : 88, "marry1" : 66, "upfill2" : 100,}
-subs["*2-2"] = { "sidefill2" : 0, "sidefill1" : 0, "cycright" : 18,
-    "main 11" : 5, "main 10" : 5, "upfill1" : 70, "b34" : 34, "b25" : 71,
-    "side l" : 34, "b23" : 67, "b22" : 50, "b32" : 57, "desk1" : 0,
-    "hotbox2" : 59, "upfill4" : 70, "b24" : 67, "desk2" : 26, "main 3" : 0,
-    "main 2" : 5, "main 5" : 56, "main 4" : 0, "main 7" : 5, "main 9" : 5,
-    "main 8" : 5, "rock" : 20, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0,
-    "god" : 100, "marry2" : 50, "cuba1" : 0, "side r" : 34,}
-subs["*sewer"] = { "sidefill2" : 33, "sidefill1" : 33, "upfill4" : 10,
-    "upfill3" : 22, "main 10" : 48, "upfill1" : 14, "b25" : 16, "b24" : 19,
-    "b23" : 46, "b22" : 50, "hotbox1" : 0, "main 11" : 40, "upfill2" : 61,
-    "main 2" : 54, "main 5" : 20, "main 4" : 45, "main 7" : 0, "main 9" : 84,
-    "main 8" : 45, "hotback" : 40, "marry2" : 0, "marry1" : 0,}
-subs["*sewer"] = { "sidefill2" : 33, "sidefill1" : 33, "upfill4" : 10,
-    "upfill3" : 22, "main 10" : 48, "upfill1" : 14, "b25" : 16, "b24" : 19,
-    "b23" : 64, "b22" : 50, "hotbox1" : 0, "main 11" : 40, "upfill2" : 61,
-    "main 2" : 54, "main 5" : 20, "main 4" : 45, "main 7" : 0, "main 9" : 84,
-    "main 8" : 45, "hotback" : 40, "sidepost1" : 31, "sidepost2" : 31,
-    "marry2" : 0, "marry1" : 0,}
+
 subs["*sewer"] = { "sidefill2" : 33, "sidefill1" : 33, "upfill4" : 10,
     "upfill3" : 22, "main 10" : 48, "upfill1" : 14, "b25" : 16, "b24" : 19,
     "b23" : 64, "b22" : 50, "hotbox1" : 0, "main 11" : 40, "upfill2" : 61,
     "main 2" : 54, "main 5" : 20, "main 4" : 45, "main 7" : 0, "main 9" : 84,
     "main 8" : 45, "hotback" : 40, "sidepost1" : 31, "sidepost2" : 31,
     "marry2" : 0, "marry1" : 0, "cuba1" : 59,}
-subs["*marry"] = { "b32" : 23, "sidefill2" : 30, "sidefill1" : 17,
-    "cycright" : 15, "main 11" : 30, "main 10" : 30, "upfill1" : 48,
-    "b34" : 30, "b25" : 30, "side l" : 30, "b23" : 30, "b22" : 14,
-    "desk2" : 23, "hotbox2" : 30, "upfill4" : 48, "b24" : 30, "side r" : 30,
-    "main 3" : 30, "main 2" : 30, "main 5" : 30, "main 4" : 22, "main 7" : 30,
-    "main 9" : 30, "main 8" : 30, "rock" : 17, "edge" : 15, "god" : 100,
-    "marry2" : 30, "cuba1" : 4,}
-subs["*marry"] = { "sidefill2" : 0, "sidefill1" : 0, "cycright" : 100,
-    "main 11" : 55, "main 10" : 55, "upfill1" : 48, "b34" : 30, "b25" : 0,
-    "side l" : 30, "b23" : 100, "b22" : 14, "b32" : 23, "main 4" : 0,
-    "hotbox2" : 43, "hotbox1" : 49, "upfill4" : 48, "b24" : 100,
-    "desk2" : 23, "patio2" : 0, "main 3" : 0, "main 2" : 30, "main 5" : 0,
-    "patio1" : 0, "main 7" : 30, "phone" : 0, "main 9" : 30, "main 8" : 0,
-    "rock" : 17, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0, "god" : 100,
-    "marry2" : 34, "marry1" : 69, "cuba1" : 0, "cuba2" : 0, "side r" : 30,}
+
 subs["*marry"] = { "sidefill2" : 0, "sidefill1" : 0, "cycright" : 100,
     "main 11" : 55, "main 10" : 55, "upfill1" : 48, "b34" : 30, "patio1" : 0,
     "b25" : 0, "side l" : 30, "b23" : 100, "b22" : 14, "b32" : 23,
@@ -566,3 +271,46 @@
     "main 4" : 0, "main 7" : 30, "phone" : 0, "main 9" : 30, "main 8" : 0,
     "rock" : 17, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0, "god" : 100,
     "marry2" : 34, "marry1" : 69, "cuba1" : 0, "cuba2" : 0, "side r" : 30,}
+
+subs['*1-01-0']=subs['*broadway open'].copy()
+subs['*1-02-0']=subs['*int mission'].copy()
+subs['*1-03-0']=subs['*phone booth'].copy()
+
+subs['*1-04-00-dance']=subs['*hotbox dance'].copy()
+subs['*1-04-10-after dance']=subs['*hotbox dance'].copy()
+subs['*1-04-20-table']=subs['*hotbox table'].copy()
+subs['*1-04-30-small table']=subs['*hotbox small table'].copy()
+
+subs['*1-05-0']=subs['*broadway open'].copy()
+subs['*1-06-0']=subs['*ext mission'].copy()
+subs['*1-07-0']=subs['*broadway night 1-7'].copy()
+
+
+subs['*1-08-00-left cafe']={ "main 3" : 100, "edge" : 100,}
+subs['*1-08-10-right cafe']= fulls(('cuba1','cuba2'))
+subs['*1-08-20-backdrop']=fulls(('upfill1','upfill2','upfill3','upfill4'))
+
+subs['*1-09-0']=subs['*cuba love'].copy()
+subs['*1-10-0']=subs['*ext mission night'].copy()
+
+subs['*2-01-0-dance']=subs['*hotbox dance'].copy()
+subs['*2-01-1-after dance']=subs['*hotbox dance'].copy()
+subs['*2-01-2-table']=subs['*hotbox table'].copy()
+subs['*2-01-3-small table']=subs['*hotbox small table'].copy()
+
+subs["*2-02-0"] = { "sidefill2" : 0, "sidefill1" : 0, "cycright" : 18,
+    "main 11" : 5, "main 10" : 5, "upfill1" : 70, "b34" : 34, "b25" : 71,
+    "side l" : 34, "b23" : 67, "b22" : 50, "b32" : 57, "desk1" : 0,
+    "hotbox2" : 59, "upfill4" : 70, "b24" : 67, "desk2" : 26, "main 3" : 0,
+    "main 2" : 5, "main 5" : 56, "main 4" : 0, "main 7" : 5, "main 9" : 5,
+    "main 8" : 5, "rock" : 20, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0,
+    "god" : 100, "marry2" : 50, "cuba1" : 0, "side r" : 34,}
+
+subs['*2-03-00-open dance']=subs['*sewer'].copy()
+subs['*2-03-10-dialogue']=subs['*sewer'].copy()
+subs['*2-03-20-luck']=subs['*sewer'].copy()
+
+subs['*2-04-0']=subs['*2-02-0'].copy() # sue me
+subs['*2-05-0']=subs['*int mission'].copy()
+subs['*2-06-0']=subs['*marry'].copy()
+subs['*2-07-0']=subs['*broadway open'].copy()
--- a/light8/ConfigDummy.py	Tue Jul 09 08:48:44 2002 +0000
+++ b/light8/ConfigDummy.py	Tue Jul 09 08:52:52 2002 +0000
@@ -4,28 +4,12 @@
 from Subs import *
 from Cue import *
 
-f1 = Fade('col blue', 0, 2, 1)
-f2 = Fade('col gree', 1, 3, .50)
-f3 = Fade('col oran', 0, 4, 0)
-f4 = Fade('col red', 0, 8, .75) 
+from Configeffects import *
 
-g1 = Fade('col blue', 1, 2, .20)
-g2 = Fade('col gree', 0, 4, .10)
-g3 = Fade('cyc', 1, 5, .20)
-g4 = Fade('god', 0, 4, .15) 
-
-r1 = Fade('col blue', 0, 2, 0)
-r2 = Fade('col gree', 1, 3, .10)
-r3 = Fade('col oran', 0, 4, .6)
-r4 = Fade('col red', 0, 8, .15) 
-r5 = Fade('cyc', 1, 5, .90)
-r6 = Fade('god', 0, 8, .75) 
+f1 = Fade('bogus sub, i hope', 0, 2, 0.1)
 
 cues = [
-    Cue("This", 0, 10, f1, f2, f3, f4),
-    Cue("That", 0, 5, g1, g2, g3, g4),
-    Cue("The other", 1, 7, f1, g2, g3, f4),
-    Cue("Reset", 1, 9, r1, r2, r3, r4, r5, r6),
+    Cue("Seat filler", 0, 10, f1),
 ]
 
 patch = {
@@ -90,190 +74,6 @@
 def levs(chans,levs):
     return dict([(c,v) for c,v in zip(chans,levs)])
 
-def strobe(params, slideradjuster):
-    patterns = {
-        'blue' : fulls((23,27,31,35,'b0 4 b','b2 3 b')),
-        'cyc' : {42:FL,43:FL},
-        'scp all' : fulls((13,16,18,19,39)),
-        '1-5' : fulls(range(1, 6)),
-    }
-    params.add_param('offtime',SliderParam(range=(0.1,0.3), res=0.001,
-                                           initial=0.11, length=100))
-    params.add_param('ontime',SliderParam(range=(0.0,0.8), res=0.001, 
-                                          length=100))
-    params.add_param('pattern',ListParam(patterns.keys()))
-    params.add_param('current',LabelParam('none'))
-    params.add_param('count',SliderParam(range=(0, 10), res=1, initial=0))
-    lastchanged = time()
-    state = 0
-    blinkcounter = 0
-    my_pattern = None
-
-    while 1:
-        if params['count'] and blinkcounter > params['count']:
-            blinkcounter = 0
-            slideradjuster.set(0)
-
-        if params['pattern'] != None:
-            params['current'] = params['pattern']
-            my_pattern = params['pattern']
-
-        if state == 0:
-            delay = params['offtime']
-        else:
-            delay = params['ontime']
-            
-        if time() > (lastchanged + delay):
-            # ready for change
-            state = not state
-            lastchanged = time()
-            blinkcounter += 0.5
-
-        try: # protect against keyerrors (and possibly everything else)
-            if state:
-                yield patterns[my_pattern]
-            else:
-                yield scaledict(patterns[my_pattern], .1)
-        except:
-            yield {}
-
-def chase(params, slideradjuster):
-    patterns = {
-        'all': ( fulls(('b01','b21')),
-                 fulls(('b02','b22')),
-                 fulls(('b03','b23')),
-                 fulls(('b04','b24')),
-                 fulls(('b05','b25')),
-                 fulls(('b06','b26')),
-                 ),
-        'red':( fulls(('b0 1 r','b2 2 r')),
-                fulls(('b0 5 r','b2 6 r'))),
-        'randcol':([fulls((x,)) for x
-                    in ("b21 b23 b25 b03 b06 b24 b22 "+
-                        "b24 b03 b23 b01 b04 b05 b22 "+
-                        "b02 b02 b26 b21 b06 b25 b26 "+
-                        "b01 b04 b05").split()]),
-        'ctrpong':[fulls((x,)) for x in (
-                   "b11 b12 b13 b14 b15 b16 b15 b14 b13 b12".split())],
-        'l-r': ( fulls(('b01','b11','b21')),
-                 fulls(('b02','b12','b22')),
-                 fulls(('b03','b13','b23')),
-                 fulls(('b04','b14','b24')),
-                 fulls(('b05','b15','b25')),
-                 fulls(('b06','b16','b26'))),
-        'flutter':(
-        fulls(('main 6','b15')),
-        fulls(('main 1','b12')),
-        fulls(('main 2','b11')),
-        fulls(('b12',   'main 3')),
-        fulls(('b15',   'main 9')),
-        fulls(('b16',   'main 4')),
-        fulls(('main 4','b13')),
-        fulls(('main 3','b11')),
-        fulls(('main 8','b15')),
-        fulls(('main 9','b12')),
-        fulls(('b11',   'main 1')),
-        fulls(('main 5','b15')),
-        fulls(('b13',   'main 6')),
-        fulls(('b14',   'main 2')),
-        fulls(('main 7','b16')),
-        ),
-        'randstage':([fulls((x,)) for x
-                    in ("""
-b22 27 b04 26 b26 21 28 b25 23 b02 31 b05 32 34 b03 24 b01 25
-b23 29 22 35 30 b24 33 36 """).split()]),
-
-        }
-
-    params.add_param('steptime',SliderParam(range=(.1,3),
-                                            initial=.4,length=150))
-    params.add_param('overlap',SliderParam(range=(0,8),initial=1.5))
-    params.add_param('pattern',ListParam(options=patterns.keys(),
-                                         initial='all'))
-    params.add_param('current',LabelParam('none'))
-    
-    steps=()
-    
-    def fn(x):
-        warm=.1
-        # the _/\_ wave for each step. input 0..1, output 0..1
-        if x<0 or x>1:
-            return warm
-        if x<.5:
-            return warm+(1.0-warm)*(x*2)
-        else:
-            return warm+(1.0-warm)*(2-(x*2))
-
-    def stepbrightness(stepnum,numsteps,overlap,pos):
-        startpos = stepnum/numsteps
-        p=( (pos-startpos)*(1.0+overlap) )%1.0
-        ret=fn( p )
-        #print "step %(stepnum)i/%(numsteps)i pos %(pos)f ,p=%(p)f is %(ret)f" % locals()
-        return ret
-
-    queued=[] # list of steps, each step is starttime,stepcue
-    lastaddtime=time()-100
-    currentpattern='all'
-    steps=patterns[currentpattern]
-    stepsiter=iter(())
-    while 1:
-        params['current'] = params['pattern']
-
-        # changed pattern?
-        if params['pattern']!=currentpattern and params['pattern'] in patterns:
-            currentpattern=params['pattern']
-            steps=patterns[currentpattern]
-            stepsiter=iter(steps) # restart iterator
-
-        # time to put a new step in the queue?
-        if time()>lastaddtime+params['steptime']:
-            lastaddtime=time()
-            try:
-                nextstep = stepsiter.next()
-            except StopIteration:
-                stepsiter=iter(steps)
-                nextstep=stepsiter.next()
-            queued.append( (time(),nextstep) )
-
-        # loop over queue, putting still-active (scaled) steps in shiftedsteps
-        keepers=[]
-        shiftedsteps=[]
-        for started,s in queued:
-            steptime = time()-started
-            finish = started+(1.0+params['overlap'])*params['steptime']
-            pos = (time()-started)/(finish-started)
-            if time()<finish:
-                keepers.append((started,s))
-                shiftedsteps.append( scaledict(s,fn(pos)) )
-
-        if len(keepers)>30:
-            print "too many steps in chase - dumping some"
-            queued=keepers[:20]
-        else:
-            queued=keepers
-            
-            
-#        pos=(time()%params['steptime'])/params['steptime'] # 0..1 animated variable
-#        shiftedsteps=[]
-#        for i,s in zip(range(0,len(steps)),steps):
-#            shiftedsteps.append( scaledict(s, stepbrightness(i,len(steps),params['overlap'],pos)) )
-        yield maxes(shiftedsteps)
-
-    
-def randomdimmer(params, slideradjuster):
-    params.add_param('magic', CheckboxParam())
-    params.add_param('cheese', TextParam())
-    params.add_param('stuff', ListParam(('a', 'b', 'c')))
-
-    curtime = time()
-    dim = 1
-    while 4:
-        if time() - curtime > 1:
-            dim = randrange(1, 64)
-            curtime = time()
-        yield {dim : 100, 20 : params.get_param_value('magic')}
-
-
 subs = {
     ('house', 'black') : { 68:100 },
     ('col oran', '#EEEE99'):fulls('oran1 oran2 oran3 oran4'.split()),
@@ -358,24 +158,7 @@
     "upfill2" : 66, "main 3" : 57, "main 2" : 0, "main 5" : 70, "main 4" : 100,
     "main 7" : 100, "main 9" : 100, "main 8" : 100, "rock" : 52,
     "marry2" : 100, "marry1" : 61, "cuba1" : 0, "cuba2" : 78,}
-subs["*hotbox dance"] = { "red3" : 100, "sidefill2" : 46, "red1" : 100,
-    "cycright" : 19, "upfill3" : 32, "upfill2" : 46, "upfill1" : 26,
-    "red2" : 100, "side l" : 46, "b25" : 46, "cycleft" : 19, "sidefill1" : 46,
-    "desk2" : 36, "b22" : 46, "phone" : 37, "hotbox1" : 46, "upfill4" : 26,
-    "b24" : 46, "side r" : 46, "main 11" : 46, "main 10" : 46, "main 3" : 46,
-    "main 2" : 46, "main 5" : 46, "main 4" : 46, "main 7" : 46, "hotbox2" : 46,
-    "main 9" : 46, "main 8" : 46, "red4" : 100, "b34" : 46, "edge" : 37,
-    "god" : 100, "marry2" : 46, "marry1" : 46,}
-subs["*hotbox dance"] = { "cycright" : 19, "upfill3" : 32, "upfill2" : 46,
-    "upfill1" : 26, "sidefill2" : 0, "b25" : 0, "side l" : 46, "b23" : 0,
-    "desk1" : 0, "desk2" : 0, "upfill4" : 26, "side r" : 46, "main 11" : 46,
-    "main 10" : 46, "god" : 100, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0,
-    "marry2" : 0, "marry1" : 0, "cuba1" : 0, "cuba2" : 0, "b13" : 0,
-    "red3" : 100, "red2" : 100, "sidefill1" : 0, "b24" : 0, "red4" : 100,
-    "b34" : 30, "cycleft" : 19, "b32" : 43, "b22" : 0, "phone" : 0,
-    "hotbox1" : 42, "main 3" : 46, "main 2" : 46, "main 5" : 46,
-    "main 4" : 46, "main 7" : 100, "hotbox2" : 78, "main 9" : 46,
-    "main 8" : 46, "hotback" : 100, "rock" : 0, "red1" : 100,}
+
 subs["*hotbox dance"] = { "cycright" : 19, "upfill3" : 32, "upfill2" : 46,
     "upfill1" : 26, "sidefill2" : 0, "b25" : 0, "side l" : 46, "b23" : 0,
     "desk1" : 0, "desk2" : 24, "upfill4" : 26, "side r" : 46, "main 11" : 46,
@@ -407,14 +190,7 @@
     "main 5" : 0, "main 4" : 0, "main 7" : 0, "phone" : 0, "main 9" : 11,
     "main 8" : 0, "god" : 100, "edge" : 0, "rock" : 0, "marry2" : 0,
     "marry1" : 0, "hotback" : 0, "cuba1" : 0, "cuba2" : 0,}
-subs["*ext mission"] = { "sidefill2" : 100, "sidefill1" : 100,
-    "cycright" : 41, "upfill3" : 69, "upfill2" : 100, "upfill1" : 56,
-    "side l" : 100, "b25" : 100, "cycleft" : 41, "b22" : 100, "desk2" : 78,
-    "phone" : 80, "hotbox1" : 100, "upfill4" : 56, "b24" : 100, "side r" : 100,
-    "main 11" : 100, "main 10" : 100, "main 3" : 100, "main 2" : 100,
-    "main 5" : 100, "main 4" : 100, "main 7" : 100, "hotbox2" : 100,
-    "main 9" : 100, "main 8" : 100, "b34" : 100, "edge" : 80, "god" : 100,
-    "marry2" : 100, "marry1" : 100,}
+
 subs["*ext mission"] = { "sidefill2" : 100, "sidefill1" : 59,
     "cycright" : 53, "upfill3" : 0, "upfill2" : 0, "upfill1" : 0,
     "b34" : 100, "b25" : 100, "side l" : 100, "b23" : 100, "b22" : 49,
@@ -424,28 +200,7 @@
     "hotbox2" : 100, "main 9" : 100, "main 8" : 100, "god" : 100,
     "cycleft" : 0, "edge" : 0, "b13" : 0, "rock" : 60, "marry2" : 100,
     "marry1" : 0, "side r" : 100,}
-subs["*broadway night 1-7"] = { "sidefill2" : 37, "sidefill1" : 37,
-    "cycright" : 15, "upfill3" : 25, "upfill2" : 37, "upfill1" : 20,
-    "side l" : 37, "b25" : 37, "cycleft" : 15, "b22" : 37, "desk2" : 28,
-    "phone" : 29, "hotbox1" : 37, "upfill4" : 20, "b24" : 37, "side r" : 37,
-    "main 11" : 37, "main 10" : 37, "main 3" : 37, "main 2" : 37,
-    "main 5" : 37, "main 4" : 37, "main 7" : 37, "hotbox2" : 37,
-    "main 9" : 37, "main 8" : 37, "b34" : 37, "edge" : 29, "god" : 100,
-    "marry2" : 37, "marry1" : 37,}
-subs["*broadway night 1-7"] = { "sidefill2" : 37, "sidefill1" : 37,
-    "upfill3" : 11, "upfill2" : 23, "b34" : 37, "b25" : 37, "b24" : 94,
-    "b23" : 100, "b22" : 61, "desk2" : 28, "hotbox2" : 37, "hotbox1" : 37,
-    "blue1" : 93, "main 11" : 37, "blue3" : 93, "blue2" : 93, "blue4" : 93,
-    "main 10" : 37, "main 3" : 25, "main 2" : 37, "main 5" : 37,
-    "main 4" : 37, "main 7" : 37, "main 9" : 37, "main 8" : 37, "edge" : 12,
-    "god" : 100, "marry2" : 37, "marry1" : 37,}
-subs["*broadway night 1-7"] = { "sidefill2" : 37, "sidefill1" : 37,
-    "upfill3" : 11, "upfill2" : 23, "b34" : 37, "b25" : 37, "b24" : 94,
-    "b23" : 100, "b22" : 61, "desk2" : 0, "desk1" : 0, "hotbox2" : 37,
-    "hotbox1" : 0, "blue1" : 93, "main 11" : 37, "blue3" : 93, "blue2" : 93,
-    "blue4" : 93, "main 10" : 37, "main 3" : 25, "main 2" : 37, "main 5" : 37,
-    "main 4" : 37, "main 7" : 37, "main 9" : 37, "main 8" : 37, "edge" : 12,
-    "god" : 100, "marry2" : 37, "marry1" : 37,}
+
 subs["*broadway night 1-7"] = { "sidefill2" : 37, "sidefill1" : 37,
     "upfill3" : 11, "upfill2" : 23, "b34" : 28, "b25" : 37, "b24" : 94,
     "b23" : 100, "b22" : 82, "desk2" : 0, "desk1" : 0, "hotbox2" : 11,
@@ -464,27 +219,7 @@
     "main 7" : 100, "main 9" : 100, "main 8" : 100, "edge" : 100,
     "god" : 100, "marry2" : 100, "marry1" : 100, "hotback" : 100,
     "cuba1" : 100, "cuba2" : 100,}
-subs["*cuba love"] = { "sidefill2" : 0, "sidefill1" : 0, "upfill4" : 61,
-    "main 11" : 100, "main 10" : 100, "upfill1" : 61, "b25" : 100,
-    "b24" : 100, "b23" : 100, "b22" : 100, "desk2" : 0, "desk1" : 0,
-    "phone" : 0, "hotbox1" : 0, "upfill3" : 61, "upfill2" : 61, "main 3" : 0,
-    "main 2" : 100, "main 5" : 100, "main 4" : 100, "main 7" : 100,
-    "main 9" : 73, "main 8" : 100, "edge" : 0, "hotback" : 0, "marry2" : 0,
-    "marry1" : 0, "cuba1" : 0, "cuba2" : 0,}
-subs["*cuba love"] = { "sidefill2" : 0, "sidefill1" : 0, "upfill4" : 0,
-    "main 11" : 28, "main 10" : 28, "upfill1" : 0, "b34" : 9, "b25" : 100,
-    "b24" : 59, "b23" : 59, "b22" : 100, "desk2" : 0, "desk1" : 0,
-    "phone" : 0, "hotbox1" : 0, "upfill3" : 43, "upfill2" : 43, "main 3" : 0,
-    "main 2" : 100, "main 5" : 16, "main 4" : 16, "main 7" : 0, "main 9" : 73,
-    "main 8" : 100, "edge" : 0, "marry2" : 9, "marry1" : 0, "hotback" : 0,
-    "cuba1" : 0, "cuba2" : 0,}
-subs["*cuba love"] = { "sidefill2" : 0, "sidefill1" : 0, "upfill4" : 0,
-    "main 11" : 28, "main 10" : 28, "upfill1" : 0, "b34" : 9, "b25" : 100,
-    "b24" : 59, "b23" : 59, "b22" : 100, "desk2" : 0, "desk1" : 0,
-    "phone" : 0, "hotbox1" : 0, "upfill3" : 43, "upfill2" : 43, "main 3" : 0,
-    "main 2" : 100, "main 5" : 16, "main 4" : 16, "main 7" : 0, "main 9" : 65,
-    "main 8" : 74, "edge" : 0, "marry2" : 9, "marry1" : 0, "hotback" : 0,
-    "cuba1" : 0, "cuba2" : 0,}
+
 subs["*cuba love"] = { "sidefill2" : 0, "sidefill1" : 0, "upfill4" : 0,
     "main 11" : 28, "main 10" : 28, "upfill1" : 0, "b34" : 9, "b25" : 100,
     "b24" : 59, "b23" : 59, "b22" : 100, "desk2" : 16, "desk1" : 0,
@@ -520,62 +255,14 @@
     "desk2" : 26, "hotbox2" : 34, "upfill4" : 8, "b24" : 34, "side r" : 34,
     "main 2" : 34, "main 5" : 34, "main 4" : 25, "main 7" : 34, "main 9" : 34,
     "main 8" : 34, "rock" : 20, "god" : 100, "marry2" : 34, "cuba1" : 5,}
-subs["*2-2"] = { "b32" : 27, "sidefill2" : 34, "sidefill1" : 20,
-    "cycright" : 18, "main 11" : 34, "main 10" : 34, "upfill1" : 70,
-    "b34" : 34, "b25" : 34, "side l" : 34, "b23" : 34, "b22" : 16,
-    "desk2" : 26, "hotbox2" : 34, "upfill4" : 70, "b24" : 34, "side r" : 34,
-    "main 2" : 34, "main 5" : 34, "main 4" : 25, "main 7" : 34, "main 9" : 34,
-    "main 8" : 34, "rock" : 20, "god" : 100, "marry2" : 34, "cuba1" : 5,}
-subs["*2-2"] = { "sidefill2" : 0, "sidefill1" : 0, "cycright" : 18,
-    "main 11" : 5, "main 10" : 5, "upfill1" : 70, "b34" : 34, "b25" : 71,
-    "side l" : 34, "b23" : 67, "b22" : 50, "b32" : 57, "desk1" : 0,
-    "hotbox2" : 59, "upfill4" : 70, "b24" : 67, "desk2" : 26, "main 3" : 0,
-    "main 2" : 5, "main 5" : 5, "main 4" : 0, "main 7" : 5, "main 9" : 5,
-    "main 8" : 5, "rock" : 20, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0,
-    "god" : 100, "marry2" : 50, "cuba1" : 0, "side r" : 34,}
-subs["*sewer"] = { "main 10" : 71, "upfill4" : 100, "main 11" : 66,
-    "main 4" : 71, "upfill1" : 88, "main 8" : 71, "main 7" : 71,
-    "main 5" : 100, "hotbox1" : 88, "hotback" : 66, "marry2" : 66,
-    "upfill3" : 88, "marry1" : 66, "upfill2" : 100,}
-subs["*2-2"] = { "sidefill2" : 0, "sidefill1" : 0, "cycright" : 18,
-    "main 11" : 5, "main 10" : 5, "upfill1" : 70, "b34" : 34, "b25" : 71,
-    "side l" : 34, "b23" : 67, "b22" : 50, "b32" : 57, "desk1" : 0,
-    "hotbox2" : 59, "upfill4" : 70, "b24" : 67, "desk2" : 26, "main 3" : 0,
-    "main 2" : 5, "main 5" : 56, "main 4" : 0, "main 7" : 5, "main 9" : 5,
-    "main 8" : 5, "rock" : 20, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0,
-    "god" : 100, "marry2" : 50, "cuba1" : 0, "side r" : 34,}
-subs["*sewer"] = { "sidefill2" : 33, "sidefill1" : 33, "upfill4" : 10,
-    "upfill3" : 22, "main 10" : 48, "upfill1" : 14, "b25" : 16, "b24" : 19,
-    "b23" : 46, "b22" : 50, "hotbox1" : 0, "main 11" : 40, "upfill2" : 61,
-    "main 2" : 54, "main 5" : 20, "main 4" : 45, "main 7" : 0, "main 9" : 84,
-    "main 8" : 45, "hotback" : 40, "marry2" : 0, "marry1" : 0,}
-subs["*sewer"] = { "sidefill2" : 33, "sidefill1" : 33, "upfill4" : 10,
-    "upfill3" : 22, "main 10" : 48, "upfill1" : 14, "b25" : 16, "b24" : 19,
-    "b23" : 64, "b22" : 50, "hotbox1" : 0, "main 11" : 40, "upfill2" : 61,
-    "main 2" : 54, "main 5" : 20, "main 4" : 45, "main 7" : 0, "main 9" : 84,
-    "main 8" : 45, "hotback" : 40, "sidepost1" : 31, "sidepost2" : 31,
-    "marry2" : 0, "marry1" : 0,}
+
 subs["*sewer"] = { "sidefill2" : 33, "sidefill1" : 33, "upfill4" : 10,
     "upfill3" : 22, "main 10" : 48, "upfill1" : 14, "b25" : 16, "b24" : 19,
     "b23" : 64, "b22" : 50, "hotbox1" : 0, "main 11" : 40, "upfill2" : 61,
     "main 2" : 54, "main 5" : 20, "main 4" : 45, "main 7" : 0, "main 9" : 84,
     "main 8" : 45, "hotback" : 40, "sidepost1" : 31, "sidepost2" : 31,
     "marry2" : 0, "marry1" : 0, "cuba1" : 59,}
-subs["*marry"] = { "b32" : 23, "sidefill2" : 30, "sidefill1" : 17,
-    "cycright" : 15, "main 11" : 30, "main 10" : 30, "upfill1" : 48,
-    "b34" : 30, "b25" : 30, "side l" : 30, "b23" : 30, "b22" : 14,
-    "desk2" : 23, "hotbox2" : 30, "upfill4" : 48, "b24" : 30, "side r" : 30,
-    "main 3" : 30, "main 2" : 30, "main 5" : 30, "main 4" : 22, "main 7" : 30,
-    "main 9" : 30, "main 8" : 30, "rock" : 17, "edge" : 15, "god" : 100,
-    "marry2" : 30, "cuba1" : 4,}
-subs["*marry"] = { "sidefill2" : 0, "sidefill1" : 0, "cycright" : 100,
-    "main 11" : 55, "main 10" : 55, "upfill1" : 48, "b34" : 30, "b25" : 0,
-    "side l" : 30, "b23" : 100, "b22" : 14, "b32" : 23, "main 4" : 0,
-    "hotbox2" : 43, "hotbox1" : 49, "upfill4" : 48, "b24" : 100,
-    "desk2" : 23, "patio2" : 0, "main 3" : 0, "main 2" : 30, "main 5" : 0,
-    "patio1" : 0, "main 7" : 30, "phone" : 0, "main 9" : 30, "main 8" : 0,
-    "rock" : 17, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0, "god" : 100,
-    "marry2" : 34, "marry1" : 69, "cuba1" : 0, "cuba2" : 0, "side r" : 30,}
+
 subs["*marry"] = { "sidefill2" : 0, "sidefill1" : 0, "cycright" : 100,
     "main 11" : 55, "main 10" : 55, "upfill1" : 48, "b34" : 30, "patio1" : 0,
     "b25" : 0, "side l" : 30, "b23" : 100, "b22" : 14, "b32" : 23,
@@ -584,3 +271,46 @@
     "main 4" : 0, "main 7" : 30, "phone" : 0, "main 9" : 30, "main 8" : 0,
     "rock" : 17, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0, "god" : 100,
     "marry2" : 34, "marry1" : 69, "cuba1" : 0, "cuba2" : 0, "side r" : 30,}
+
+subs['*1-01-0']=subs['*broadway open'].copy()
+subs['*1-02-0']=subs['*int mission'].copy()
+subs['*1-03-0']=subs['*phone booth'].copy()
+
+subs['*1-04-00-dance']=subs['*hotbox dance'].copy()
+subs['*1-04-10-after dance']=subs['*hotbox dance'].copy()
+subs['*1-04-20-table']=subs['*hotbox table'].copy()
+subs['*1-04-30-small table']=subs['*hotbox small table'].copy()
+
+subs['*1-05-0']=subs['*broadway open'].copy()
+subs['*1-06-0']=subs['*ext mission'].copy()
+subs['*1-07-0']=subs['*broadway night 1-7'].copy()
+
+
+subs['*1-08-00-left cafe']={ "main 3" : 100, "edge" : 100,}
+subs['*1-08-10-right cafe']= fulls(('cuba1','cuba2'))
+subs['*1-08-20-backdrop']=fulls(('upfill1','upfill2','upfill3','upfill4'))
+
+subs['*1-09-0']=subs['*cuba love'].copy()
+subs['*1-10-0']=subs['*ext mission night'].copy()
+
+subs['*2-01-0-dance']=subs['*hotbox dance'].copy()
+subs['*2-01-1-after dance']=subs['*hotbox dance'].copy()
+subs['*2-01-2-table']=subs['*hotbox table'].copy()
+subs['*2-01-3-small table']=subs['*hotbox small table'].copy()
+
+subs["*2-02-0"] = { "sidefill2" : 0, "sidefill1" : 0, "cycright" : 18,
+    "main 11" : 5, "main 10" : 5, "upfill1" : 70, "b34" : 34, "b25" : 71,
+    "side l" : 34, "b23" : 67, "b22" : 50, "b32" : 57, "desk1" : 0,
+    "hotbox2" : 59, "upfill4" : 70, "b24" : 67, "desk2" : 26, "main 3" : 0,
+    "main 2" : 5, "main 5" : 56, "main 4" : 0, "main 7" : 5, "main 9" : 5,
+    "main 8" : 5, "rock" : 20, "edge" : 0, "sidepost1" : 0, "sidepost2" : 0,
+    "god" : 100, "marry2" : 50, "cuba1" : 0, "side r" : 34,}
+
+subs['*2-03-00-open dance']=subs['*sewer'].copy()
+subs['*2-03-10-dialogue']=subs['*sewer'].copy()
+subs['*2-03-20-luck']=subs['*sewer'].copy()
+
+subs['*2-04-0']=subs['*2-02-0'].copy() # sue me
+subs['*2-05-0']=subs['*int mission'].copy()
+subs['*2-06-0']=subs['*marry'].copy()
+subs['*2-07-0']=subs['*broadway open'].copy()