-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
π outer tvscreen day cycle, JOIN QUEUE, adjust pit decorations (#229)
* β»οΈ alphabetize `package-scripts.js` scripts object - except `default` key always first * π¨ add yarn script command to open MC log file * π extra colorize for pit textdisplays * π increase brightness of pit textdisplays * π add dev log when placing pink_shulker_boxes above booth * π reword pit introduction - thx Snave * πΈ convert `JOIN QUEUE` to an interaction entity - remove command block in world (later commit) * π± replace stereo `noise` sound file with 2 mono versions - only some sounds because this adds to file size quite a bit * π§ update build with new split mono sound files * π§ split noise sound config into decorative/bossfight * β‘οΈ convert outside tvscreen to macro UUID * π fix kill/flowey_model admin command * π set TV variant to non-glow on daytime - static for 10 ticks with sound, then set to non-glowing smiling variant * π set TV variant to glow on nighttime - static for 10 ticks with sound, then set to non-glowing smiling variant * π§ add `daylight_cycle` logic to build * π add feedback form logic to build
- Loading branch information
1 parent
6b9e50f
commit b6860de
Showing
38 changed files
with
211 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
5 changes: 5 additions & 0 deletions
5
datapacks/omegaflowey/data/daylight_cycle/tags/function/api/day.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"values": [ | ||
"omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_day" | ||
] | ||
} |
5 changes: 5 additions & 0 deletions
5
datapacks/omegaflowey/data/daylight_cycle/tags/function/api/night.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"values": [ | ||
"omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_night" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
...ks/omegaflowey/data/omegaflowey.entity/advancement/player_interacted_with_join_queue.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
datapacks/omegaflowey/data/omegaflowey.entity/function/decorative/remove.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...packs/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...gaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon/relative.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 4 additions & 9 deletions
13
...gaflowey.entity/function/hostile/omega-flowey/summon/remove_preexisting_models.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
2 changes: 2 additions & 0 deletions
2
...omegaflowey/data/omegaflowey.entity/function/player/interacted/with_join_queue.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
1 change: 1 addition & 0 deletions
1
...a/omegaflowey.entity/function/player/interacted/with_join_queue/as_interaction.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
execute on target run function omegaflowey.entity:directorial/boss_fight/summit/player/queue/join |
1 change: 1 addition & 0 deletions
1
...lowey/data/omegaflowey.entity/function/player/interacted/with_join_queue/macro.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
$execute as $(join_queue_interaction_uuid) run function omegaflowey.entity:player/interacted/with_join_queue/as_interaction |
2 changes: 1 addition & 1 deletion
2
...packs/omegaflowey/data/omegaflowey.entity/function/remove_animated_java_models.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
2 changes: 1 addition & 1 deletion
2
...flowey/data/omegaflowey.entity/function/remove_animated_java_models/boss_fight.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
...omegaflowey/data/omegaflowey.main/function/summit/room/outside/setup/tv_screen.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
2 changes: 2 additions & 0 deletions
2
.../omegaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_day.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
2 changes: 2 additions & 0 deletions
2
...n/summit/room/outside/setup/tv_screen/set_variant_day/macro_set_smiling_noglow.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
2 changes: 2 additions & 0 deletions
2
.../room/outside/setup/tv_screen/set_variant_day/macro_set_smiling_noglow/as_root.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
stopsound @a ambient omega-flowey:decorative.static | ||
function animated_java:omegaflowey_tv_screen/variants/smiling_noglow/apply |
2 changes: 2 additions & 0 deletions
2
...ey.main/function/summit/room/outside/setup/tv_screen/set_variant_day/scheduled.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_day/macro_set_smiling_noglow \ | ||
with storage omegaflowey:decorative |
2 changes: 2 additions & 0 deletions
2
...megaflowey.main/function/summit/room/outside/setup/tv_screen/set_variant_night.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
2 changes: 2 additions & 0 deletions
2
...nction/summit/room/outside/setup/tv_screen/set_variant_night/macro_set_smiling.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
2 changes: 2 additions & 0 deletions
2
...ummit/room/outside/setup/tv_screen/set_variant_night/macro_set_smiling/as_root.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
stopsound @a ambient omega-flowey:decorative.static | ||
function animated_java:omegaflowey_tv_screen/variants/smiling/apply |
2 changes: 2 additions & 0 deletions
2
....main/function/summit/room/outside/setup/tv_screen/set_variant_night/scheduled.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
function omegaflowey.main:summit/room/outside/setup/tv_screen/set_variant_night/macro_set_smiling \ | ||
with storage omegaflowey:decorative |
2 changes: 2 additions & 0 deletions
2
...nction/summit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
2 changes: 2 additions & 0 deletions
2
...ummit/room/outside/setup/tv_screen/set_variant_shared/macro_set_static/as_root.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
playsound omega-flowey:decorative.static ambient @a ~ ~ ~ 4 | ||
function animated_java:omegaflowey_tv_screen/variants/static/apply |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
.../data/omegaflowey.main/function/summit/room/pit/setup/place_pink_shulker_boxes.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.