diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop.mcfunction index 5c4e7cc1c..df6b58a2f 100644 --- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop.mcfunction +++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop.mcfunction @@ -3,9 +3,6 @@ scoreboard players add @s attack.clock.i 1 # Ignore bullet summoning logic while `attack.clock.i` is negative execute if score @s attack.clock.i matches ..-1 run return 0 -# Summon laser after `attack.indicator.clock.delay` -execute if score @s attack.clock.i matches 0 run function entity:hostile/omega-flowey/attack/bomb/indicator/loop/laser/presummon - # Summon a bullet execute if score @s attack.clock.i matches 5 run function entity:hostile/omega-flowey/attack/bomb/indicator/loop/bullet/presummon diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/bullet/presummon.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/bullet/presummon.mcfunction index 9ca484932..a0a1ae572 100644 --- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/bullet/presummon.mcfunction +++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/bullet/presummon.mcfunction @@ -2,8 +2,5 @@ execute store result storage attack:bomb x double 0.01 run data get entity @s Pos[0] 100 execute store result storage attack:bomb z double 0.01 run data get entity @s Pos[2] 100 -# Terminate associated laser -function entity:hostile/omega-flowey/attack/bomb/indicator/loop/laser/terminate - # Summon bullet function entity:hostile/omega-flowey/attack/bomb/indicator/loop/bullet/summon with storage attack:bomb diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/initialize.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/initialize.mcfunction deleted file mode 100644 index 8939865ca..000000000 --- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/initialize.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# Copy group id from parent indicator -function entity:group/copy with storage group - -# Play laser sound (blink) once -playsound omega-flowey:attack.bomb.laser hostile @a ~ ~ ~ 5 1 1 - -# Remove tags -tag @s remove bomb-laser-new diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/presummon.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/presummon.mcfunction deleted file mode 100644 index 0b1d23067..000000000 --- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/presummon.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# Summon laser at same z-position as indicator -execute store result storage attack:bomb z double 0.01 run data get entity @s Pos[2] 100 - -function entity:hostile/omega-flowey/attack/bomb/indicator/loop/laser/summon with storage attack:bomb diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/summon.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/summon.mcfunction deleted file mode 100644 index acb4e39d1..000000000 --- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/summon.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# Summon laser -$execute positioned 0.5 33.5 $(z) run function animated_java:bomb_laser/summon - -# Copy group id to laser -execute store result storage group id int 1 run scoreboard players get @s group.id - -# Initialize laser -execute as @e[tag=bomb-laser-new] run function entity:hostile/omega-flowey/attack/bomb/indicator/loop/laser/initialize with storage attack:bomb diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/terminate.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/terminate.mcfunction deleted file mode 100644 index e105fd56c..000000000 --- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/indicator/loop/laser/terminate.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -function entity:group/start -execute as @e[tag=bomb-laser,scores={group.id=0}] run function animated_java:bomb_laser/remove/this -function entity:group/end diff --git a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/reset_scores.mcfunction b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/reset_scores.mcfunction index 3592a639d..ff5d7e8e2 100644 --- a/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/reset_scores.mcfunction +++ b/datapacks/omega-flowey/data/entity/functions/hostile/omega-flowey/attack/bomb/reset_scores.mcfunction @@ -4,6 +4,5 @@ scoreboard players set #attack-bomb attack.executor.clock.length 66 scoreboard players set #attack-bomb attack.executor.rate 3 scoreboard players set #attack-bomb attack.indicator.clock.delay 14 -# lifespan of indicator after summoning laser scoreboard players set #attack-bomb attack.indicator.clock.length 40 scoreboard players set #attack-bomb attack.speed.z 110