diff --git a/datapacks/omegaflowey/data/_/function/summon/remove.mcfunction b/datapacks/omegaflowey/data/_/function/summon/remove.mcfunction index 97b88ce25..8f263842d 100644 --- a/datapacks/omegaflowey/data/_/function/summon/remove.mcfunction +++ b/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 diff --git a/datapacks/omegaflowey/data/daylight_cycle/tags/function/api/day.json b/datapacks/omegaflowey/data/daylight_cycle/tags/function/api/day.json new file mode 100644 index 000000000..d36d30797 --- /dev/null +++ b/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" + ] +} diff --git a/datapacks/omegaflowey/data/daylight_cycle/tags/function/api/night.json b/datapacks/omegaflowey/data/daylight_cycle/tags/function/api/night.json new file mode 100644 index 000000000..76c7e6762 --- /dev/null +++ b/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" + ] +} diff --git a/datapacks/omegaflowey/data/omegaflowey.admin/function/kill/flowey_model.mcfunction b/datapacks/omegaflowey/data/omegaflowey.admin/function/kill/flowey_model.mcfunction index a3666bc39..5740bec89 100644 --- a/datapacks/omegaflowey/data/omegaflowey.admin/function/kill/flowey_model.mcfunction +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/advancement/player_interacted_with_join_queue.json b/datapacks/omegaflowey/data/omegaflowey.entity/advancement/player_interacted_with_join_queue.json new file mode 100644 index 000000000..ef3d5d7bd --- /dev/null +++ b/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" + } +} diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/decorative/remove.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/decorative/remove.mcfunction index 861c25bcc..2cf9da8de 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/decorative/remove.mcfunction +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon.mcfunction index 62285a06f..14ccedb31 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon.mcfunction +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon/relative.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon/relative.mcfunction index 273d42edd..fef1beb82 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon/relative.mcfunction +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon/remove_preexisting_models.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon/remove_preexisting_models.mcfunction index f3c188d62..2b321da54 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon/remove_preexisting_models.mcfunction +++ b/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 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 new file mode 100644 index 000000000..5559aaacd --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue/as_interaction.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue/as_interaction.mcfunction new file mode 100644 index 000000000..5816f70b1 --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue/macro.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue/macro.mcfunction new file mode 100644 index 000000000..d10c4f4dd --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models.mcfunction index 09cfdec1f..63538fa5c 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models.mcfunction +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/boss_fight.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/boss_fight.mcfunction index 2bbcaceb2..c267b50c9 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models/boss_fight.mcfunction +++ b/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 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 55bb4a03f..76687b668 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 @@ -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 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 1b2c3d574..a4b8b8fe7 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 @@ -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" }, \ "!" \ ]', \ 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 51bf3f7b5..44aa9d71b 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 @@ -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: [ \ 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 536511db2..744c040d0 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 @@ -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 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day.mcfunction new file mode 100644 index 000000000..52666aead --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day/macro_set_smiling_noglow.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day/macro_set_smiling_noglow.mcfunction new file mode 100644 index 000000000..57104f058 --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day/macro_set_smiling_noglow/as_root.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day/macro_set_smiling_noglow/as_root.mcfunction new file mode 100644 index 000000000..a4fe29d1a --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day/scheduled.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day/scheduled.mcfunction new file mode 100644 index 000000000..fb01b6c5a --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night.mcfunction new file mode 100644 index 000000000..296db55fe --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night/macro_set_smiling.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night/macro_set_smiling.mcfunction new file mode 100644 index 000000000..c18dca757 --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night/macro_set_smiling/as_root.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night/macro_set_smiling/as_root.mcfunction new file mode 100644 index 000000000..303e67bc0 --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night/scheduled.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night/scheduled.mcfunction new file mode 100644 index 000000000..bd246c056 --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static.mcfunction new file mode 100644 index 000000000..8976523c6 --- /dev/null +++ b/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 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 new file mode 100644 index 000000000..1d967659d --- /dev/null +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/pit/setup.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/pit/setup.mcfunction index 351995a73..3549be420 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/pit/setup.mcfunction +++ b/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 diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/pit/setup/place_pink_shulker_boxes.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/pit/setup/place_pink_shulker_boxes.mcfunction new file mode 100644 index 000000000..14e91be7b --- /dev/null +++ b/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] diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/pit/setup/text_displays.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/pit/setup/text_displays.mcfunction index 3dd633595..669d76384 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/pit/setup/text_displays.mcfunction +++ b/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], \ diff --git a/package-scripts.js b/package-scripts.js index 1240153d9..b6575545b 100644 --- a/package-scripts.js +++ b/package-scripts.js @@ -47,21 +47,19 @@ const smithedSummitWorldSyncArgs = `--backup-path="${smithedSummitWorldSyncPath} module.exports = { scripts: { default: 'nps watch', - watch: { - default: `node ${watchScriptPath}`, + build: { + default: 'nps build.summit', + clean: 'rimraf ./build', + summit: 'node ./package-scripts/build', }, - sync: { - default: 'nps sync.summit', - world: { - default: 'nps sync.world.up', - down: `node ./package-scripts/sync-world --down ${worldSyncArgs}`, - up: `node ./package-scripts/sync-world --up ${worldSyncArgs}"`, - }, - summit: { - default: 'nps sync.summit.up', - down: `node ./package-scripts/sync-world --down ${smithedSummitWorldSyncArgs}`, - up: `node ./package-scripts/sync-world --up ${smithedSummitWorldSyncArgs}`, - }, + export: { + default: 'nps export.run', + run: `yarn exec "${blockbenchPath}" --script="${ajexportScriptPath}" --cwd="${process.cwd()}" --assets-dir="${assetsDir}" --datapack="${datapack}" --resourcepack="${resourcePack}"`, + // forcibly purge the `animated_java` export-cache + force: series( + `rimraf ${allAnimatedJavaExportFiles.join(' ')}`, + 'nps export', + ), }, lint: { default: 'nps lint.custom lint.scripts', @@ -98,19 +96,22 @@ module.exports = { 'node ./package-scripts/run-linting-rules --include "**/*" --exclude "resourcepack/**/*,datapacks/**/*"', }, }, - export: { - default: 'nps export.run', - run: `yarn exec "${blockbenchPath}" --script="${ajexportScriptPath}" --cwd="${process.cwd()}" --assets-dir="${assetsDir}" --datapack="${datapack}" --resourcepack="${resourcePack}"`, - // forcibly purge the `animated_java` export-cache - force: series( - `rimraf ${allAnimatedJavaExportFiles.join(' ')}`, - 'nps export', - ), + log: `code -r "${minecraftPath}/logs/latest.log"`, + sync: { + default: 'nps sync.summit', + world: { + default: 'nps sync.world.up', + down: `node ./package-scripts/sync-world --down ${worldSyncArgs}`, + up: `node ./package-scripts/sync-world --up ${worldSyncArgs}"`, + }, + summit: { + default: 'nps sync.summit.up', + down: `node ./package-scripts/sync-world --down ${smithedSummitWorldSyncArgs}`, + up: `node ./package-scripts/sync-world --up ${smithedSummitWorldSyncArgs}`, + }, }, - build: { - clean: 'rimraf ./build', - default: 'nps build.summit', - summit: 'node ./package-scripts/build', + watch: { + default: `node ${watchScriptPath}`, }, }, }; diff --git a/package-scripts/build.js b/package-scripts/build.js index 7a20c59f2..f60da930e 100644 --- a/package-scripts/build.js +++ b/package-scripts/build.js @@ -75,7 +75,9 @@ const getSummitDatapackPaths = () => { 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', ...prefixPaths('function/', [ ...bossFightPaths, 'decorative', @@ -105,6 +107,7 @@ const getSummitDatapackPaths = () => { 'pack.mcmeta', ...prefixPaths('data/', [ 'animated_java/tags/function/', + 'daylight_cycle', 'minecraft', 'omegaflowey.admin/function/', ...entityPaths, @@ -142,13 +145,16 @@ const getSummitResourcepackPaths = () => { 'reward_hat_cyan.json', ]); + const splitMonoSounds = ['mus_f_noise']; + const soundPaths = prefixPaths( 'sounds/', suffixPaths( [ + ...suffixPaths(splitMonoSounds, '-01'), + ...suffixPaths(splitMonoSounds, '-02'), 'mus_f_6s_6', 'mus_f_alarm', - 'mus_f_noise', 'mus_f_part1', 'mus_f_part2', 'mus_f_saved', 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 6890799f3..68d1ed15c 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 @@ -834,6 +834,15 @@ "f4d3290b-8e74-e77f-c372-e0c3af2c203b": "f68699ff-08b0-7875-d080-7e8dc0c76406" }, "excluded_nodes": ["a392135b-a4c6-2b9e-d88f-f3b3746d5270"] + }, + { + "name": "smiling_noglow", + "display_name": "smiling_noglow", + "uuid": "acb19228-dc5c-ee24-9e6a-7c6db62464ff", + "texture_map": { + "32717bc3-fe35-1fc8-9bbf-54407fe854d1": "41a69925-626e-aadd-232c-27ef97a00c94" + }, + "excluded_nodes": ["a392135b-a4c6-2b9e-d88f-f3b3746d5270"] } ] }, diff --git a/resourcepack/assets/omega-flowey/sounds.json b/resourcepack/assets/omega-flowey/sounds.json index de60b4433..19b9d9e2f 100644 --- a/resourcepack/assets/omega-flowey/sounds.json +++ b/resourcepack/assets/omega-flowey/sounds.json @@ -143,7 +143,24 @@ "boss-fight.static": { "sounds": [ { - "name": "omega-flowey:mus_f_noise" + "name": "omega-flowey:mus_f_noise-01" + }, + { + "name": "omega-flowey:mus_f_noise-02" + } + ] + }, + "decorative.static": { + "sounds": [ + { + "attenuation_distance": 55, + "name": "omega-flowey:mus_f_noise-01", + "volume": 0.1 + }, + { + "attenuation_distance": 55, + "name": "omega-flowey:mus_f_noise-02", + "volume": 0.1 } ] }, diff --git a/resourcepack/assets/omega-flowey/sounds/mus_f_noise-01.ogg b/resourcepack/assets/omega-flowey/sounds/mus_f_noise-01.ogg new file mode 100644 index 000000000..cb0564a60 Binary files /dev/null and b/resourcepack/assets/omega-flowey/sounds/mus_f_noise-01.ogg differ diff --git a/resourcepack/assets/omega-flowey/sounds/mus_f_noise-02.ogg b/resourcepack/assets/omega-flowey/sounds/mus_f_noise-02.ogg new file mode 100644 index 000000000..9f85625bd Binary files /dev/null and b/resourcepack/assets/omega-flowey/sounds/mus_f_noise-02.ogg differ diff --git a/resourcepack/assets/omega-flowey/sounds/mus_f_noise.ogg b/resourcepack/assets/omega-flowey/sounds/mus_f_noise.ogg deleted file mode 100644 index e3ff2a37c..000000000 Binary files a/resourcepack/assets/omega-flowey/sounds/mus_f_noise.ogg and /dev/null differ