commit 84

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

@@ -2,6 +2,7 @@ package de.moritzruth.dracula_musical.act
 
 import de.moritzruth.dracula_musical.device.*
 import de.moritzruth.dracula_musical.song.*
+import de.moritzruth.theaterdsl.device.reset
 import de.moritzruth.theaterdsl.show.CurtainState
 import de.moritzruth.theaterdsl.show.PropPosition
 import de.moritzruth.theaterdsl.show.ShowBuilderContext
@@ -133,7 +134,10 @@ fun ShowBuilderContext.act2() = act("2. Akt") {
             }
 
             onRun {
-                Tops.both { it.brightness.off() }
+                Tops.both {
+                    it.brightness.off()
+                    it.strobeSpeed.off()
+                }
                 BlinderBars.all { it.brightness.off(1.seconds) }
                 FrontLights.all { it.brightness.fade(75.percent, 1.seconds) }
             }
@@ -302,8 +306,8 @@ fun ShowBuilderContext.act2() = act("2. Akt") {
             }
 
             onRun {
+                Tops.both { it.reset() }
                 BlinderBars.all { it.brightness.off(1.seconds) }
-                Tops.both { it.brightness.off() }
                 FrontLights.all { it.brightness.fade(75.percent, 1.seconds) }
             }
         }
@@ -358,7 +362,7 @@ fun ShowBuilderContext.act2() = act("2. Akt") {
 
             onRun {
                 BlinderBars.all { it.brightness.off(1.seconds) }
-                Tops.both { it.brightness.off() }
+                Tops.both { it.reset() }
                 Washs.both { it.brightness.off() }
                 FrontLights.all { it.brightness.fade(75.percent, 1.seconds) }
             }

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

@@ -98,7 +98,7 @@ class CoemarProWash(override val firstChannel: DmxAddress, private val invertAng
         writer.writeRaw(DmxValue(0u))
 
         writer.writeRaw(DmxValue(0u)) // no function
-        writer.writeRaw(DmxValue((strobeSpeed.getCurrentValue().value * 32 + 63).roundToInt().toUByte()))
+        writer.writeRaw(DmxValue(strobeSpeed.getCurrentValue().ofRange(63.0..95.0).roundToInt().toUByte()))
         writer.writePercentage(brightness.getCurrentValue())
     }
 }

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

@@ -289,7 +289,7 @@ fun SceneBuilderContext.songDraculasZorn() {
     }
 
     lightStep(StepCue.Text("Alle", "Meister!", "erste Silbe")) {
-        backlightBar.strobeSpeed.static(0.percent)
+        backlightBar.strobeSpeed.off()
         backlightBar.brightness.pulseOnce(0.1.seconds, 1.seconds, end = 40.percent)
     }
 

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

@@ -134,7 +134,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() {
 
     lightStep(StepCue.Text("Vampire", "Jetzt…")) {
         backlightBar.brightness.static(100.percent)
-        backlightBar.strobeSpeed.static(0.percent)
+        backlightBar.strobeSpeed.off()
     }
 
     lightStep(StepCue.Text("Vampire", "…ist…")) {

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

@@ -355,7 +355,7 @@ fun SceneBuilderContext.songFinaleErsterAkt() {
 
     lightStep(StepCue.Text("Vampire", "Das ist egal!", "letzte Silbe")) {
         sidelight.brightness.fade(start = 0.percent, end = 100.percent, duration = 0.4.seconds)
-        sidelight.strobeSpeed.static(0.percent)
+        sidelight.strobeSpeed.off()
     }
 
     lightStep(StepCue.Text("Dracula", "Schaut sie wenigstens an!", "letzte Silbe")) {
@@ -536,9 +536,11 @@ fun SceneBuilderContext.songFinaleErsterAkt() {
         Spots.right.brightness.off(4.seconds)
         FrontLights.all { it.brightness.off() }
         Washs.both { it.brightness.off(0.5.seconds) }
-        backlightBar.strobeSpeed.static(0.percent)
+
+        backlightBar.strobeSpeed.off()
         backlightBar.brightness.pulseOnce(0.2.seconds, 2.seconds)
-        sidelight.strobeSpeed.static(0.percent)
+
+        sidelight.strobeSpeed.off()
         sidelight.brightness.pulseOnce(0.2.seconds, 2.seconds)
 
         BlinderBars.all {

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

@@ -92,7 +92,7 @@ fun SceneBuilderContext.songIrrenhaus() {
         }
 
         backlightBar.strobeSpeed.static(80.percent)
-        backlightBar.brightness.fade(100.percent, 2.seconds)
+        backlightBar.brightness.fade(100.percent, 3.seconds)
 
         BlinderBars.all {
             it.presetSpeed.static(80.percent)
@@ -102,13 +102,18 @@ fun SceneBuilderContext.songIrrenhaus() {
 
     lightStep(StepCue.Text("Alle", "Hurra", "letzte Silbe")) {
         FrontLights.all { it.brightness.off() }
-        backlightBar.strobeSpeed.static(0.percent)
+        backlightBar.strobeSpeed.off()
     }
 
     lightStep(StepCue.Custom("Musik: Nächster Beat")) {
         FrontLights.all { it.brightness.pulseOnce(0.seconds, 0.5.seconds, peak = 100.percent, end = 60.percent) }
         Tops.both { it.brightness.pulseOnce(0.1.seconds, 0.5.seconds, 100.percent) }
-        Washs.both { it.brightness.pulseOnce(0.1.seconds, 0.5.seconds, 100.percent) }
+
+        Washs.both {
+            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)
@@ -143,7 +148,7 @@ fun SceneBuilderContext.songIrrenhaus() {
         }
 
         backlightBar.strobeSpeed.static(80.percent)
-        backlightBar.brightness.fade(100.percent, 2.seconds)
+        backlightBar.brightness.fade(100.percent, 3.seconds)
 
         BlinderBars.all {
             it.presetSpeed.static(80.percent)
@@ -159,7 +164,10 @@ fun SceneBuilderContext.songIrrenhaus() {
     lightStep(StepCue.Custom("Musik: Nächster Beat")) {
         FrontLights.all { it.brightness.pulseOnce(0.seconds, 0.5.seconds, peak = 100.percent, end = 60.percent) }
         Tops.both { it.brightness.pulseOnce(0.1.seconds, 0.5.seconds, 100.percent) }
-        Washs.both { it.brightness.pulseOnce(0.1.seconds, 0.5.seconds, 100.percent) }
+        Washs.both {
+            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)