From e923231c59b8bcb9995af20516c9f70322855e89 Mon Sep 17 00:00:00 2001 From: Moritz Ruth Date: Thu, 6 Jul 2023 22:11:43 +0200 Subject: [PATCH] commit #52 --- .../de/moritzruth/lampenfieber/act/First.kt | 6 ++--- .../de/moritzruth/lampenfieber/act/Fourth.kt | 14 +++++----- .../de/moritzruth/lampenfieber/act/Second.kt | 6 ++--- .../de/moritzruth/lampenfieber/act/Third.kt | 6 ++--- .../lampenfieber/song/RopeSkippingTanz.kt | 26 +++++++++++-------- .../lampenfieber/song/SchauMichMit.kt | 2 +- 6 files changed, 33 insertions(+), 27 deletions(-) diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/act/First.kt b/src/main/kotlin/de/moritzruth/lampenfieber/act/First.kt index 9b866e3..080aa50 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/act/First.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/act/First.kt @@ -17,7 +17,7 @@ import kotlin.time.Duration.Companion.seconds fun ShowBuilderContext.firstAct() = act("Erster Akt") { @Suppress("DuplicatedCode") scene("Intro") { - step(StepCue.MusicStart("Lampenfieber", 5.minutes + 20.seconds)) { + step(StepCue.MusicStart("Lampenfieber", 5.minutes + 10.seconds)) { props(PropConfigurations::classroom) onRun { @@ -128,7 +128,7 @@ fun ShowBuilderContext.firstAct() = act("Erster Akt") { } } - step(StepCue.MusicStart("Rap", 2.minutes + 30.seconds)) { + step(StepCue.MusicStart("Rap", 2.minutes + 20.seconds)) { actors { +"Maria" +"Kathi" @@ -312,7 +312,7 @@ fun ShowBuilderContext.firstAct() = act("Erster Akt") { FrontLights.center.forEach { it.brightness.off(10.seconds) } } - step(StepCue.MusicStart("Aus dem Schatten treten", 3.minutes + 20.seconds)) { + step(StepCue.MusicStart("Aus dem Schatten treten", 4.minutes)) { actors { -"Kai / nach links" -"Adrian / nach links" diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt b/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt index b21978a..6a3dc7c 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/act/Fourth.kt @@ -99,7 +99,7 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { songSchauMichMit() - step(StepCue.MusicStart("Umbaumusik", 3.minutes + 20.seconds)) { + step(StepCue.MusicStart("Umbaumusik", 2.minutes)) { props(PropConfigurations::richy) } } @@ -141,7 +141,7 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { } } - step(StepCue.MusicStart("Und jetzt", 5.minutes + 30.seconds)) { + step(StepCue.MusicStart("Und jetzt", 5.minutes + 16.seconds)) { rightSpotTarget = "Tina" onRun { @@ -215,7 +215,7 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { } scene("Szene 3") { - step(StepCue.MusicStart("Probenatmosphäre", 10.minutes)) { + step(StepCue.MusicStart("Probenatmosphäre", 30.seconds)) { actors { +"David" // mehr @@ -381,7 +381,7 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { } } - lightStep(StepCue.MusicStart("Paulas Monolog", 3.minutes + 45.seconds)) { + lightStep(StepCue.MusicStart("Paulas Monolog", 3.minutes + 8.seconds)) { Washs.both.forEach { it.beamAngle.static(100.percent) it.colorWheelMode.static(CoemarProWash.ColorWheelMode.DarkBlue) @@ -409,7 +409,9 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { bar.color.static(Color(190.degrees)) bar.brightness.static(100.percent) - sideLight.color3.fadeRandomAround(190.degrees, 10.degrees, 5.seconds) + sideLight.color1.static(Color(190.degrees, 40.percent, 40.percent)) + sideLight.color2.fadeRandomAround(190.degrees, 10.degrees, 5.seconds) + sideLight.color3.static(Color(190.degrees, 40.percent, 70.percent)) sideLight.color4.fadeRandomAround(190.degrees, 20.degrees, 6.seconds) Washs.both.forEach { @@ -463,7 +465,7 @@ fun ShowBuilderContext.fourthAct() = act("Vierter Akt") { } scene("Szene 8") { - step(StepCue.MusicStart("Angstballett", 4.minutes + 45.seconds)) { + step(StepCue.MusicStart("Angstballett", 2.minutes + 20.seconds)) { onRun { // instrumental } diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/act/Second.kt b/src/main/kotlin/de/moritzruth/lampenfieber/act/Second.kt index cf68262..62b7dae 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/act/Second.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/act/Second.kt @@ -16,7 +16,7 @@ import kotlin.time.Duration.Companion.seconds fun ShowBuilderContext.secondAct() = act("Zweiter Akt") { scene("Szene 1") { - step(StepCue.MusicStart("Umbaumusik", 1.minutes + 14.seconds)) { + step(StepCue.MusicStart("Umbaumusik", 1.minutes + 30.seconds)) { props(PropConfigurations::tvRoom) } } @@ -100,7 +100,7 @@ fun ShowBuilderContext.secondAct() = act("Zweiter Akt") { } } - step(StepCue.MusicStart("Eine Rolle spielen I", 2.minutes + 5.seconds)) { + step(StepCue.MusicStart("Eine Rolle spielen I", 2.minutes + 45.seconds)) { Washs.both.forEach { it.colorWheelMode.static(CoemarProWash.ColorWheelMode.WarmWhite) it.pointAtGuests() @@ -168,7 +168,7 @@ fun ShowBuilderContext.secondAct() = act("Zweiter Akt") { } } - step(StepCue.MusicStart("Eine Rolle spielen II", 10.minutes)) { + step(StepCue.MusicStart("Eine Rolle spielen II", 1.minutes + 30.seconds)) { props(PropConfigurations::casting) // instrumental } diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt b/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt index 88c930d..7b8ad70 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/act/Third.kt @@ -132,7 +132,7 @@ fun ShowBuilderContext.thirdAct() = act("Dritter Akt") { } scene("Szene 3") { - lightStep(StepCue.MusicStart("Tischballett (Umbau)", 10.minutes)) { + lightStep(StepCue.MusicStart("Tischballett (Umbau)", 50.seconds)) { sideLight.fadeColorsToClassroomFromDarkness(Duration.ZERO) } } @@ -209,7 +209,7 @@ fun ShowBuilderContext.thirdAct() = act("Dritter Akt") { } scene("Szene 6") { - step(StepCue.MusicStart("Umbaumusik", 1.minutes + 50.seconds)) { + step(StepCue.MusicStart("Umbaumusik", 2.minutes + 20.seconds)) { props(PropConfigurations::calling) onRun { @@ -294,7 +294,7 @@ fun ShowBuilderContext.thirdAct() = act("Dritter Akt") { } } - step(StepCue.MusicStart("Aus dem Schatten treten II", 10.minutes)) { + step(StepCue.MusicStart("Aus dem Schatten treten II", 3.seconds + 20.seconds)) { actors { -"Kathi" -"David" diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/song/RopeSkippingTanz.kt b/src/main/kotlin/de/moritzruth/lampenfieber/song/RopeSkippingTanz.kt index 36d7f81..f14ed08 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/song/RopeSkippingTanz.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/song/RopeSkippingTanz.kt @@ -12,17 +12,7 @@ import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds -@Suppress("DuplicatedCode") -fun SceneBuilderContext.songRopeSkippingTanz() { - step(StepCue.MusicStart("Rope-Skipping-Tanz", 3.minutes)) { - onRun { - Washs.both.forEach { - it.pointAtCeiling() - it.colorWheelMode.static(CoemarProWash.ColorWheelMode.WarmWhite) - } - } - } - +private fun SceneBuilderContext.intro() { lightStep(StepCue.Custom("Erster Klavier-Ton")) { Washs.both.forEach { it.brightness.pulseOnce(200.milliseconds, 2000.milliseconds) } } @@ -43,6 +33,20 @@ fun SceneBuilderContext.songRopeSkippingTanz() { it.brightness.fade(0.percent, 1.seconds) } } +} + +@Suppress("DuplicatedCode") +fun SceneBuilderContext.songRopeSkippingTanz() { + // intro() + + step(StepCue.MusicStart("Rope-Skipping-Tanz", 3.minutes)) { + onRun { + Washs.both.forEach { + it.pointAtCeiling() + it.colorWheelMode.static(CoemarProWash.ColorWheelMode.WarmWhite) + } + } + } lightStep(StepCue.Custom("Schlagzeug-Einsatz")) { Washs.both.forEach { diff --git a/src/main/kotlin/de/moritzruth/lampenfieber/song/SchauMichMit.kt b/src/main/kotlin/de/moritzruth/lampenfieber/song/SchauMichMit.kt index 3983268..efff5f2 100644 --- a/src/main/kotlin/de/moritzruth/lampenfieber/song/SchauMichMit.kt +++ b/src/main/kotlin/de/moritzruth/lampenfieber/song/SchauMichMit.kt @@ -17,7 +17,7 @@ import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds fun SceneBuilderContext.songSchauMichMit() { - step(StepCue.MusicStart("Schau mich mit anderen Augen an", 10.minutes)) { + step(StepCue.MusicStart("Schau mich mit anderen Augen an", 3.minutes + 40.seconds)) { onRun { sideLight.moveColorsPinkAndBlue()