From 03bbb807e465417b007824c550a20081e558b20e Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Tue, 22 Oct 2024 18:10:21 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=88=20add=20missing=20bossfight=20cuts?= =?UTF-8?q?cene=20telemetry=20tags?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boss_fight/summit/phase/cutscene/initialize.mcfunction | 5 +++++ .../summit/phase/cutscene/loop/0/laugh_start.mcfunction | 2 ++ .../summit/phase/cutscene/loop/0/laugh_stop.mcfunction | 2 ++ .../summit/phase/cutscene/loop/0/start_cutscene.mcfunction | 2 ++ .../summit/phase/cutscene/loop/0/turn_on_screen.mcfunction | 2 ++ .../boss_fight/summit/phase/cutscene/terminate.mcfunction | 2 ++ .../summit/phase/cutscene/terminate/scheduled.mcfunction | 2 ++ 7 files changed, 17 insertions(+) diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize.mcfunction index dbd6e150c..e17efc0d4 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize.mcfunction @@ -1,3 +1,8 @@ +data modify storage omegaflowey:telemetry.temp data set value {} +execute store result storage omegaflowey:telemetry.temp data.phase_index int 1 run \ + scoreboard players get @s omegaflowey.boss-fight.cutscene.phase.i +function omegaflowey.main:telemetry/bossfight/tag/start { name: "bossfight.phase.cutscene" } + # Set scores scoreboard players set @s omegaflowey.boss-fight.cutscene.clock.i -1 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/laugh_start.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/laugh_start.mcfunction index a9e081744..b91d4b42a 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/laugh_start.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/laugh_start.mcfunction @@ -1,3 +1,5 @@ +function omegaflowey.main:telemetry/bossfight/tag/start { name: "cutscene.intro.laugh" } + function omegaflowey.entity:shared/run_as_active_player_or_spectator { command: "\ execute at @s run playsound omega-flowey:cutscene.intro.laugh ambient @s ~ ~ ~ 1 1\ "} diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/laugh_stop.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/laugh_stop.mcfunction index f601e02b5..a5b7439bd 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/laugh_stop.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/laugh_stop.mcfunction @@ -1,3 +1,5 @@ +function omegaflowey.main:telemetry/bossfight/tag/end { name: "cutscene.intro.laugh" } + data modify storage omegaflowey:bossfight temp set value { duration: 1 } execute store result storage omegaflowey:bossfight temp.to_frame int 1 run scoreboard players get @s aj.omegaflowey_nose_move_slow_shake.frame $execute as $(model_nose_uuid) run function animated_java:omegaflowey_nose/animations/omegaflowey_nose_move_slow/tween with storage omegaflowey:bossfight temp diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/start_cutscene.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/start_cutscene.mcfunction index f355ccc60..cd17e53c9 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/start_cutscene.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/start_cutscene.mcfunction @@ -1,3 +1,5 @@ +function omegaflowey.main:telemetry/bossfight/tag/start { name: "cutscene.intro" } + # Summon and animate Omega Flowey entity function omegaflowey.entity:directorial/boss_fight/summit/origin/at { \ command: "execute positioned ~ ~ ~29.4 run function omegaflowey.entity:hostile/omega-flowey/summon/relative" \ diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/turn_on_screen.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/turn_on_screen.mcfunction index 62abdf96e..2793ddb05 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/turn_on_screen.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/turn_on_screen.mcfunction @@ -1,3 +1,5 @@ +function omegaflowey.main:telemetry/bossfight/tag/instant { name: "cutscene.intro.turn_on_screen" } + $execute as $(bossfight_tvscreen_uuid) run function animated_java:omegaflowey_tv_screen/variants/reveal_1/apply $execute as $(bossfight_tvscreen_uuid) on passengers if entity @s[tag=aj.omegaflowey_tv_screen.bone] run \ data merge entity @s { brightness: { block: 11, sky: 0 } } diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/terminate.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/terminate.mcfunction index 0a06608aa..ddd7908b9 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/terminate.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/terminate.mcfunction @@ -1 +1,3 @@ +function omegaflowey.main:telemetry/bossfight/tag/end { name: "bossfight.phase.cutscene" } + $execute as $(boss_fight_uuid) at @s run function omegaflowey.entity:directorial/boss_fight/summit/phase/cutscene/terminate/as_bossfight with storage omegaflowey:bossfight diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/terminate/scheduled.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/terminate/scheduled.mcfunction index b8a738167..bdcaa9932 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/terminate/scheduled.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/terminate/scheduled.mcfunction @@ -1 +1,3 @@ +function omegaflowey.main:telemetry/bossfight/tag/end { name: "cutscene.intro" } + function omegaflowey.entity:directorial/boss_fight/summit/phase/cutscene/terminate with storage omegaflowey:bossfight