Skip to content

Commit

Permalink
🍱 add simplified petal-pipe models for summit (#231)
Browse files Browse the repository at this point in the history 
* 📋 copy `petal-pipe-circle` to `...-simplified`

* 🍱 update general ppc-simplified AJ config

* 🍱 resolve already-valid bones in `petal-pipe-circle-simplified`

* 🍱 resolve remaining bones in `petal-pipe-circle-simplified`
- ones that had invalid rotations

* 💫 add `float_and_pulsate` animation to simplified petalpipecircle model

* ♻️ replace mcfunction instances to use petalpipecircle simplified

* 🐛 fix ppcircle simplified initialize function

* 📋 copy `petal-pipe-middle` to `...-simplified`

* 🍱 resolve bones in `petal-pipe-middle-simplified`

* 💫 add `float_and_pulsate` animation to simplified petalpipemiddle model

* ♻️ replace mcfunction instances to use petalpipemiddle simplified

* 🍱 center soul-5 flower and heart crosshair on x-axis
- was barely uncentered before

* 💫 add `disabled` animation to simplified petal pipe circle model
- simplified pp middle model doesnt need this for summit

* 🐛 fix `petal-pipe-middle-simplified` having same UUID as petal-pipe-middle
  • Loading branch information
@TheAfroOfDoom
TheAfroOfDoom authored Oct 23, 2024
1 parent b6860de commit 6d8fc68
Show file tree
Hide file tree
Showing 18 changed files with 15,562 additions and 338 deletions.
4 changes: 2 additions & 2 deletions datapacks/omegaflowey/data/omegaflowey.admin/function/kill/petalpipes.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ function omegaflowey.utils:log { text_component: '[ \
{ "selector": "@s", "color": "gold" }, \
{ "text": " killed the petal pipe models", "color": "yellow" } \
]'}
function animated_java:omegaflowey_petal_pipe_circle/remove/all
function animated_java:omegaflowey_petal_pipe_middle/remove/all
function animated_java:omegaflowey_petal_pipe_circle_simplified/remove/all
function animated_java:omegaflowey_petal_pipe_middle_simplified/remove/all
4 changes: 2 additions & 2 deletions ...gaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/animate/as_root.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ execute if entity @s[tag=aj.omegaflowey_mouth.root] run function animated_java:o
execute if entity @s[tag=aj.omegaflowey_nose.root] run function animated_java:omegaflowey_nose/animations/omegaflowey_move/play
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.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_circle_simplified.root] run function omegaflowey.entity:hostile/omega-flowey/animate/petal_pipe_circle
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
4 changes: 2 additions & 2 deletions ...aflowey.entity/function/hostile/omega-flowey/animate/petal_pipe_circle/default.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
function animated_java:omegaflowey_petal_pipe_circle/animations/omegaflowey_float_and_pulsate/play
function animated_java:omegaflowey_petal_pipe_circle/variants/default/apply
function animated_java:omegaflowey_petal_pipe_circle_simplified/animations/omegaflowey_float_and_pulsate/play
function animated_java:omegaflowey_petal_pipe_circle_simplified/variants/default/apply
4 changes: 2 additions & 2 deletions ...flowey.entity/function/hostile/omega-flowey/animate/petal_pipe_circle/disabled.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
function animated_java:omegaflowey_petal_pipe_circle/animations/omegaflowey_float_disabled/play
function animated_java:omegaflowey_petal_pipe_circle/variants/disabled/apply
function animated_java:omegaflowey_petal_pipe_circle_simplified/animations/omegaflowey_float_disabled/play
function animated_java:omegaflowey_petal_pipe_circle_simplified/variants/disabled/apply
4 changes: 2 additions & 2 deletions ...aflowey.entity/function/hostile/omega-flowey/animate/petal_pipe_middle/default.mcfunction
View file
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
4 changes: 2 additions & 2 deletions ...flowey.entity/function/hostile/omega-flowey/animate/petal_pipe_middle/disabled.mcfunction
View file
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
2 changes: 1 addition & 1 deletion ...owey/data/omegaflowey.entity/function/hostile/omega-flowey/animate/pipe/soul_0.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$execute as $(petal_pipe_lower_right_uuid) run function animated_java:omegaflowey_petal_pipe_circle/variants/soul_0/apply
$execute as $(petal_pipe_lower_right_uuid) run function animated_java:omegaflowey_petal_pipe_circle_simplified/variants/soul_0/apply
2 changes: 1 addition & 1 deletion ...owey/data/omegaflowey.entity/function/hostile/omega-flowey/animate/pipe/soul_1.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$execute as $(petal_pipe_lower_left_uuid) run function animated_java:omegaflowey_petal_pipe_circle/variants/soul_1/apply
$execute as $(petal_pipe_lower_left_uuid) run function animated_java:omegaflowey_petal_pipe_circle_simplified/variants/soul_1/apply
3 changes: 2 additions & 1 deletion ...owey/data/omegaflowey.entity/function/hostile/omega-flowey/animate/pipe/soul_2.mcfunction
View file
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
3 changes: 2 additions & 1 deletion ...owey/data/omegaflowey.entity/function/hostile/omega-flowey/animate/pipe/soul_3.mcfunction
View file
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
2 changes: 1 addition & 1 deletion ...owey/data/omegaflowey.entity/function/hostile/omega-flowey/animate/pipe/soul_4.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$execute as $(petal_pipe_upper_right_uuid) run function animated_java:omegaflowey_petal_pipe_circle/variants/soul_4/apply
$execute as $(petal_pipe_upper_right_uuid) run function animated_java:omegaflowey_petal_pipe_circle_simplified/variants/soul_4/apply
2 changes: 1 addition & 1 deletion ...owey/data/omegaflowey.entity/function/hostile/omega-flowey/animate/pipe/soul_5.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
$execute as $(petal_pipe_upper_left_uuid) run function animated_java:omegaflowey_petal_pipe_circle/variants/soul_5/apply
$execute as $(petal_pipe_upper_left_uuid) run function animated_java:omegaflowey_petal_pipe_circle_simplified/variants/soul_5/apply
12 changes: 6 additions & 6 deletions ...gaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/summon/relative.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ execute positioned ^5.5 ^5.5 ^6.5 rotated ~10 ~20 run function animated_java:ome
## Lower petal pipes
# Right-lower petal pipe
scoreboard players set #omegaflowey.summon.tag_variant omegaflowey.global.flag 1
execute positioned ^-11.5 ^7.5 ^ rotated ~-10 ~20 run function animated_java:omegaflowey_petal_pipe_circle/summon { args: {} }
execute positioned ^-11.5 ^7.5 ^ rotated ~-10 ~20 run function animated_java:omegaflowey_petal_pipe_circle_simplified/summon { args: {} }
# Left-lower petal pipe
scoreboard players set #omegaflowey.summon.tag_variant omegaflowey.global.flag 2
execute positioned ^11.5 ^7.5 ^ rotated ~-170 ~-20 run function animated_java:omegaflowey_petal_pipe_circle/summon { args: {} }
execute positioned ^11.5 ^7.5 ^ rotated ~-170 ~-20 run function animated_java:omegaflowey_petal_pipe_circle_simplified/summon { args: {} }

