Skip to content

Commit

Permalink
♻️ replace mcfunction instances to use petalpipemiddle simplified
Browse files Browse the repository at this point in the history
  • Loading branch information
TheAfroOfDoom committed Oct 18, 2024
1 parent fe0e3d7 commit 35a8d9f
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ function omegaflowey.utils:log { text_component: '[ \
{ "text": " killed the petal pipe models", "color": "yellow" } \
]'}
function animated_java:omegaflowey_petal_pipe_circle_simplified/remove/all
function animated_java:omegaflowey_petal_pipe_middle/remove/all
function animated_java:omegaflowey_petal_pipe_middle_simplified/remove/all
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ execute if entity @s[tag=aj.omegaflowey_nose.root] run function animated_java:om
execute if entity @s[tag=aj.omegaflowey_large_side_vine.root] run function omegaflowey.entity:hostile/omega-flowey/animate/large_side_vine
execute if entity @s[tag=aj.omegaflowey_lower_eye.root] run function animated_java:omegaflowey_lower_eye/animations/omegaflowey_look_around/play
execute if entity @s[tag=aj.omegaflowey_petal_pipe_circle_simplified.root] run function omegaflowey.entity:hostile/omega-flowey/animate/petal_pipe_circle
execute if entity @s[tag=aj.omegaflowey_petal_pipe_middle.root] run function omegaflowey.entity:hostile/omega-flowey/animate/petal_pipe_middle
execute if entity @s[tag=aj.omegaflowey_petal_pipe_middle_simplified.root] run function omegaflowey.entity:hostile/omega-flowey/animate/petal_pipe_middle
execute unless score #omegaflowey.bossfight.skip_resummon_tvscreen omegaflowey.global.flag matches 1 \
if entity @s[tag=aj.omegaflowey_tv_screen.root,tag=tv_screen.boss_fight] run function omegaflowey.entity:hostile/omega-flowey/animate/tv-screen/default
execute if entity @s[tag=aj.omegaflowey_upper_eye.root] run function animated_java:omegaflowey_upper_eye/animations/omegaflowey_look_around/play
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
function animated_java:omegaflowey_petal_pipe_middle/animations/omegaflowey_float_and_pulsate/play
function animated_java:omegaflowey_petal_pipe_middle/variants/default/apply
function animated_java:omegaflowey_petal_pipe_middle_simplified/animations/omegaflowey_float_and_pulsate/play
function animated_java:omegaflowey_petal_pipe_middle_simplified/variants/default/apply
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
function animated_java:omegaflowey_petal_pipe_middle/animations/omegaflowey_float_disabled/play
function animated_java:omegaflowey_petal_pipe_middle/variants/disabled/apply
function animated_java:omegaflowey_petal_pipe_middle_simplified/animations/omegaflowey_float_disabled/play
function animated_java:omegaflowey_petal_pipe_middle_simplified/variants/disabled/apply
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
execute as @e[tag=aj.omegaflowey_petal_pipe_middle.root,tag=petal_pipe.right] run function animated_java:omegaflowey_petal_pipe_middle/variants/soul_2/apply
execute as @e[tag=aj.omegaflowey_petal_pipe_middle_simplified.root,tag=petal_pipe.right] run \
function animated_java:omegaflowey_petal_pipe_middle_simplified/variants/soul_2/apply
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
execute as @e[tag=aj.omegaflowey_petal_pipe_middle.root,tag=petal_pipe.left] run function animated_java:omegaflowey_petal_pipe_middle/variants/soul_3/apply
execute as @e[tag=aj.omegaflowey_petal_pipe_middle_simplified.root,tag=petal_pipe.left] run \
function animated_java:omegaflowey_petal_pipe_middle_simplified/variants/soul_3/apply
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ execute positioned ^11.5 ^7.5 ^ rotated ~-170 ~-20 run function animated_java:om
## Middle petal pipes
# Right-middle petal pipe
scoreboard players set #omegaflowey.summon.tag_variant omegaflowey.global.flag 1
execute positioned ^-15.0 ^11.5 ^6.5 rotated ~-20 ~40 run function animated_java:omegaflowey_petal_pipe_middle/summon { args: {} }
execute positioned ^-15.0 ^11.5 ^6.5 rotated ~-20 ~40 run function animated_java:omegaflowey_petal_pipe_middle_simplified/summon { args: {} }
# Left-middle petal pipe
scoreboard players set #omegaflowey.summon.tag_variant omegaflowey.global.flag 2
execute positioned ^15.0 ^11.5 ^6.5 rotated ~-160 ~-40 run function animated_java:omegaflowey_petal_pipe_middle/summon { args: {} }
execute positioned ^15.0 ^11.5 ^6.5 rotated ~-160 ~-40 run function animated_java:omegaflowey_petal_pipe_middle_simplified/summon { args: {} }

## Mouth
execute positioned ^ ^-1.5 ^9.35 rotated ~ ~9 run function animated_java:omegaflowey_mouth/summon { args: {} }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ function animated_java:omegaflowey_lower_eye/remove/all
function animated_java:omegaflowey_mouth/remove/all
function animated_java:omegaflowey_nose/remove/all
function animated_java:omegaflowey_petal_pipe_circle_simplified/remove/all
function animated_java:omegaflowey_petal_pipe_middle/remove/all
function animated_java:omegaflowey_petal_pipe_middle_simplified/remove/all
function animated_java:omegaflowey_upper_eye/remove/all

0 comments on commit 35a8d9f

Please sign in to comment.