From 4690ad44adfec928436dcb7766c155cf2dec5c35 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Fri, 18 Oct 2024 20:50:27 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=8A=20playsound=20to=20player=20upon?= =?UTF-8?q?=20dying=20in=20bossfight/leaving=20arena?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boss_fight/shared/stop.mcfunction | 2 +- .../shared/stop/as_active_player.mcfunction | 3 +++ resourcepack/assets/omega-flowey/sounds.json | 7 +++++++ .../assets/omega-flowey/sounds/snd_escaped.ogg | Bin 0 -> 12360 bytes 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 resourcepack/assets/omega-flowey/sounds/snd_escaped.ogg diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop.mcfunction index f4d9462f7..2639c6f79 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop.mcfunction @@ -9,7 +9,7 @@ function omegaflowey.entity:shared/run_as_active_player_or_spectator { command: 'execute unless entity @s[tag=omegaflowey.player.fighting_flowey] run \ function omegaflowey.entity:directorial/boss_fight/shared/stop/as_spectator' \ } -$execute as $(active_player_uuid) run function omegaflowey.entity:directorial/boss_fight/shared/stop/as_active_player +$execute as $(active_player_uuid) at @s run function omegaflowey.entity:directorial/boss_fight/shared/stop/as_active_player function omegaflowey.main:summit/room/cave/active_player_display/update_value with storage omegaflowey:bossfight # prompt next player in queue diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player.mcfunction index a5bd9d52b..9d5b006e1 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player.mcfunction @@ -12,3 +12,6 @@ execute \ function omegaflowey.entity:directorial/boss_fight/shared/stop/as_active_player/modify_health_and_tags function omegaflowey.entity:directorial/boss_fight/shared/stop/as_active_player/log_reason + +execute if score #omegaflowey.bossfight.stop_reason omegaflowey.global.flag matches 3 run \ + playsound omega-flowey:player.escaped player @s ~ ~ ~ 3 diff --git a/resourcepack/assets/omega-flowey/sounds.json b/resourcepack/assets/omega-flowey/sounds.json index 9d32b9c51..85a4a57fd 100644 --- a/resourcepack/assets/omega-flowey/sounds.json +++ b/resourcepack/assets/omega-flowey/sounds.json @@ -283,6 +283,13 @@ } ] }, + "player.escaped": { + "sounds": [ + { + "name": "omega-flowey:snd_escaped" + } + ] + }, "soul.heal": { "sounds": [ { diff --git a/resourcepack/assets/omega-flowey/sounds/snd_escaped.ogg b/resourcepack/assets/omega-flowey/sounds/snd_escaped.ogg new file mode 100644 index 0000000000000000000000000000000000000000..edb01578682b1b1563811970ac6d2c2d29b06461 GIT binary patch literal 12360 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