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/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/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/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..3bdcf69f8 --- /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,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/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/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/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 new file mode 100644 index 000000000..2339f7d61 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue_2.mcfunction @@ -0,0 +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 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..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", \ @@ -92,6 +93,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 +127,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", \ 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 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 diff --git a/package-scripts/build.js b/package-scripts/build.js index 17edb07ba..91b7bb06b 100644 --- a/package-scripts/build.js +++ b/package-scripts/build.js @@ -85,13 +85,24 @@ 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', + 'join_queue_2', + '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', @@ -143,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) { @@ -228,8 +245,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 +259,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 +317,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 +382,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/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/sounds.json b/resourcepack/assets/omega-flowey/sounds.json index eeef1f787..ece47dc96 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": [ { @@ -178,6 +192,14 @@ } ] }, + "cutscene.summit.victory": { + "sounds": [ + { + "name": "omega-flowey:snd_dumbvictory", + "attenuation_distance": 55 + } + ] + }, "decorative.soul.break": { "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 000000000..d56d11b2d Binary files /dev/null and b/resourcepack/assets/omega-flowey/sounds/battle_start.ogg differ diff --git a/resourcepack/assets/omega-flowey/sounds/snd_battlefall.ogg b/resourcepack/assets/omega-flowey/sounds/snd_battlefall.ogg new file mode 100644 index 000000000..b6495807f Binary files /dev/null and b/resourcepack/assets/omega-flowey/sounds/snd_battlefall.ogg differ 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 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 07176f576..000000000 Binary files a/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/intro_laugh_copy.png and /dev/null differ 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 07b2e6404..b16d024f4 100644 Binary files a/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/smiling_open.png and b/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/smiling_open.png differ diff --git a/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/thumbs_up.pdn b/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/thumbs_up.pdn new file mode 100644 index 000000000..ca3a587cf Binary files /dev/null and b/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/thumbs_up.pdn differ diff --git a/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/thumbs_up.png b/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/thumbs_up.png new file mode 100644 index 000000000..f660c0ccb Binary files /dev/null and b/resourcepack/assets/omega-flowey/textures/custom/tv_screen/faces/thumbs_up.png differ