# HG changeset patch # User drewp@bigasterisk.com # Date 2010-06-20 21:09:22 # Node ID a3b0acd0f83fb03a7dd97ae47e6718bbe01d8c83 # Parent a17b39ab488cdf7f315cd7b0a97ad366f17c71f6 cp Ignore-this: 73e1b7aa3cb81a0b1f4cb3f5310c190c diff --git a/show/dance2010/curves/song10-full b/show/dance2010/curves/song10-full --- a/show/dance2010/curves/song10-full +++ b/show/dance2010/curves/song10-full @@ -1,6 +1,6 @@ -0 0 -114.106982704 0 -117.93842684 1 -121.752715255 1 -124.165953203 0 -125.586303855 0 +0.0 0.0 +114.106982704 0.0 +117.93842684 1.0 +121.752715255 1.0 +124.165953203 0.0 +125.586303855 0.0 diff --git a/show/dance2010/curves/song10-song10 b/show/dance2010/curves/song10-song10 --- a/show/dance2010/curves/song10-song10 +++ b/show/dance2010/curves/song10-song10 @@ -1,8 +1,8 @@ -0 0 -3.45277650243 0 +0.0 0.0 +3.45277650243 0.0 3.92593476387 0.13829787234 6.21073501733 0.255319148936 -9.32249655656 1 -116.640310692 1 -117.372288079 0 -125.586303855 0 +9.32249655656 1.0 +116.640310692 1.0 +117.372288079 0.0 +125.586303855 0.0 diff --git a/show/dance2010/curves/song11-blacklight b/show/dance2010/curves/song11-blacklight new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song11-blacklight @@ -0,0 +1,2 @@ +0 0 +211.77585034 0 diff --git a/show/dance2010/curves/song11-ch1 b/show/dance2010/curves/song11-ch1 --- a/show/dance2010/curves/song11-ch1 +++ b/show/dance2010/curves/song11-ch1 @@ -1,6 +1,15 @@ -0 0 -4.10077718501 0 +0.0 0.0 +4.10077718501 0.0 5.2724278093 0.989361702128 -198.448324489 0.957446808511 -203.134926986 0 -211.77585034 0 +6.67718818584 1 +6.95587090498 0 +7.83173087942 0 +8.20994314111 0.904255319149 +108.767913797 1 +108.86017691 0 +116.415138515 0 +118.821089268 0 +153.770949322 0 +199.234017791 0 +203.134926986 0.0 +211.77585034 0.0 diff --git a/show/dance2010/curves/song11-ch2 b/show/dance2010/curves/song11-ch2 new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song11-ch2 @@ -0,0 +1,8 @@ +0 0 +116.375326698 0 +116.609558778 1 +119.623072853 1 +127.655059962 1 +134.101306802 1 +151.613974226 0 +211.77585034 0 diff --git a/show/dance2010/curves/song11-chcolor b/show/dance2010/curves/song11-chcolor --- a/show/dance2010/curves/song11-chcolor +++ b/show/dance2010/curves/song11-chcolor @@ -1,10 +1,11 @@ -0 0 -3.97059378231 0 -4.02483686677 1 -6.54834569593 1 -6.67913179957 0 -110.295209266 0 -110.50749393 1 -112.538930926 1 -112.560360293 0 -211.77585034 0 +0.0 0.0 +3.97059378231 0.0 +4.02483686677 1.0 +6.54834569593 1.0 +6.67913179957 0.0 +108.786370043 0 +108.831005905 1 +111.063621464 1 +111.202404992 0 +117.762687 0.0 +211.77585034 0.0 diff --git a/show/dance2010/curves/song11-chcolslow b/show/dance2010/curves/song11-chcolslow new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song11-chcolslow @@ -0,0 +1,6 @@ +0 0 +134.194786423 0 +148.741924864 0.478723404255 +175.79875783 0.627659574468 +194.69278297 0.925531914894 +211.77585034 0 diff --git a/show/dance2010/curves/song11-full b/show/dance2010/curves/song11-full --- a/show/dance2010/curves/song11-full +++ b/show/dance2010/curves/song11-full @@ -1,6 +1,6 @@ -0 0 -196.796923918 0 -199.689888422 1 -208.021626195 1 -209.410249157 0 -211.77585034 0 +0.0 0.0 +196.796923918 0.0 +199.689888422 1.0 +208.021626195 1.0 +209.410249157 0.0 +211.77585034 0.0 diff --git a/show/dance2010/curves/song11-song11 b/show/dance2010/curves/song11-song11 new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song11-song11 @@ -0,0 +1,16 @@ +0 0 +6.77451924822 0 +6.99350785665 0.712765957447 +7.8990605679 0.712765957447 +8.27123401464 0 +93.2253592034 0 +94.8093964782 0.531914893617 +98.257971 1.0 +99.538341 0.5 +106.370519831 0.425531914894 +108.549198 0.0 +121.64018308 0 +130.842835388 0 +137.565251622 0.63829787234 +208.357773 0.702127659574 +211.77585034 0 diff --git a/show/dance2010/curves/song11-strobe b/show/dance2010/curves/song11-strobe new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song11-strobe @@ -0,0 +1,6 @@ +0 0 +111.040828619 0 +112.302559526 0.744680851064 +117.716943403 0 +131.784198 0.0 +211.77585034 0 diff --git a/show/dance2010/curves/song16-chscolor b/show/dance2010/curves/song16-chscolor --- a/show/dance2010/curves/song16-chscolor +++ b/show/dance2010/curves/song16-chscolor @@ -1,11 +1,21 @@ 0.0 0.0 -252.668485346 0 +218.786034846 0 +227.701690891 0.648936170213 +253.623734208 0.0851063829787 257.435980965 0.659574468085 +282.965098911 0.787234042553 +291.173163206 0.797872340426 311.475572237 0.659574468085 -314.076256967 0.0 +352.710766493 0.617021276596 419.38417842 0.0106382978723 -494.519320635 0 +494.519320635 0.0 504.592831781 0.702127659574 528.648977803 0.68085106383 -532.783038735 0 +532.783038735 0.0 +544.658930553 0 +548.338407651 0.553191489362 +599.756741452 0.595744680851 +621.871355311 0.585106382979 +655.698946548 0.585106382979 +656.811713204 0 667.873922902 0.0 diff --git a/show/dance2010/curves/song16-chscoop b/show/dance2010/curves/song16-chscoop --- a/show/dance2010/curves/song16-chscoop +++ b/show/dance2010/curves/song16-chscoop @@ -1,7 +1,11 @@ 0.0 0.0 -136.542174874 0 +136.542174874 0.0 157.672509563 0.117021276596 179.321971445 0.446808510638 248.570227232 0.563829787234 -251.56840261 0 +251.56840261 0.0 +317.085302 0.0 +321.330064147 0 +557.678618745 0 +564.282808407 0 667.873922902 0.0 diff --git a/show/dance2010/curves/song16-full b/show/dance2010/curves/song16-full --- a/show/dance2010/curves/song16-full +++ b/show/dance2010/curves/song16-full @@ -1,6 +1,6 @@ 0.0 0.0 660.124573286 0.0 -663.899257142 0.734042553191 -666.287573692 0.723404255319 +663.899257142 0.574468085106 +666.287573692 0.563829787234 667.41912077 0.0 667.873922902 0.0 diff --git a/show/dance2010/curves/song16-song16blue b/show/dance2010/curves/song16-song16blue --- a/show/dance2010/curves/song16-song16blue +++ b/show/dance2010/curves/song16-song16blue @@ -1,12 +1,12 @@ 0.0 0.0 -129.583853412 0 -136.390432758 1 +129.583853412 0.0 +136.390432758 1.0 254.032266664 1.0 -255.318192736 0 -618.650967448 0 +255.318192736 0.0 +618.650967448 0.0 628.694786593 1.0 635.006980776 1.0 640.883851223 1.0 -655.026546838 0.670212765957 -655.661856643 0 +654.358246783 0.659574468085 +655.661856643 0.0 667.873922902 0.0 diff --git a/show/dance2010/curves/song16-song16ltred b/show/dance2010/curves/song16-song16ltred --- a/show/dance2010/curves/song16-song16ltred +++ b/show/dance2010/curves/song16-song16ltred @@ -1,21 +1,38 @@ 0.0 0.0 -3.46215353149 0 -23.0788821499 1 -129.919093854 1 -136.189198647 0 -417.088600628 0 +3.46215353149 0.0 +23.0788821499 1.0 +25.1478703075 0.712765957447 +25.7128626552 0.989361702128 +26.3406319303 0.755319148936 +27.658947408 0.936170212766 +28.8517090307 0.734042553191 +29.3539244508 0.670212765957 +31.1116784212 0.925531914894 +31.3627861312 0.765957446809 +31.6138938413 0.712765957447 +32.8694323915 0.989361702128 +33.4344247391 0.691489361702 +34.8155171444 0.989361702128 +129.919093854 1.0 +136.189198647 0.0 +417.088600628 0.0 422.200531657 0.510638297872 436.483868358 0.5 -462.795278069 0 -477.612885861 0 +452.747475225 0 +477.612885861 0.0 490.309495081 0.670212765957 512.673632375 1.0 +586.366750079 0.968085106383 +587.088054742 0 +594.338813894 0 +595.263820908 1 597.106761659 1.0 610.737682451 1.0 -615.510466155 0 -630.884774233 0 +615.510466155 0.0 +630.884774233 0.0 639.214391682 0.393617021277 -655.061841827 0.382978723404 -655.654013312 0 -664.344423984 0 +653.63622608 0.372340425532 +655.032785303 0.0851063829785 +655.654013312 0.0 +664.344423984 0.0 667.873922902 0.0 diff --git a/show/dance2010/curves/song16-song16one23 b/show/dance2010/curves/song16-song16one23 --- a/show/dance2010/curves/song16-song16one23 +++ b/show/dance2010/curves/song16-song16one23 @@ -1,15 +1,15 @@ 0.0 0.0 -304.83715741 0 -308.726112091 1 -393.576755365 1 -397.24228016 0.68085106383 -409.646230452 0.691489361702 -413.705705094 0.5 +304.83715741 0.0 +308.726112091 1.0 +393.576755365 1.0 +395.685578311 0.670212765958 +407.664973553 0.691489361702 +411.724448195 0.5 417.088600628 0.5 -418.386435902 0 +418.386435902 0.0 490.975089935 0.0 -610.710676076 0 -615.179606529 1 -621.906356393 1 -625.743069297 0 +610.710676076 0.0 +615.179606529 1.0 +621.906356393 1.0 +625.743069297 0.0 667.873922902 0.0 diff --git a/show/dance2010/curves/song16-song16poison b/show/dance2010/curves/song16-song16poison --- a/show/dance2010/curves/song16-song16poison +++ b/show/dance2010/curves/song16-song16poison @@ -3,4 +3,5 @@ 253.108512967 0.0 260.960419391 1.0 304.376843149 1.0 308.995611633 0.031914893617 +416.139231317 0 667.873922902 0.0 diff --git a/show/dance2010/curves/song16-song16tightred b/show/dance2010/curves/song16-song16tightred --- a/show/dance2010/curves/song16-song16tightred +++ b/show/dance2010/curves/song16-song16tightred @@ -1,9 +1,83 @@ 0.0 0.0 -414.121742739 0 -420.992633212 1 +414.121742739 0.0 +420.992633212 1.0 +462.311782 1.0 +462.515037 0.75 +462.843332 1.0 +463.284005 0.75 +463.554852 1.0 +463.776252 0.75 +464.01349 1.0 +464.23665 0.75 +464.481526 1.0 +464.751217 0.75 +465.00239 1.0 +465.256282 0.75 +465.531099 1.0 +465.752801 0.75 +466.0364 1.0 +466.27324 0.75 +466.539358 1.0 +466.767456 0.75 +467.006939 1.0 +467.266755 0.75 +467.499474 1.0 +467.75771 0.75 +468.003683 1.0 +468.276664 0.75 +468.555318 1.0 +468.748193 0.75 +469.027463 1.0 +469.298218 0.75 +469.564263 1.0 +469.801911 0.75 +470.099447 1.0 +470.301479 0.75 +470.567912 1.0 +470.806029 0.75 +471.059447 1.0 +471.28301 0.75 +471.339842 1.0 +471.775921 0.75 +472.014251 1.0 +472.272139 0.75 +472.522117 1.0 +472.809441 0.75 +473.054836 1.0 +473.295728 0.75 +473.576132 1.0 +473.809919 0.75 +474.087159 1.0 +474.321081 0.75 +474.583839 1.0 +474.847493 0.75 +475.090835 1.0 +475.340063 0.75 +475.567028 1.0 +475.83335 0.75 +476.06824 1.0 +476.325529 0.75 +476.590672 1.0 +476.858053 0.75 +477.08722 1.0 +477.333064 0.75 +477.606108 1.0 +477.879605 0.75 +478.132311 1.0 +478.425271323 0.867021276596 +478.659013 1.0 +478.934116108 0.920212765957 +479.201579 1.0 +479.615145892 0.952127659574 +480.030835 1.0 486.573883817 1.0 539.23944787 0.0 -655.359099188 0 -655.675623154 1 -664.337658115 1 +655.359099188 0.0 +655.476379372 1 +656.46867978 1 +656.654131869 0.712765957447 +657.526984841 0.702127659574 +657.558444074 0.5 +658.244728211 0.5 +664.303366904 0.351063829787 667.873922902 0.0 diff --git a/show/dance2010/curves/song16-strobe b/show/dance2010/curves/song16-strobe new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song16-strobe @@ -0,0 +1,5 @@ +0 0 +586.57646705 0 +590.655458608 1 +594.937347844 0 +667.873922902 0 diff --git a/show/dance2010/curves/song16-whitec b/show/dance2010/curves/song16-whitec new file mode 100644 --- /dev/null +++ b/show/dance2010/curves/song16-whitec @@ -0,0 +1,7 @@ +0 0 +655.646946013 0.0106382978723 +656.300665569 0.36170212766 +661.360939173 0.351063829787 +663.927393728 1 +666.360683188 1 +667.873922902 0 diff --git a/show/dance2010/readme b/show/dance2010/readme --- a/show/dance2010/readme +++ b/show/dance2010/readme @@ -106,6 +106,7 @@ 245 light change as they turn 112 strobe? with the sound effect 180 challenge R then L 191 busy before the end, then light their line +- 2nd req for BL #14 test BL 146 darker before kick line, so we can get brighter on it at this time diff --git a/show/dance2010/subs/song11 b/show/dance2010/subs/song11 new file mode 100644 --- /dev/null +++ b/show/dance2010/subs/song11 @@ -0,0 +1,13 @@ + "song11". + _:UoBkHSda1860. + _:UoBkHSda1863. + _:UoBkHSda1862. + _:UoBkHSda1861. +_:UoBkHSda1863 "0.35"^^. +_:UoBkHSda1863 . +_:UoBkHSda1862 "0.4175"^^. +_:UoBkHSda1862 . +_:UoBkHSda1861 "0.5"^^. +_:UoBkHSda1861 . +_:UoBkHSda1860 "0.35"^^. +_:UoBkHSda1860 . diff --git a/show/dance2010/subs/whitec b/show/dance2010/subs/whitec new file mode 100644 --- /dev/null +++ b/show/dance2010/subs/whitec @@ -0,0 +1,19 @@ +_:RLmhMUpk94 "0.58"^^. +_:RLmhMUpk94 . +_:RLmhMUpk90 "0.305"^^. +_:RLmhMUpk90 . +_:RLmhMUpk89 "1"^^. +_:RLmhMUpk89 . +_:RLmhMUpk91 "0.595"^^. +_:RLmhMUpk91 . +_:RLmhMUpk92 "0.685"^^. +_:RLmhMUpk92 . +_:RLmhMUpk93 "0.695"^^. +_:RLmhMUpk93 . + "whitec". + _:RLmhMUpk94. + _:RLmhMUpk90. + _:RLmhMUpk89. + _:RLmhMUpk91. + _:RLmhMUpk92. + _:RLmhMUpk93. diff --git a/show/dance2010/subterms/song10.n3 b/show/dance2010/subterms/song10.n3 --- a/show/dance2010/subterms/song10.n3 +++ b/show/dance2010/subterms/song10.n3 @@ -1,10 +1,10 @@ + . . - . - "song10". + . + "full(t)". + . + "full". + . "song10(t)". . - . - "full". - "full(t)". - . - . + "song10". diff --git a/show/dance2010/subterms/song11.n3 b/show/dance2010/subterms/song11.n3 --- a/show/dance2010/subterms/song11.n3 +++ b/show/dance2010/subterms/song11.n3 @@ -1,15 +1,40 @@ + . + "song11". + . + "song11(t)". + . + "strobe". + . + "strobe(t)>0". + . + "chcolor". + . + "chcolor(t)*chase(t, names=colors+back, ontime=.1, offset=0, offval=.1, random=1)". . "ch1". + . "ch1(t)*(chase(t, names=scoop,ontime=.15, offset=.4,offval=.2,random=1)+chase(t, names=scoop,ontime=.18, offset=.35,offval=.3,random=2))". - . + . + "blacklight". + . + "blacklight(t)>0". . "full". + . "full(t)". - . - . - "chcolor". - "chcolor(t)*chase(t, names=colors+back, ontime=.1, offset=0, offval=.1, random=1)". - . + . + . + . . + . . - . + . + . + . + "chcolslow". + . + "chcolslow(t)*chase(t, names=colors+back, ontime=.3, offset=-.1, offval=.1, random=1)". + . + "ch2". + . + "ch2(t)*chase(t, names=scoop,ontime=.05, offset=.05,offval=.1,random=1)". diff --git a/show/dance2010/subterms/song16.n3 b/show/dance2010/subterms/song16.n3 --- a/show/dance2010/subterms/song16.n3 +++ b/show/dance2010/subterms/song16.n3 @@ -1,40 +1,50 @@ - "chscolor(t)*chase(t, names=colors+back, ontime=.3, offset=-.2, random=1)". - . - . - "chscolor". + "song16tightred(t)". + . + . + "song16tightred". + "song16one23(t)". + . + . + "song16one23". + "song16blue(t)". + . + . + "song16blue". + "full(t)". + . + . + "full". + "strobe(t)>0". + . + . + "strobe". + "song16poison(t)". + . + . + "song16poison". + . + . + . + . + . + . + . + . + . + . + "whitec(t)". + . + . + "whitec". "cyc(t)". . . "cyc". - "full(t)". - . - . - "full". - "song16blue(t)". - . - . - "song16blue". + "chscolor(t)*chase(t, names=colors+back, ontime=.3, offset=-.2, random=1)". + . + . + "chscolor". "song16ltred(t)". . . "song16ltred". - "song16one23(t)". - . - . - "song16one23". - "song16poison(t)". - . - . - "song16poison". - "song16tightred(t)". - . - . - "song16tightred". - . - . - . - . - . - . - . - .