💄 outer tvscreen day cycle, JOIN QUEUE, adjust pit decorations

datapacks/omegaflowey/data/_/function/summon/remove.mcfunction

@@ -1 +1 @@
-function omegaflowey.entity:hostile/omega-flowey/summon/remove_preexisting_models
+function omegaflowey.entity:hostile/omega-flowey/summon/remove_preexisting_models with storage omegaflowey:bossfight

datapacks/omegaflowey/data/daylight_cycle/tags/function/api/day.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_day"
+  ]
+}

datapacks/omegaflowey/data/daylight_cycle/tags/function/api/night.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_night"
+  ]
+}

datapacks/omegaflowey/data/omegaflowey.admin/function/kill/flowey_model.mcfunction

@@ -2,4 +2,4 @@ function omegaflowey.utils:log { text_component: '[ \
   { "selector": "@s", "color": "gold" }, \
   { "text": " killed the bossfight Flowey model ", "color": "yellow" } \
 ]'}
-function omegaflowey.entity:hostile/omega-flowey/summon/remove_preexisting_models
+function omegaflowey.entity:hostile/omega-flowey/summon/remove_preexisting_models with storage omegaflowey:bossfight

datapacks/omegaflowey/data/omegaflowey.entity/advancement/player_interacted_with_join_queue.json

@@ -0,0 +1,16 @@
+{
+  "criteria": {
+    "requirement": {
+      "trigger": "minecraft:player_interacted_with_entity",
+      "conditions": {
+        "entity": {
+          "type": "minecraft:interaction",
+          "nbt": "{ Tags: [\"join-queue-interaction\"] }"
+        }
+      }
+    }
+  },
+  "rewards": {
+    "function": "omegaflowey.entity:player/interacted/with_join_queue"
+  }
+}

datapacks/omegaflowey/data/omegaflowey.entity/function/decorative/remove.mcfunction

@@ -1,5 +1,5 @@
 # Remove preexisting decorative AJ models
-function omegaflowey.entity:remove_animated_java_models/summit
+function omegaflowey.entity:remove_animated_java_models/summit with storage omegaflowey:decorative
 
 # Remove other preexisting decorative entities
 # NOTE: TAG_SUMMIT_HARDCODED_GLOBAL_VOLUME

datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon.mcfunction

@@ -1,4 +1,4 @@
-function omegaflowey.entity:hostile/omega-flowey/summon/remove_preexisting_models
+function omegaflowey.entity:hostile/omega-flowey/summon/remove_preexisting_models with storage omegaflowey:bossfight
 
 ## Large side vines
 # Right large side vine

datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon/relative.mcfunction

@@ -1,4 +1,4 @@
-function omegaflowey.entity:hostile/omega-flowey/summon/remove_preexisting_models
+function omegaflowey.entity:hostile/omega-flowey/summon/remove_preexisting_models with storage omegaflowey:bossfight
 
 ## Large side vines
 # Right large side vine

datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon/remove_preexisting_models.mcfunction

@@ -1,10 +1,5 @@
 function omegaflowey.entity:hostile/omega-flowey/summon/remove_preexisting_models/except_tv_screen
-# TAG_SUMMIT_HARDCODED_ARENA_VOLUME
-execute unless score #omegaflowey.bossfight.skip_resummon_tvscreen omegaflowey.global.flag matches 1 \
-  as @e[ \
-    x=-186, dx=61, y=12, dy=44, z=47, dz=60, \
-    type=minecraft:item_display, \
-    tag=!tv_screen.outside, \
-    tag=aj.omegaflowey_tv_screen.root, \
-    tag=omega-flowey-remastered \
-  ] run function animated_java:omegaflowey_tv_screen/remove/this
+$execute \
+  unless score #omegaflowey.bossfight.skip_resummon_tvscreen omegaflowey.global.flag matches 1 \
+  as $(bossfight_tvscreen_uuid) \
+  run function animated_java:omegaflowey_tv_screen/remove/this

datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue.mcfunction

@@ -0,0 +1,2 @@
+function omegaflowey.entity:player/interacted/with_join_queue/macro with storage omegaflowey:decorative
+advancement revoke @s only omegaflowey.entity:player_interacted_with_join_queue

datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue/as_interaction.mcfunction

@@ -0,0 +1 @@
+execute on target run function omegaflowey.entity:directorial/boss_fight/summit/player/queue/join

datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue/macro.mcfunction

