add splat effect after housefly shrinks

TheAfroOfDoom · Jan 31, 2024 · 1568e17 · 1568e17
1 parent 5575428
commit 1568e17
Show file tree

Hide file tree

Showing 3 changed files with 252 additions and 85 deletions.
diff --git a/...ega-flowey/data/entity/functions/hostile/omega-flowey/attack/flies/bullet/loop.mcfunction b/...ega-flowey/data/entity/functions/hostile/omega-flowey/attack/flies/bullet/loop.mcfunction
@@ -1,12 +1,12 @@
 data merge storage utils:damage { damage: 2, radius: 1.5 }
 execute positioned ~ ~-0.5 ~ run function entity:utils/damage with storage utils:damage
 
-# Move forward
-function entity:hostile/omega-flowey/attack/flies/bullet/loop/move
-
 execute if entity @s[tag=is_terminating] run function entity:hostile/omega-flowey/attack/flies/bullet/loop/terminating
 execute if entity @s[tag=is_terminating] run return 0
 
+# Move forward
+function entity:hostile/omega-flowey/attack/flies/bullet/loop/move
+
 # Begin terminating after reaching the venus fly trap's mouth
 function entity:group/start
 execute if entity @e[scores={group.id=0},tag=attack-indicator,tag=flies,distance=..5] run tag @s add is_terminating

diff --git a/...ata/entity/functions/hostile/omega-flowey/attack/flies/bullet/loop/terminating.mcfunction b/...ata/entity/functions/hostile/omega-flowey/attack/flies/bullet/loop/terminating.mcfunction
@@ -6,4 +6,8 @@ execute if score @s attack.clock.i matches 0 run playsound omega-flowey:attack.f
 # Start animation
 execute if score @s attack.clock.i matches 0 run function animated_java:housefly/animations/shrink/play
 
-execute if score @s attack.clock.i matches 5.. run function entity:hostile/omega-flowey/attack/flies/bullet/terminate
+# Move forward until done shrinking
+execute if score @s attack.clock.i matches ..3 run function entity:hostile/omega-flowey/attack/flies/bullet/loop/move
+
+# Terminate
+execute if score @s attack.clock.i matches 10.. run function entity:hostile/omega-flowey/attack/flies/bullet/terminate