## 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 All @@ -54,10 +54,10 @@ execute positioned ^16.0 ^11.5 ^9.5 rotated ~20 ~40 run function animated_java:o
## Upper petal pipes
# Right-upper petal pipe
scoreboard players set #omegaflowey.summon.tag_variant omegaflowey.global.flag 3
execute positioned ^-11.5 ^26.5 ^17.5 rotated ~-10 ~45 run function animated_java:omegaflowey_petal_pipe_circle/summon { args: {} }
execute positioned ^-11.5 ^26.5 ^17.5 rotated ~-10 ~45 run function animated_java:omegaflowey_petal_pipe_circle_simplified/summon { args: {} }
# Left-upper petal pipe
scoreboard players set #omegaflowey.summon.tag_variant omegaflowey.global.flag 4
execute positioned ^11.5 ^26.5 ^17.5 rotated ~-170 ~-45 run function animated_java:omegaflowey_petal_pipe_circle/summon { args: {} }
execute positioned ^11.5 ^26.5 ^17.5 rotated ~-170 ~-45 run function animated_java:omegaflowey_petal_pipe_circle_simplified/summon { args: {} }

# reset tag-variant flag
scoreboard players set #omegaflowey.summon.tag_variant omegaflowey.global.flag 0
4 changes: 2 additions & 2 deletions ...unction/hostile/omega-flowey/summon/remove_preexisting_models/except_tv_screen.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ function animated_java:omegaflowey_large_side_vine/remove/all
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/remove/all
function animated_java:omegaflowey_petal_pipe_middle/remove/all
function animated_java:omegaflowey_petal_pipe_circle_simplified/remove/all
function animated_java:omegaflowey_petal_pipe_middle_simplified/remove/all
function animated_java:omegaflowey_upper_eye/remove/all
Loading

0 comments on commit 6d8fc68

Please sign in to comment.