diff --git a/bin/smithed-summit-2024/world/smithed-summit-2024-omegaflowey-plot.zip b/bin/smithed-summit-2024/world/smithed-summit-2024-omegaflowey-plot.zip index 1be9cb4fe..ffc48c72f 100644 Binary files a/bin/smithed-summit-2024/world/smithed-summit-2024-omegaflowey-plot.zip and b/bin/smithed-summit-2024/world/smithed-summit-2024-omegaflowey-plot.zip differ diff --git a/datapacks/omegaflowey/data/omegaflowey.admin/function/death_message/set_global.mcfunction b/datapacks/omegaflowey/data/omegaflowey.admin/function/death_message/set_global.mcfunction new file mode 100644 index 000000000..df89f34cf --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.admin/function/death_message/set_global.mcfunction @@ -0,0 +1,16 @@ +execute if score #omegaflowey.bossfight.show_death_message_globally omegaflowey.global.flag matches 1 run \ + return run function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "The ", "color": "red" }, \ + { "text": "Flowey death message ", "color": "yellow" }, \ + { "text": "is already set to appear to all players ", "color": "red" }, \ + { "text": "globally ", "color": "yellow" } \ +]'} + +scoreboard players set #omegaflowey.bossfight.show_death_message_globally omegaflowey.global.flag 1 +function omegaflowey.utils:log { text_component: '[ \ + { "selector": "@s", "color": "yellow" }, \ + { "text": " set the ", "color": "gold" }, \ + { "text": "Flowey death message ", "color": "yellow" }, \ + { "text": "to appear ", "color": "gold" }, \ + { "text": "globally", "color": "yellow" } \ +]' } diff --git a/datapacks/omegaflowey/data/omegaflowey.admin/function/death_message/set_local.mcfunction b/datapacks/omegaflowey/data/omegaflowey.admin/function/death_message/set_local.mcfunction new file mode 100644 index 000000000..5cf2046a7 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.admin/function/death_message/set_local.mcfunction @@ -0,0 +1,17 @@ +execute if score #omegaflowey.bossfight.show_death_message_globally omegaflowey.global.flag matches 0 run \ + return run function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "The ", "color": "red" }, \ + { "text": "Flowey death message ", "color": "yellow" }, \ + { "text": "is already set to ", "color": "red" }, \ + { "text": "local ", "color": "yellow" }, \ + { "text": "(only appear to players near the Flowey booth)", "color": "red" } \ +]'} + +scoreboard players set #omegaflowey.bossfight.show_death_message_globally omegaflowey.global.flag 0 +function omegaflowey.utils:log { text_component: '[ \ + { "selector": "@s", "color": "yellow" }, \ + { "text": " set the ", "color": "gold" }, \ + { "text": "Flowey death message ", "color": "yellow" }, \ + { "text": "to appear ", "color": "gold" }, \ + { "text": "locally", "color": "yellow" } \ +]' } diff --git a/datapacks/omegaflowey/data/omegaflowey.admin/function/help.mcfunction b/datapacks/omegaflowey/data/omegaflowey.admin/function/help.mcfunction index 559e4708d..ef80d4366 100644 --- a/datapacks/omegaflowey/data/omegaflowey.admin/function/help.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.admin/function/help.mcfunction @@ -271,7 +271,27 @@ function omegaflowey.utils:log/self { text_component: '[ \ "value": "/function omegaflowey.admin:queue/disable" \ } \ }, \ - ": disables the join queue buttons and hides their text" \ + ": disables the join queue buttons and hides their text", \ + "\\n", \ + "\\n", \ + { "text": "death_message/ ", "color": "aqua" }, \ + { \ + "text": "global", \ + "color": "yellow", \ + "clickEvent": { \ + "action": "suggest_command", \ + "value": "/function omegaflowey.admin:death_message/set_global" \ + } \ + }, \ + " ", \ + { \ + "text": "local", \ + "color": "yellow", \ + "clickEvent": { \ + "action": "suggest_command", \ + "value": "/function omegaflowey.admin:death_message/set_local" \ + } \ + }, \ "\\n", \ "\\n", \ { \ diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/initialize.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/initialize.mcfunction index 17ad9a0d6..84a5a6e12 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/initialize.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/initialize.mcfunction @@ -25,6 +25,7 @@ scoreboard players set @s omegaflowey.boss-fight.progress.phase.i 0 scoreboard players set @s omegaflowey.boss-fight.progress.phase.total 2 scoreboard players set #omegaflowey.bossfight.attack_phase_total_count omegaflowey.global.flag 0 +scoreboard players set #omegaflowey.bossfight.player_died omegaflowey.global.flag 0 # Initialize first cutscene function omegaflowey.entity:directorial/boss_fight/summit/phase/cutscene/initialize diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/summit.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/summit.mcfunction index 03916ec19..42a6ace80 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/summit.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/summit.mcfunction @@ -12,7 +12,5 @@ execute as @e[ \ tag=aj.omegaflowey_tv_screen.root, \ tag=!tv_screen.boss_fight, \ tag=!tv_screen.soul, \ - tag=decorative, \ - tag=omega-flowey-remastered, \ - limit=1 \ + tag=omega-flowey-remastered \ ] run function animated_java:omegaflowey_tv_screen/remove/this diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage.mcfunction index 638209577..9ba36aa98 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage.mcfunction @@ -1,5 +1,6 @@ -# Quit early if player is currently damage-immune +# Quit early if player is currently damage-immune or has already died execute if score #omegaflowey.bossfight.player_is_damage_immune omegaflowey.global.flag matches 1 run return 0 +execute if score #omegaflowey.bossfight.player_died omegaflowey.global.flag matches 1 run return 0 # Check if player is within some radius $execute as $(active_player_uuid) if entity @s[distance=..$(radius), tag=omegaflowey.player.fighting_flowey] run \ diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage/as_player/died.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage/as_player/died.mcfunction index 52e968cd6..08019ada7 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage/as_player/died.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage/as_player/died.mcfunction @@ -1,15 +1,6 @@ ## The active player died after being damaged by a Flowey attack -# Show custom death message -# TAG_SUMMIT_HARDCODED_GLOBAL_VOLUME -tellraw @a[ \ - x=-186, dx=91, y=10, dy=95, z=12, dz=95, \ - tag=omegaflowey.player \ -] [ \ - { "selector": "@s"}, \ - " was slain by ", \ - { "text": "Omega Flowey", "color": "green" } \ -] +function omegaflowey.entity:utils/damage/as_player/died/show_death_message # Run outside tvscreen death animation function omegaflowey.main:summit/room/outside/setup/tv_screen/death_animation with storage omegaflowey:decorative diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage/as_player/died/show_death_message.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage/as_player/died/show_death_message.mcfunction new file mode 100644 index 000000000..04d4c48f5 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage/as_player/died/show_death_message.mcfunction @@ -0,0 +1,23 @@ +## Show custom death message + +# Locally +# TAG_SUMMIT_HARDCODED_GLOBAL_VOLUME +execute \ + unless score #omegaflowey.bossfight.show_death_message_globally omegaflowey.global.flag matches 1 \ +run tellraw @a[ \ + x=-186, dx=91, y=10, dy=95, z=12, dz=95, \ + tag=omegaflowey.player \ +] [ \ + { "selector": "@s"}, \ + " was slain by ", \ + { "text": "Omega Flowey", "color": "yellow" } \ +] + +# Globally +execute \ + if score #omegaflowey.bossfight.show_death_message_globally omegaflowey.global.flag matches 1 \ +run tellraw @a [ \ + { "selector": "@s"}, \ + " was slain by ", \ + { "text": "Omega Flowey", "color": "yellow" } \ +] diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/setup/const.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/setup/const.mcfunction index 4050c15f6..d5abb135c 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/setup/const.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/setup/const.mcfunction @@ -5,6 +5,9 @@ scoreboard players set #omegaflowey.const.4 omegaflowey.math.const 4 scoreboard players set #omegaflowey.const.10 omegaflowey.math.const 10 scoreboard players set #omegaflowey.const.180 omegaflowey.math.const 180 +execute unless score #omegaflowey.bossfight.show_death_message_globally omegaflowey.global.flag matches 0.. run \ + scoreboard players set #omegaflowey.bossfight.show_death_message_globally omegaflowey.global.flag 1 + execute unless score #omegaflowey.telemetry.bossfight.basetime omegaflowey.global.flag matches 0.. run \ scoreboard players set #omegaflowey.telemetry.bossfight.basetime omegaflowey.global.flag -1 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/setup/objectives.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/setup/objectives.mcfunction index 8a243c57d..caa8be77c 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/setup/objectives.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/setup/objectives.mcfunction @@ -122,6 +122,8 @@ scoreboard objectives add omegaflowey.player.telemetry.id dummy scoreboard objectives add omegaflowey.player.telemetry.trigger.disable trigger scoreboard objectives add omegaflowey.player.telemetry.trigger.enable trigger scoreboard objectives add omegaflowey.player.telemetry.trigger.help trigger +scoreboard objectives add omegaflowey.player.telemetry.trigger.new_page.booth trigger +scoreboard objectives add omegaflowey.player.telemetry.trigger.new_page.bossfight trigger scoreboard objectives add omegaflowey.player.telemetry.trigger.pop.booth trigger scoreboard objectives add omegaflowey.player.telemetry.trigger.pop.bossfight trigger scoreboard objectives add omegaflowey.player.telemetry.trigger.show.booth trigger diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/cave_back/setup.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/cave_back/setup.mcfunction index 2d261e162..4bc7ebab3 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/cave_back/setup.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/cave_back/setup.mcfunction @@ -2,6 +2,7 @@ function omegaflowey.main:summit/room/cave/cave_back/setup/text_displays summon minecraft:item_display -156.99 42.0 34.4375 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -26,6 +27,7 @@ summon minecraft:item_display -156.99 42.0 34.4375 { \ summon minecraft:item_display -156.99 42.0 31.5625 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -122,6 +124,7 @@ summon minecraft:item_display -151.99 43.0 41.0 { \ summon minecraft:item_display -147.5 42.125 45.5 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -131,6 +134,7 @@ summon minecraft:item_display -147.5 42.125 45.5 { \ { \ id: "minecraft:item", \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/cave_back/setup/text_displays.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/cave_back/setup/text_displays.mcfunction index a4b8b8fe7..aab24da99 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/cave_back/setup/text_displays.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/cave_back/setup/text_displays.mcfunction @@ -27,6 +27,7 @@ summon minecraft:text_display -148.01 45.125 21.5 { \ summon minecraft:text_display -156.99 43.75 33.0 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -50,6 +51,7 @@ summon minecraft:text_display -156.99 43.75 33.0 { \ summon minecraft:text_display -156.99 40.3125 33.0 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -73,6 +75,7 @@ summon minecraft:text_display -156.99 40.3125 33.0 { \ summon minecraft:text_display -156.99 43.125 34.4375 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -96,6 +99,7 @@ summon minecraft:text_display -156.99 43.125 34.4375 { \ summon minecraft:text_display -156.99 43.125 31.5625 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ 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 f7f8dfa02..0d8d5ad10 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 @@ -1,5 +1,6 @@ summon minecraft:text_display -133.5 45.0 44.99 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -23,6 +24,7 @@ summon minecraft:text_display -133.5 45.0 44.99 { \ summon minecraft:text_display -133.5 44.0 44.99 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -53,6 +55,7 @@ data modify storage omegaflowey:bossfight active_player_display_uuid set from st summon minecraft:text_display -134.5 43.1875 44.99 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -86,6 +89,7 @@ function omegaflowey.main:summit/room/cave/active_player_display/update_value wi scoreboard players set #omegaflowey.bossfight.queue_disabled omegaflowey.global.flag 0 summon minecraft:text_display -137.5 43.5 42.5 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -109,6 +113,7 @@ summon minecraft:text_display -137.5 43.5 42.5 { \ } summon minecraft:interaction -137.5 43.5 42.5 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -127,8 +132,9 @@ 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 { \ +summon minecraft:text_display -135.0 39.0 46.25 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -150,8 +156,9 @@ summon minecraft:text_display -135.75 38.5 46.25 { \ translation: [0.0f, 0.0f, 0.0f] \ } \ } -summon minecraft:interaction -135.75 38.5 46.25 { \ +summon minecraft:interaction -135.0 39.0 46.25 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -172,6 +179,7 @@ data modify storage omegaflowey:decorative join_queue_2_interaction_uuid set fro summon minecraft:text_display -139.99 45.0 39.0 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ @@ -195,6 +203,7 @@ summon minecraft:text_display -139.99 45.0 39.0 { \ summon minecraft:text_display -139.99 43.3125 39.0 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-cave", \ 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 index 03f78bfd6..f9e5368d6 100644 --- 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 @@ -16,7 +16,7 @@ execute as @e[ \ ] run data modify entity @s response set value false execute as @e[ \ - x=-135.75, y=38.5, z=46.25, distance=..0.01, \ + x=-135.0, y=39.0, z=46.25, distance=..0.01, \ type=minecraft:text_display, \ tag=join-queue-2-title, \ limit=1 \ @@ -26,7 +26,7 @@ execute as @e[ \ ]' execute as @e[ \ - x=-135.75, y=38.5, z=46.25, distance=..0.01, \ + x=-135.0, y=39.0, z=46.25, distance=..0.01, \ type=minecraft:interaction, \ tag=join-queue-2-interaction, \ limit=1 \ 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 index f60d201e6..88712236f 100644 --- 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 @@ -15,7 +15,7 @@ execute as @e[ \ ] run data modify entity @s response set value true execute as @e[ \ - x=-135.75, y=38.5, z=46.25, distance=..0.01, \ + x=-135.0, y=39.0, z=46.25, distance=..0.01, \ type=minecraft:text_display, \ tag=join-queue-2-title, \ limit=1 \ @@ -24,7 +24,7 @@ execute as @e[ \ ]' execute as @e[ \ - x=-135.75, y=38.5, z=46.25, distance=..0.01, \ + x=-135.0, y=39.0, z=46.25, distance=..0.01, \ type=minecraft:interaction, \ tag=join-queue-2-interaction, \ limit=1 \ diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/text_displays.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/text_displays.mcfunction index ba34c95cb..c2a70076c 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/text_displays.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/text_displays.mcfunction @@ -1,5 +1,6 @@ summon minecraft:text_display -109.5 78.0 33.0 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-outside", \ @@ -28,6 +29,7 @@ summon minecraft:text_display -109.5 78.0 33.0 { \ summon minecraft:text_display -109.345947265625 83.625 32.349365234375 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-outside", \ @@ -56,6 +58,7 @@ summon minecraft:text_display -109.345947265625 83.625 32.349365234375 { \ summon minecraft:text_display -109.36833640835407 82.4375 32.46571874706921 { \ Tags: [ \ + "entityview.ignore", \ "omega-flowey-remastered", \ "decorative", \ "decorative-outside", \ @@ -91,6 +94,7 @@ summon minecraft:text_display -133.5 70.95 36.0 { \ ], \ alignment: "center", \ background: 0, \ + brightness: { block: 7, sky: 15 }, \ default_background: false, \ line_width: 200, \ see_through: 0b, \ diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/help.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/help.mcfunction index c738f5fd1..668e48d3d 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/help.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/help.mcfunction @@ -42,6 +42,25 @@ function omegaflowey.utils:log/self { text_component: '[ \ } \ }, \ "\\n", \ + { "text": "new_page: ", "color": "aqua" }, \ + { \ + "text": "booth", \ + "color": "yellow", \ + "clickEvent": { \ + "action": "suggest_command", \ + "value": "/trigger omegaflowey.player.telemetry.trigger.new_page.booth" \ + } \ + }, \ + " ", \ + { \ + "text": "bossfight", \ + "color": "yellow", \ + "clickEvent": { \ + "action": "suggest_command", \ + "value": "/trigger omegaflowey.player.telemetry.trigger.new_page.bossfight" \ + } \ + }, \ + "\\n", \ "\\n", \ { \ "text": "stats", \ diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/booth.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/booth.mcfunction new file mode 100644 index 000000000..33dc8a205 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/booth.mcfunction @@ -0,0 +1,11 @@ +execute if entity @s[name=!TheAfroOfDoom] run return run function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "Only ", "color": "red" }, \ + { "text": "TheAfroOfDoom ", "color": "yellow" }, \ + { "text": "can start a new page in booth telemetry", "color": "red" } \ +]'} + +function omegaflowey.main:telemetry/booth/add_tag/new_page + +function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "Started a new page in booth telemetry ", "color": "yellow" } \ +]'} diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/bossfight.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/bossfight.mcfunction new file mode 100644 index 000000000..a285ec04f --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/new_page/bossfight.mcfunction @@ -0,0 +1,15 @@ +execute if entity @s[name=!TheAfroOfDoom] run return run function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "Only ", "color": "red" }, \ + { "text": "TheAfroOfDoom ", "color": "yellow" }, \ + { "text": "can start a new page in bossfight telemetry", "color": "red" } \ +]'} + +$execute if entity $(boss_fight_uuid) run return run function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "Cannot start a new page in bossfight telemetry: a bossfight is currently active", "color": "red" } \ +]'} + +function omegaflowey.main:telemetry/bossfight/tag/root/start/new_page + +function omegaflowey.utils:log/self { text_component: '[ \ + { "text": "Started a new page in bossfight telemetry ", "color": "yellow" } \ +]'} diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/reset_triggers.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/reset_triggers.mcfunction index c08f1166c..8f5c4cd1f 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/reset_triggers.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/reset_triggers.mcfunction @@ -1,6 +1,8 @@ scoreboard players enable @s omegaflowey.player.telemetry.trigger.disable scoreboard players enable @s omegaflowey.player.telemetry.trigger.enable scoreboard players enable @s omegaflowey.player.telemetry.trigger.help +scoreboard players enable @s omegaflowey.player.telemetry.trigger.new_page.booth +scoreboard players enable @s omegaflowey.player.telemetry.trigger.new_page.bossfight scoreboard players enable @s omegaflowey.player.telemetry.trigger.pop.booth scoreboard players enable @s omegaflowey.player.telemetry.trigger.pop.bossfight scoreboard players enable @s omegaflowey.player.telemetry.trigger.show.booth @@ -10,6 +12,8 @@ scoreboard players enable @s omegaflowey.player.telemetry.trigger.stats scoreboard players set @s omegaflowey.player.telemetry.trigger.disable 0 scoreboard players set @s omegaflowey.player.telemetry.trigger.enable 0 scoreboard players set @s omegaflowey.player.telemetry.trigger.help 0 +scoreboard players set @s omegaflowey.player.telemetry.trigger.new_page.booth 0 +scoreboard players set @s omegaflowey.player.telemetry.trigger.new_page.bossfight 0 scoreboard players set @s omegaflowey.player.telemetry.trigger.pop.booth 0 scoreboard players set @s omegaflowey.player.telemetry.trigger.pop.bossfight 0 scoreboard players set @s omegaflowey.player.telemetry.trigger.show.booth 0 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/tick.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/tick.mcfunction index 0ebccd944..e78200560 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/tick.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/admin/tick.mcfunction @@ -4,6 +4,10 @@ execute if score @s omegaflowey.player.telemetry.trigger.enable matches 1 run \ function omegaflowey.main:telemetry/admin/enable execute if score @s omegaflowey.player.telemetry.trigger.help matches 1 run \ function omegaflowey.main:telemetry/admin/help +execute if score @s omegaflowey.player.telemetry.trigger.new_page.booth matches 1 run \ + function omegaflowey.main:telemetry/admin/new_page/booth +execute if score @s omegaflowey.player.telemetry.trigger.new_page.bossfight matches 1 run \ + function omegaflowey.main:telemetry/admin/new_page/bossfight with storage omegaflowey:bossfight execute if score @s omegaflowey.player.telemetry.trigger.pop.booth matches 1 run \ function omegaflowey.main:telemetry/admin/pop/booth execute if score @s omegaflowey.player.telemetry.trigger.pop.bossfight matches 1 run \