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 e5d3569..5f4d829 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt @@ -496,7 +496,7 @@ fun ShowBuilderContext.act1() = act("1. Akt") { sidelight.color4.static(Color(hue = 230.degrees, saturation = 20.percent)) sidelight.brightness.fade(50.percent, 8.seconds) - FrontLights.right { it.brightness.fade(30.percent, 10.seconds) } + FrontLights.left { it.brightness.fade(30.percent, 10.seconds) } FrontLights.center { it.brightness.fade(30.percent, 10.seconds) } } } @@ -512,7 +512,7 @@ fun ShowBuilderContext.act1() = act("1. Akt") { } onRun { - FrontLights.center { it.brightness.fade(50.percent, 6.seconds) } + FrontLights.all { 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/EsIstAngerichtet.kt b/src/main/kotlin/de/moritzruth/dracula_musical/song/EsIstAngerichtet.kt index 01c11f5..1a6537d 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/EsIstAngerichtet.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/EsIstAngerichtet.kt @@ -24,7 +24,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { Washs.both { it.pointAtStageCenter() it.colorWheelMode.static(CoemarProWash.ColorWheelMode.Red) - it.brightness.pulse(1.8.seconds, 0.15.seconds, 0.3.seconds, startDelay = 0.4.seconds, peak = 30.percent) + it.brightness.pulse(1.8.seconds, 0.15.seconds, 0.3.seconds, startDelay = 0.4.seconds, peak = 50.percent) } } } @@ -40,7 +40,6 @@ fun SceneBuilderContext.songEsIstAngerichtet() { } } - lightStep(StepCue.Text("Vampire", "Wir wollen bloß spielen!", "Anfang")) { Washs.both { it.brightness.off(0.3.seconds) @@ -74,7 +73,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { lightStep(StepCue.Text("Vampire", "Aaah")) { sidelight.brightness.fade(80.percent, 3.seconds) - backlightBar.brightness.pulse(1.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 50.percent) + backlightBar.brightness.pulse(1.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, end = 50.percent) } greedyCueStep(StepCue.Text("Vampire", "Aaah")) @@ -82,11 +81,11 @@ fun SceneBuilderContext.songEsIstAngerichtet() { repeat(3) { lightStep(StepCue.Text("Vampire", "Aaah")) { sidelight.brightness.fade(80.percent, 3.seconds) - backlightBar.brightness.pulse(0.5.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 50.percent) + backlightBar.brightness.pulse(0.5.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 100.percent) } 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")) { @@ -105,7 +104,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { lightStep(StepCue.Text("Vampire", "Aaah")) { 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) + backlightBar.brightness.pulse(1.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, end = 50.percent) Washs.both { it.pointAtAudience() @@ -127,7 +126,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { lightStep(StepCue.Text("Vampire", "Aaah")) { sidelight.brightness.off(7.seconds) backlightBar.strobeSpeed.fade(start = 60.percent, end = 90.percent, duration = 7.seconds) - backlightBar.brightness.fade(start = 10.percent, end = 100.percent, duration = 7.seconds) + backlightBar.brightness.fade(start = 0.percent, end = 100.percent, duration = 7.seconds) BlinderBars.all { it.brightness.off(5.seconds) } } @@ -163,7 +162,6 @@ fun SceneBuilderContext.songEsIstAngerichtet() { lightStep(StepCue.Custom("Musik: Nächster Beat")) { backlightBar.color.fade(Color(hue = 0.degrees, saturation = 30.percent), 1.seconds) - backlightBar.brightness.fade(30.percent, 1.seconds) sidelight.brightness.off(1.seconds) Washs.both { it.brightness.off(1.seconds) } 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 b3c34e9..4c4386c 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/FinaleErsterAkt.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/FinaleErsterAkt.kt @@ -29,7 +29,10 @@ fun SceneBuilderContext.songFinaleErsterAkt() { } onRun { - FrontLights.center { it.brightness.off(10.seconds) } + FrontLights.left { it.brightness.off(10.seconds) } + FrontLights.all { it.brightness.fade(30.percent, 10.seconds) } + FrontLights.right { it.brightness.off(10.seconds) } + Spots.right.brightness.fade(100.percent, 10.seconds) backlightBar.brightness.fade(100.percent, 10.seconds) @@ -357,6 +360,8 @@ fun SceneBuilderContext.songFinaleErsterAkt() { sidelight.strobeSpeed.off() } + greedyCueStep(StepCue.Text("Dracula", "Schaut sie wenigstens an!", "Anfang")) + lightStep(StepCue.Text("Dracula", "Schaut sie wenigstens an!", "letzte Silbe")) { backlightBar.color.fade(Color.WARM_WHITE, 6.seconds) backlightBar.brightness.fade(60.percent, 10.seconds) @@ -374,7 +379,7 @@ fun SceneBuilderContext.songFinaleErsterAkt() { it.prismMode.static(FuturelightDmh160.PrismMode.FROST) } - FrontLights.center { it.brightness.fade(100.percent, 10.seconds, start = 30.percent) } + FrontLights.center { it.brightness.fade(100.percent, 6.seconds) } } // genre change @@ -392,13 +397,13 @@ fun SceneBuilderContext.songFinaleErsterAkt() { } lightStep(StepCue.Text("Vampire", "Oh ja", "Anfang")) { - FrontLights.left { it.brightness.pulseOnce(2.seconds, 5.seconds) } - FrontLights.right { it.brightness.pulseOnce(2.seconds, 5.seconds) } + FrontLights.left { it.brightness.pulseOnce(2.seconds, 4.seconds, peak = 50.percent) } + FrontLights.right { it.brightness.pulseOnce(2.seconds, 4.seconds, peak = 50.percent) } } lightStep(StepCue.Text("Vampire", "Oh ja", "Anfang")) { - FrontLights.left { it.brightness.pulseOnce(2.seconds, 5.seconds) } - FrontLights.right { it.brightness.pulseOnce(2.seconds, 5.seconds) } + FrontLights.left { it.brightness.pulseOnce(2.seconds, 5.seconds, peak = 50.percent) } + FrontLights.right { it.brightness.pulseOnce(2.seconds, 5.seconds, peak = 50.percent) } Washs.both { it.brightness.pulseOnce(2.seconds, 5.seconds) } } @@ -416,8 +421,8 @@ fun SceneBuilderContext.songFinaleErsterAkt() { } } - lightStep(StepCue.Text("Vampire", "Komm zu uns morgen nacht!", "letzte Silbe")) { - FrontLights.center { it.brightness.off(3.seconds) } + lightStep(StepCue.Text("Alle", "Komm zu uns morgen nacht!", "letzte Silbe")) { + FrontLights.center { it.brightness.fade(30.percent, 4.seconds) } BlinderBars.all { it.brightness.off(2.seconds) } sidelight.brightness.off(2.seconds) Tops.both { it.brightness.off(2.seconds) } @@ -433,7 +438,7 @@ fun SceneBuilderContext.songFinaleErsterAkt() { 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, 1.seconds) + sidelight.brightness.fade(100.percent, 1.seconds) BlinderBars.all { it.brightness.fade(25.percent, 1.seconds) @@ -443,8 +448,8 @@ fun SceneBuilderContext.songFinaleErsterAkt() { } lightStep(StepCue.Text("Dracula", "Mina…", "Anfang")) { - backlightBar.color.fade(Color.WARM_WHITE, 1.seconds) - backlightBar.brightness.fade(50.percent, 1.seconds) + backlightBar.color.fade(Color.WARM_WHITE, 3.seconds) + backlightBar.brightness.fade(50.percent, 3.seconds) } lightStep(StepCue.Text("Vampire", "Komm zu uns morgen nacht!", "Anfang")) { @@ -509,16 +514,16 @@ fun SceneBuilderContext.songFinaleErsterAkt() { lightStep(StepCue.Text("Dracula", "Mina…")) { backlightBar.brightness.off(0.5.seconds) - sidelight.brightness.fade(20.percent, 5.seconds) + sidelight.brightness.fade(30.percent, 5.seconds) BlinderBars.all { it.brightness.off(1.seconds) } } lightStep(StepCue.Text("Dracula", "Morgen nacht!", "letzte Silbe")) { backlightBar.breathe() - backlightBar.strobeSpeed.static(90.percent) + backlightBar.strobeSpeed.fade(start = 50.percent, end = 90.percent, duration = 3.5.seconds) sidelight.brightness.static(100.percent) - sidelight.strobeSpeed.static(90.percent) + sidelight.strobeSpeed.fade(start = 50.percent, end = 90.percent, duration = 3.5.seconds) Washs.both { it.brightness.rampDown(0.8.seconds) } @@ -528,13 +533,20 @@ fun SceneBuilderContext.songFinaleErsterAkt() { it.brightness.fade(60.percent, 5.seconds) } - FrontLights.center { it.brightness.fade(100.percent, 5.seconds) } + FrontLights.center { it.brightness.fade(100.percent, 4.seconds) } + + Tops.both { + it.pointAtStageMiddleSingleCenterMarking() + it.colorWheelMode.static(FuturelightDmh160.ColorWheelMode.White) + it.prismMode.static(FuturelightDmh160.PrismMode.FROST) + } } lightStep(StepCue.Custom("Musik: Schlussschlag")) { - Spots.right.brightness.off(10.seconds) - FrontLights.center { it.brightness.off() } - Washs.both { it.brightness.off(0.5.seconds) } + Spots.right.brightness.off() + FrontLights.center { it.brightness.fade(start = 40.percent, end = 0.percent, duration = 10.seconds) } + Washs.both { it.brightness.off(10.seconds) } + Tops.both { it.brightness.pulseOnce(0.2.seconds, 10.seconds) } backlightBar.strobeSpeed.off() backlightBar.brightness.pulseOnce(0.2.seconds, 10.seconds) diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/song/Maskenball.kt b/src/main/kotlin/de/moritzruth/dracula_musical/song/Maskenball.kt index 083595d..36f20cb 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/Maskenball.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/Maskenball.kt @@ -98,7 +98,7 @@ fun SceneBuilderContext.songMaskenball() { } onRun { - backlightBar.brightness.fade(20.percent, 5.seconds) + backlightBar.brightness.off(20.seconds) } } } \ No newline at end of file diff --git a/src/main/kotlin/de/moritzruth/theaterdsl/show/Dsl.kt b/src/main/kotlin/de/moritzruth/theaterdsl/show/Dsl.kt index 98918ca..14272e9 100644 --- a/src/main/kotlin/de/moritzruth/theaterdsl/show/Dsl.kt +++ b/src/main/kotlin/de/moritzruth/theaterdsl/show/Dsl.kt @@ -31,7 +31,9 @@ interface SceneBuilderContext { * Inserts a step doing nothing. * Intended to be for cases where the cue of the following step could be confused with the cue of this step if this step would not exist. */ -fun SceneBuilderContext.greedyCueStep(cue: StepCue) {} +fun SceneBuilderContext.greedyCueStep(cue: StepCue) { + step(cue) {} +} @TheaterDslMarker interface StepDataBuilderContext {