🐛 fix arena box culling, subsequent intros, nose model (#249)

* 🐛 fix nose model not moving fast again after intro cutscene finishes * 🐛 fix scheduled cutscene terminate running from old cutscenes - if a player leaves during initial cutscene, and another player starts the fight, the fight can start super early since we never cleared this scheduled function before * 🐛 fix arena box being invisible when looking straight down - adding this `height` field makes it not cull when looking straight down during the red intro cutscene
TheAfroOfDoom · Oct 24, 2024 · 0059359 · 0059359
1 parent 9bcaa67
commit 0059359
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/...omegaflowey.entity/function/directorial/boss_fight/shared/arena_box/initialize.mcfunction b/...omegaflowey.entity/function/directorial/boss_fight/shared/arena_box/initialize.mcfunction
@@ -8,3 +8,6 @@ tag @s add arena_box
 # Store boss fight UUID to storage for later use
 function gu:generate
 data modify storage omegaflowey:bossfight arena_box_uuid set from storage gu:main out
+
+execute on passengers if entity @s[tag=aj.omegaflowey_arena_box.bone] run \
+  data merge entity @s { height: -10.0f }
diff --git a/...megaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop.mcfunction b/...megaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop.mcfunction
@@ -5,6 +5,8 @@ execute store result storage omegaflowey:telemetry.temp data.s int 1 run \
 function omegaflowey.main:telemetry/bossfight/tag/end { name: "bossfight.summit" }
 function omegaflowey.main:telemetry/bossfight/tag/root/end
 
+schedule clear omegaflowey.entity:directorial/boss_fight/summit/phase/cutscene/terminate/scheduled
+
 function omegaflowey.entity:remove_animated_java_models/boss_fight
 # TAG_SUMMIT_HARDCODED_ARENA_VOLUME
 execute as @e[ \

diff --git a/...y/function/directorial/boss_fight/summit/phase/cutscene/terminate/as_bossfight.mcfunction b/...y/function/directorial/boss_fight/summit/phase/cutscene/terminate/as_bossfight.mcfunction
@@ -14,7 +14,7 @@ kill @e[ \
 # Begin animating largesidevines/nose at full speed
 $execute as $(large_side_vine_left_uuid) run function omegaflowey.entity:hostile/omega-flowey/animate/large_side_vine/resume_normal_from_slow/left
 $execute as $(large_side_vine_right_uuid) run function omegaflowey.entity:hostile/omega-flowey/animate/large_side_vine/resume_normal_from_slow/right
-$execute as $(model_nose_uuid) run function animated_java:omegaflowey_nose/animations/move/tween { duration: 1, to_frame: 1 }
+$execute as $(model_nose_uuid) run function animated_java:omegaflowey_nose/animations/omegaflowey_move/tween { duration: 1, to_frame: 1 }
 
 # Re-animate main Omega Flowey models
 scoreboard players set #omegaflowey.bossfight.skip_reanimate_largesidevine omegaflowey.global.flag 1