From 29abf5c15cfd587a460fbf2e787009d6218aac3f Mon Sep 17 00:00:00 2001 From: Moritz Ruth Date: Sat, 22 Mar 2025 15:32:41 +0100 Subject: [PATCH] commit 92 --- .../de/moritzruth/dracula_musical/act/Act1.kt | 19 +++++++++------ .../dracula_musical/song/DraculasZorn.kt | 24 +++++++------------ .../dracula_musical/song/EsIstAngerichtet.kt | 13 +++++----- .../dracula_musical/song/FinaleErsterAkt.kt | 9 ++++--- 4 files changed, 31 insertions(+), 34 deletions(-) diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt b/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt index 2e79eb6..e5d3569 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt @@ -348,6 +348,7 @@ fun ShowBuilderContext.act1() = act("1. Akt") { onRun { FrontLights.center { it.brightness.fade(100.percent, 3.seconds) } + FrontLights.right { it.brightness.fade(50.percent, 4.seconds) } sidelight.brightness.off(10.seconds) Spots.right.brightness.off(6.seconds) } @@ -387,14 +388,14 @@ fun ShowBuilderContext.act1() = act("1. Akt") { rightSpotTarget = "Van Helsing" onRun { - Spots.right.brightness.pulseOnce(0.seconds, 20.seconds) - FrontLights.center { + Spots.right.brightness.pulseOnce(0.seconds, 15.seconds) + FrontLights.all { it.brightness.pulseOnce( rampUpDuration = 1.seconds, rampDownDuration = 10.seconds, peak = 0.percent, start = 100.percent, - end = 100.percent + end = 75.percent ) } @@ -438,7 +439,7 @@ fun ShowBuilderContext.act1() = act("1. Akt") { } onRun { - FrontLights.center { it.brightness.off(3.seconds) } + FrontLights.all { it.brightness.off(3.seconds) } BlinderBars.all { it.color.reset() @@ -471,7 +472,7 @@ fun ShowBuilderContext.act1() = act("1. Akt") { rightSpotTarget = "mittig verbleiben" onRun { - Spots.right.brightness.off(10.seconds) + Spots.right.brightness.off(6.seconds) } } } @@ -493,7 +494,10 @@ fun ShowBuilderContext.act1() = act("1. Akt") { sidelight.color2.fadeRandomAround(230.degrees, 35.degrees, 4.seconds) sidelight.color3.static(Color(hue = 230.degrees, saturation = 20.percent)) sidelight.color4.static(Color(hue = 230.degrees, saturation = 20.percent)) - sidelight.brightness.fade(40.percent, 8.seconds) + sidelight.brightness.fade(50.percent, 8.seconds) + + FrontLights.right { it.brightness.fade(30.percent, 10.seconds) } + FrontLights.center { it.brightness.fade(30.percent, 10.seconds) } } } @@ -508,7 +512,8 @@ fun ShowBuilderContext.act1() = act("1. Akt") { } onRun { - backlightBar.brightness.fade(2.percent, 6.seconds) + FrontLights.center { it.brightness.fade(50.percent, 6.seconds) } + backlightBar.brightness.fade(50.percent, 3.seconds) } } diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/song/DraculasZorn.kt b/src/main/kotlin/de/moritzruth/dracula_musical/song/DraculasZorn.kt index 2673037..86beeb7 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/DraculasZorn.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/DraculasZorn.kt @@ -10,7 +10,7 @@ import de.moritzruth.theaterdsl.value.percent import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds -private fun StairvilleTlb.pulseSlow() = brightness.pulse(1.5.seconds, 0.15.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 50.percent) +private fun StairvilleTlb.pulseSlow() = brightness.pulse(1.5.seconds, 0.15.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 100.percent) private fun StairvilleTlb.pulseFast() = brightness.pulse(0.5.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 100.percent) fun SceneBuilderContext.songDraculasZorn() { @@ -23,11 +23,8 @@ fun SceneBuilderContext.songDraculasZorn() { onRun { Spots.right.brightness.static(100.percent) - - backlightBar.color.fade(Color(hue = 0.degrees, saturation = 100.percent), 10.seconds) backlightBar.pulseFast() - - sidelight.brightness.off(5.seconds) + FrontLights.all { it.brightness.pulseOnce(0.2.seconds, 2.seconds, peak = 100.percent, end = 40.percent)} BlinderBars.all { it.preset.static(StairvilleSplb.Preset.STUB) // red, chase, back-and-forth @@ -75,7 +72,7 @@ fun SceneBuilderContext.songDraculasZorn() { } lightStep(StepCue.Text("Dracula", "Das seh ich selbst!", "letzte Silbe")) { - sidelight.brightness.pulseOnce(0.1.seconds, 1.seconds) + sidelight.brightness.fade(50.percent, 1.seconds) backlightBar.brightness.pulseOnce(0.1.seconds, 1.seconds, end = 20.percent) Washs.both { it.brightness.pulseOnce(0.1.seconds, 1.seconds) } } @@ -127,7 +124,7 @@ fun SceneBuilderContext.songDraculasZorn() { lightStep(StepCue.Text("Alle", "…ist es…", "Anfang")) { FrontLights.right { it.brightness.off(4.seconds) } - sidelight.brightness.off(6.seconds) + sidelight.brightness.fade(50.percent, 6.seconds) } lightStep(StepCue.Text("Alle", "…eben…", "Anfang")) { @@ -219,8 +216,6 @@ fun SceneBuilderContext.songDraculasZorn() { lightStep(StepCue.Custom("Musik: Fill-in")) { FrontLights.center { it.brightness.off(3.seconds) } - sidelight.brightness.off(4.seconds) - BlinderBars.all { it.preset.static(null) it.color.static(Color.WHITE) @@ -284,7 +279,7 @@ fun SceneBuilderContext.songDraculasZorn() { lightStep(StepCue.Text("Alle", "Du bist unser…", "Anfang")) { backlightBar.strobeSpeed.fade(10.percent, 2.seconds) - sidelight.brightness.fade(40.percent, 1.seconds) + sidelight.brightness.fade(50.percent, 1.seconds) Washs.both { it.brightness.ramp(1.seconds, 100.percent, 50.percent) } } @@ -294,11 +289,11 @@ fun SceneBuilderContext.songDraculasZorn() { } lightStep(StepCue.Text("Alle", "Meister!", "zweite Silbe")) { - sidelight.brightness.pulseOnce(0.1.seconds, 1.seconds, end = 40.percent) + sidelight.brightness.pulseOnce(0.1.seconds, 1.seconds, end = 50.percent) } lightStep(StepCue.Text("Alle", "Graf Dracula!", "Anfang")) { - FrontLights.center { it.brightness.fade(50.percent, 8.seconds) } + FrontLights.center { it.brightness.fade(80.percent, 8.seconds) } sidelight.brightness.fade(100.percent, 8.seconds) @@ -315,10 +310,9 @@ fun SceneBuilderContext.songDraculasZorn() { lightStep(StepCue.Custom("Musik: Schlussschlag")) { Tops.both { it.brightness.pulseOnce(0.1.seconds, 6.seconds) } - FrontLights.center { it.brightness.off() } + FrontLights.center { it.brightness.static(50.percent) } Washs.both { it.brightness.off(1.seconds) } - sidelight.brightness.off(1.seconds) backlightBar.strobeSpeed.off() BlinderBars.all { @@ -334,7 +328,7 @@ fun SceneBuilderContext.songDraculasZorn() { BlinderBars.all { it.reset() } - sidelight.brightness.fade(60.percent, 20.seconds) + sidelight.brightness.fade(50.percent, 20.seconds) backlightBar.brightness.off(20.seconds) } } \ No newline at end of file diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/song/EsIstAngerichtet.kt b/src/main/kotlin/de/moritzruth/dracula_musical/song/EsIstAngerichtet.kt index b4a32ae..01c11f5 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/EsIstAngerichtet.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/EsIstAngerichtet.kt @@ -55,11 +55,11 @@ fun SceneBuilderContext.songEsIstAngerichtet() { } lightStep(StepCue.Text("Vampire", "…angerichtet!", "erste Silbe")) { - backlightBar.brightness.pulseOnce(0.1.seconds, 2.seconds, end = 20.percent) + backlightBar.brightness.pulseOnce(0.1.seconds, 2.seconds, end = 50.percent) } lightStep(StepCue.Text("Vampire", "…angerichtet!", "zweite Silbe")) { - sidelight.brightness.pulseOnce(0.1.seconds, 1.seconds, end = 40.percent) + sidelight.brightness.pulseOnce(0.1.seconds, 1.seconds, end = 50.percent) Washs.both { it.brightness.pulseOnce(0.1.seconds, 0.4.seconds) } } @@ -90,7 +90,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { } lightStep(StepCue.Text("Vampire", "…angerichtet!", "zweite Silbe")) { - sidelight.brightness.pulseOnce(0.1.seconds, 1.seconds, end = 40.percent) + sidelight.brightness.pulseOnce(0.1.seconds, 1.seconds, end = 50.percent) Washs.both { it.brightness.pulseOnce(0.1.seconds, 0.4.seconds) } } @@ -104,7 +104,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { } lightStep(StepCue.Text("Vampire", "Aaah")) { - sidelight.brightness.pulseOnce(2.seconds, 1.seconds, peak = 80.percent, end = 40.percent) + sidelight.brightness.pulseOnce(2.seconds, 1.seconds, peak = 80.percent, end = 50.percent) backlightBar.brightness.pulse(1.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 50.percent) Washs.both { @@ -115,7 +115,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { } lightStep(StepCue.Text("Vampire", "Aaah")) { - sidelight.brightness.pulseOnce(2.seconds, 1.seconds, peak = 80.percent, end = 40.percent) + sidelight.brightness.pulseOnce(2.seconds, 1.seconds, peak = 80.percent, end = 50.percent) BlinderBars.all { it.brightness.pulseOnce(2.seconds, 1.seconds, peak = 50.percent, end = 30.percent) } Washs.both { @@ -171,8 +171,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { } lightStep(StepCue.MusicEnd) { - sidelight.brightness.fade(40.percent, 10.seconds) - + sidelight.brightness.fade(50.percent, 10.seconds) BlinderBars.all { it.color.reset() } } } \ No newline at end of file diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/song/FinaleErsterAkt.kt b/src/main/kotlin/de/moritzruth/dracula_musical/song/FinaleErsterAkt.kt index d77b215..b3c34e9 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/FinaleErsterAkt.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/FinaleErsterAkt.kt @@ -38,7 +38,6 @@ fun SceneBuilderContext.songFinaleErsterAkt() { lightStep(StepCue.Text("Vampire", "Und du lässt ihn geh’n!", "letzte Silbe")) { sidelight.brightness.static(100.percent) - sidelight.strobeSpeed.static(20.percent) backlightBar.breathe() BlinderBars.all { @@ -533,21 +532,21 @@ fun SceneBuilderContext.songFinaleErsterAkt() { } lightStep(StepCue.Custom("Musik: Schlussschlag")) { - Spots.right.brightness.off(4.seconds) + Spots.right.brightness.off(10.seconds) FrontLights.center { it.brightness.off() } Washs.both { it.brightness.off(0.5.seconds) } backlightBar.strobeSpeed.off() - backlightBar.brightness.pulseOnce(0.2.seconds, 2.seconds) + backlightBar.brightness.pulseOnce(0.2.seconds, 10.seconds) sidelight.strobeSpeed.off() - sidelight.brightness.pulseOnce(0.2.seconds, 2.seconds) + sidelight.brightness.pulseOnce(0.2.seconds, 10.seconds) BlinderBars.all { it.preset.static(null) it.color.static(Color.WHITE) it.white.static(100.percent) - it.brightness.pulseOnce(0.2.seconds, 2.seconds) + it.brightness.pulseOnce(0.2.seconds, 3.seconds) } }