From 1a73212bc7cbe7b411647f677879bc3e6f090f3f Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Sun, 25 Feb 2024 22:23:22 -0500 Subject: [PATCH] let `attack-flies` trigger next boss-fight attack sooner - before, had to wait for indicator to finish de-animating/terminating - now, we check for X flies to be remaining in order to trigger the next boss fight's attack --- .../attack/flies/indicator/maybe_terminate.mcfunction | 5 ++++- .../omega-flowey/attack/flies/indicator/terminate.mcfunction | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/flies/indicator/maybe_terminate.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/flies/indicator/maybe_terminate.mcfunction index cf208e61c..3c63ee809 100644 --- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/flies/indicator/maybe_terminate.mcfunction +++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/flies/indicator/maybe_terminate.mcfunction @@ -1,6 +1,9 @@ -## terminate if there are no more associated flies +## terminate indicator if there are no more associated flies # (`function entity:group/start` has already been ran by the bullet who called this function) scoreboard players set #attack.flies.count math.0 0 execute as @e[scores={group.id=0},tag=attack-bullet,tag=flies] run scoreboard players add #attack.flies.count math.0 1 execute if score #attack.flies.count math.0 matches 1 run scoreboard players set @s attack.clock.i -1 execute if score #attack.flies.count math.0 matches 1 run tag @s add flies_are_done + +# let boss fight perform next attack if there are 5 flies remaining +execute if score #attack.flies.count math.0 matches 5 as @e[tag=boss_fight] run function entity:hostile/omega-flowey/attack/flies/indicator/terminate/boss_fight diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/flies/indicator/terminate.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/flies/indicator/terminate.mcfunction index 15d0bae8b..c55b32e6a 100644 --- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/flies/indicator/terminate.mcfunction +++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/flies/indicator/terminate.mcfunction @@ -1,3 +1 @@ -execute as @e[tag=boss_fight] run function entity:hostile/omega-flowey/attack/flies/indicator/terminate/boss_fight - function animated_java:venus_fly_trap/remove/this