@@ -0,0 +1 @@
+$execute as $(join_queue_interaction_uuid) run function omegaflowey.entity:player/interacted/with_join_queue/as_interaction

datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models.mcfunction

@@ -1,2 +1,2 @@
 function omegaflowey.entity:remove_animated_java_models/boss_fight
-function omegaflowey.entity:remove_animated_java_models/summit
+function omegaflowey.entity:remove_animated_java_models/summit with storage omegaflowey:decorative

datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/boss_fight.mcfunction

@@ -1,5 +1,5 @@
 # Omega Flowey model
-function omegaflowey.entity:hostile/omega-flowey/summon/remove_preexisting_models
+function omegaflowey.entity:hostile/omega-flowey/summon/remove_preexisting_models with storage omegaflowey:bossfight
 
 # Bossfight models
 function animated_java:omegaflowey_arena_box/remove/all

datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/summit.mcfunction

@@ -4,11 +4,4 @@ function animated_java:omegaflowey_summitflowerbed/remove/all
 function animated_java:omegaflowey_summitpetalpipeleft/remove/all
 function animated_java:omegaflowey_summitpetalpiperight/remove/all
 function animated_java:omegaflowey_summitpetalpipetop/remove/all
-# TAG_SUMMIT_HARDCODED_GLOBAL_VOLUME
-execute as @e[ \
-  x=-186, dx=91, y=12, dy=93, z=12, dz=95, \
-  type=minecraft:item_display, \
-  tag=tv_screen.outside, \
-  tag=aj.omegaflowey_tv_screen.root, \
-  tag=omega-flowey-remastered \
-] run function animated_java:omegaflowey_tv_screen/remove/this
+$execute as $(outside_tvscreen_uuid) run function animated_java:omegaflowey_tv_screen/remove/this

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/cave_back/setup/text_displays.mcfunction

@@ -262,9 +262,10 @@ summon minecraft:text_display -151.99 41.1875 41.0 { \
   see_through: 0b, \
   shadow: 0b, \
   text: '[ \
-    "They\'re here at\\n", \
+    "They\'re here at the\\n", \
     { "text": "Smithed Summit ", "color": "blue" }, \
-    "too!\\nGo check out\\ntheir ", \
+    { "translate": ":mountain_snow:" }, \
+    "\\ntoo! Go check out\\ntheir ", \
     { "text": "booth", "color": "#00ACED" }, \
     "!" \
   ]', \

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction

@@ -96,7 +96,7 @@ summon minecraft:text_display -137.5 43.5 42.5 { \
   line_width: 200, \
   see_through: 0b, \
   shadow: 0b, \
-  text: '[{ "text": "JOIN QUEUE", "color": "light_purple", "bold": true }]', \
+  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], \
@@ -105,6 +105,25 @@ summon minecraft:text_display -137.5 43.5 42.5 { \
     translation: [0.0f, 0.0f, 0.0f] \
   } \
 }
