commit 91

src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt

@@ -150,8 +150,15 @@ fun ShowBuilderContext.act1() = act("1. Akt") {
                 -"Oberschwester"
                 -"Pflegeteam"
                 -"Die Irren"
+            }
+        }
+
+        step(StepCue.MusicStart("Pflegemarsch", 25.seconds)) {}
+
+        step(StepCue.MusicEnd) {
+            actors {
                 +"Renfield / durch rechte Tür"
-                +"Vermieterin / durch rechte Tür"
+                +"Mrs. Nothgroschen / durch rechte Tür"
                 +"Wärter 1 / durch rechte Tür"
                 +"Wärter 2 / durch rechte Tür"
             }
@@ -160,12 +167,16 @@ fun ShowBuilderContext.act1() = act("1. Akt") {
         step(StepCue.Text("Dr. Sewart", "Ich liebe meinen Job!")) {
             actors {
                 -"Renfield / durch rechte Tür"
-                -"Vermieterin / durch rechte Tür"
+                -"Mrs. Nothgroschen / durch rechte Tür"
                 -"Wärter 1 / durch rechte Tür"
                 -"Wärter 2 / durch rechte Tür"
                 -"Dr. Sewart / durch rechte Tür"
                 -"Ascot / durch rechte Tür"
             }
+
+            onRun {
+                FrontLights.all { it.brightness.fade(75.percent, 10.seconds) }
+            }
         }
 
         step(StepCue.Custom("Mina öffnet die Tür")) {
@@ -192,8 +203,8 @@ fun ShowBuilderContext.act1() = act("1. Akt") {
 
             onRun {
                 FrontLights.center { it.brightness.fade(100.percent, 2.seconds) }
-                sidelight.brightness.off(1.seconds)
+                sidelight.brightness.off(3.seconds)
-                Spots.right.brightness.off(1.seconds)
+                Spots.right.brightness.off(3.seconds)
             }
         }
 
@@ -213,15 +224,15 @@ fun ShowBuilderContext.act1() = act("1. Akt") {
             }
         }
 
-        repeat(2) {
+        repeat(3) {
             lightStep(StepCue.Custom("Gardine wird geschlossen")) {
-                FrontLights.center { it.brightness.fade(40.percent, 2.seconds) }
+                FrontLights.center { it.brightness.fade(40.percent, 4.seconds) }
                 sidelight.brightness.fade(80.percent, 3.seconds)
             }
 
             lightStep(StepCue.Custom("Gardine wird geöffnet")) {
-                FrontLights.center { it.brightness.fade(100.percent, 1.seconds) }
+                FrontLights.center { it.brightness.fade(100.percent, 2.seconds) }
-                sidelight.brightness.off(1.5.seconds)
+                sidelight.brightness.off(2.seconds)
             }
         }
 
@@ -242,9 +253,7 @@ fun ShowBuilderContext.act1() = act("1. Akt") {
             }
         }
 
-        step(StepCue.MusicStart("Umbau (Sittlichkeitsverein)", 10.seconds)) {
+        step(StepCue.MusicStart("Umbau (Sittlichkeitsverein)", 10.seconds)) {}
-
-        }
     }
 
     scene("Männerbesuch [22]") {
@@ -306,11 +315,12 @@ fun ShowBuilderContext.act1() = act("1. Akt") {
             }
 
             curtainState = CurtainState.OPEN
-            rightSpotTarget = "Dr. Sewart"
+            rightSpotTarget = "Dr. Sewart (von rechts)"
 
             onRun {
                 sidelight.colors.forEach { it.static(Color.WARM_WHITE) }
                 sidelight.brightness.fade(10.percent, 6.seconds)
+                Spots.right.brightness.fade(100.percent, 6.seconds)
             }
         }
 
@@ -320,9 +330,8 @@ fun ShowBuilderContext.act1() = act("1. Akt") {
             }
 
             onRun {
-                FrontLights.center { it.brightness.fade(50.percent, 3.5.seconds) }
+                FrontLights.center { it.brightness.fade(50.percent, 4.seconds) }
-                sidelight.brightness.fade(75.percent, 4.seconds)
+                sidelight.brightness.fade(75.percent, 5.seconds)
-                Spots.right.brightness.static(100.percent)
             }
         }
 

