diff --git a/firestar.py b/firestar.py index 7b9fa51..81a000e 100755 --- a/firestar.py +++ b/firestar.py @@ -77,7 +77,7 @@ def runsimple(ss): b.set_light([edges[e].light_id for e in subs[i]], thiscmd) time.sleep((transition_to + hold_time)/10) -runsimple(intro) +#runsimple(intro) # The most symmetric five-coloring of edges fivecs = []; @@ -126,62 +126,12 @@ fivecolors = [vb(c) for c in ['R', 'Y', 'G', 'B', 'K']] # Nick's coloring (NC) "0" fivetour = [(fivecs[0], fivecolors)] -# 1: Step NC "0" to NC "1" +# Step NC "0" to NC "1" fivetour.append(([[3,21,26],[4,19,28]], [vb('K'),vb('Y')])) -# 2: Step NC "1" to NC "0" +# Step NC "1" to NC "0" fivetour.append(([[3,21,26],[4,19,28]], [vb('Y'),vb('K')])) -# 3: Step NC "1" to NC "2" -fivetour.append(([[0,12,25],[1,10,27]], [vb('G'),vb('R')])) -# 4: Step NC "2" to NC "1" -fivetour.append(([[0,12,25],[1,10,27]], [vb('R'),vb('G')])) -# 5: Step NC "2" to NC "3" -fivetour.append(([[1,22],[3,24]], [vb('K'),vb('R')])) -# 6: Step NC "3" to NC "2" -fivetour.append(([[1,22],[3,24]], [vb('R'),vb('K')])) -# 7: Step NC "3" to NC "4" -fivetour.append(([[12,20],[11,19]], [vb('Y'),vb('G')])) -# 8: Step NC "4" to NC "3" -fivetour.append(([[12,20],[11,19]], [vb('G'),vb('Y')])) -# 9: Step NC "4" to NC "5" -fivetour.append(([[0,15,19],[3,9,27]], [vb('R'),vb('G')])) -# 10: Step NC "5" to NC "4" -fivetour.append(([[0,15,19],[3,9,27]], [vb('G'),vb('R')])) -# 11: Step NC "5" to NC "6" -fivetour.append(([[4,12,16],[1,6,26]], [vb('K'),vb('Y')])) -# 12: Step NC "6" to NC "5" -fivetour.append(([[4,12,16],[1,6,26]], [vb('K'),vb('Y')])) -# 13: Step NC "4" to NC "7" -fivetour.append(([[0,19,25],[1,21,26]], [vb('K'),vb('G')])) -# 14: Step NC "7" to NC "4" -fivetour.append(([[0,19,25],[1,21,26]], [vb('K'),vb('G')])) -# Would need to add asymmetric colorings here, but no time :-( +tour5show = (fivetour, [(0,30,20),(1,5,5),(2,5,5),(1,5,5),(2,5,5),(1,5,30)]) -tour5show = (fivetour, [(0,30,20), - (1,5,5),(2,5,5),(1,5,5),(2,5,5),(1,5,30), - (3,5,5),(4,5,5),(3,5,5),(4,5,5),(3,5,30), - (5,5,5),(6,5,5),(5,5,5),(6,5,5),(5,5,30), - (7,5,5),(8,5,5),(7,5,5),(8,5,5),(7,5,30), - (9,5,5),(10,5,5),(9,5,5),(10,5,5),(9,5,30), - (11,5,5),(12,5,5),(11,5,5),(12,5,5),(11,5,100), - (12,5,5),(11,5,5),(12,5,5),(11,5,5),(12,5,30), - (10,5,5),(9,5,5),(10,5,5),(9,5,5),(10,5,30), - (13,5,5),(14,5,5),(13,5,5),(14,5,5),(13,5,100), - (14,5,5),(13,5,5),(14,5,5),(13,5,5),(14,5,30), - (8,5,5),(7,5,5),(8,5,5),(7,5,5),(8,5,30), - (6,5,5),(5,5,5),(6,5,5),(5,5,5),(6,5,30), - (4,5,5),(3,5,5),(4,5,5),(3,5,5),(4,5,30), - (2,5,5),(1,5,5),(2,5,5),(1,5,5),(2,5,100), -]) - -while True: - runsimple(interlude) - runsimple(jmsshow1) - runsimple(interlude) - runsimple(jmsshow2) - - runsimple(interlude) - runsimple(starshow) - - runsimple(interlude) - runsimple(tour5show) +runsimple(interlude) +runsimple(tour5show)