+summon minecraft:interaction -137.5 43.5 42.5 { \
+  Tags: [ \
+    "omega-flowey-remastered", \
+    "decorative", \
+    "decorative-cave", \
+    "join-queue-interaction", \
+  ], \
+  width: 2.5, \
+  height: 0.5, \
+  response: true, \
+}
+execute as @e[ \
+  x=-138.0, dx=2, y=42.0, dy=2, z=42.0, dz=2, \
+  type=minecraft:interaction, \
+  tag=join-queue-interaction, \
+  tag=omega-flowey-remastered, \
+  limit=1 \
+] run function gu:generate
+data modify storage omegaflowey:decorative join_queue_interaction_uuid set from storage gu:main out
 
 summon minecraft:text_display -139.99 45.0 39.0 { \
   Tags: [ \

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen.mcfunction

@@ -1,3 +1,6 @@
 tag @s add tv_screen.outside
 
 execute on passengers if entity @s[tag=aj.omegaflowey_tv_screen.bone] run function omegaflowey.main:summit/room/outside/setup/tv_screen/bone
+
+function gu:generate
+data modify storage omegaflowey:decorative outside_tvscreen_uuid set from storage gu:main out

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day.mcfunction

@@ -0,0 +1,2 @@
+function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static with storage omegaflowey:decorative
+schedule function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_day/scheduled 10t

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day/macro_set_smiling_noglow.mcfunction

@@ -0,0 +1,2 @@
+$execute as $(outside_tvscreen_uuid) at @s \
+  run function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_day/macro_set_smiling_noglow/as_root

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day/macro_set_smiling_noglow/as_root.mcfunction

@@ -0,0 +1,2 @@
+stopsound @a ambient omega-flowey:decorative.static
+function animated_java:omegaflowey_tv_screen/variants/smiling_noglow/apply

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day/scheduled.mcfunction

@@ -0,0 +1,2 @@
+function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_day/macro_set_smiling_noglow \
+  with storage omegaflowey:decorative

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night.mcfunction

@@ -0,0 +1,2 @@
+function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static with storage omegaflowey:decorative
+schedule function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_night/scheduled 10t

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night/macro_set_smiling.mcfunction

@@ -0,0 +1,2 @@
+$execute as $(outside_tvscreen_uuid) at @s \
+  run function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_night/macro_set_smiling/as_root

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night/macro_set_smiling/as_root.mcfunction

@@ -0,0 +1,2 @@
+stopsound @a ambient omega-flowey:decorative.static
+function animated_java:omegaflowey_tv_screen/variants/smiling/apply

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night/scheduled.mcfunction

@@ -0,0 +1,2 @@
+function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_night/macro_set_smiling \
+  with storage omegaflowey:decorative

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static.mcfunction

@@ -0,0 +1,2 @@
+$execute as $(outside_tvscreen_uuid) at @s \
+  run function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static/as_root

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static/as_root.mcfunction

@@ -0,0 +1,2 @@
+playsound omega-flowey:decorative.static ambient @a ~ ~ ~ 4
+function animated_java:omegaflowey_tv_screen/variants/static/apply

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/pit/setup.mcfunction

@@ -11,5 +11,5 @@ execute positioned -106.1875 41.0 25.5625 rotated 20 0 run function animated_jav
 
 function omegaflowey.main:summit/room/pit/setup/text_displays
 
-execute unless score #omegaflowey.setup_flags.dont_place_blocks omegaflowey.global.flag matches 1 run fill -113 319 35 -107 319 29 minecraft:barrier
-execute unless score #omegaflowey.setup_flags.dont_place_blocks omegaflowey.global.flag matches 1 run fill -113 318 35 -107 318 29 minecraft:pink_shulker_box[facing=up]
+execute unless score #omegaflowey.setup_flags.dont_place_blocks omegaflowey.global.flag matches 1 run \
+  function omegaflowey.main:summit/room/pit/setup/place_pink_shulker_boxes

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/pit/setup/place_pink_shulker_boxes.mcfunction

@@ -0,0 +1,23 @@
+# If one shulker box is within the sky range, assume they're all already there
+execute \
+  if block -113 318 29 minecraft:pink_shulker_box \
+  if block -113 319 29 minecraft:barrier \
+run return 0
+
+function omegaflowey.utils:log { text_component: '[ \
+  { "text": "Filled a small section of sky from ", "color": "yellow" }, \
+  { "text": "[", "color": "white" }, \
+  { "text": "-113,318,29", "color": "aqua" }, \
+  { "text": "] ", "color": "white" }, \
+  "to ", \
+  { "text": "[", "color": "white" }, \
+  { "text": "-107,319,35", "color": "aqua" }, \
+  { "text": "] ", "color": "white" }, \
+  "with ", \
+  { "text": "locked ", "color": "red" }, \
+  { "text": "pink_shulker_boxes ", "color": "light_purple" }, \
+  "above the booth to make the pit darker" \
+]'}
+
+fill -113 319 29 -107 319 35 minecraft:barrier
+fill -113 318 29 -107 318 35 minecraft:pink_shulker_box[facing=up]

datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/pit/setup/text_displays.mcfunction

@@ -7,11 +7,17 @@ summon minecraft:text_display -108.5 43.9375 38.5 {\
   ], \
   alignment: "center", \
   background: 1073741824, \
+  brightness: { block: 12, sky: 0 }, \
   default_background: 0b, \
   line_width: 200, \
   see_through: 0b, \
   shadow: 0b, \
-  text: '[ "Welcome to the\\n", { "color": "green", "text" :"Omega Flowey "}, "demo!" ]', \
+  text: '[ \
+    "Welcome to the\\n", \
+    { "text": "Omega Flowey ", "color": "green" }, \
+    { "text": "demo", "color": "aqua" }, \
+    "!" \
+  ]', \
   text_opacity: 255, \
   transformation: {\
     left_rotation: [0.0f, 1.0f, 0.0f, 0.0f], \
@@ -30,6 +36,7 @@ summon minecraft:text_display -110.5 43.0 38.5 { \
   ], \
   alignment: "center", \
   background: 1073741824, \
+  brightness: { block: 12, sky: 0 }, \
   default_background: 0b, \
   line_width: 200, \
   see_through: 0b, \
@@ -53,11 +60,17 @@ summon minecraft:text_display -101.4375 44.0 32.5 { \
   ], \
   alignment: "left", \
   background: 1073741824, \
+  brightness: { block: 12, sky: 0 }, \
   default_background: 0b, \
   line_width: 200, \
   see_through: 0b, \
   shadow: 0b, \
-  text: '[ "This is a recreation of a boss\\nfrom Toby Fox\'s ", { "color": "light_purple", "text": "Undertale" } ]', \
+  text: '[ \
+    "This is a recreation of a boss\\nfrom ", \
+    { "text": "Toby Fox", "color": "yellow" }, \
+    "\'s ", \
+    { "color": "light_purple", "text": "Undertale" } \
+  ]', \
   text_opacity: 255, \
   transformation: { \
     left_rotation: [0.0f, -0.7071068f, 0.0f, 0.7071068f], \
@@ -76,11 +89,20 @@ summon minecraft:text_display -101.4375 42.1875 32.5 { \
   ], \
   alignment: "left", \
   background: 1073741824, \
+  brightness: { block: 12, sky: 0 }, \
   default_background: 0b, \
   line_width: 160, \
   see_through: 0b, \
   shadow: 0b, \
-  text: '"The map is still a WIP, but functional nonetheless. So we put together a short demo for Smithed Summit!"', \
+  text: '[ \
+    "The map is still ", \
+    { "text": "in development", "color": "gold" }, \
+    ", but we\'ve created a short ", \
+    { "text": "demo ", "color": "aqua" }, \
+    "for you to enjoy during the ", \
+    { "text": "Smithed Summit ", "color": "blue" }, \
+    { "translate": ":mountain_snow:" } \
+  ]', \
   text_opacity: 255, \
   transformation: { \
     left_rotation: [0.0f, -0.7071068f, 0.0f, 0.7071068f], \
@@ -99,11 +121,16 @@ summon minecraft:text_display -108.0 44.0 25.0 { \
   ], \
   alignment: "center", \
   background: 1073741824, \
+  brightness: { block: 12, sky: 0 }, \
   default_background: 0b, \
   line_width: 200, \
   see_through: 0b, \
   shadow: 0b, \
-  text: '[ "Special thanks\\nto our", { "color": "yellow", "text": " contributors" }, " :)" ]', \
+  text: '[ \
+    "Special thanks\\nto our ", \
+    { "text": "contributors ", "color": "gold" }, \
+    { "translate": ":smile:" } \
+  ]', \
   text_opacity: 255, \
   transformation: { \
     left_rotation: [0.0f, 0.0f, 0.0f, 1.0f], \
@@ -122,11 +149,12 @@ summon minecraft:text_display -109.5625 42.75 25.625 { \
   ], \
   alignment: "center", \
   background: 1073741824, \
+  brightness: { block: 12, sky: 0 }, \
   default_background: 0b, \
   line_width: 200, \
   see_through: 0b, \
   shadow: 0b, \
-  text: '"adahy"', \
+  text: '{"text": "adahy", "color": "yellow" }', \
   text_opacity: 255, \
   transformation: { \
     left_rotation: [0.0f, 0.1736482f, 0.0f, 0.98480785f], \
@@ -145,11 +173,12 @@ summon minecraft:text_display -108.0 42.75 25.5 { \
   ], \
   alignment: "center", \
   background: 1073741824, \
+  brightness: { block: 12, sky: 0 }, \
   default_background: 0b, \
   line_width: 200, \
   see_through: 0b, \
   shadow: 0b, \
-  text: '"naTia"', \
+  text: '{"text": "naTia", "color": "yellow" }', \
   text_opacity: 255, \
   transformation: { \
     left_rotation: [0.0f, 0.0f, 0.0f, 1.0f], \
@@ -168,11 +197,12 @@ summon minecraft:text_display -106.1875 42.75 25.5625 { \
   ], \
   alignment: "center", \
   background: 1073741824, \
+  brightness: { block: 12, sky: 0 }, \
   default_background: 0b, \
   line_width: 200, \
   see_through: 0b, \
   shadow: 0b, \
-  text: '"Wes"', \
+  text: '{"text": "Wes", "color": "yellow" }', \
   text_opacity: 255, \
   transformation: { \
     left_rotation: [0.0f, -0.1736482f, 0.0f, 0.98480785f], \