src/main/kotlin/de/moritzruth/dracula_musical/device/Devices.kt

@@ -45,7 +45,7 @@ val sidelight = StairvilleClb4(DmxAddress(140u))
 val fogMachine = AdjFogFury3000(DmxAddress(117u))
 
 val devices = persistentSetOf(
-    *FrontLights.center.toTypedArray(),
+    *FrontLights.all.toTypedArray(),
     Spots.left,
     Spots.right,
     *Tops.both.toTypedArray(),

src/main/kotlin/de/moritzruth/dracula_musical/song/DuettMinaJonathan.kt

@@ -11,7 +11,6 @@ import kotlin.time.Duration.Companion.seconds
 
 fun SceneBuilderContext.songDuettMinaJonathan() {
     lightStep(StepCue.MusicStart("Duett", 3.minutes + 50.seconds)) {
-        FrontLights.center { it.brightness.fade(40.percent, 5.seconds) }
         Washs.both {
             it.pointAtCeiling()
             it.colorWheelMode.static(CoemarProWash.ColorWheelMode.White)
@@ -44,7 +43,6 @@ fun SceneBuilderContext.songDuettMinaJonathan() {
 
     lightStep(StepCue.MusicEnd) {
         Spots.left.brightness.off(10.seconds)
-        FrontLights.center { it.brightness.fade(75.percent, 10.seconds) }
         BlinderBars.all { it.brightness.off(4.seconds) }
         Washs.both { it.brightness.off(4.seconds) }
         backlightBar.brightness.off(6.seconds)

src/main/kotlin/de/moritzruth/dracula_musical/song/Irrenhaus.kt

@@ -168,6 +168,7 @@ fun SceneBuilderContext.songIrrenhaus() {
             it.brightness.pulseOnce(0.1.seconds, 0.5.seconds, 100.percent)
             it.strobeSpeed.off()
         }
+
         BlinderBars.all {
             it.preset.static(null)
             it.brightness.pulseOnce(0.1.seconds, 0.5.seconds, 100.percent)
@@ -199,7 +200,7 @@ fun SceneBuilderContext.songIrrenhaus() {
     }
 
     lightStep(StepCue.Custom("Musik: Schlussschlag")) {
-        FrontLights.center { it.brightness.static(100.percent) }
+        FrontLights.all { it.brightness.static(100.percent) }
         Tops.both { it.brightness.pulseOnce(0.1.seconds, 2.seconds, 100.percent) }
         Washs.both { it.brightness.pulseOnce(0.1.seconds, 2.seconds, 100.percent) }
         BlinderBars.all {
@@ -215,7 +216,6 @@ fun SceneBuilderContext.songIrrenhaus() {
         rightSpotTarget = null
 
         onRun {
-            FrontLights.center { it.brightness.fade(50.percent, 5.seconds) }
             Spots.right.brightness.off(5.seconds)
         }
     }

src/main/kotlin/de/moritzruth/dracula_musical/song/Lucy.kt

@@ -17,6 +17,9 @@ fun SceneBuilderContext.songLucy() {
         backlightBar.brightness.fade(40.percent, 15.seconds)
         backlightBar.color.static(Color(hue = 315.degrees, saturation = 20.percent))
 
+        FrontLights.left { it.brightness.off(10.seconds) }
+        FrontLights.right { it.brightness.off(10.seconds) }
+
         Washs.both {
             it.pointAtCeiling()
             it.colorWheelMode.static(CoemarProWash.ColorWheelMode.White)
@@ -73,7 +76,7 @@ fun SceneBuilderContext.songLucy() {
         rightSpotTarget = "Lucy"
 
         onRun {
-            FrontLights.center { it.brightness.fade(25.percent, 2.seconds) }
+            FrontLights.center { it.brightness.fade(50.percent, 2.seconds) }
             Spots.right.brightness.fade(100.percent, 1.seconds)
             sidelight.brightness.off(2.seconds)
         }
@@ -92,6 +95,8 @@ fun SceneBuilderContext.songLucy() {
             it.presetSpeed.static(40.percent)
         }
 
+        FrontLights.center { it.brightness.fade(100.percent, 1.seconds) }
+
         Tops.both { it.brightness.sine(5.seconds, 20.percent, 100.percent) }
     }
 
@@ -100,7 +105,7 @@ fun SceneBuilderContext.songLucy() {
 
         Washs.both {
             it.brightness.off(0.1.seconds)
-            it.pointAtAudience()
+            it.pointAtStageCenter()
         }
 
         BlinderBars.all {
@@ -136,7 +141,6 @@ fun SceneBuilderContext.songLucy() {
     greedyCueStep(StepCue.Custom("2. Beat"))
 
     lightStep(StepCue.Custom("3. Beat")) {
-        Washs.both { it.brightness.pulseOnce(0.1.seconds, 2.seconds) }
         backlightBar.brightness.pulseOnce(0.1.seconds, 2.seconds)
 
         BlinderBars.all {
@@ -150,11 +154,7 @@ fun SceneBuilderContext.songLucy() {
         backlightBar.color.static(Color.RED)
         backlightBar.brightness.pulseOnce(0.1.seconds, 5.seconds)
 
-        Washs.both {
+        Washs.both { it.brightness.pulseOnce(0.1.seconds, 3.seconds) }
-            it.pointAtStageCenter()
-            it.brightness.pulseOnce(0.1.seconds, 3.seconds)
-        }
-
         FrontLights.center { it.brightness.pulseOnce(0.1.seconds, 4.seconds, end = 40.percent) }
     }
 

src/main/kotlin/de/moritzruth/dracula_musical/song/Mittsommernacht.kt

@@ -162,9 +162,11 @@ fun SceneBuilderContext.songMittsommernacht() {
         }
 
         backlightBar.color.static(Color(hue = 240.degrees))
-        backlightBar.brightness.fade(75.percent, 3.seconds)
+        backlightBar.brightness.fade(75.percent, 2.seconds)
 
         Washs.both { it.brightness.fade(100.percent, 3.seconds) }
+
+        FrontLights.center { it.brightness.fade(50.percent, 3.seconds) }
     }
 
     step(StepCue.Text("Vampire", "Süße Damen")) {
@@ -190,7 +192,7 @@ fun SceneBuilderContext.songMittsommernacht() {
 
         onRun {
             Spots.right.brightness.off(3.seconds)
-            Washs.both { it.brightness.off(2.seconds) }
+            Washs.both { it.brightness.off(5.seconds) }
 
             BlinderBars.all {
                 it.presetSpeed.fade(5.percent, 2.seconds)
@@ -222,21 +224,20 @@ fun SceneBuilderContext.songMittsommernacht() {
         leftSpotTarget = null
 
         onRun {
-            Spots.left.brightness.off()
+            Spots.left.brightness.off(2.seconds)
-            backlightBar.brightness.off(1.seconds)
+            backlightBar.brightness.off(6.seconds)
-            BlinderBars.all { it.brightness.off(1.seconds) }
+            BlinderBars.all { it.brightness.off(6.seconds) }
         }
     }
 
     lightStep(StepCue.Custom("Die Bewohner entfreezen")) {
         FrontLights.center { it.brightness.fade(100.percent, 1.seconds) }
-        Tops.both { it.brightness.fade(100.percent, 2.seconds) }
 
         backlightBar.brightness.fade(75.percent, 2.seconds)
         backlightBar.color.cycle(12.seconds)
 
         Washs.both {
-            it.brightness.pulseOnce(2.seconds, 5.seconds, 100.percent)
+            it.brightness.pulseOnce(1.seconds, 5.seconds, 100.percent)
             it.beamAngle.fade(0.percent, 2.seconds)
             it.pointAtCeiling(6.seconds)
         }
@@ -249,7 +250,6 @@ fun SceneBuilderContext.songMittsommernacht() {
     }
 
     lightStep(StepCue.Text("Alle", "In der Mittsommernacht!", "Anfang")) {
-        Tops.both { it.brightness.off(3.seconds) }
         backlightBar.brightness.off(3.seconds)
         BlinderBars.all { it.brightness.off(3.seconds) }
     }
@@ -278,9 +278,5 @@ fun SceneBuilderContext.songMittsommernacht() {
             +"Lucy / durch Mitte"
             +"Jonathan / von links"
         }
-
-        onRun {
-            FrontLights.center { it.brightness.fade(50.percent, 3.seconds) }
-        }
     }
 }