diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/active/leave_and_rejoin.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/active/leave_and_rejoin.mcfunction index da43c1c9a..651be3212 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/active/leave_and_rejoin.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/active/leave_and_rejoin.mcfunction @@ -1,3 +1,5 @@ +function omegaflowey.main:telemetry/booth/add_tag { name: "player.rejoin.was_in_bossfight" } + # players who leave the server are removed from the bossfight (when they rejoin) function omegaflowey.entity:directorial/boss_fight/shared/stop/as_active_player/modify_health_and_tags 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/join.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/join.mcfunction index c4232da8f..de7c1e9ee 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/join.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/join.mcfunction @@ -1,6 +1,8 @@ # if already in queue (or in bossfight somehow), do nothing execute unless entity @s[tag=!omegaflowey.player.in_queue, tag=!omegaflowey.player.fighting_flowey] run return 0 +function omegaflowey.main:telemetry/booth/add_tag { name: "player.queue.join" } + # Play select sound if this was called from the interaction (and not manually) execute if score #omegaflowey.play_join_queue_select_sound omegaflowey.global.flag matches 1 run \ playsound omega-flowey:soul.touch player @s diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/leave_and_rejoin.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/leave_and_rejoin.mcfunction index 45c26b365..db929579a 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/leave_and_rejoin.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/leave_and_rejoin.mcfunction @@ -1,3 +1,5 @@ +function omegaflowey.main:telemetry/booth/add_tag { name: "player.rejoin.was_in_queue" } + # players who leave the server are removed from the queue (when they rejoin) function omegaflowey.entity:directorial/boss_fight/summit/player/queue/leave_and_rejoin/remove_from_queue_array diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt.mcfunction index 3023b5600..921cbb086 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt.mcfunction @@ -1,3 +1,5 @@ +function omegaflowey.main:telemetry/booth/add_tag { name: "player.queue.shown_prompt" } + scoreboard players set #omegaflowey.bossfight.has_player_been_prompted omegaflowey.global.flag 1 tag @s add omegaflowey.player.in_queue.prompted 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 947a7e9e9..d97e16996 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 @@ -1,3 +1,5 @@ +function omegaflowey.main:telemetry/booth/add_tag { name: "player.queue.confirm" } + function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/shared/as_player/triggers 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/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 358d25c08..fd082d7b6 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 @@ +function omegaflowey.main:telemetry/booth/add_tag { name: "player.queue.confirm.after_delay" } + 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 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/deny.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/deny.mcfunction index a06e302f5..91f972072 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/deny.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/deny.mcfunction @@ -1,3 +1,5 @@ +function omegaflowey.main:telemetry/booth/add_tag { name: "player.queue.deny" } + function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/shared function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/shared/as_player function omegaflowey.entity:directorial/boss_fight/summit/player/queue/check_should_prompt diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/timeout/as_player.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/timeout/as_player.mcfunction index 1dd3dc6b4..832edc554 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/timeout/as_player.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/timeout/as_player.mcfunction @@ -1,3 +1,5 @@ +function omegaflowey.main:telemetry/booth/add_tag { name: "player.queue.timeout" } + function omegaflowey.entity:directorial/boss_fight/summit/player/queue/prompt_next_player/show_prompt/shared/as_player function omegaflowey.utils:log/self { text_component: '[ \ diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/booth/schema/setup.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/booth/schema/setup.mcfunction index 2960ecded..f655ffda3 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/booth/schema/setup.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/booth/schema/setup.mcfunction @@ -16,4 +16,12 @@ data modify storage omegaflowey:telemetry schema_booth_n set value { \ "player.interact.feedback_form_link": 10, \ "player.interact.animated_java_link": 11, \ "player.interact.back_cave_github_link": 12, \ + 'player.queue.join': 13, \ + 'player.queue.shown_prompt': 14, \ + 'player.queue.confirm': 15, \ + 'player.queue.deny': 16, \ + 'player.queue.timeout': 17, \ + 'player.queue.confirm.after_delay': 18, \ + 'player.rejoin.was_in_bossfight': 19, \ + 'player.rejoin.was_in_queue': 20, \ }