From 1716257ee9a057f06a511e8068d08c7781dd0899 Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Tue, 22 Oct 2024 21:48:26 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=88=20minify=20bossfight=20data=20tags?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boss_fight/shared/stop.mcfunction | 2 +- .../summit/phase/attack/initialize.mcfunction | 2 +- .../phase/cutscene/initialize.mcfunction | 2 +- .../summit/phase/soul/initialize.mcfunction | 2 +- .../summit/phase/warn/initialize.mcfunction | 2 +- .../soul_5/healer/heal/as_player.mcfunction | 2 +- .../function/utils/damage/as_player.mcfunction | 4 ++-- .../bossfight/schema/setup.mcfunction | 18 ++++++++++++++++++ .../bossfight_hit_count.mcfunction | 2 +- .../data/active_player/gamemode.mcfunction | 8 ++++---- 10 files changed, 31 insertions(+), 13 deletions(-) diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop.mcfunction index 4b7912104..4590a61c4 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop.mcfunction @@ -1,6 +1,6 @@ function omegaflowey.main:telemetry/data/active_player/bossfight_hit_count function omegaflowey.main:telemetry/data/active_player/gamemode with storage omegaflowey:bossfight -execute store result storage omegaflowey:telemetry.temp data.stop_reason int 1 run \ +execute store result storage omegaflowey:telemetry.temp data.s int 1 run \ scoreboard players get #omegaflowey.bossfight.stop_reason omegaflowey.global.flag function omegaflowey.main:telemetry/bossfight/tag/end { name: "bossfight.summit" } function omegaflowey.main:telemetry/bossfight/tag/root/end diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/attack/initialize.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/attack/initialize.mcfunction index 629325553..0ce57e8ae 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/attack/initialize.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/attack/initialize.mcfunction @@ -1,5 +1,5 @@ data modify storage omegaflowey:telemetry.temp data set value {} -execute store result storage omegaflowey:telemetry.temp data.phase_index int 1 run \ +execute store result storage omegaflowey:telemetry.temp data.i int 1 run \ scoreboard players get @s omegaflowey.boss-fight.attack.phase.i function omegaflowey.main:telemetry/bossfight/tag/start { name: "bossfight.phase.attack" } diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize.mcfunction index e17efc0d4..ca4f16a38 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/cutscene/initialize.mcfunction @@ -1,5 +1,5 @@ data modify storage omegaflowey:telemetry.temp data set value {} -execute store result storage omegaflowey:telemetry.temp data.phase_index int 1 run \ +execute store result storage omegaflowey:telemetry.temp data.i int 1 run \ scoreboard players get @s omegaflowey.boss-fight.cutscene.phase.i function omegaflowey.main:telemetry/bossfight/tag/start { name: "bossfight.phase.cutscene" } diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/initialize.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/initialize.mcfunction index 419c72f69..37dfce3ad 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/initialize.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/soul/initialize.mcfunction @@ -1,5 +1,5 @@ data modify storage omegaflowey:telemetry.temp data set value {} -execute store result storage omegaflowey:telemetry.temp data.phase_index int 1 run \ +execute store result storage omegaflowey:telemetry.temp data.i int 1 run \ scoreboard players get @s omegaflowey.boss-fight.progress.phase.i function omegaflowey.main:telemetry/bossfight/tag/start { name: "bossfight.phase.soul" } diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/warn/initialize.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/warn/initialize.mcfunction index 57a65e009..0181333fb 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/warn/initialize.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/summit/phase/warn/initialize.mcfunction @@ -1,5 +1,5 @@ data modify storage omegaflowey:telemetry.temp data set value {} -execute store result storage omegaflowey:telemetry.temp data.phase_index int 1 run \ +execute store result storage omegaflowey:telemetry.temp data.i int 1 run \ scoreboard players get @s omegaflowey.boss-fight.progress.phase.i function omegaflowey.main:telemetry/bossfight/tag/start { name: "bossfight.phase.warn" } diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/healer/heal/as_player.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/healer/heal/as_player.mcfunction index 682f2e865..18b267cfb 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/healer/heal/as_player.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/soul/soul_5/healer/heal/as_player.mcfunction @@ -1,4 +1,4 @@ -data modify storage omegaflowey:telemetry.temp data set value { amount: 4 } +data modify storage omegaflowey:telemetry.temp data set value { a: 4 } function omegaflowey.main:telemetry/bossfight/tag/instant { name: "player.heal" } effect give @s minecraft:instant_health 1 1 true diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage/as_player.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage/as_player.mcfunction index f047bf952..a2b626c00 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage/as_player.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/utils/damage/as_player.mcfunction @@ -1,5 +1,5 @@ -$data modify storage omegaflowey:telemetry.temp data set value { amount: $(damage) } -data modify storage omegaflowey:telemetry.temp data.source set from storage omegaflowey:utils.damage source +$data modify storage omegaflowey:telemetry.temp data set value { d: $(damage) } +data modify storage omegaflowey:telemetry.temp data.s set from storage omegaflowey:utils.damage source function omegaflowey.main:telemetry/data/active_player/gamemode with storage omegaflowey:bossfight function omegaflowey.main:telemetry/bossfight/tag/instant { name: "player.damage" } diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/schema/setup.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/schema/setup.mcfunction index 3b3a947e7..62c88feac 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/schema/setup.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/bossfight/schema/setup.mcfunction @@ -43,3 +43,21 @@ data modify storage omegaflowey:telemetry schema_bossfight_name set value { \ "soul.saved": 34, \ "player.heal": 35, \ } + +## bossfight.summit.end data +# h: player_hit_count +# s: stop_reason + +## bossfight.phase.attack.start data +## bossfight.phase.cutscene.start data +## bossfight.phase.soul.start data +## bossfight.phase.warn.start data +# i: phase_index + +## player.damage data +# d: damage +# g: player_gamemode +# s: source + +## player.heal data +# a: amount diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/data/active_player/bossfight_hit_count.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/data/active_player/bossfight_hit_count.mcfunction index df88b12f9..e2fe78f4d 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/data/active_player/bossfight_hit_count.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/data/active_player/bossfight_hit_count.mcfunction @@ -1,4 +1,4 @@ function omegaflowey.main:telemetry/data/shared -execute store result storage omegaflowey:telemetry.temp data.player_hit_count int 1 run \ +execute store result storage omegaflowey:telemetry.temp data.h int 1 run \ scoreboard players get #omegaflowey.bossfight.player_hit_count omegaflowey.global.flag diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/data/active_player/gamemode.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/data/active_player/gamemode.mcfunction index 2c087dc48..5e7847acf 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/data/active_player/gamemode.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/telemetry/data/active_player/gamemode.mcfunction @@ -1,10 +1,10 @@ function omegaflowey.main:telemetry/data/shared $execute as $(active_player_uuid) if entity @s[gamemode=survival] run \ - data modify storage omegaflowey:telemetry.temp data.player_gamemode set value 0 + data modify storage omegaflowey:telemetry.temp data.g set value 0 $execute as $(active_player_uuid) if entity @s[gamemode=creative] run \ - data modify storage omegaflowey:telemetry.temp data.player_gamemode set value 1 + data modify storage omegaflowey:telemetry.temp data.g set value 1 $execute as $(active_player_uuid) if entity @s[gamemode=adventure] run \ - data modify storage omegaflowey:telemetry.temp data.player_gamemode set value 2 + data modify storage omegaflowey:telemetry.temp data.g set value 2 $execute as $(active_player_uuid) if entity @s[gamemode=spectator] run \ - data modify storage omegaflowey:telemetry.temp data.player_gamemode set value 3 + data modify storage omegaflowey:telemetry.temp data.g set value 3