From 888cd27e241cc09bd60810ac48db393dddb3f690 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Tue, 22 Oct 2024 01:23:15 -0400 Subject: [PATCH 1/9] =?UTF-8?q?=F0=9F=8E=A5=20add=20sounds=20+=20animation?= =?UTF-8?q?=20when=20being=20teleported=20to=20bossfight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../phase/cutscene/initialize/0.mcfunction | 21 ++------------- .../summit/phase/cutscene/loop.mcfunction | 1 + .../summit/phase/cutscene/loop/0.mcfunction | 6 +++++ .../loop/0/clear_player_blindness.mcfunction | 1 + .../cutscene/loop/0/start_cutscene.mcfunction | 19 ++++++++++++++ .../summit/player/join_bossfight.mcfunction | 3 +++ .../reset_prompted_player.mcfunction | 1 + .../show_prompt/confirm.mcfunction | 2 +- .../confirm/after_delay/as_player.mcfunction | 2 ++ .../confirm/after_delay/macro.mcfunction | 3 ++- .../confirm/teleport_animation.mcfunction | 6 +++++ .../teleport_animation/as_player.mcfunction | 2 ++ .../teleport_animation/macro.mcfunction | 2 ++ .../show_prompt/shared.mcfunction | 1 + .../summit/player/queue/reset.mcfunction | 1 + resourcepack/assets/omega-flowey/sounds.json | 16 +++++++++++- .../omega-flowey/sounds/battle_start.ogg | Bin 0 -> 10629 bytes .../omega-flowey/sounds/snd_battlefall.ogg | Bin 0 -> 8511 bytes .../assets/omega-flowey/sounds/stats.txt | 24 ++++++++++++++++++ 19 files changed, 89 insertions(+), 22 deletions(-) create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/clear_player_blindness.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/start_cutscene.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation/as_player.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation/macro.mcfunction create mode 100644 resourcepack/assets/omega-flowey/sounds/battle_start.ogg create mode 100644 resourcepack/assets/omega-flowey/sounds/snd_battlefall.ogg diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize/0.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize/0.mcfunction index f355ccc60..d1d32364f 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize/0.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize/0.mcfunction @@ -1,19 +1,2 @@ -# 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" \ -} -execute as @e[ \ - x=-186, dx=61, y=12, dy=44, z=47, dz=91, \ - type=minecraft:item_display, \ - tag=aj.rig_root, \ - tag=omega-flowey-remastered \ -] run function omegaflowey.entity:hostile/omega-flowey/animate/intro/darken/as_root - -function omegaflowey.entity:shared/run_as_active_player_or_spectator { command: "\ - execute at @s run playsound omega-flowey:cutscene.intro.music record @s ~ ~ ~ 1 1\ -"} - -# Set arena box to flashing red variant -$execute as $(arena_box_uuid) run function animated_java:omegaflowey_arena_box/variants/intro_flashing_red/apply - -schedule function omegaflowey.entity:directorial/boss_fight/summit/phase/cutscene/terminate/scheduled 575t +# Delay before music/red flashing starts +scoreboard players set @s omegaflowey.boss-fight.cutscene.clock.i -14 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop.mcfunction index ebeb80590..4c1cae472 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop.mcfunction @@ -1,4 +1,5 @@ scoreboard players add @s omegaflowey.boss-fight.cutscene.clock.i 1 +execute if score @s omegaflowey.boss-fight.cutscene.clock.i matches ..-1 run return 0 # Run cutscene specific logic execute if score @s omegaflowey.boss-fight.cutscene.phase.i matches 0 run return run \ diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0.mcfunction index fe0f3c227..855715559 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0.mcfunction @@ -1,3 +1,9 @@ +execute if score @s omegaflowey.boss-fight.cutscene.clock.i matches 0 run \ + function omegaflowey.entity:directorial/boss_fight/summit/phase/cutscene/loop/0/start_cutscene with storage omegaflowey:bossfight + +execute if score @s omegaflowey.boss-fight.cutscene.clock.i matches 1 run \ + function omegaflowey.entity:directorial/boss_fight/summit/phase/cutscene/loop/0/clear_player_blindness with storage omegaflowey:bossfight + execute if score @s omegaflowey.boss-fight.cutscene.clock.i matches 0..293 run return run \ function omegaflowey.entity:directorial/boss_fight/summit/phase/cutscene/loop/0/approach execute if score @s omegaflowey.boss-fight.cutscene.clock.i matches 332 run return run \ diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/clear_player_blindness.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/clear_player_blindness.mcfunction new file mode 100644 index 000000000..07bed5539 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/clear_player_blindness.mcfunction @@ -0,0 +1 @@ + $effect clear $(active_player_uuid) minecraft:blindness 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 new file mode 100644 index 000000000..f355ccc60 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/loop/0/start_cutscene.mcfunction @@ -0,0 +1,19 @@ +# 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" \ +} +execute as @e[ \ + x=-186, dx=61, y=12, dy=44, z=47, dz=91, \ + type=minecraft:item_display, \ + tag=aj.rig_root, \ + tag=omega-flowey-remastered \ +] run function omegaflowey.entity:hostile/omega-flowey/animate/intro/darken/as_root + +function omegaflowey.entity:shared/run_as_active_player_or_spectator { command: "\ + execute at @s run playsound omega-flowey:cutscene.intro.music record @s ~ ~ ~ 1 1\ +"} + +# Set arena box to flashing red variant +$execute as $(arena_box_uuid) run function animated_java:omegaflowey_arena_box/variants/intro_flashing_red/apply + +schedule function omegaflowey.entity:directorial/boss_fight/summit/phase/cutscene/terminate/scheduled 575t diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/join_bossfight.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/join_bossfight.mcfunction index 672ba8cac..acffb8865 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/join_bossfight.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/join_bossfight.mcfunction @@ -11,7 +11,10 @@ data modify storage omegaflowey:bossfight active_player_uuid set from storage gu teleport @s ~ ~-4.0 ~-27.0 ~180.0 -30.0 spawnpoint @s -142 43 25 -45 +execute at @s run playsound omega-flowey:cutscene.intro.battle_start_end ambient @s ~ ~ ~ 5 + effect clear @s +effect give @s minecraft:blindness 5 0 true effect give @s instant_health 1 4 true function omegaflowey.main:summit/room/cave/active_player_display/update_value with storage omegaflowey:bossfight diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/leave_and_rejoin/remove_from_queue_array/reset_prompted_player.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/leave_and_rejoin/remove_from_queue_array/reset_prompted_player.mcfunction index c925afa76..b578477ea 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/leave_and_rejoin/remove_from_queue_array/reset_prompted_player.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/leave_and_rejoin/remove_from_queue_array/reset_prompted_player.mcfunction @@ -1,4 +1,5 @@ scoreboard players set #omegaflowey.bossfight.has_player_been_prompted omegaflowey.global.flag 0 data remove storage omegaflowey:bossfight player_queue_timeout_uuid schedule clear omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay +schedule clear omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation schedule clear omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/timeout diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm.mcfunction index ec4bbc10f..947a7e9e9 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm.mcfunction @@ -10,4 +10,4 @@ function omegaflowey.utils:log/self { text_component: '[ \ { "text": "...", "color": "yellow" } \ ]' } -schedule function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay 3s replace +schedule function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation 3s replace diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay/as_player.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay/as_player.mcfunction index f2dbc0b19..358d25c08 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay/as_player.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay/as_player.mcfunction @@ -1,3 +1,5 @@ +stopsound @s ambient omega-flowey:cutscene.intro.battle_start + function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/shared/as_player function omegaflowey.entity:directorial/boss_fight/summit/origin/at { \ command: "function omegaflowey.entity:directorial/boss_fight/summit/player/join_bossfight" \ diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay/macro.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay/macro.mcfunction index c1ba31503..d70d730fc 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay/macro.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay/macro.mcfunction @@ -1 +1,2 @@ -$execute as $(player_uuid) run function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay/as_player +$execute as $(player_uuid) at @s run \ + function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay/as_player diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation.mcfunction new file mode 100644 index 000000000..ca7850b8f --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation.mcfunction @@ -0,0 +1,6 @@ +function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation/macro \ + with storage omegaflowey:bossfight player_queue[0] + +schedule \ + function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay \ + 6t replace diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation/as_player.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation/as_player.mcfunction new file mode 100644 index 000000000..7f4c4d6ad --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation/as_player.mcfunction @@ -0,0 +1,2 @@ +playsound omega-flowey:cutscene.intro.battle_start_full ambient @a[distance=..16] ~ ~ ~ 1 1 +effect give @s minecraft:blindness 5 0 true diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation/macro.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation/macro.mcfunction new file mode 100644 index 000000000..65d4227d6 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation/macro.mcfunction @@ -0,0 +1,2 @@ +$execute as $(player_uuid) at @s run \ + function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation/as_player diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/shared.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/shared.mcfunction index fd42f0c89..16922c025 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/shared.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/shared.mcfunction @@ -2,6 +2,7 @@ scoreboard players set #omegaflowey.bossfight.has_player_been_prompted omegaflow # clear scheduled functions schedule clear omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay +schedule clear omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation schedule clear omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/timeout function omegaflowey.entity:directorial/boss_fight/summit/player/queue/pop diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/reset.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/reset.mcfunction index ed24509f1..46fea829b 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/reset.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/reset.mcfunction @@ -5,4 +5,5 @@ function omegaflowey.main:summit/room/cave/player_queue_counter/update_value scoreboard players set #omegaflowey.bossfight.has_player_been_prompted omegaflowey.global.flag 0 execute as @a run function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/shared/as_player schedule clear omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/after_delay +schedule clear omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/confirm/teleport_animation schedule clear omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/timeout diff --git a/resourcepack/assets/omega-flowey/sounds.json b/resourcepack/assets/omega-flowey/sounds.json index eeef1f787..306feb069 100644 --- a/resourcepack/assets/omega-flowey/sounds.json +++ b/resourcepack/assets/omega-flowey/sounds.json @@ -149,11 +149,25 @@ "sounds": [ { "name": "omega-flowey:mus_f_noise", - "attenuation_distance": 40, "volume": 0.3 } ] }, + "cutscene.intro.battle_start_full": { + "sounds": [ + { + "name": "omega-flowey:battle_start", + "attenuation_distance": 8 + } + ] + }, + "cutscene.intro.battle_start_end": { + "sounds": [ + { + "name": "omega-flowey:snd_battlefall" + } + ] + }, "cutscene.intro.laugh": { "sounds": [ { diff --git a/resourcepack/assets/omega-flowey/sounds/battle_start.ogg b/resourcepack/assets/omega-flowey/sounds/battle_start.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d56d11b2d5df23bf343fc06cdff252cee84ee596 GIT binary patch literal 10629 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 F{{h)DcDeun literal 0 HcmV?d00001 diff --git a/resourcepack/assets/omega-flowey/sounds/stats.txt b/resourcepack/assets/omega-flowey/sounds/stats.txt index 9a83402d7..212013386 100644 --- a/resourcepack/assets/omega-flowey/sounds/stats.txt +++ b/resourcepack/assets/omega-flowey/sounds/stats.txt @@ -1,3 +1,15 @@ +# .\battle_start.ogg +channelsVolumeDiffMax: N/A +channels: 1 +Integrated loudness: +I: -18.9 LUFS +Threshold: -28.9 LUFS +Loudness range: +LRA: 0.0 LU +Threshold: 0.0 LUFS +LRA low: 0.0 LUFS +LRA high: 0.0 LUFS + # .\mus_f_6s_1.ogg channelsVolumeDiffMax: -28.4 dB channels: 2 @@ -202,6 +214,18 @@ Threshold: 0.0 LUFS LRA low: 0.0 LUFS LRA high: 0.0 LUFS +# .\snd_battlefall.ogg +channelsVolumeDiffMax: N/A +channels: 1 +Integrated loudness: +I: -70.0 LUFS +Threshold: 0.0 LUFS +Loudness range: +LRA: 0.0 LU +Threshold: 0.0 LUFS +LRA low: 0.0 LUFS +LRA high: 0.0 LUFS + # .\snd_bombfall.ogg channelsVolumeDiffMax: N/A channels: 1 From d14c745a4b1462ee0b09b913b9d837c67de12023 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Tue, 22 Oct 2024 01:59:21 -0400 Subject: [PATCH 2/9] =?UTF-8?q?=F0=9F=92=84=20auto=20set=20day/night=20out?= =?UTF-8?q?side=20screen=20on=20load?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/summit/room/outside/setup.mcfunction | 2 +- .../function/summit/room/outside/setup/tv_screen.mcfunction | 4 ++++ .../setup/tv_screen/reset_variant/macro/as_root.mcfunction | 2 +- .../set_variant_shared/macro_set_static/as_root.mcfunction | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup.mcfunction index f44f3d4b7..0bd5a72fd 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup.mcfunction @@ -1,7 +1,7 @@ # Flowey TV screen, smiling scoreboard players set #omegaflowey.summon.tag_variant omegaflowey.global.flag 3 execute positioned -123.47 87.25 33.35 rotated -158.2 12.52 run \ - function animated_java:omegaflowey_tv_screen/summon { args: { animation: 'omegaflowey_move_slow', start_animation: true, variant: 'smiling' } } + function animated_java:omegaflowey_tv_screen/summon { args: { animation: 'omegaflowey_move_slow', start_animation: true, variant: 'smiling_noglow' } } # Surrounding petal pipes, very simplified models execute positioned -109.9375 90.0625 41.9375 rotated 200 15 run \ diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen.mcfunction index 744c040d0..41448a49a 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen.mcfunction @@ -4,3 +4,7 @@ execute on passengers if entity @s[tag=aj.omegaflowey_tv_screen.bone] run functi function gu:generate data modify storage omegaflowey:decorative outside_tvscreen_uuid set from storage gu:main out + +# Set variant to day/night automatically +execute at @s run function omegaflowey.main:summit/room/outside/setup/tv_screen/set_screen/clear +schedule function omegaflowey.main:summit/room/outside/setup/tv_screen/reset_variant 20t diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/reset_variant/macro/as_root.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/reset_variant/macro/as_root.mcfunction index 882d56d28..f94b9588c 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/reset_variant/macro/as_root.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/reset_variant/macro/as_root.mcfunction @@ -5,7 +5,7 @@ execute if entity @s[tag=is_active_death_animation] run return 0 execute store result score @s omegaflowey.math.0 run time query daytime execute unless score @s omegaflowey.math.0 matches 13500..23000 run tag @s add is_daytime -execute if entity @s[tag=is_daytime] run function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_day execute unless entity @s[tag=is_daytime] run function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_night +execute if entity @s[tag=is_daytime] run function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_day tag @s remove is_daytime diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static/as_root.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static/as_root.mcfunction index 2c75bf2c2..262029865 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static/as_root.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static/as_root.mcfunction @@ -7,7 +7,7 @@ execute if entity @s[tag=is_active_death_animation] run return 0 execute store result score @s omegaflowey.math.0 run time query daytime execute unless score @s omegaflowey.math.0 matches 13500..23000 run tag @s add is_daytime -execute if entity @s[tag=is_daytime] run function animated_java:omegaflowey_tv_screen/variants/static_noglow/apply execute unless entity @s[tag=is_daytime] run function animated_java:omegaflowey_tv_screen/variants/static/apply +execute if entity @s[tag=is_daytime] run function animated_java:omegaflowey_tv_screen/variants/static_noglow/apply tag @s remove is_daytime From 824eeb13b7096be5d969d713f958a0aba5fbcdf0 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Tue, 22 Oct 2024 02:47:32 -0400 Subject: [PATCH 3/9] =?UTF-8?q?=F0=9F=8E=A5=20fix=20missing=20victory=20so?= =?UTF-8?q?und?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../summit/phase/soul/loop/next_event/1.mcfunction | 10 ++++------ .../soul/loop/next_event/1/as_tvscreen.mcfunction | 3 +++ .../phase/soul/loop/next_event/1/scheduled.mcfunction | 1 + .../next_event/1/scheduled/as_bossfight.mcfunction | 3 +++ .../soul/loop/next_event/1/scheduled/macro.mcfunction | 2 ++ resourcepack/assets/omega-flowey/sounds.json | 8 ++++++++ 6 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/as_tvscreen.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled/as_bossfight.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled/macro.mcfunction diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1.mcfunction index 2bde14baa..5f681bd58 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1.mcfunction @@ -1,7 +1,5 @@ -$execute at $(bossfight_tvscreen_uuid) run function omegaflowey.entity:shared/run_as_active_player_or_spectator { command: '\ - playsound omega-flowey:cutscene.summit.victory ambient @s ~ ~ ~ 5 1\ -'} +$execute as $(bossfight_tvscreen_uuid) at @s run \ + function omegaflowey.entity:directorial/boss_fight/summit/phase/soul/loop/next_event/1/as_tvscreen -scoreboard players add @s omegaflowey.boss-fight.progress.phase.i 1 - -function omegaflowey.entity:directorial/boss_fight/shared/phase/soul/loop/event_finished with storage omegaflowey:bossfight +schedule clear omegaflowey.entity:directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled +schedule function omegaflowey.entity:directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled 30t replace diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/as_tvscreen.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/as_tvscreen.mcfunction new file mode 100644 index 000000000..6387be0f6 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/as_tvscreen.mcfunction @@ -0,0 +1,3 @@ +function omegaflowey.entity:shared/run_as_active_player_or_spectator { command: '\ + playsound omega-flowey:cutscene.summit.victory ambient @s ~ ~ ~ 5 1\ +'} diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled.mcfunction new file mode 100644 index 000000000..a225bcd4e --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled.mcfunction @@ -0,0 +1 @@ +function omegaflowey.entity:directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled/macro with storage omegaflowey:bossfight diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled/as_bossfight.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled/as_bossfight.mcfunction new file mode 100644 index 000000000..ea06e94a2 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled/as_bossfight.mcfunction @@ -0,0 +1,3 @@ +scoreboard players add @s omegaflowey.boss-fight.progress.phase.i 1 + +function omegaflowey.entity:directorial/boss_fight/shared/phase/soul/loop/event_finished with storage omegaflowey:bossfight diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled/macro.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled/macro.mcfunction new file mode 100644 index 000000000..a895bc182 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled/macro.mcfunction @@ -0,0 +1,2 @@ +$execute as $(boss_fight_uuid) at @s run \ + function omegaflowey.entity:directorial/boss_fight/summit/phase/soul/loop/next_event/1/scheduled/as_bossfight diff --git a/resourcepack/assets/omega-flowey/sounds.json b/resourcepack/assets/omega-flowey/sounds.json index 306feb069..ece47dc96 100644 --- a/resourcepack/assets/omega-flowey/sounds.json +++ b/resourcepack/assets/omega-flowey/sounds.json @@ -192,6 +192,14 @@ } ] }, + "cutscene.summit.victory": { + "sounds": [ + { + "name": "omega-flowey:snd_dumbvictory", + "attenuation_distance": 55 + } + ] + }, "decorative.soul.break": { "sounds": [ { From 2964adeae06b7b11a0fd65bff9cb0ecfb35a2a49 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Tue, 22 Oct 2024 10:00:05 -0400 Subject: [PATCH 4/9] =?UTF-8?q?=F0=9F=9A=B8=20add=202nd=20join=20queue=20b?= =?UTF-8?q?utton=20near=20spectator=20box?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../player_interacted_with_join_queue_2.json | 16 +++++++ .../interacted/with_join_queue_2.mcfunction | 3 ++ .../as_interaction.mcfunction | 1 + .../with_join_queue_2/macro.mcfunction | 1 + .../room/cave/setup/text_displays.mcfunction | 44 +++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/advancement/player_interacted_with_join_queue_2.json create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2/as_interaction.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2/macro.mcfunction diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/advancement/player_interacted_with_join_queue_2.json b/datapacks/omegaflowey/data/omegaflowey.entity/advancement/player_interacted_with_join_queue_2.json new file mode 100644 index 000000000..4b5b8ca8e --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/advancement/player_interacted_with_join_queue_2.json @@ -0,0 +1,16 @@ +{ + "criteria": { + "requirement": { + "trigger": "minecraft:player_interacted_with_entity", + "conditions": { + "entity": { + "type": "minecraft:interaction", + "nbt": "{ Tags: [\"join-queue-2-interaction\"] }" + } + } + } + }, + "rewards": { + "function": "omegaflowey.entity:player/interacted/with_join_queue_2" + } +} diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2.mcfunction new file mode 100644 index 000000000..53a436c23 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2.mcfunction @@ -0,0 +1,3 @@ +function omegaflowey.main:telemetry/booth/add_tag { name: "player.interact.join_queue_2" } +function omegaflowey.entity:player/interacted/with_join_queue_2/macro with storage omegaflowey:decorative +advancement revoke @s only omegaflowey.entity:player_interacted_with_join_queue_2 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2/as_interaction.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2/as_interaction.mcfunction new file mode 100644 index 000000000..6d8efdd27 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2/as_interaction.mcfunction @@ -0,0 +1 @@ +function omegaflowey.entity:player/interacted/with_join_queue/as_interaction diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2/macro.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2/macro.mcfunction new file mode 100644 index 000000000..2881ea3da --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2/macro.mcfunction @@ -0,0 +1 @@ +$execute as $(join_queue_2_interaction_uuid) run function omegaflowey.entity:player/interacted/with_join_queue_2/as_interaction diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction index 52f70943a..17f7f0d81 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction @@ -92,6 +92,7 @@ summon minecraft:text_display -137.5 43.5 42.5 { \ ], \ alignment: "center", \ billboard: "center", \ + brightness: { block: 14, sky: 0 }, \ default_background: 0b, \ line_width: 200, \ see_through: 0b, \ @@ -125,6 +126,49 @@ execute as @e[ \ ] run function gu:generate data modify storage omegaflowey:decorative join_queue_interaction_uuid set from storage gu:main out +summon minecraft:text_display -135.75 38.5 46.25 { \ + Tags: [ \ + "omega-flowey-remastered", \ + "decorative", \ + "decorative-cave", \ + "join-queue-2-title", \ + ], \ + alignment: "center", \ + billboard: "center", \ + brightness: { block: 14, sky: 0 }, \ + default_background: 0b, \ + line_width: 200, \ + see_through: 0b, \ + shadow: 0b, \ + text: '[{ "text": "JOIN QUEUE", "color": "light_purple", "bold": true, "underlined": true }]', \ + text_opacity: 255, \ + transformation: { \ + left_rotation: [0.0f, 0.0f, 0.0f, 1.0f], \ + right_rotation: [0.0f, 0.0f, 0.0f, 1.0f], \ + scale: [1.5f, 1.5f, 1.5f], \ + translation: [0.0f, 0.0f, 0.0f] \ + } \ +} +summon minecraft:interaction -135.75 38.5 46.25 { \ + Tags: [ \ + "omega-flowey-remastered", \ + "decorative", \ + "decorative-cave", \ + "join-queue-2-interaction", \ + ], \ + width: 2.5, \ + height: 0.5, \ + response: true, \ +} +execute as @e[ \ + x=-136.0, dx=2, y=38.0, dy=2, z=45.0, dz=2, \ + type=minecraft:interaction, \ + tag=join-queue-2-interaction, \ + tag=omega-flowey-remastered, \ + limit=1 \ +] run function gu:generate +data modify storage omegaflowey:decorative join_queue_2_interaction_uuid set from storage gu:main out + summon minecraft:text_display -139.99 45.0 39.0 { \ Tags: [ \ "omega-flowey-remastered", \ From 795bb2ce42ca6206b510519d20887fc3b925471f Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Tue, 22 Oct 2024 10:14:47 -0400 Subject: [PATCH 5/9] =?UTF-8?q?=F0=9F=8E=A5=20add=20thumbs=20up=20screen?= =?UTF-8?q?=20after=20winning=20bossfight=20-=20also=20fix=20`smiling=5Fop?= =?UTF-8?q?en`=20variant=20looking=20weird=20by=20moving=20it=20up=20a=20l?= =?UTF-8?q?ittle=20bit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loop/next_event/1/as_tvscreen.mcfunction | 2 + .../omega-flowey/tv-screen.ajblueprint | 39 +++++++++++++++++- .../custom/tv_screen/faces/smiling_open.png | Bin 1655 -> 1655 bytes .../custom/tv_screen/faces/thumbs_up.pdn | Bin 0 -> 6599 bytes .../custom/tv_screen/faces/thumbs_up.png | Bin 0 -> 1518 bytes 5 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/thumbs_up.pdn create mode 100644 resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/thumbs_up.png diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/as_tvscreen.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/as_tvscreen.mcfunction index 6387be0f6..3bdcf69f8 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/as_tvscreen.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/loop/next_event/1/as_tvscreen.mcfunction @@ -1,3 +1,5 @@ function omegaflowey.entity:shared/run_as_active_player_or_spectator { command: '\ playsound omega-flowey:cutscene.summit.victory ambient @s ~ ~ ~ 5 1\ '} + +function animated_java:omegaflowey_tv_screen/variants/thumbs_up/apply diff --git a/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/tv-screen.ajblueprint b/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/tv-screen.ajblueprint index faa9ca12e..2bfc03bd4 100644 --- a/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/tv-screen.ajblueprint +++ b/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/tv-screen.ajblueprint @@ -1814,7 +1814,35 @@ "internal": false, "saved": true, "uuid": "dece6fae-77bb-97dd-af40-bea77f10a24a", - "source": "data:image/png;base64,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", + "source": "data:image/png;base64,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", + "mode": "bitmap" + }, + { + "path": "G:\\Coding\\omegaflowey-minecraft-remastered\\resourcepack\\assets\\omega-flowey\\textures\\custom\\tv_screen\\faces\\thumbs_up.png", + "name": "thumbs_up.png", + "folder": "", + "namespace": "", + "id": "42", + "group": "", + "width": 128, + "height": 128, + "uv_width": 16, + "uv_height": 16, + "particle": false, + "use_as_default": false, + "layers_enabled": false, + "sync_to_project": "", + "render_mode": "default", + "render_sides": "auto", + "frame_time": 1, + "frame_order_type": "loop", + "frame_order": "", + "frame_interpolate": false, + "visible": true, + "internal": false, + "saved": true, + "uuid": "31628fa8-f150-cec9-24de-93036ffcb817", + "source": "data:image/png;base64,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", "mode": "bitmap" } ], @@ -2147,6 +2175,15 @@ "70dac508-a15a-2c61-c69b-5ae6c46952f2": "3dc44e6b-7594-04c0-12fd-29f604f95a5a" }, "excluded_nodes": [] + }, + { + "name": "thumbs_up", + "display_name": "thumbs_up", + "uuid": "5bef8aff-8ed9-163b-8d80-816a01d24556", + "texture_map": { + "32717bc3-fe35-1fc8-9bbf-54407fe854d1": "31628fa8-f150-cec9-24de-93036ffcb817" + }, + "excluded_nodes": [] } ] }, diff --git a/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/smiling_open.png b/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/smiling_open.png index 07b2e6404aac644ad1d65982ee69871881f2db6b..b16d024f44726f2fc8e88e385a1e6d3c5a9c9fd5 100644 GIT binary patch delta 1356 zcmcJO>sOKo9LFC(R34c(95boZEp3*NN2j=Df@oV_D>4P@As!e>(Ez&!2tlU z9DoT*PH0LFQBjj;VZb~B047UX;_dpq71@7=6WRd)85SHA5Xnl=C`%n-zLq+v!C-*W zIV0!RwmSus4j{KcnM#0NsCP3z0CV08dQ(j*l3?a74-&6 zMRXsy`Zee36dM)69hl}HIS_j}jtf1K%PW%H5}M#oBAVKC4kW+IyjE_9>{f?*i5p*( zdd{SbzR!ld53fZtLPIrY4vEm6gg!N&9$w9a0veu2Po>)o%X?>R${ILA)bMIqJ%_1J z?N=O+QH6Y1PAC1#OJCD#_e0vlX+&ewbAfE?GH$g&Sc_eX$?Be|=z!qE#Kvu+2WfY| zkMQ|6&-sh^NB)>~z1kgDy>ySu!kCdVgD+HzCJCBir&dlgvCcJ@S#g{r2X9y;g(AZq zIO@2(F4uQw#+T_o5XN|#stIIZ$X2o;%9Q;kKz+d~MY>p=aroe=Mv!&aR5W3K#r%YI94s4UjL+rH0$Q^?GvhsnLd;RLShYQ*54MP-IByY12( zmrfCMDfb{^=|zr~FY*`@8Mx&!Y0`!!8DSr7zspof7-F9{BWdZ8ogdLsP0mpv3Zk9& zq}E7=qQuW?xU)5ek)aOCcMxpz~J3(FJh zrz%h?*_c0~F6sO5if=S`Uh&mXN{*giqZ@DB^x#oFXJelTS|(_;vo*1%D$Pc#+J1LT z@{A-q_uCV}*@LDe{q1X3d5y-4pm_rxK975>K3kqJZ^;J#e}ygNT@mrTQsVi=L%spX zTsv6qICkCMS)ghss$TJsuu8I9koVI-V0&prhexnCrpE#93*A=al;zha8%<7AQZOu^ zL_CJ{n*uRHu%|{!M(RP|Mj8KXbXziVIx*>8k`!cwT%U8V#4F}$BdV?}?Iyp4UtPK_ z=*_&+%{u5w)Piqo@d=-k6sOKpNObJZu+yD#(Ny}wwClSj{5iGJ_OX;vFHUd1%vw^Y z*({pH!l3W?1&fx6QeilNNVb0O(C)PnX=X2YW9-fj>P$i);5=lDc7vOLF4&(>{fYT@ bclSE%N9|xu{k@{UfQ<{@8xhn(q38Su*Azo> delta 1381 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 Date: Tue, 22 Oct 2024 10:25:11 -0400 Subject: [PATCH 6/9] =?UTF-8?q?=F0=9F=94=A7=20add=20missing=20build=20reso?= =?UTF-8?q?urcepack=20paths?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-scripts/build.js | 13 +++++++++++++ .../custom/tv_screen/faces/intro_laugh_copy.png | Bin 5116 -> 0 bytes 2 files changed, 13 insertions(+) delete mode 100644 resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/intro_laugh_copy.png diff --git a/package-scripts/build.js b/package-scripts/build.js index 17edb07ba..7852b32fd 100644 --- a/package-scripts/build.js +++ b/package-scripts/build.js @@ -228,8 +228,11 @@ const getSummitResourcepackPaths = () => { 'sounds/', suffixPaths( [ + 'battle_start', 'mus_f_6s_6', 'mus_f_alarm', + 'mus_f_intro', + 'mus_f_laugh', 'mus_f_noise', 'mus_f_part1', 'mus_f_part2', @@ -239,13 +242,19 @@ const getSummitResourcepackPaths = () => { 'mus_sfx_generate', 'mus_sfx_segapower', 'mus_sfx_yowl', + 'snd_battlefall', 'snd_bombfall', 'snd_bombsplosion', 'snd_break1', 'snd_break2', 'snd_break2_c', + 'snd_dumbvictory', + 'snd_elecdoor_shutheavy', + 'snd_escaped', 'snd_heal_c', + 'snd_hurt1_c', 'snd_impact', + 'snd_item', 'snd_noise', 'snd_select', 'snd_shakerbreaker', @@ -291,7 +300,9 @@ const getSummitResourcepackPaths = () => { 'flowery', 'friendliness-pellet-ring-blinking', 'friendliness-pellet-ring-finished', + 'homing_vine_orange_shulker_box_emissive', 'homing-vine', + 'homing-vine-noshade', 'homing-vine-blinking-lane', 'moss_block_1', 'petes_fly', @@ -354,6 +365,8 @@ const getSummitResourcepackPaths = () => { 'tv_screen', 'x_bullets_shared', 'black.png', + 'intro_flashing_red.png', + 'intro_flashing_red.png.mcmeta', 'white.png', ]); diff --git a/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/intro_laugh_copy.png b/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/intro_laugh_copy.png deleted file mode 100644 index 07176f5767ac69fd1030204dd035962acd93752e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5116 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 ItKq``2Zdd|WdHyG From fe00fa52e735dc087f51c36e00fa8f76ca43e285 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Tue, 22 Oct 2024 10:59:12 -0400 Subject: [PATCH 7/9] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor=20advancement?= =?UTF-8?q?=20build=20config=20to=20be=20easier=20to=20add=20to?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-scripts/build.js | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/package-scripts/build.js b/package-scripts/build.js index 7852b32fd..735e5273d 100644 --- a/package-scripts/build.js +++ b/package-scripts/build.js @@ -85,13 +85,23 @@ const getSummitDatapackPaths = () => { 'shake_screen.mcfunction', ]); + const advancementPaths = prefixPaths( + 'advancement/player_interacted_with_', + suffixPaths( + [ + 'animated_java_link', + 'back_cave_github_link', + 'feedback_form_link', + 'github_description', + 'join_queue', + 'soul_act_button_locator', + ], + '.json', + ), + ); + const entityPaths = prefixPaths('omegaflowey.entity/', [ - 'advancement/player_interacted_with_animated_java_link.json', - 'advancement/player_interacted_with_back_cave_github_link.json', - 'advancement/player_interacted_with_feedback_form_link.json', - 'advancement/player_interacted_with_github_description.json', - 'advancement/player_interacted_with_join_queue.json', - 'advancement/player_interacted_with_soul_act_button_locator.json', + ...advancementPaths, ...prefixPaths('function/', [ ...bossFightPaths, 'decorative', From 75526af241503aa3e5c82f03826be8be5281804a Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Tue, 22 Oct 2024 11:00:54 -0400 Subject: [PATCH 8/9] =?UTF-8?q?=F0=9F=94=A7=20add=20missing=20build=20data?= =?UTF-8?q?pack=20paths=20and=20prune=20markdown=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-scripts/build.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package-scripts/build.js b/package-scripts/build.js index 735e5273d..91b7bb06b 100644 --- a/package-scripts/build.js +++ b/package-scripts/build.js @@ -94,6 +94,7 @@ const getSummitDatapackPaths = () => { 'feedback_form_link', 'github_description', 'join_queue', + 'join_queue_2', 'soul_act_button_locator', ], '.json', @@ -153,6 +154,12 @@ const getSummitDatapackPaths = () => { ...primaryDatapackPaths, ]); + const pruneMarkdownFiles = async ({ compiledPath }) => { + const mdGlob = `${compiledPath}/datapacks/**/*.md`; + await rimraf(mdGlob, { glob: true }); + }; + postProcessors.push(pruneMarkdownFiles); + const pruneAnimatedJavaDatapackExports = async ({ compiledPath }) => { const prunePromises = []; for (const dir of animatedJavaExportsToPrune) { From 6d4332cdd2e66cd979c80286aee48df4fb42c435 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Tue, 22 Oct 2024 22:23:03 -0400 Subject: [PATCH 9/9] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20add=20a?= =?UTF-8?q?dmin=20queue=20enable/disable=20functions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/help.mcfunction | 23 +++++++++++- .../function/queue/disable.mcfunction | 6 +++ .../function/queue/enable.mcfunction | 6 +++ .../interacted/with_join_queue.mcfunction | 5 ++- .../interacted/with_join_queue_2.mcfunction | 5 ++- .../room/cave/setup/text_displays.mcfunction | 1 + .../join_queue/disable.mcfunction | 37 +++++++++++++++++++ .../join_queue/enable.mcfunction | 33 +++++++++++++++++ 8 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 datapacks/omegaflowey/data/omegaflowey.admin/function/queue/disable.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.admin/function/queue/enable.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays/join_queue/disable.mcfunction create mode 100644 datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays/join_queue/enable.mcfunction diff --git a/datapacks/omegaflowey/data/omegaflowey.admin/function/help.mcfunction b/datapacks/omegaflowey/data/omegaflowey.admin/function/help.mcfunction index 18b43cb0d..35b8eb925 100644 --- a/datapacks/omegaflowey/data/omegaflowey.admin/function/help.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.admin/function/help.mcfunction @@ -250,7 +250,28 @@ function omegaflowey.utils:log/self { text_component: '[ \ "value": "/function omegaflowey.admin:kill/queue" \ } \ }, \ - ": resets the bossfight player queue" \ + ": resets the bossfight player queue", \ + "\\n", \ + "\\n", \ + { \ + "text": "queue/enable", \ + "color": "yellow", \ + "clickEvent": { \ + "action": "suggest_command", \ + "value": "/function omegaflowey.admin:queue/enable" \ + } \ + }, \ + ": enables the join queue buttons and shows their text", \ + "\\n", \ + { \ + "text": "queue/disable", \ + "color": "yellow", \ + "clickEvent": { \ + "action": "suggest_command", \ + "value": "/function omegaflowey.admin:queue/disable" \ + } \ + }, \ + ": disables the join queue buttons and hides their text" \ ] \ } \ ]'} diff --git a/datapacks/omegaflowey/data/omegaflowey.admin/function/queue/disable.mcfunction b/datapacks/omegaflowey/data/omegaflowey.admin/function/queue/disable.mcfunction new file mode 100644 index 000000000..a692b3bc9 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.admin/function/queue/disable.mcfunction @@ -0,0 +1,6 @@ +function omegaflowey.utils:log { text_component: '[ \ + { "selector": "@s", "color": "gold" }, \ + { "text": " disabled the JOIN QUEUE buttons ", "color": "yellow" } \ +]'} + +function omegaflowey.main:summit/room/cave/setup/text_displays/join_queue/disable diff --git a/datapacks/omegaflowey/data/omegaflowey.admin/function/queue/enable.mcfunction b/datapacks/omegaflowey/data/omegaflowey.admin/function/queue/enable.mcfunction new file mode 100644 index 000000000..350be3a10 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.admin/function/queue/enable.mcfunction @@ -0,0 +1,6 @@ +function omegaflowey.utils:log { text_component: '[ \ + { "selector": "@s", "color": "gold" }, \ + { "text": " enabled the JOIN QUEUE buttons ", "color": "yellow" } \ +]'} + +function omegaflowey.main:summit/room/cave/setup/text_displays/join_queue/enable diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue.mcfunction index 27433d319..be8a3fcd9 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue.mcfunction @@ -1,3 +1,6 @@ +advancement revoke @s only omegaflowey.entity:player_interacted_with_join_queue + +execute if score #omegaflowey.bossfight.queue_disabled omegaflowey.global.flag matches 1 run return 0 + function omegaflowey.main:telemetry/booth/add_tag { name: "player.interact.join_queue" } function omegaflowey.entity:player/interacted/with_join_queue/macro with storage omegaflowey:decorative -advancement revoke @s only omegaflowey.entity:player_interacted_with_join_queue diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2.mcfunction index 53a436c23..2339f7d61 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2.mcfunction @@ -1,3 +1,6 @@ +advancement revoke @s only omegaflowey.entity:player_interacted_with_join_queue_2 + +execute if score #omegaflowey.bossfight.queue_disabled omegaflowey.global.flag matches 1 run return 0 + function omegaflowey.main:telemetry/booth/add_tag { name: "player.interact.join_queue_2" } function omegaflowey.entity:player/interacted/with_join_queue_2/macro with storage omegaflowey:decorative -advancement revoke @s only omegaflowey.entity:player_interacted_with_join_queue_2 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction index 17f7f0d81..f7f8dfa02 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction @@ -83,6 +83,7 @@ data modify storage omegaflowey:bossfight active_player_health_display_uuid set # Player name display updates both the name (+ skull) and the health counter function omegaflowey.main:summit/room/cave/active_player_display/update_value with storage omegaflowey:bossfight +scoreboard players set #omegaflowey.bossfight.queue_disabled omegaflowey.global.flag 0 summon minecraft:text_display -137.5 43.5 42.5 { \ Tags: [ \ "omega-flowey-remastered", \ diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays/join_queue/disable.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays/join_queue/disable.mcfunction new file mode 100644 index 000000000..03f78bfd6 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays/join_queue/disable.mcfunction @@ -0,0 +1,37 @@ +execute as @e[ \ + x=-137.5, y=43.5, z=42.5, distance=..0.01, \ + type=minecraft:text_display, \ + tag=join-queue-title, \ + limit=1 \ +] run data modify entity @s text set value '[ \ + { "text": "FIGHT\\n", "color": "red", "bold": true, "underlined": false }, \ + { "text": "DISABLED", "underlined": true } \ +]' + +execute as @e[ \ + x=-137.5, y=43.5, z=42.5, distance=..0.01, \ + type=minecraft:interaction, \ + tag=join-queue-interaction, \ + limit=1 \ +] run data modify entity @s response set value false + +execute as @e[ \ + x=-135.75, y=38.5, z=46.25, distance=..0.01, \ + type=minecraft:text_display, \ + tag=join-queue-2-title, \ + limit=1 \ +] run data modify entity @s text set value '[ \ + { "text": "FIGHT\\n", "color": "red", "bold": true, "underlined": false }, \ + { "text": "DISABLED", "underlined": true } \ +]' + +execute as @e[ \ + x=-135.75, y=38.5, z=46.25, distance=..0.01, \ + type=minecraft:interaction, \ + tag=join-queue-2-interaction, \ + limit=1 \ +] run data modify entity @s response set value false + +scoreboard players set #omegaflowey.bossfight.queue_disabled omegaflowey.global.flag 1 + +function omegaflowey.entity:directorial/boss_fight/summit/player/queue/reset diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays/join_queue/enable.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays/join_queue/enable.mcfunction new file mode 100644 index 000000000..f60d201e6 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays/join_queue/enable.mcfunction @@ -0,0 +1,33 @@ +execute as @e[ \ + x=-137.5, y=43.5, z=42.5, distance=..0.01, \ + type=minecraft:text_display, \ + tag=join-queue-title, \ + limit=1 \ +] run data modify entity @s text set value '[ \ + { "text": "JOIN QUEUE", "color": "light_purple", "bold": true, "underlined": true } \ +]' + +execute as @e[ \ + x=-137.5, y=43.5, z=42.5, distance=..0.01, \ + type=minecraft:interaction, \ + tag=join-queue-interaction, \ + limit=1 \ +] run data modify entity @s response set value true + +execute as @e[ \ + x=-135.75, y=38.5, z=46.25, distance=..0.01, \ + type=minecraft:text_display, \ + tag=join-queue-2-title, \ + limit=1 \ +] run data modify entity @s text set value '[ \ + { "text": "JOIN QUEUE", "color": "light_purple", "bold": true, "underlined": true } \ +]' + +execute as @e[ \ + x=-135.75, y=38.5, z=46.25, distance=..0.01, \ + type=minecraft:interaction, \ + tag=join-queue-2-interaction, \ + limit=1 \ +] run data modify entity @s response set value true + +scoreboard players set #omegaflowey.bossfight.queue_disabled omegaflowey.global.flag 0