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 1047b35..1fbd1c2 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt @@ -177,9 +177,14 @@ fun ShowBuilderContext.act1() = act("Erster Akt") { scene("Blockflötenkreis") { songLucy() - lightStep(StepCue.Custom("Gardine wird geöffnet")) { - FrontLights.all { it.brightness.fade(100.percent, 2.seconds) } - sidelight.brightness.off(1.seconds) + step(StepCue.Custom("Gardine wird geöffnet")) { + rightSpotTarget = null + + onRun { + FrontLights.all { it.brightness.fade(100.percent, 2.seconds) } + sidelight.brightness.off(1.seconds) + Spots.right.brightness.off(1.seconds) + } } step(StepCue.Text("Mr. Nickelby", "…als du die Vorhänge aufgemacht hast.")) { @@ -201,7 +206,7 @@ fun ShowBuilderContext.act1() = act("Erster Akt") { repeat(2) { lightStep(StepCue.Custom("Gardine wird geschlossen")) { FrontLights.all { it.brightness.fade(40.percent, 2.seconds) } - sidelight.brightness.fade(80.percent, 1.seconds) + sidelight.brightness.fade(80.percent, 3.seconds) } lightStep(StepCue.Custom("Gardine wird geöffnet")) { @@ -239,6 +244,8 @@ fun ShowBuilderContext.act1() = act("Erster Akt") { +"Jonathan / von rechts, 1. Tür" } + curtainState = CurtainState.OPEN + onRun { FrontLights.all { it.brightness.fade(75.percent, 5.seconds) } } @@ -358,14 +365,16 @@ fun ShowBuilderContext.act1() = act("Erster Akt") { rightSpotTarget = "Van Helsing" onRun { - Spots.right.brightness.static(100.percent) - FrontLights.all { it.brightness.pulseOnce( - rampUpDuration = 1.seconds, - rampDownDuration = 10.seconds, - peak = 0.percent, - start = 100.percent, - end = 100.percent - ) } + Spots.right.brightness.pulseOnce(0.seconds, 20.seconds) + FrontLights.all { + it.brightness.pulseOnce( + rampUpDuration = 1.seconds, + rampDownDuration = 10.seconds, + peak = 0.percent, + start = 100.percent, + end = 100.percent + ) + } BlinderBars.all { it.preset.static(null) @@ -398,6 +407,7 @@ fun ShowBuilderContext.act1() = act("Erster Akt") { } curtainState = CurtainState.CLOSED + rightSpotTarget = null props { it[PropPosition.CENTER] = null 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 351961b..79ddb6c 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/DraculasZorn.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/DraculasZorn.kt @@ -10,8 +10,8 @@ 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 = 40.percent) -private fun StairvilleTlb.pulseFast() = brightness.pulse(0.5.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 40.percent) +private fun StairvilleTlb.pulseSlow() = brightness.pulse(1.5.seconds, 0.15.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 50.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() { step(StepCue.MusicStart("Draculas Zorn", 3.minutes + 50.seconds)) { @@ -316,12 +316,11 @@ fun SceneBuilderContext.songDraculasZorn() { lightStep(StepCue.Custom("Musik: Schlussschlag")) { Tops.both { it.brightness.pulseOnce(0.1.seconds, 6.seconds) } FrontLights.all { it.brightness.off() } - sidelight.brightness.off(1.seconds) - - backlightBar.strobeSpeed.off() - Washs.both { it.brightness.off(1.seconds) } + sidelight.brightness.off(1.seconds) + backlightBar.strobeSpeed.off() + BlinderBars.all { it.brightness.pulseOnce(0.1.seconds, 2.seconds) it.preset.static(null) @@ -335,7 +334,7 @@ fun SceneBuilderContext.songDraculasZorn() { BlinderBars.all { it.reset() } - sidelight.brightness.fade(40.percent, 20.seconds) - backlightBar.brightness.off(10.seconds) + sidelight.brightness.fade(60.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 593a829..b8afdb9 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/EsIstAngerichtet.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/EsIstAngerichtet.kt @@ -29,7 +29,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { } lightStep(StepCue.Custom("Musik: Einsetzen der Drums")) { - backlightBar.brightness.pulse(1.6.seconds, 0.15.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 20.percent) + backlightBar.brightness.pulse(1.6.seconds, 0.15.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 50.percent) Washs.both { it.brightness.pulse(1.6.seconds, 0.1.seconds, 0.3.seconds, startDelay = 0.4.seconds, peak = 100.percent) } BlinderBars.all { @@ -50,7 +50,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { repeat(2) { lightStep(StepCue.Text("Vampire", "Aaah")) { sidelight.brightness.fade(60.percent, 3.seconds) - backlightBar.brightness.pulse(0.5.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 40.percent) + backlightBar.brightness.pulse(0.5.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 50.percent) } lightStep(StepCue.Text("Vampire", "…angerichtet!", "erste Silbe")) { @@ -73,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 = 40.percent) + backlightBar.brightness.pulse(1.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 50.percent) } lightStep(StepCue.Text("Vampire", "Aaah")) { @@ -83,7 +83,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { repeat(2) { 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 = 40.percent) + backlightBar.brightness.pulse(0.5.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 50.percent) } lightStep(StepCue.Text("Vampire", "…angerichtet!", "erste Silbe")) { @@ -106,7 +106,7 @@ fun SceneBuilderContext.songEsIstAngerichtet() { lightStep(StepCue.Text("Vampire", "Aaah")) { sidelight.brightness.pulseOnce(2.seconds, 1.seconds, peak = 80.percent, end = 40.percent) - backlightBar.brightness.pulse(1.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 40.percent) + backlightBar.brightness.pulse(1.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.seconds, peak = 50.percent) Washs.both { it.pointAtAudience() 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 39d178f..f06baae 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/FinaleErsterAkt.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/FinaleErsterAkt.kt @@ -40,6 +40,7 @@ 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() diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/song/Lucy.kt b/src/main/kotlin/de/moritzruth/dracula_musical/song/Lucy.kt index cc5d849..d174120 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/Lucy.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/Lucy.kt @@ -42,7 +42,7 @@ fun SceneBuilderContext.songLucy() { lightStep(StepCue.Text("Lucy", "Sittlichkeitsverein", "letzte Silbe")) { backlightBar.color.fade(Color(hue = 315.degrees, saturation = 100.percent), 30.seconds) - backlightBar.brightness.fade(50.percent, 2.seconds) + backlightBar.brightness.sine(3.seconds, minimum = 40.percent, maximum = 75.percent) BlinderBars.all { it.brightness.fade(25.percent, 2.seconds) @@ -62,7 +62,7 @@ fun SceneBuilderContext.songLucy() { Tops.both { it.brightness.sine(8.seconds, 20.percent, 100.percent) } } - lightStep(StepCue.Text("Lucy", "Oh Nick")) { + lightStep(StepCue.Text("Lucy", "Oh Nick…")) { // To prevent confusion with the next step } diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/song/Mittsommernacht.kt b/src/main/kotlin/de/moritzruth/dracula_musical/song/Mittsommernacht.kt index c724729..e14bf4c 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/Mittsommernacht.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/Mittsommernacht.kt @@ -194,6 +194,7 @@ fun SceneBuilderContext.songMittsommernacht() { step(StepCue.Text("Vampire", "Wir warten auf euch", "Anfang")) { rightSpotTarget = null + leftSpotTarget = "Vampire" onRun { Spots.right.brightness.off(3.seconds)