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 87c4163..1047b35 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/act/Act1.kt @@ -29,19 +29,19 @@ fun ShowBuilderContext.act1() = act("Erster Akt") { step(StepCue.MusicEnd) { actors { - +"Erzähler / in der Mitte der Vorbühne" + +"Van Helsing / in der Mitte der Vorbühne" } - rightSpotTarget = "Erzähler (Mitte der Vorbühne)" + rightSpotTarget = "Van Helsing (Mitte der Vorbühne)" onRun { Spots.right.brightness.fade(100.percent, 2.seconds) } } - step(StepCue.Text("Erzähler", "Der Mittsommernacht.")) { + step(StepCue.Text("Van Helsing", "Der Mittsommernacht.")) { actors { - -"Erzähler" + -"Van Helsing" } rightSpotTarget = null diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/act/Act2.kt b/src/main/kotlin/de/moritzruth/dracula_musical/act/Act2.kt index 96faefa..5f58cd9 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/act/Act2.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/act/Act2.kt @@ -487,15 +487,15 @@ fun ShowBuilderContext.act2() = act("Zweiter Akt") { FrontLights.all { it.brightness.static(100.percent) } backlightBar.color.fade(Color.WARM_WHITE, 0.5.seconds) - backlightBar.brightness.pulseOnce(0.5.seconds, 10.seconds, end = 40.percent) + backlightBar.brightness.pulseOnce(0.5.seconds, 25.seconds, end = 40.percent) sidelight.colors.forEach { it.fade(Color.WARM_WHITE, 0.5.seconds) } - sidelight.brightness.pulseOnce(0.5.seconds, 10.seconds, end = 40.percent) + sidelight.brightness.pulseOnce(0.5.seconds, 25.seconds, end = 40.percent) Washs.both { it.pointAtStageCenter() it.colorWheelMode.static(CoemarProWash.ColorWheelMode.WarmWhite) - it.brightness.pulseOnce(0.5.seconds, 10.seconds) + it.brightness.pulseOnce(0.5.seconds, 25.seconds) } BlinderBars.all { @@ -517,6 +517,10 @@ fun ShowBuilderContext.act2() = act("Zweiter Akt") { -"Françoise / ist verdampft" -"Bernadette / ist verdampft" -"Ascot / ist verdampft" + -"Backe / ist verdampft" + -"Timmy / ist verdampft" + -"Lucy / ist verdampft" + -"Hawkins / ist verdampft" } leftSpotTarget = "Jonathan" @@ -533,6 +537,8 @@ fun ShowBuilderContext.act2() = act("Zweiter Akt") { lightStep(StepCue.Custom("Jonathan zieht Minas Sarg")) { Spots.left.brightness.off(6.seconds) + backlightBar.color.static(Color.DARK_BLUE) + backlightBar.brightness.fade(40.percent, 10.seconds) Tops.both { it.startRoomMovement(2.0) @@ -542,8 +548,6 @@ fun ShowBuilderContext.act2() = act("Zweiter Akt") { } lightStep(StepCue.Custom("Musik: Wechsel in moll")) { - backlightBar.color.static(Color.DARK_BLUE) - backlightBar.brightness.fade(40.percent, 5.seconds) sidelight.colors.forEach { it.fade(Color.RED, 10.seconds) } sidelight.brightness.fade(40.percent, 10.seconds) @@ -553,14 +557,14 @@ fun ShowBuilderContext.act2() = act("Zweiter Akt") { backlightBar.color.fade(Color(hue = 359.degrees), 6.seconds) backlightBar.brightness.fade(60.percent, 5.seconds) - Washs.both { it.brightness.pulse(1.seconds, 0.1.seconds, 0.2.seconds) } + Washs.both { it.brightness.pulse(1.05.seconds, 0.1.seconds, 0.2.seconds) } } lightStep(StepCue.Custom("Musik: +2 Takte")) { sidelight.brightness.fade(75.percent, 5.seconds) - backlightBar.brightness.pulse(1.seconds, 0.1.seconds, 0.2.seconds) + backlightBar.brightness.pulse(1.05.seconds, 0.1.seconds, 0.2.seconds) - Washs.both { it.brightness.pulse(1.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.3.seconds) } + Washs.both { it.brightness.pulse(1.05.seconds, 0.1.seconds, 0.2.seconds, startDelay = 0.3.seconds) } } lightStep(StepCue.Custom("1. Beat")) { @@ -568,7 +572,7 @@ fun ShowBuilderContext.act2() = act("Zweiter Akt") { it.preset.static(null) it.white.static(100.percent) it.color.reset() - it.brightness.pulseOnce(0.seconds, 0.15.seconds) + it.brightness.pulseOnce(0.seconds, 0.2.seconds) } sidelight.brightness.off(0.1.seconds) @@ -587,16 +591,20 @@ fun ShowBuilderContext.act2() = act("Zweiter Akt") { BlinderBars.all { it.white.reset() it.color.static(Color.RED) - it.brightness.pulseOnce(0.seconds, 0.15.seconds) + it.brightness.pulseOnce(0.seconds, 0.2.seconds) } - sidelight.brightness.pulseOnce(0.seconds, 0.15.seconds) + sidelight.brightness.pulseOnce(0.seconds, 1.seconds) - Tops.both { it.brightness.pulseOnce(0.seconds, 0.15.seconds) } + Tops.both { it.brightness.pulseOnce(0.seconds, 0.4.seconds) } } lightStep(StepCue.Custom("4. Beat")) { - backlightBar.brightness.pulseOnce(0.seconds, 0.3.seconds, end = 40.percent) + backlightBar.brightness.pulseOnce(0.seconds, 10.seconds) } } + + scene("Finale") { + songFinale() + } } \ No newline at end of file diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/song/Finale.kt b/src/main/kotlin/de/moritzruth/dracula_musical/song/Finale.kt new file mode 100644 index 0000000..32591ce --- /dev/null +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/Finale.kt @@ -0,0 +1,15 @@ +package de.moritzruth.dracula_musical.song + +import de.moritzruth.theaterdsl.show.SceneBuilderContext +import de.moritzruth.theaterdsl.show.StepCue +import kotlin.time.Duration.Companion.seconds + +fun SceneBuilderContext.songFinale() { + step(StepCue.MusicStart("Finale", 10.seconds)) { + actors { + -"Mina" + -"Jonathan" + +"Van Helsing / von links" + } + } +} \ No newline at end of file diff --git a/src/main/kotlin/de/moritzruth/dracula_musical/song/RepriseDuett.kt b/src/main/kotlin/de/moritzruth/dracula_musical/song/RepriseDuett.kt index 080af26..c995241 100644 --- a/src/main/kotlin/de/moritzruth/dracula_musical/song/RepriseDuett.kt +++ b/src/main/kotlin/de/moritzruth/dracula_musical/song/RepriseDuett.kt @@ -7,10 +7,11 @@ import de.moritzruth.dracula_musical.device.Washs import de.moritzruth.theaterdsl.show.SceneBuilderContext import de.moritzruth.theaterdsl.show.StepCue import de.moritzruth.theaterdsl.value.percent +import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds fun SceneBuilderContext.songRepriseDuett() { - lightStep(StepCue.MusicStart("Reprise: Duett", 10.seconds)) { + lightStep(StepCue.MusicStart("Reprise: Duett", 1.minutes + 15.seconds)) { Washs.both { it.pointAtCeiling() it.colorWheelMode.static(CoemarProWash.ColorWheelMode.White) diff --git a/src/main/kotlin/de/moritzruth/theaterdsl/value/Color.kt b/src/main/kotlin/de/moritzruth/theaterdsl/value/Color.kt index 5456468..4b71d43 100644 --- a/src/main/kotlin/de/moritzruth/theaterdsl/value/Color.kt +++ b/src/main/kotlin/de/moritzruth/theaterdsl/value/Color.kt @@ -64,6 +64,6 @@ data class Color( val RED = Color(0.degrees, 100.percent, 100.percent) val DARK_BLUE = Color(240.degrees, 100.percent, 100.percent) - val WARM_WHITE = Color(30.degrees, 60.percent, 100.percent) + val WARM_WHITE = Color(30.degrees, 40.percent, 100.percent) } } \ No newline at end of file