diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/check.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/check.mcfunction new file mode 100644 index 000000000..61046aec8 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/check.mcfunction @@ -0,0 +1,20 @@ +tag @s remove omegaflowey.player.room.is_within.back_cave +tag @s remove omegaflowey.player.room.is_within.back_cave.waterfall_secret + +# back_cave +tag @s[x=-157, dx=16, y=36, dy=12, z=18, dz=28] add omegaflowey.player.room.is_within.back_cave + +execute if entity @s[tag=!omegaflowey.player.room.back_cave, tag=omegaflowey.player.room.is_within.back_cave] run \ + function omegaflowey.entity:player/room/underground/back_cave/enter +execute if entity @s[tag=omegaflowey.player.room.back_cave, tag=!omegaflowey.player.room.is_within.back_cave] run \ + function omegaflowey.entity:player/room/underground/back_cave/exit + +tag @s remove omegaflowey.player.room.is_within.back_cave.waterfall_secret + +# back_cave.waterfall_secret +tag @s[x=-155, dx=7, y=43, dy=5, z=18, dz=8] add omegaflowey.player.room.is_within.back_cave.waterfall_secret + +execute if entity @s[tag=!omegaflowey.player.room.back_cave.waterfall_secret, tag=omegaflowey.player.room.is_within.back_cave.waterfall_secret] run \ + function omegaflowey.entity:player/room/underground/back_cave/waterfall_secret/enter +execute if entity @s[tag=omegaflowey.player.room.back_cave.waterfall_secret, tag=!omegaflowey.player.room.is_within.back_cave.waterfall_secret] run \ + function omegaflowey.entity:player/room/underground/back_cave/waterfall_secret/exit diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/enter.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/enter.mcfunction new file mode 100644 index 000000000..a5e884e1b --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/enter.mcfunction @@ -0,0 +1,2 @@ +function omegaflowey.main:telemetry/booth/add_tag { name: "room.underground.back_cave.enter" } +tag @s add omegaflowey.player.room.back_cave diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/exit.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/exit.mcfunction new file mode 100644 index 000000000..423a63089 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/exit.mcfunction @@ -0,0 +1,2 @@ +# function omegaflowey.main:telemetry/booth/add_tag { name: "room.underground.back_cave.exit" } +tag @s remove omegaflowey.player.room.back_cave diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/waterfall_secret/enter.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/waterfall_secret/enter.mcfunction new file mode 100644 index 000000000..c02ea3d38 --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/waterfall_secret/enter.mcfunction @@ -0,0 +1,2 @@ +function omegaflowey.main:telemetry/booth/add_tag { name: "room.underground.back_cave.waterfall_secret.enter" } +tag @s add omegaflowey.player.room.back_cave.waterfall_secret diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/waterfall_secret/exit.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/waterfall_secret/exit.mcfunction new file mode 100644 index 000000000..41c9c50ef --- /dev/null +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/back_cave/waterfall_secret/exit.mcfunction @@ -0,0 +1,2 @@ +# function omegaflowey.main:telemetry/booth/add_tag { name: "room.underground.back_cave.waterfall_secret.exit" } +tag @s remove omegaflowey.player.room.back_cave.waterfall_secret diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/check.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/check.mcfunction index 5f2b20f95..37847f511 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/check.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/player/room/underground/check.mcfunction @@ -23,4 +23,6 @@ execute if entity @s[tag=!omegaflowey.player.room.underground] run return 0 execute unless score #omegaflowey.telemetry.enabled omegaflowey.global.flag matches 1 run return 0 # TAG_SUMMIT_HARDCODED_PARKOUR_FULL -execute if entity @s[x=-122, dx=27, y=41, dy=14, z=31, dz=14] run function omegaflowey.entity:player/room/underground/parkour/check +execute if entity @s[x=-122, dx=27, y=41, dy=14, z=31, dz=14] run return run \ + function omegaflowey.entity:player/room/underground/parkour/check +function omegaflowey.entity:player/room/underground/back_cave/check diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/booth/schema/setup.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/booth/schema/setup.mcfunction index 233a579d7..5f60316d7 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/booth/schema/setup.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/booth/schema/setup.mcfunction @@ -33,4 +33,6 @@ data modify storage omegaflowey:telemetry schema_booth_n set value { \ 'room.underground.parkour.before_final_jump.enter': 27, \ 'room.underground.parkour.finish.enter': 28, \ 'player.shown_feedback_link.won_fight': 29, \ + 'room.underground.back_cave.enter': 30, \ + 'room.underground.back_cave.waterfall_secret.enter': 31, \ }