diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/0.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/0.mcfunction index cb8882e64d..57c5f05cb9 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/0.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/0.mcfunction @@ -1,8 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.22203125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.5f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -execute on vehicle unless entity @s[tag=aj.transforms_only] run function animated_java:beat/variants/default_angry/apply \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.34046875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.0625f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/1.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/1.mcfunction index 96b193c9de..04804a7830 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/1.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/1.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,1.795361663937926e-18f,1.2245151899063662e-16f,0.26875f,0f,0.9998925328992174f,-0.014660240529660688f,0.4105f,-1.2246467991473532e-16f,-0.014660240529660688f,-0.9998925328992174f,-0.13249999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,1.795361663937926e-18f,1.2245151899063662e-16f,0.26875f,0f,0.9998925328992174f,-0.014660240529660688f,0.4105f,-1.2246467991473532e-16f,-0.014660240529660688f,-0.9998925328992174f,-0.13249999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-8.457413944018093e-18f,1.221722962704643e-16f,-3.518946036924973e-17f,0f,0.9976125063612252f,0.06906002571440577f,0.20753125f,-1.2246467991473532e-16f,0.06906002571440577f,-0.9976125063612252f,0.28734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9915810044372617f,0.12948788220984692f,1.2246467991473532e-16f,-0.3875f,0.12948788220984692f,0.9915810044372617f,0f,0.3605f,-1.21433650317941e-16f,1.5857692047665853e-17f,-1f,-0.148125f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9915810044372617f,-0.12948788220984692f,1.2246467991473532e-16f,0.3875f,-0.12948788220984692f,0.9915810044372617f,0f,0.3605f,-1.21433650317941e-16f,-1.5857692047665853e-17f,-1f,-0.14812499999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,8.57252759403147e-18f,0f,1f,0f,0.4855f,-1.2246467991473532e-16f,0f,-1f,-0.06999999999999998f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,1.795361663937926e-18f,1.2245151899063662e-16f,0.26875f,0f,0.9998925328992174f,-0.014660240529660688f,-0.15200000000000002f,-1.2246467991473532e-16f,-0.014660240529660688f,-0.9998925328992174f,-0.13249999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,1.795361663937926e-18f,1.2245151899063662e-16f,0.26875f,0f,0.9998925328992174f,-0.014660240529660688f,-0.15200000000000002f,-1.2246467991473532e-16f,-0.014660240529660688f,-0.9998925328992174f,-0.13249999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-8.457413944018093e-18f,1.221722962704643e-16f,-3.518946036924973e-17f,0f,0.9976125063612252f,0.06906002571440577f,-0.35496875f,-1.2246467991473532e-16f,0.06906002571440577f,-0.9976125063612252f,0.28734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9915810044372617f,0.12948788220984692f,1.2246467991473532e-16f,-0.3875f,0.12948788220984692f,0.9915810044372617f,0f,-0.202f,-1.21433650317941e-16f,1.5857692047665853e-17f,-1f,-0.148125f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9915810044372617f,-0.12948788220984692f,1.2246467991473532e-16f,0.3875f,-0.12948788220984692f,0.9915810044372617f,0f,-0.202f,-1.21433650317941e-16f,-1.5857692047665853e-17f,-1f,-0.14812499999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,8.57252759403147e-18f,0f,1f,0f,-0.077f,-1.2246467991473532e-16f,0f,-1f,-0.06999999999999998f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/10.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/10.mcfunction index 4bbae7b5c6..1d169116d0 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/10.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/10.mcfunction @@ -1,7 +1,8 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,6.123233995736765e-17f,1.0605752387249069e-16f,0.26875000000000004f,0f,0.8660254037844387f,-0.49999999999999994f,0.425f,-1.2246467991473532e-16f,-0.49999999999999994f,-0.8660254037844387f,-0.31249999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,6.123233995736765e-17f,1.0605752387249069e-16f,0.26875000000000004f,0f,0.8660254037844387f,-0.49999999999999994f,0.425f,-1.2246467991473532e-16f,-0.49999999999999994f,-0.8660254037844387f,-0.31249999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-8.659560562354934e-17f,8.659560562354932e-17f,-1.3145817984597374e-17f,0f,0.7071067811865475f,0.7071067811865476f,0.22203125f,-1.2246467991473532e-16f,0.7071067811865476f,-0.7071067811865475f,0.10734375000000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.38749999999999996f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.32812500000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.38750000000000007f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.32812499999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.061616997868383e-17f,0f,1f,0f,0.5f,-1.2246467991473532e-16f,0f,-1f,-0.25f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,6.123233995736765e-17f,1.0605752387249069e-16f,0.26875000000000004f,0f,0.8660254037844387f,-0.49999999999999994f,-0.1375f,-1.2246467991473532e-16f,-0.49999999999999994f,-0.8660254037844387f,-0.31249999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,6.123233995736765e-17f,1.0605752387249069e-16f,0.26875000000000004f,0f,0.8660254037844387f,-0.49999999999999994f,-0.1375f,-1.2246467991473532e-16f,-0.49999999999999994f,-0.8660254037844387f,-0.31249999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-8.659560562354934e-17f,8.659560562354932e-17f,-1.3145817984597374e-17f,0f,0.7071067811865475f,0.7071067811865476f,-0.34046875f,-1.2246467991473532e-16f,0.7071067811865476f,-0.7071067811865475f,0.10734375000000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.38749999999999996f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.32812500000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.38750000000000007f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.32812499999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.061616997868383e-17f,0f,1f,0f,-0.0625f,-1.2246467991473532e-16f,0f,-1f,-0.25f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +execute on vehicle unless entity @s[tag=aj.transforms_only] at @s run function animated_java:beat/animations/attack/zzz/frames/zzz/0 \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/11.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/11.mcfunction index 3c8f4ff3fb..8afb08818d 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/11.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/11.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,5.536914571063319e-17f,1.0923303314425196e-16f,0.26875f,0f,0.8919554047771509f,-0.4521233856911506f,0.43950000000000006f,-1.2246467991473532e-16f,-0.4521233856911506f,-0.8919554047771509f,-0.19049999999999984f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,5.536914571063319e-17f,1.0923303314425196e-16f,0.26875f,0f,0.8919554047771509f,-0.4521233856911506f,0.43950000000000006f,-1.2246467991473532e-16f,-0.4521233856911506f,-0.8919554047771509f,-0.19049999999999984f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-7.444998931763958e-17f,9.723578002578027e-17f,-2.80865089341951e-17f,0f,0.7939903986478355f,0.6079302976946052f,0.23653125000000008f,-1.2246467991473532e-16f,0.6079302976946052f,-0.7939903986478355f,0.22934375000000015f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9898755634773158f,-0.14193790484034458f,1.2246467991473532e-16f,-0.3875f,-0.14193790484034458f,0.9898755634773158f,0f,0.38950000000000007f,-1.2122479403666774e-16f,-1.738238008404096e-17f,-1f,-0.2061249999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9898755634773158f,0.14193790484034458f,1.2246467991473532e-16f,0.3875f,0.14193790484034458f,0.9898755634773158f,0f,0.38950000000000007f,-1.2122479403666774e-16f,1.738238008404096e-17f,-1f,-0.20612499999999984f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,1.5675479029086105e-17f,0f,1f,0f,0.5145000000000001f,-1.2246467991473532e-16f,0f,-1f,-0.12799999999999986f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,5.536914571063319e-17f,1.0923303314425196e-16f,0.26875f,0f,0.8919554047771509f,-0.4521233856911506f,-0.123f,-1.2246467991473532e-16f,-0.4521233856911506f,-0.8919554047771509f,-0.19049999999999984f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,5.536914571063319e-17f,1.0923303314425196e-16f,0.26875f,0f,0.8919554047771509f,-0.4521233856911506f,-0.123f,-1.2246467991473532e-16f,-0.4521233856911506f,-0.8919554047771509f,-0.19049999999999984f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-7.444998931763958e-17f,9.723578002578027e-17f,-2.80865089341951e-17f,0f,0.7939903986478355f,0.6079302976946052f,-0.32596875f,-1.2246467991473532e-16f,0.6079302976946052f,-0.7939903986478355f,0.22934375000000015f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9898755634773158f,-0.14193790484034458f,1.2246467991473532e-16f,-0.3875f,-0.14193790484034458f,0.9898755634773158f,0f,-0.173f,-1.2122479403666774e-16f,-1.738238008404096e-17f,-1f,-0.2061249999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9898755634773158f,0.14193790484034458f,1.2246467991473532e-16f,0.3875f,0.14193790484034458f,0.9898755634773158f,0f,-0.173f,-1.2122479403666774e-16f,1.738238008404096e-17f,-1f,-0.20612499999999984f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,1.5675479029086105e-17f,0f,1f,0f,-0.04799999999999999f,-1.2246467991473532e-16f,0f,-1f,-0.12799999999999986f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/12.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/12.mcfunction index 0ba5d57dfb..644ed48ae4 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/12.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/12.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,4.0758638989375565e-17f,1.1548303414074438e-16f,0.26875f,0f,0.9429905358928644f,-0.3328195445229867f,0.456f,-1.2246467991473532e-16f,-0.3328195445229867f,-0.9429905358928644f,-0.006500000000000082f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,4.0758638989375565e-17f,1.1548303414074438e-16f,0.26875f,0f,0.9429905358928644f,-0.3328195445229867f,0.456f,-1.2246467991473532e-16f,-0.3328195445229867f,-0.9429905358928644f,-0.006500000000000082f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-5.353124244859065e-17f,1.1014537624670762e-16f,-5.062001003850637e-17f,0f,0.899405251566371f,0.43711576665093305f,0.25303125000000004f,-1.2246467991473532e-16f,0.43711576665093305f,-0.899405251566371f,0.4133437499999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9623129786416633f,-0.2719443530169538f,1.2246467991473532e-16f,-0.3875f,-0.2719443530169538f,0.9623129786416633f,0f,0.406f,-1.1784935090714683e-16f,-3.3303578146841035e-17f,-1f,-0.02212500000000016f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9623129786416633f,0.2719443530169538f,1.2246467991473532e-16f,0.3875f,0.2719443530169538f,0.9623129786416633f,0f,0.406f,-1.1784935090714683e-16f,3.3303578146841035e-17f,-1f,-0.022125000000000075f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-6.8580220752251635e-18f,0f,1f,0f,0.531f,-1.2246467991473532e-16f,0f,-1f,0.05599999999999988f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,4.0758638989375565e-17f,1.1548303414074438e-16f,0.26875f,0f,0.9429905358928644f,-0.3328195445229867f,-0.10650000000000001f,-1.2246467991473532e-16f,-0.3328195445229867f,-0.9429905358928644f,-0.006500000000000082f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,4.0758638989375565e-17f,1.1548303414074438e-16f,0.26875f,0f,0.9429905358928644f,-0.3328195445229867f,-0.10650000000000001f,-1.2246467991473532e-16f,-0.3328195445229867f,-0.9429905358928644f,-0.006500000000000082f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-5.353124244859065e-17f,1.1014537624670762e-16f,-5.062001003850637e-17f,0f,0.899405251566371f,0.43711576665093305f,-0.30946875f,-1.2246467991473532e-16f,0.43711576665093305f,-0.899405251566371f,0.4133437499999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9623129786416633f,-0.2719443530169538f,1.2246467991473532e-16f,-0.3875f,-0.2719443530169538f,0.9623129786416633f,0f,-0.1565f,-1.1784935090714683e-16f,-3.3303578146841035e-17f,-1f,-0.02212500000000016f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9623129786416633f,0.2719443530169538f,1.2246467991473532e-16f,0.3875f,0.2719443530169538f,0.9623129786416633f,0f,-0.1565f,-1.1784935090714683e-16f,3.3303578146841035e-17f,-1f,-0.022125000000000075f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-6.8580220752251635e-18f,0f,1f,0f,-0.03150000000000001f,-1.2246467991473532e-16f,0f,-1f,0.05599999999999988f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/13.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/13.mcfunction index 891398aa6d..2bd277922f 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/13.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/13.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,2.2443500281894057e-17f,1.2039056076667803e-16f,0.26874999999999993f,0f,0.9830635318730154f,-0.1832650875135598f,0.4715f,-1.2246467991473532e-16f,-0.1832650875135598f,-0.9830635318730154f,0.19150000000000003f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,2.2443500281894057e-17f,1.2039056076667803e-16f,0.26874999999999993f,0f,0.9830635318730154f,-0.1832650875135598f,0.4715f,-1.2246467991473532e-16f,-0.1832650875135598f,-0.9830635318730154f,0.19150000000000003f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-2.896277397066638e-17f,1.1899056916639516e-16f,-7.486801666162398e-17f,0f,0.971631732914674f,0.23649899702372465f,0.26853125f,-1.2246467991473532e-16f,0.23649899702372465f,-0.971631732914674f,0.6113437500000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.925077206834458f,-0.379779095521801f,1.2246467991473532e-16f,-0.38750000000000007f,-0.379779095521801f,0.925077206834458f,0f,0.4215f,-1.132892840313993e-16f,-4.650952537138505e-17f,-1f,0.17587499999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.925077206834458f,0.379779095521801f,1.2246467991473532e-16f,0.38749999999999996f,0.379779095521801f,0.925077206834458f,0f,0.4215f,-1.132892840313993e-16f,4.650952537138505e-17f,-1f,0.17587500000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-3.110602869834277e-17f,0f,1f,0f,0.5465f,-1.2246467991473532e-16f,0f,-1f,0.254f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,2.2443500281894057e-17f,1.2039056076667803e-16f,0.26874999999999993f,0f,0.9830635318730154f,-0.1832650875135598f,-0.091f,-1.2246467991473532e-16f,-0.1832650875135598f,-0.9830635318730154f,0.19150000000000003f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,2.2443500281894057e-17f,1.2039056076667803e-16f,0.26874999999999993f,0f,0.9830635318730154f,-0.1832650875135598f,-0.091f,-1.2246467991473532e-16f,-0.1832650875135598f,-0.9830635318730154f,0.19150000000000003f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-2.896277397066638e-17f,1.1899056916639516e-16f,-7.486801666162398e-17f,0f,0.971631732914674f,0.23649899702372465f,-0.29396875f,-1.2246467991473532e-16f,0.23649899702372465f,-0.971631732914674f,0.6113437500000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.925077206834458f,-0.379779095521801f,1.2246467991473532e-16f,-0.38750000000000007f,-0.379779095521801f,0.925077206834458f,0f,-0.141f,-1.132892840313993e-16f,-4.650952537138505e-17f,-1f,0.17587499999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.925077206834458f,0.379779095521801f,1.2246467991473532e-16f,0.38749999999999996f,0.379779095521801f,0.925077206834458f,0f,-0.141f,-1.132892840313993e-16f,4.650952537138505e-17f,-1f,0.17587500000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-3.110602869834277e-17f,0f,1f,0f,-0.015999999999999993f,-1.2246467991473532e-16f,0f,-1f,0.254f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/14.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/14.mcfunction index dffcff2391..92315bccad 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/14.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/14.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,6.66542980087546e-18f,1.2228315449066637e-16f,0.26874999999999993f,0f,0.9985177324254199f,-0.05442736473500924f,0.48299999999999993f,-1.2246467991473532e-16f,-0.05442736473500924f,-0.9985177324254199f,0.35549999999999987f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,6.66542980087546e-18f,1.2228315449066637e-16f,0.26874999999999993f,0f,0.9985177324254199f,-0.05442736473500924f,0.48299999999999993f,-1.2246467991473532e-16f,-0.05442736473500924f,-0.9985177324254199f,0.35549999999999987f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-8.457413944018115e-18f,1.221722962704643e-16f,-9.495222416764055e-17f,0f,0.9976125063612252f,0.06906002571440595f,0.28003124999999995f,-1.2246467991473532e-16f,0.06906002571440595f,-0.9976125063612252f,0.7753437499999998f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8890970420186033f,-0.45771874538166996f,1.2246467991473532e-16f,-0.38750000000000007f,-0.45771874538166996f,0.8890970420186033f,0f,0.43299999999999994f,-1.0888298466394623e-16f,-5.605437964414045e-17f,-1f,0.33987499999999976f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8890970420186033f,0.45771874538166996f,1.2246467991473532e-16f,0.38749999999999996f,0.45771874538166996f,0.8890970420186033f,0f,0.43299999999999994f,-1.0888298466394623e-16f,5.605437964414045e-17f,-1f,0.33987499999999987f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-5.1190236204359343e-17f,0f,1f,0f,0.5579999999999999f,-1.2246467991473532e-16f,0f,-1f,0.4179999999999998f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,6.66542980087546e-18f,1.2228315449066637e-16f,0.26874999999999993f,0f,0.9985177324254199f,-0.05442736473500924f,-0.07950000000000002f,-1.2246467991473532e-16f,-0.05442736473500924f,-0.9985177324254199f,0.35549999999999987f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,6.66542980087546e-18f,1.2228315449066637e-16f,0.26874999999999993f,0f,0.9985177324254199f,-0.05442736473500924f,-0.07950000000000002f,-1.2246467991473532e-16f,-0.05442736473500924f,-0.9985177324254199f,0.35549999999999987f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-8.457413944018115e-18f,1.221722962704643e-16f,-9.495222416764055e-17f,0f,0.9976125063612252f,0.06906002571440595f,-0.28246875f,-1.2246467991473532e-16f,0.06906002571440595f,-0.9976125063612252f,0.7753437499999998f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8890970420186033f,-0.45771874538166996f,1.2246467991473532e-16f,-0.38750000000000007f,-0.45771874538166996f,0.8890970420186033f,0f,-0.1295f,-1.0888298466394623e-16f,-5.605437964414045e-17f,-1f,0.33987499999999976f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8890970420186033f,0.45771874538166996f,1.2246467991473532e-16f,0.38749999999999996f,0.45771874538166996f,0.8890970420186033f,0f,-0.1295f,-1.0888298466394623e-16f,5.605437964414045e-17f,-1f,0.33987499999999987f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-5.1190236204359343e-17f,0f,1f,0f,-0.004500000000000011f,-1.2246467991473532e-16f,0f,-1f,0.4179999999999998f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/15.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/15.mcfunction index 4b1043176a..8b0dac8011 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/15.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/15.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,0.4875f,-1.2246467991473532e-16f,0f,-1f,0.43750000000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,0.4875f,-1.2246467991473532e-16f,0f,-1f,0.43750000000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-1.0499432792064886e-16f,0f,1f,0f,0.28453125f,-1.2246467991473532e-16f,0f,-1f,0.8573437500000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8660254037844387f,-0.49999999999999994f,1.2246467991473532e-16f,-0.38750000000000007f,-0.49999999999999994f,0.8660254037844387f,0f,0.4375f,-1.0605752387249069e-16f,-6.123233995736765e-17f,-1f,0.42187499999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8660254037844387f,0.49999999999999994f,1.2246467991473532e-16f,0.38749999999999996f,0.49999999999999994f,0.8660254037844387f,0f,0.4375f,-1.0605752387249069e-16f,6.123233995736765e-17f,-1f,0.42187500000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-6.123233995736766e-17f,0f,1f,0f,0.5625f,-1.2246467991473532e-16f,0f,-1f,0.5f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,-0.07500000000000001f,-1.2246467991473532e-16f,0f,-1f,0.43750000000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,-0.07500000000000001f,-1.2246467991473532e-16f,0f,-1f,0.43750000000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-1.0499432792064886e-16f,0f,1f,0f,-0.27796875f,-1.2246467991473532e-16f,0f,-1f,0.8573437500000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8660254037844387f,-0.49999999999999994f,1.2246467991473532e-16f,-0.38750000000000007f,-0.49999999999999994f,0.8660254037844387f,0f,-0.125f,-1.0605752387249069e-16f,-6.123233995736765e-17f,-1f,0.42187499999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8660254037844387f,0.49999999999999994f,1.2246467991473532e-16f,0.38749999999999996f,0.49999999999999994f,0.8660254037844387f,0f,-0.125f,-1.0605752387249069e-16f,6.123233995736765e-17f,-1f,0.42187500000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-6.123233995736766e-17f,0f,1f,0f,0f,-1.2246467991473532e-16f,0f,-1f,0.5f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/16.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/16.mcfunction index dd696a9f40..852cf9cdd7 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/16.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/16.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,0.48300000000000004f,-1.2246467991473532e-16f,0f,-1f,0.4135f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,0.48300000000000004f,-1.2246467991473532e-16f,0f,-1f,0.4135f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-1.0205517560269521e-16f,0f,1f,0f,0.28003125000000006f,-1.2246467991473532e-16f,0f,-1f,0.8333437499999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8681121951482392f,-0.49636802539537683f,1.2246467991473532e-16f,-0.38750000000000007f,-0.49636802539537683f,0.8681121951482392f,0f,0.43300000000000005f,-1.0631308210890736e-16f,-6.078755134995403e-17f,-1f,0.39787499999999987f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8681121951482392f,0.49636802539537683f,1.2246467991473532e-16f,0.38749999999999996f,0.49636802539537683f,0.8681121951482392f,0f,0.43300000000000005f,-1.0631308210890736e-16f,6.078755134995403e-17f,-1f,0.397875f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-5.829318763941401e-17f,0f,1f,0f,0.558f,-1.2246467991473532e-16f,0f,-1f,0.4759999999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,-0.07950000000000002f,-1.2246467991473532e-16f,0f,-1f,0.4135f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,-0.07950000000000002f,-1.2246467991473532e-16f,0f,-1f,0.4135f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-1.0205517560269521e-16f,0f,1f,0f,-0.28246875f,-1.2246467991473532e-16f,0f,-1f,0.8333437499999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8681121951482392f,-0.49636802539537683f,1.2246467991473532e-16f,-0.38750000000000007f,-0.49636802539537683f,0.8681121951482392f,0f,-0.1295f,-1.0631308210890736e-16f,-6.078755134995403e-17f,-1f,0.39787499999999987f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8681121951482392f,0.49636802539537683f,1.2246467991473532e-16f,0.38749999999999996f,0.49636802539537683f,0.8681121951482392f,0f,-0.1295f,-1.0631308210890736e-16f,6.078755134995403e-17f,-1f,0.397875f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-5.829318763941401e-17f,0f,1f,0f,-0.004500000000000004f,-1.2246467991473532e-16f,0f,-1f,0.4759999999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/17.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/17.mcfunction index d8619fa472..8b79074831 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/17.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/17.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,0.4715f,-1.2246467991473532e-16f,0f,-1f,0.3155000000000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,0.4715f,-1.2246467991473532e-16f,0f,-1f,0.3155000000000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-9.005363697105116e-17f,0f,1f,0f,0.26853125f,-1.2246467991473532e-16f,0f,-1f,0.7353437500000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9101059706849957f,-0.4143755809932842f,1.2246467991473532e-16f,-0.38750000000000007f,-0.4143755809932842f,0.9101059706849957f,0f,0.4215f,-1.114558363884275e-16f,-5.074637289082503e-17f,-1f,0.299875f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9101059706849957f,0.4143755809932842f,1.2246467991473532e-16f,0.38749999999999996f,0.4143755809932842f,0.9101059706849957f,0f,0.4215f,-1.114558363884275e-16f,5.074637289082503e-17f,-1f,0.2998750000000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.629164900776996e-17f,0f,1f,0f,0.5465f,-1.2246467991473532e-16f,0f,-1f,0.37800000000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,-0.091f,-1.2246467991473532e-16f,0f,-1f,0.3155000000000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,-0.091f,-1.2246467991473532e-16f,0f,-1f,0.3155000000000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-9.005363697105116e-17f,0f,1f,0f,-0.29396875f,-1.2246467991473532e-16f,0f,-1f,0.7353437500000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9101059706849957f,-0.4143755809932842f,1.2246467991473532e-16f,-0.38750000000000007f,-0.4143755809932842f,0.9101059706849957f,0f,-0.141f,-1.114558363884275e-16f,-5.074637289082503e-17f,-1f,0.299875f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9101059706849957f,0.4143755809932842f,1.2246467991473532e-16f,0.38749999999999996f,0.4143755809932842f,0.9101059706849957f,0f,-0.141f,-1.114558363884275e-16f,5.074637289082503e-17f,-1f,0.2998750000000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.629164900776996e-17f,0f,1f,0f,-0.015999999999999993f,-1.2246467991473532e-16f,0f,-1f,0.37800000000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/18.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/18.mcfunction index 2911c01302..3739a3b785 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/18.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/18.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,0.456f,-1.2246467991473532e-16f,0f,-1f,0.17949999999999997f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,0.456f,-1.2246467991473532e-16f,0f,-1f,0.17949999999999997f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-7.339844050264714e-17f,0f,1f,0f,0.25303125000000004f,-1.2246467991473532e-16f,0f,-1f,0.59934375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9597072623390667f,-0.28100172706525106f,1.2246467991473532e-16f,-0.38750000000000007f,-0.28100172706525106f,0.9597072623390667f,0f,0.406f,-1.175302426942007e-16f,-3.441278656053379e-17f,-1f,0.16387499999999988f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9597072623390667f,0.28100172706525106f,1.2246467991473532e-16f,0.38749999999999996f,0.28100172706525106f,0.9597072623390667f,0f,0.406f,-1.175302426942007e-16f,3.441278656053379e-17f,-1f,0.163875f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-2.963645253936594e-17f,0f,1f,0f,0.531f,-1.2246467991473532e-16f,0f,-1f,0.24199999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,-0.10650000000000001f,-1.2246467991473532e-16f,0f,-1f,0.17949999999999997f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26874999999999993f,0f,1f,0f,-0.10650000000000001f,-1.2246467991473532e-16f,0f,-1f,0.17949999999999997f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-7.339844050264714e-17f,0f,1f,0f,-0.30946875f,-1.2246467991473532e-16f,0f,-1f,0.59934375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9597072623390667f,-0.28100172706525106f,1.2246467991473532e-16f,-0.38750000000000007f,-0.28100172706525106f,0.9597072623390667f,0f,-0.1565f,-1.175302426942007e-16f,-3.441278656053379e-17f,-1f,0.16387499999999988f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9597072623390667f,0.28100172706525106f,1.2246467991473532e-16f,0.38749999999999996f,0.28100172706525106f,0.9597072623390667f,0f,-0.1565f,-1.175302426942007e-16f,3.441278656053379e-17f,-1f,0.163875f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-2.963645253936594e-17f,0f,1f,0f,-0.03150000000000001f,-1.2246467991473532e-16f,0f,-1f,0.24199999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/19.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/19.mcfunction index e2e0fd6bfa..5535c5e652 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/19.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/19.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.43950000000000006f,-1.2246467991473532e-16f,0f,-1f,0.04150000000000024f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.43950000000000006f,-1.2246467991473532e-16f,0f,-1f,0.04150000000000024f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-5.64983146744137e-17f,0f,1f,0f,0.23653125000000008f,-1.2246467991473532e-16f,0f,-1f,0.4613437500000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9915810044372617f,-0.1294878822098471f,1.2246467991473532e-16f,-0.3875f,-0.1294878822098471f,0.9915810044372617f,0f,0.38950000000000007f,-1.21433650317941e-16f,-1.5857692047665878e-17f,-1f,0.025875000000000162f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9915810044372617f,0.1294878822098471f,1.2246467991473532e-16f,0.3875f,0.1294878822098471f,0.9915810044372617f,0f,0.38950000000000007f,-1.21433650317941e-16f,1.5857692047665878e-17f,-1f,0.025875000000000245f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-1.2736326711132498e-17f,0f,1f,0f,0.5145000000000001f,-1.2246467991473532e-16f,0f,-1f,0.1040000000000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.123f,-1.2246467991473532e-16f,0f,-1f,0.04150000000000024f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.123f,-1.2246467991473532e-16f,0f,-1f,0.04150000000000024f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-5.64983146744137e-17f,0f,1f,0f,-0.32596875f,-1.2246467991473532e-16f,0f,-1f,0.4613437500000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9915810044372617f,-0.1294878822098471f,1.2246467991473532e-16f,-0.3875f,-0.1294878822098471f,0.9915810044372617f,0f,-0.173f,-1.21433650317941e-16f,-1.5857692047665878e-17f,-1f,0.025875000000000162f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9915810044372617f,0.1294878822098471f,1.2246467991473532e-16f,0.3875f,0.1294878822098471f,0.9915810044372617f,0f,-0.173f,-1.21433650317941e-16f,1.5857692047665878e-17f,-1f,0.025875000000000245f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,-1.2736326711132498e-17f,0f,1f,0f,-0.04799999999999998f,-1.2246467991473532e-16f,0f,-1f,0.1040000000000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/2.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/2.mcfunction index 4ee352044a..aad0515209 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/2.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/2.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,6.66542980087544e-18f,1.2228315449066637e-16f,0.26875f,0f,0.9985177324254199f,-0.05442736473500908f,0.394f,-1.2246467991473532e-16f,-0.05442736473500908f,-0.9985177324254199f,-0.19249999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,6.66542980087544e-18f,1.2228315449066637e-16f,0.26875f,0f,0.9985177324254199f,-0.05442736473500908f,0.394f,-1.2246467991473532e-16f,-0.05442736473500908f,-0.9985177324254199f,-0.19249999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-2.896277397066637e-17f,1.1899056916639516e-16f,-2.784157957436561e-17f,0f,0.971631732914674f,0.23649899702372457f,0.19103125000000004f,-1.2246467991473532e-16f,0.23649899702372457f,-0.971631732914674f,0.22734375000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9597072623390667f,0.28100172706525095f,1.2246467991473532e-16f,-0.3875f,0.28100172706525095f,0.9597072623390667f,0f,0.34400000000000003f,-1.175302426942007e-16f,3.4412786560533775e-17f,-1f,-0.208125f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9597072623390667f,-0.28100172706525095f,1.2246467991473532e-16f,0.3875f,-0.28100172706525095f,0.9597072623390667f,0f,0.34400000000000003f,-1.175302426942007e-16f,-3.4412786560533775e-17f,-1f,-0.20812499999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,1.592040838891559e-17f,0f,1f,0f,0.46900000000000003f,-1.2246467991473532e-16f,0f,-1f,-0.12999999999999998f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,6.66542980087544e-18f,1.2228315449066637e-16f,0.26875f,0f,0.9985177324254199f,-0.05442736473500908f,-0.1685f,-1.2246467991473532e-16f,-0.05442736473500908f,-0.9985177324254199f,-0.19249999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,6.66542980087544e-18f,1.2228315449066637e-16f,0.26875f,0f,0.9985177324254199f,-0.05442736473500908f,-0.1685f,-1.2246467991473532e-16f,-0.05442736473500908f,-0.9985177324254199f,-0.19249999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-2.896277397066637e-17f,1.1899056916639516e-16f,-2.784157957436561e-17f,0f,0.971631732914674f,0.23649899702372457f,-0.37146875f,-1.2246467991473532e-16f,0.23649899702372457f,-0.971631732914674f,0.22734375000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9597072623390667f,0.28100172706525095f,1.2246467991473532e-16f,-0.3875f,0.28100172706525095f,0.9597072623390667f,0f,-0.2185f,-1.175302426942007e-16f,3.4412786560533775e-17f,-1f,-0.208125f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9597072623390667f,-0.28100172706525095f,1.2246467991473532e-16f,0.3875f,-0.28100172706525095f,0.9597072623390667f,0f,-0.2185f,-1.175302426942007e-16f,-3.4412786560533775e-17f,-1f,-0.20812499999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,1.592040838891559e-17f,0f,1f,0f,-0.0935f,-1.2246467991473532e-16f,0f,-1f,-0.12999999999999998f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/20.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/20.mcfunction index 9bd16381e8..57c5f05cb9 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/20.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/20.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.22203125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.5f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.34046875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.0625f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/3.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/3.mcfunction index 464ebb30b2..7f869148ad 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/3.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/3.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,1.3820921049865113e-17f,1.216822911024935e-16f,0.26875f,0f,0.9936113105200084f,-0.1128563848734817f,0.3785f,-1.2246467991473532e-16f,-0.1128563848734817f,-0.9936113105200084f,-0.2425f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,1.3820921049865113e-17f,1.216822911024935e-16f,0.26875f,0f,0.9936113105200084f,-0.1128563848734817f,0.3785f,-1.2246467991473532e-16f,-0.1128563848734817f,-0.9936113105200084f,-0.2425f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-5.353124244859065e-17f,1.1014537624670762e-16f,-2.1718345578628843e-17f,0f,0.899405251566371f,0.43711576665093305f,0.17553125000000003f,-1.2246467991473532e-16f,0.43711576665093305f,-0.899405251566371f,0.17734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9101059706849957f,0.4143755809932842f,1.2246467991473532e-16f,-0.3875f,0.4143755809932842f,0.9101059706849957f,0f,0.3285f,-1.114558363884275e-16f,5.074637289082503e-17f,-1f,-0.25812500000000005f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9101059706849957f,-0.4143755809932842f,1.2246467991473532e-16f,0.3875f,-0.4143755809932842f,0.9101059706849957f,0f,0.3285f,-1.114558363884275e-16f,-5.074637289082503e-17f,-1f,-0.258125f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,2.204364238465236e-17f,0f,1f,0f,0.4535f,-1.2246467991473532e-16f,0f,-1f,-0.18000000000000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,1.3820921049865113e-17f,1.216822911024935e-16f,0.26875f,0f,0.9936113105200084f,-0.1128563848734817f,-0.18400000000000002f,-1.2246467991473532e-16f,-0.1128563848734817f,-0.9936113105200084f,-0.2425f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,1.3820921049865113e-17f,1.216822911024935e-16f,0.26875f,0f,0.9936113105200084f,-0.1128563848734817f,-0.18400000000000002f,-1.2246467991473532e-16f,-0.1128563848734817f,-0.9936113105200084f,-0.2425f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-5.353124244859065e-17f,1.1014537624670762e-16f,-2.1718345578628843e-17f,0f,0.899405251566371f,0.43711576665093305f,-0.38696875f,-1.2246467991473532e-16f,0.43711576665093305f,-0.899405251566371f,0.17734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9101059706849957f,0.4143755809932842f,1.2246467991473532e-16f,-0.3875f,0.4143755809932842f,0.9101059706849957f,0f,-0.234f,-1.114558363884275e-16f,5.074637289082503e-17f,-1f,-0.25812500000000005f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9101059706849957f,-0.4143755809932842f,1.2246467991473532e-16f,0.3875f,-0.4143755809932842f,0.9101059706849957f,0f,-0.234f,-1.114558363884275e-16f,-5.074637289082503e-17f,-1f,-0.258125f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,2.204364238465236e-17f,0f,1f,0f,-0.10900000000000001f,-1.2246467991473532e-16f,0f,-1f,-0.18000000000000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/4.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/4.mcfunction index f3ac468be2..cc2355f510 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/4.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/4.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,2.2443500281894048e-17f,1.2039056076667803e-16f,0.26875f,0f,0.9830635318730154f,-0.18326508751355972f,0.367f,-1.2246467991473532e-16f,-0.18326508751355972f,-0.9830635318730154f,-0.2824999999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,2.2443500281894048e-17f,1.2039056076667803e-16f,0.26875f,0f,0.9830635318730154f,-0.18326508751355972f,0.367f,-1.2246467991473532e-16f,-0.18326508751355972f,-0.9830635318730154f,-0.2824999999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-7.444998931763957e-17f,9.723578002578028e-17f,-1.6819758382039438e-17f,0f,0.7939903986478356f,0.607930297694605f,0.16403125000000002f,-1.2246467991473532e-16f,0.607930297694605f,-0.7939903986478356f,0.13734375000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8681121951482392f,0.4963680253953767f,1.2246467991473532e-16f,-0.3875f,0.4963680253953767f,0.8681121951482392f,0f,0.317f,-1.0631308210890736e-16f,6.078755134995402e-17f,-1f,-0.29812500000000003f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8681121951482392f,-0.4963680253953767f,1.2246467991473532e-16f,0.3875f,-0.4963680253953767f,0.8681121951482392f,0f,0.317f,-1.0631308210890736e-16f,-6.078755134995402e-17f,-1f,-0.2981249999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,2.6942229581241766e-17f,0f,1f,0f,0.442f,-1.2246467991473532e-16f,0f,-1f,-0.21999999999999997f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,2.2443500281894048e-17f,1.2039056076667803e-16f,0.26875f,0f,0.9830635318730154f,-0.18326508751355972f,-0.1955f,-1.2246467991473532e-16f,-0.18326508751355972f,-0.9830635318730154f,-0.2824999999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,2.2443500281894048e-17f,1.2039056076667803e-16f,0.26875f,0f,0.9830635318730154f,-0.18326508751355972f,-0.1955f,-1.2246467991473532e-16f,-0.18326508751355972f,-0.9830635318730154f,-0.2824999999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-7.444998931763957e-17f,9.723578002578028e-17f,-1.6819758382039438e-17f,0f,0.7939903986478356f,0.607930297694605f,-0.39846875f,-1.2246467991473532e-16f,0.607930297694605f,-0.7939903986478356f,0.13734375000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8681121951482392f,0.4963680253953767f,1.2246467991473532e-16f,-0.3875f,0.4963680253953767f,0.8681121951482392f,0f,-0.2455f,-1.0631308210890736e-16f,6.078755134995402e-17f,-1f,-0.29812500000000003f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8681121951482392f,-0.4963680253953767f,1.2246467991473532e-16f,0.3875f,-0.4963680253953767f,0.8681121951482392f,0f,-0.2455f,-1.0631308210890736e-16f,-6.078755134995402e-17f,-1f,-0.2981249999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,2.6942229581241766e-17f,0f,1f,0f,-0.1205f,-1.2246467991473532e-16f,0f,-1f,-0.21999999999999997f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/5.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/5.mcfunction index b170076cb2..71ef43af01 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/5.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/5.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,3.169619151431765e-17f,1.1829179713786698e-16f,0.26875000000000004f,0f,0.9659258262890683f,-0.25881904510252074f,0.3625f,-1.2246467991473532e-16f,-0.25881904510252074f,-0.9659258262890683f,-0.31249999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,3.169619151431765e-17f,1.1829179713786698e-16f,0.26875000000000004f,0f,0.9659258262890683f,-0.25881904510252074f,0.3625f,-1.2246467991473532e-16f,-0.25881904510252074f,-0.9659258262890683f,-0.31249999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-8.659560562354934e-17f,8.659560562354932e-17f,-1.3145817984597374e-17f,0f,0.7071067811865475f,0.7071067811865476f,0.15953125f,-1.2246467991473532e-16f,0.7071067811865476f,-0.7071067811865475f,0.10734375000000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8660254037844387f,0.49999999999999994f,1.2246467991473532e-16f,-0.38749999999999996f,0.49999999999999994f,0.8660254037844387f,0f,0.3125f,-1.0605752387249069e-16f,6.123233995736765e-17f,-1f,-0.32812500000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8660254037844387f,-0.49999999999999994f,1.2246467991473532e-16f,0.38750000000000007f,-0.49999999999999994f,0.8660254037844387f,0f,0.3125f,-1.0605752387249069e-16f,-6.123233995736765e-17f,-1f,-0.32812499999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.061616997868383e-17f,0f,1f,0f,0.4375f,-1.2246467991473532e-16f,0f,-1f,-0.25f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,3.169619151431765e-17f,1.1829179713786698e-16f,0.26875000000000004f,0f,0.9659258262890683f,-0.25881904510252074f,-0.2f,-1.2246467991473532e-16f,-0.25881904510252074f,-0.9659258262890683f,-0.31249999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,3.169619151431765e-17f,1.1829179713786698e-16f,0.26875000000000004f,0f,0.9659258262890683f,-0.25881904510252074f,-0.2f,-1.2246467991473532e-16f,-0.25881904510252074f,-0.9659258262890683f,-0.31249999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-8.659560562354934e-17f,8.659560562354932e-17f,-1.3145817984597374e-17f,0f,0.7071067811865475f,0.7071067811865476f,-0.40296875f,-1.2246467991473532e-16f,0.7071067811865476f,-0.7071067811865475f,0.10734375000000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8660254037844387f,0.49999999999999994f,1.2246467991473532e-16f,-0.38749999999999996f,0.49999999999999994f,0.8660254037844387f,0f,-0.25f,-1.0605752387249069e-16f,6.123233995736765e-17f,-1f,-0.32812500000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8660254037844387f,-0.49999999999999994f,1.2246467991473532e-16f,0.38750000000000007f,-0.49999999999999994f,0.8660254037844387f,0f,-0.25f,-1.0605752387249069e-16f,-6.123233995736765e-17f,-1f,-0.32812499999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.061616997868383e-17f,0f,1f,0f,-0.125f,-1.2246467991473532e-16f,0f,-1f,-0.25f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/6.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/6.mcfunction index 27e530c3c6..3367955a02 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/6.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/6.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,4.075863898937556e-17f,1.1548303414074438e-16f,0.26875000000000004f,0f,0.9429905358928645f,-0.3328195445229866f,0.367f,-1.2246467991473532e-16f,-0.3328195445229866f,-0.9429905358928645f,-0.3404999999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,4.075863898937556e-17f,1.1548303414074438e-16f,0.26875000000000004f,0f,0.9429905358928645f,-0.3328195445229866f,0.367f,-1.2246467991473532e-16f,-0.3328195445229866f,-0.9429905358928645f,-0.3404999999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-9.186211204279397e-17f,8.098734591067758e-17f,-9.716806946984786e-18f,0f,0.6613118653236518f,0.7501110696304596f,0.16403125000000002f,-1.2246467991473532e-16f,0.7501110696304596f,-0.6613118653236518f,0.07934375000000005f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8890970420186033f,0.45771874538166996f,1.2246467991473532e-16f,-0.38749999999999996f,0.45771874538166996f,0.8890970420186033f,0f,0.317f,-1.0888298466394623e-16f,5.605437964414045e-17f,-1f,-0.356125f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8890970420186033f,-0.45771874538166996f,1.2246467991473532e-16f,0.38750000000000007f,-0.45771874538166996f,0.8890970420186033f,0f,0.317f,-1.0888298466394623e-16f,-5.605437964414045e-17f,-1f,-0.3561249999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.404518101629642e-17f,0f,1f,0f,0.442f,-1.2246467991473532e-16f,0f,-1f,-0.27799999999999997f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,4.075863898937556e-17f,1.1548303414074438e-16f,0.26875000000000004f,0f,0.9429905358928645f,-0.3328195445229866f,-0.1955f,-1.2246467991473532e-16f,-0.3328195445229866f,-0.9429905358928645f,-0.3404999999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,4.075863898937556e-17f,1.1548303414074438e-16f,0.26875000000000004f,0f,0.9429905358928645f,-0.3328195445229866f,-0.1955f,-1.2246467991473532e-16f,-0.3328195445229866f,-0.9429905358928645f,-0.3404999999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-9.186211204279397e-17f,8.098734591067758e-17f,-9.716806946984786e-18f,0f,0.6613118653236518f,0.7501110696304596f,-0.39846875f,-1.2246467991473532e-16f,0.7501110696304596f,-0.6613118653236518f,0.07934375000000005f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8890970420186033f,0.45771874538166996f,1.2246467991473532e-16f,-0.38749999999999996f,0.45771874538166996f,0.8890970420186033f,0f,-0.2455f,-1.0888298466394623e-16f,5.605437964414045e-17f,-1f,-0.356125f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8890970420186033f,-0.45771874538166996f,1.2246467991473532e-16f,0.38750000000000007f,-0.45771874538166996f,0.8890970420186033f,0f,-0.2455f,-1.0888298466394623e-16f,-5.605437964414045e-17f,-1f,-0.3561249999999999f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.404518101629642e-17f,0f,1f,0f,-0.1205f,-1.2246467991473532e-16f,0f,-1f,-0.27799999999999997f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/7.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/7.mcfunction index 4b343c33fd..0136037db7 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/7.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/7.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,4.887187681836448e-17f,1.122904158103851e-16f,0.26875000000000004f,0f,0.9169208288346163f,-0.3990691589802952f,0.3785f,-1.2246467991473532e-16f,-0.3990691589802952f,-0.9169208288346163f,-0.36649999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,4.887187681836448e-17f,1.122904158103851e-16f,0.26875000000000004f,0f,0.9169208288346163f,-0.3990691589802952f,0.3785f,-1.2246467991473532e-16f,-0.3990691589802952f,-0.9169208288346163f,-0.36649999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-9.436065764660176e-17f,7.806192487454681e-17f,-6.532725269201669e-18f,0f,0.6374239897486897f,0.7705132427757891f,0.17553125000000003f,-1.2246467991473532e-16f,0.7705132427757891f,-0.6374239897486897f,0.05334375000000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.925077206834458f,0.37977909552180117f,1.2246467991473532e-16f,-0.38749999999999996f,0.37977909552180117f,0.925077206834458f,0f,0.3285f,-1.132892840313993e-16f,4.650952537138507e-17f,-1f,-0.38212500000000005f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.925077206834458f,-0.37977909552180117f,1.2246467991473532e-16f,0.38750000000000007f,-0.37977909552180117f,0.925077206834458f,0f,0.3285f,-1.132892840313993e-16f,-4.650952537138507e-17f,-1f,-0.38212499999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.7229262694079535e-17f,0f,1f,0f,0.4535f,-1.2246467991473532e-16f,0f,-1f,-0.304f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,4.887187681836448e-17f,1.122904158103851e-16f,0.26875000000000004f,0f,0.9169208288346163f,-0.3990691589802952f,-0.18400000000000002f,-1.2246467991473532e-16f,-0.3990691589802952f,-0.9169208288346163f,-0.36649999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,4.887187681836448e-17f,1.122904158103851e-16f,0.26875000000000004f,0f,0.9169208288346163f,-0.3990691589802952f,-0.18400000000000002f,-1.2246467991473532e-16f,-0.3990691589802952f,-0.9169208288346163f,-0.36649999999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-9.436065764660176e-17f,7.806192487454681e-17f,-6.532725269201669e-18f,0f,0.6374239897486897f,0.7705132427757891f,-0.38696875f,-1.2246467991473532e-16f,0.7705132427757891f,-0.6374239897486897f,0.05334375000000002f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.925077206834458f,0.37977909552180117f,1.2246467991473532e-16f,-0.38749999999999996f,0.37977909552180117f,0.925077206834458f,0f,-0.234f,-1.132892840313993e-16f,4.650952537138507e-17f,-1f,-0.38212500000000005f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.925077206834458f,-0.37977909552180117f,1.2246467991473532e-16f,0.38750000000000007f,-0.37977909552180117f,0.925077206834458f,0f,-0.234f,-1.132892840313993e-16f,-4.650952537138507e-17f,-1f,-0.38212499999999994f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.7229262694079535e-17f,0f,1f,0f,-0.10900000000000001f,-1.2246467991473532e-16f,0f,-1f,-0.304f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/8.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/8.mcfunction index 13c64c4eeb..d8cbbb35f2 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/8.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/8.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,5.5369145710633175e-17f,1.0923303314425196e-16f,0.26875000000000004f,0f,0.8919554047771509f,-0.45212338569115057f,0.394f,-1.2246467991473532e-16f,-0.45212338569115057f,-0.8919554047771509f,-0.37849999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,5.5369145710633175e-17f,1.0923303314425196e-16f,0.26875000000000004f,0f,0.8919554047771509f,-0.45212338569115057f,0.394f,-1.2246467991473532e-16f,-0.45212338569115057f,-0.8919554047771509f,-0.37849999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-9.436065764660176e-17f,7.806192487454681e-17f,-5.063149110224842e-18f,0f,0.6374239897486897f,0.7705132427757891f,0.19103125000000004f,-1.2246467991473532e-16f,0.7705132427757891f,-0.6374239897486897f,0.04134375000000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9623129786416633f,0.27194435301695374f,1.2246467991473532e-16f,-0.38749999999999996f,0.27194435301695374f,0.9623129786416633f,0f,0.34400000000000003f,-1.1784935090714683e-16f,3.330357814684103e-17f,-1f,-0.39412500000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9623129786416633f,-0.27194435301695374f,1.2246467991473532e-16f,0.38750000000000007f,-0.27194435301695374f,0.9623129786416633f,0f,0.34400000000000003f,-1.1784935090714683e-16f,-3.330357814684103e-17f,-1f,-0.39412499999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.869883885305636e-17f,0f,1f,0f,0.46900000000000003f,-1.2246467991473532e-16f,0f,-1f,-0.316f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,5.5369145710633175e-17f,1.0923303314425196e-16f,0.26875000000000004f,0f,0.8919554047771509f,-0.45212338569115057f,-0.1685f,-1.2246467991473532e-16f,-0.45212338569115057f,-0.8919554047771509f,-0.37849999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,5.5369145710633175e-17f,1.0923303314425196e-16f,0.26875000000000004f,0f,0.8919554047771509f,-0.45212338569115057f,-0.1685f,-1.2246467991473532e-16f,-0.45212338569115057f,-0.8919554047771509f,-0.37849999999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-9.436065764660176e-17f,7.806192487454681e-17f,-5.063149110224842e-18f,0f,0.6374239897486897f,0.7705132427757891f,-0.37146875f,-1.2246467991473532e-16f,0.7705132427757891f,-0.6374239897486897f,0.04134375000000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9623129786416633f,0.27194435301695374f,1.2246467991473532e-16f,-0.38749999999999996f,0.27194435301695374f,0.9623129786416633f,0f,-0.2185f,-1.1784935090714683e-16f,3.330357814684103e-17f,-1f,-0.39412500000000006f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9623129786416633f,-0.27194435301695374f,1.2246467991473532e-16f,0.38750000000000007f,-0.27194435301695374f,0.9623129786416633f,0f,-0.2185f,-1.1784935090714683e-16f,-3.330357814684103e-17f,-1f,-0.39412499999999995f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.869883885305636e-17f,0f,1f,0f,-0.0935f,-1.2246467991473532e-16f,0f,-1f,-0.316f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/9.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/9.mcfunction index 5ea12c07e6..00818b614c 100644 --- a/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/9.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/9.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,5.967093068536737e-17f,1.0694380700985289e-16f,0.26875000000000004f,0f,0.8732624548099202f,-0.4872501257253324f,0.4105f,-1.2246467991473532e-16f,-0.4872501257253324f,-0.8732624548099202f,-0.3645f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,5.967093068536737e-17f,1.0694380700985289e-16f,0.26875000000000004f,0f,0.8732624548099202f,-0.4872501257253324f,0.4105f,-1.2246467991473532e-16f,-0.4872501257253324f,-0.8732624548099202f,-0.3645f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,-9.186211204279397e-17f,8.098734591067758e-17f,-6.777654629031133e-18f,0f,0.6613118653236518f,0.7501110696304596f,0.20753125f,-1.2246467991473532e-16f,0.7501110696304596f,-0.6613118653236518f,0.05534374999999997f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9898755634773158f,0.1419379048403445f,1.2246467991473532e-16f,-0.38749999999999996f,0.1419379048403445f,0.9898755634773158f,0f,0.3605f,-1.2122479403666774e-16f,1.738238008404095e-17f,-1f,-0.3801250000000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9898755634773158f,-0.1419379048403445f,1.2246467991473532e-16f,0.38750000000000007f,-0.1419379048403445f,0.9898755634773158f,0f,0.3605f,-1.2122479403666774e-16f,-1.738238008404095e-17f,-1f,-0.380125f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.698433333425007e-17f,0f,1f,0f,0.4855f,-1.2246467991473532e-16f,0f,-1f,-0.30200000000000005f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,5.967093068536737e-17f,1.0694380700985289e-16f,0.26875000000000004f,0f,0.8732624548099202f,-0.4872501257253324f,-0.15200000000000002f,-1.2246467991473532e-16f,-0.4872501257253324f,-0.8732624548099202f,-0.3645f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,5.967093068536737e-17f,1.0694380700985289e-16f,0.26875000000000004f,0f,0.8732624548099202f,-0.4872501257253324f,-0.15200000000000002f,-1.2246467991473532e-16f,-0.4872501257253324f,-0.8732624548099202f,-0.3645f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,-9.186211204279397e-17f,8.098734591067758e-17f,-6.777654629031133e-18f,0f,0.6613118653236518f,0.7501110696304596f,-0.35496875f,-1.2246467991473532e-16f,0.7501110696304596f,-0.6613118653236518f,0.05534374999999997f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9898755634773158f,0.1419379048403445f,1.2246467991473532e-16f,-0.38749999999999996f,0.1419379048403445f,0.9898755634773158f,0f,-0.202f,-1.2122479403666774e-16f,1.738238008404095e-17f,-1f,-0.3801250000000001f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9898755634773158f,-0.1419379048403445f,1.2246467991473532e-16f,0.38750000000000007f,-0.1419379048403445f,0.9898755634773158f,0f,-0.202f,-1.2122479403666774e-16f,-1.738238008404095e-17f,-1f,-0.380125f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,3.698433333425007e-17f,0f,1f,0f,-0.07700000000000001f,-1.2246467991473532e-16f,0f,-1f,-0.30200000000000005f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/invalid_version_warning.mcfunction b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/zzz/0.mcfunction similarity index 64% rename from animated_java/data/animated_java/function/jukebox_display/invalid_version_warning.mcfunction rename to animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/zzz/0.mcfunction index 2aa1d21d6d..651382121d 100644 --- a/animated_java/data/animated_java/function/jukebox_display/invalid_version_warning.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/zzz/0.mcfunction @@ -1 +1,2 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. +playsound ssbrc:fighter.mega_man.beat_call.loop hostile @a \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/0.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/0.mcfunction index 9bd16381e8..57c5f05cb9 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/0.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/0.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.22203125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.5f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.34046875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.0625f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/1.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/1.mcfunction index 9a138b94a6..b4de0b6511 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/1.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/1.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.4095f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.4095f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.20653125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9915810044372617f,0.12948788220984692f,1.2246467991473532e-16f,-0.3875f,0.12948788220984692f,0.9915810044372617f,0f,0.3595f,-1.21433650317941e-16f,1.5857692047665853e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9915810044372617f,-0.12948788220984692f,1.2246467991473532e-16f,0.3875f,-0.12948788220984692f,0.9915810044372617f,0f,0.3595f,-1.21433650317941e-16f,-1.5857692047665853e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.4845f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.15300000000000002f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.15300000000000002f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.35596875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9915810044372617f,0.12948788220984692f,1.2246467991473532e-16f,-0.3875f,0.12948788220984692f,0.9915810044372617f,0f,-0.203f,-1.21433650317941e-16f,1.5857692047665853e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9915810044372617f,-0.12948788220984692f,1.2246467991473532e-16f,0.3875f,-0.12948788220984692f,0.9915810044372617f,0f,-0.203f,-1.21433650317941e-16f,-1.5857692047665853e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.078f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/10.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/10.mcfunction index 9bd16381e8..2a3204256f 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/10.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/10.mcfunction @@ -1,7 +1,8 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.22203125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.5f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.34046875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.0625f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +execute on vehicle unless entity @s[tag=aj.transforms_only] at @s run function animated_java:beat/animations/idle/zzz/frames/zzz/0 \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/11.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/11.mcfunction index 1fe559197c..9a722981d9 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/11.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/11.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.442f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.442f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.23903125000000003f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9898755634773158f,-0.14193790484034458f,1.2246467991473532e-16f,-0.3875f,-0.14193790484034458f,0.9898755634773158f,0f,0.392f,-1.2122479403666774e-16f,-1.738238008404096e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9898755634773158f,0.14193790484034458f,1.2246467991473532e-16f,0.3875f,0.14193790484034458f,0.9898755634773158f,0f,0.392f,-1.2122479403666774e-16f,1.738238008404096e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.517f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1205f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1205f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.32346874999999997f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9898755634773158f,-0.14193790484034458f,1.2246467991473532e-16f,-0.3875f,-0.14193790484034458f,0.9898755634773158f,0f,-0.17049999999999998f,-1.2122479403666774e-16f,-1.738238008404096e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9898755634773158f,0.14193790484034458f,1.2246467991473532e-16f,0.3875f,0.14193790484034458f,0.9898755634773158f,0f,-0.17049999999999998f,-1.2122479403666774e-16f,1.738238008404096e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.045499999999999985f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/12.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/12.mcfunction index 7665984eda..48eede627b 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/12.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/12.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.457875f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.457875f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.25490625f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9623129786416633f,-0.2719443530169538f,1.2246467991473532e-16f,-0.3875f,-0.2719443530169538f,0.9623129786416633f,0f,0.407875f,-1.1784935090714683e-16f,-3.3303578146841035e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9623129786416633f,0.2719443530169538f,1.2246467991473532e-16f,0.3875f,0.2719443530169538f,0.9623129786416633f,0f,0.407875f,-1.1784935090714683e-16f,3.3303578146841035e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.532875f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.10462500000000002f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.10462500000000002f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.30759375f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9623129786416633f,-0.2719443530169538f,1.2246467991473532e-16f,-0.3875f,-0.2719443530169538f,0.9623129786416633f,0f,-0.154625f,-1.1784935090714683e-16f,-3.3303578146841035e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9623129786416633f,0.2719443530169538f,1.2246467991473532e-16f,0.3875f,0.2719443530169538f,0.9623129786416633f,0f,-0.154625f,-1.1784935090714683e-16f,3.3303578146841035e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.029625000000000012f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/13.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/13.mcfunction index a692d87ca7..853c8155e9 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/13.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/13.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.4715f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.4715f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.26853125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.925077206834458f,-0.379779095521801f,1.2246467991473532e-16f,-0.3875f,-0.379779095521801f,0.925077206834458f,0f,0.4215f,-1.132892840313993e-16f,-4.650952537138505e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.925077206834458f,0.379779095521801f,1.2246467991473532e-16f,0.3875f,0.379779095521801f,0.925077206834458f,0f,0.4215f,-1.132892840313993e-16f,4.650952537138505e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.5465f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.09100000000000005f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.09100000000000005f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.29396875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.925077206834458f,-0.379779095521801f,1.2246467991473532e-16f,-0.3875f,-0.379779095521801f,0.925077206834458f,0f,-0.14100000000000004f,-1.132892840313993e-16f,-4.650952537138505e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.925077206834458f,0.379779095521801f,1.2246467991473532e-16f,0.3875f,0.379779095521801f,0.925077206834458f,0f,-0.14100000000000004f,-1.132892840313993e-16f,4.650952537138505e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.016000000000000042f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/14.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/14.mcfunction index eabbc13a1d..e21c657cfe 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/14.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/14.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.48174999999999996f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.48174999999999996f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.27878125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8890970420186033f,-0.45771874538166996f,1.2246467991473532e-16f,-0.3875f,-0.45771874538166996f,0.8890970420186033f,0f,0.43174999999999997f,-1.0888298466394623e-16f,-5.605437964414045e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8890970420186033f,0.45771874538166996f,1.2246467991473532e-16f,0.3875f,0.45771874538166996f,0.8890970420186033f,0f,0.43174999999999997f,-1.0888298466394623e-16f,5.605437964414045e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.55675f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.08075000000000003f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.08075000000000003f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.28371875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8890970420186033f,-0.45771874538166996f,1.2246467991473532e-16f,-0.3875f,-0.45771874538166996f,0.8890970420186033f,0f,-0.13075000000000003f,-1.0888298466394623e-16f,-5.605437964414045e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8890970420186033f,0.45771874538166996f,1.2246467991473532e-16f,0.3875f,0.45771874538166996f,0.8890970420186033f,0f,-0.13075000000000003f,-1.0888298466394623e-16f,5.605437964414045e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.005750000000000019f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/15.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/15.mcfunction index 93d26d00b5..975b21dfaf 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/15.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/15.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.4875f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.4875f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.28453125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8660254037844387f,-0.49999999999999994f,1.2246467991473532e-16f,-0.3875f,-0.49999999999999994f,0.8660254037844387f,0f,0.4375f,-1.0605752387249069e-16f,-6.123233995736765e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8660254037844387f,0.49999999999999994f,1.2246467991473532e-16f,0.3875f,0.49999999999999994f,0.8660254037844387f,0f,0.4375f,-1.0605752387249069e-16f,6.123233995736765e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.5625f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.07500000000000001f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.07500000000000001f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.27796875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8660254037844387f,-0.49999999999999994f,1.2246467991473532e-16f,-0.3875f,-0.49999999999999994f,0.8660254037844387f,0f,-0.125f,-1.0605752387249069e-16f,-6.123233995736765e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8660254037844387f,0.49999999999999994f,1.2246467991473532e-16f,0.3875f,0.49999999999999994f,0.8660254037844387f,0f,-0.125f,-1.0605752387249069e-16f,6.123233995736765e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/16.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/16.mcfunction index 0f34ac5010..4d9557bfaf 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/16.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/16.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.48699999999999993f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.48699999999999993f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.28403124999999996f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8681121951482392f,-0.49636802539537683f,1.2246467991473532e-16f,-0.3875f,-0.49636802539537683f,0.8681121951482392f,0f,0.43699999999999994f,-1.0631308210890736e-16f,-6.078755134995403e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8681121951482392f,0.49636802539537683f,1.2246467991473532e-16f,0.3875f,0.49636802539537683f,0.8681121951482392f,0f,0.43699999999999994f,-1.0631308210890736e-16f,6.078755134995403e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.5619999999999999f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.07550000000000001f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.07550000000000001f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.27846875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8681121951482392f,-0.49636802539537683f,1.2246467991473532e-16f,-0.3875f,-0.49636802539537683f,0.8681121951482392f,0f,-0.1255f,-1.0631308210890736e-16f,-6.078755134995403e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8681121951482392f,0.49636802539537683f,1.2246467991473532e-16f,0.3875f,0.49636802539537683f,0.8681121951482392f,0f,-0.1255f,-1.0631308210890736e-16f,6.078755134995403e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.0005000000000000074f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/17.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/17.mcfunction index dd32f2ee1d..59d7382e58 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/17.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/17.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.47600000000000003f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.47600000000000003f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.27303125000000006f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9101059706849957f,-0.4143755809932842f,1.2246467991473532e-16f,-0.3875f,-0.4143755809932842f,0.9101059706849957f,0f,0.42600000000000005f,-1.114558363884275e-16f,-5.074637289082503e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9101059706849957f,0.4143755809932842f,1.2246467991473532e-16f,0.3875f,0.4143755809932842f,0.9101059706849957f,0f,0.42600000000000005f,-1.114558363884275e-16f,5.074637289082503e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.551f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.0865f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.0865f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.28946875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9101059706849957f,-0.4143755809932842f,1.2246467991473532e-16f,-0.3875f,-0.4143755809932842f,0.9101059706849957f,0f,-0.13649999999999998f,-1.114558363884275e-16f,-5.074637289082503e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9101059706849957f,0.4143755809932842f,1.2246467991473532e-16f,0.3875f,0.4143755809932842f,0.9101059706849957f,0f,-0.13649999999999998f,-1.114558363884275e-16f,5.074637289082503e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.01149999999999999f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/18.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/18.mcfunction index 0412469db6..a977fde618 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/18.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/18.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.459f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.459f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.25603125000000004f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9597072623390667f,-0.28100172706525106f,1.2246467991473532e-16f,-0.3875f,-0.28100172706525106f,0.9597072623390667f,0f,0.40900000000000003f,-1.175302426942007e-16f,-3.441278656053379e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9597072623390667f,0.28100172706525106f,1.2246467991473532e-16f,0.3875f,0.28100172706525106f,0.9597072623390667f,0f,0.40900000000000003f,-1.175302426942007e-16f,3.441278656053379e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.534f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.10350000000000002f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.10350000000000002f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.30646875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9597072623390667f,-0.28100172706525106f,1.2246467991473532e-16f,-0.3875f,-0.28100172706525106f,0.9597072623390667f,0f,-0.15350000000000003f,-1.175302426942007e-16f,-3.441278656053379e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9597072623390667f,0.28100172706525106f,1.2246467991473532e-16f,0.3875f,0.28100172706525106f,0.9597072623390667f,0f,-0.15350000000000003f,-1.175302426942007e-16f,3.441278656053379e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.02850000000000001f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/19.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/19.mcfunction index 7802cf377f..ae10b966bd 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/19.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/19.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.44050000000000006f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.44050000000000006f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.23753125000000008f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9915810044372617f,-0.1294878822098471f,1.2246467991473532e-16f,-0.3875f,-0.1294878822098471f,0.9915810044372617f,0f,0.39050000000000007f,-1.21433650317941e-16f,-1.5857692047665878e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9915810044372617f,0.1294878822098471f,1.2246467991473532e-16f,0.3875f,0.1294878822098471f,0.9915810044372617f,0f,0.39050000000000007f,-1.21433650317941e-16f,1.5857692047665878e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.5155000000000001f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.12199999999999998f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.12199999999999998f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.32496875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9915810044372617f,-0.1294878822098471f,1.2246467991473532e-16f,-0.3875f,-0.1294878822098471f,0.9915810044372617f,0f,-0.172f,-1.21433650317941e-16f,-1.5857692047665878e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9915810044372617f,0.1294878822098471f,1.2246467991473532e-16f,0.3875f,0.1294878822098471f,0.9915810044372617f,0f,-0.172f,-1.21433650317941e-16f,1.5857692047665878e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.04699999999999997f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/2.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/2.mcfunction index 2cafe12f08..7fbb07d846 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/2.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/2.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.391f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.391f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.18803125000000004f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9597072623390667f,0.28100172706525095f,1.2246467991473532e-16f,-0.3875f,0.28100172706525095f,0.9597072623390667f,0f,0.341f,-1.175302426942007e-16f,3.4412786560533775e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9597072623390667f,-0.28100172706525095f,1.2246467991473532e-16f,0.3875f,-0.28100172706525095f,0.9597072623390667f,0f,0.341f,-1.175302426942007e-16f,-3.4412786560533775e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.466f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.17149999999999999f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.17149999999999999f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.37446874999999996f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9597072623390667f,0.28100172706525095f,1.2246467991473532e-16f,-0.3875f,0.28100172706525095f,0.9597072623390667f,0f,-0.22149999999999997f,-1.175302426942007e-16f,3.4412786560533775e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9597072623390667f,-0.28100172706525095f,1.2246467991473532e-16f,0.3875f,-0.28100172706525095f,0.9597072623390667f,0f,-0.22149999999999997f,-1.175302426942007e-16f,-3.4412786560533775e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.09649999999999999f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/20.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/20.mcfunction index 9bd16381e8..57c5f05cb9 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/20.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/20.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.22203125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.5f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.34046875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.0625f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/3.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/3.mcfunction index ffbf360801..1819d3596c 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/3.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/3.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.374f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.374f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.17103125000000002f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9101059706849957f,0.4143755809932842f,1.2246467991473532e-16f,-0.3875f,0.4143755809932842f,0.9101059706849957f,0f,0.324f,-1.114558363884275e-16f,5.074637289082503e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9101059706849957f,-0.4143755809932842f,1.2246467991473532e-16f,0.3875f,-0.4143755809932842f,0.9101059706849957f,0f,0.324f,-1.114558363884275e-16f,-5.074637289082503e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.449f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1885f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1885f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.39146875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9101059706849957f,0.4143755809932842f,1.2246467991473532e-16f,-0.3875f,0.4143755809932842f,0.9101059706849957f,0f,-0.2385f,-1.114558363884275e-16f,5.074637289082503e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9101059706849957f,-0.4143755809932842f,1.2246467991473532e-16f,0.3875f,-0.4143755809932842f,0.9101059706849957f,0f,-0.2385f,-1.114558363884275e-16f,-5.074637289082503e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.1135f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/4.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/4.mcfunction index 0d8722f2a3..fded7e8208 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/4.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/4.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.363f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.363f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.16003125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8681121951482392f,0.4963680253953767f,1.2246467991473532e-16f,-0.3875f,0.4963680253953767f,0.8681121951482392f,0f,0.313f,-1.0631308210890736e-16f,6.078755134995402e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8681121951482392f,-0.4963680253953767f,1.2246467991473532e-16f,0.3875f,-0.4963680253953767f,0.8681121951482392f,0f,0.313f,-1.0631308210890736e-16f,-6.078755134995402e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.438f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1995f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1995f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.40246875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8681121951482392f,0.4963680253953767f,1.2246467991473532e-16f,-0.3875f,0.4963680253953767f,0.8681121951482392f,0f,-0.2495f,-1.0631308210890736e-16f,6.078755134995402e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8681121951482392f,-0.4963680253953767f,1.2246467991473532e-16f,0.3875f,-0.4963680253953767f,0.8681121951482392f,0f,-0.2495f,-1.0631308210890736e-16f,-6.078755134995402e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.12449999999999999f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/5.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/5.mcfunction index 47f854745a..4f4ba451d3 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/5.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/5.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.3625f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.3625f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.15953125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8660254037844387f,0.49999999999999994f,1.2246467991473532e-16f,-0.3875f,0.49999999999999994f,0.8660254037844387f,0f,0.3125f,-1.0605752387249069e-16f,6.123233995736765e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8660254037844387f,-0.49999999999999994f,1.2246467991473532e-16f,0.3875f,-0.49999999999999994f,0.8660254037844387f,0f,0.3125f,-1.0605752387249069e-16f,-6.123233995736765e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.4375f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.2f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.2f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.40296875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8660254037844387f,0.49999999999999994f,1.2246467991473532e-16f,-0.3875f,0.49999999999999994f,0.8660254037844387f,0f,-0.25f,-1.0605752387249069e-16f,6.123233995736765e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8660254037844387f,-0.49999999999999994f,1.2246467991473532e-16f,0.3875f,-0.49999999999999994f,0.8660254037844387f,0f,-0.25f,-1.0605752387249069e-16f,-6.123233995736765e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.125f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/6.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/6.mcfunction index 1f4d299a90..6d770de3cb 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/6.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/6.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.36825f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.36825f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.16528125000000005f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.8890970420186033f,0.45771874538166996f,1.2246467991473532e-16f,-0.3875f,0.45771874538166996f,0.8890970420186033f,0f,0.31825000000000003f,-1.0888298466394623e-16f,5.605437964414045e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.8890970420186033f,-0.45771874538166996f,1.2246467991473532e-16f,0.3875f,-0.45771874538166996f,0.8890970420186033f,0f,0.31825000000000003f,-1.0888298466394623e-16f,-5.605437964414045e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.44325000000000003f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.19425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.19425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.39721874999999995f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.8890970420186033f,0.45771874538166996f,1.2246467991473532e-16f,-0.3875f,0.45771874538166996f,0.8890970420186033f,0f,-0.24425f,-1.0888298466394623e-16f,5.605437964414045e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.8890970420186033f,-0.45771874538166996f,1.2246467991473532e-16f,0.3875f,-0.45771874538166996f,0.8890970420186033f,0f,-0.24425f,-1.0888298466394623e-16f,-5.605437964414045e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.11925f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/7.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/7.mcfunction index e15df11ef5..d72e17152f 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/7.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/7.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.3785f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.3785f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.17553125000000003f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.925077206834458f,0.37977909552180117f,1.2246467991473532e-16f,-0.3875f,0.37977909552180117f,0.925077206834458f,0f,0.3285f,-1.132892840313993e-16f,4.650952537138507e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.925077206834458f,-0.37977909552180117f,1.2246467991473532e-16f,0.3875f,-0.37977909552180117f,0.925077206834458f,0f,0.3285f,-1.132892840313993e-16f,-4.650952537138507e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.4535f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.18400000000000002f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.18400000000000002f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.38696875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.925077206834458f,0.37977909552180117f,1.2246467991473532e-16f,-0.3875f,0.37977909552180117f,0.925077206834458f,0f,-0.234f,-1.132892840313993e-16f,4.650952537138507e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.925077206834458f,-0.37977909552180117f,1.2246467991473532e-16f,0.3875f,-0.37977909552180117f,0.925077206834458f,0f,-0.234f,-1.132892840313993e-16f,-4.650952537138507e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.10900000000000001f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/8.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/8.mcfunction index 2b52b1a2a3..d3fc36ea27 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/8.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/8.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.392125f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.392125f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.18915625000000003f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9623129786416633f,0.27194435301695374f,1.2246467991473532e-16f,-0.3875f,0.27194435301695374f,0.9623129786416633f,0f,0.342125f,-1.1784935090714683e-16f,3.330357814684103e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9623129786416633f,-0.27194435301695374f,1.2246467991473532e-16f,0.3875f,-0.27194435301695374f,0.9623129786416633f,0f,0.342125f,-1.1784935090714683e-16f,-3.330357814684103e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.467125f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.170375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.170375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.37334375f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9623129786416633f,0.27194435301695374f,1.2246467991473532e-16f,-0.3875f,0.27194435301695374f,0.9623129786416633f,0f,-0.220375f,-1.1784935090714683e-16f,3.330357814684103e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9623129786416633f,-0.27194435301695374f,1.2246467991473532e-16f,0.3875f,-0.27194435301695374f,0.9623129786416633f,0f,-0.220375f,-1.1784935090714683e-16f,-3.330357814684103e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.09537499999999999f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/9.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/9.mcfunction index bfcf4ff037..63c06ef1e9 100644 --- a/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/9.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/9.mcfunction @@ -1,7 +1,7 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.408f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.408f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.20503125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_right_wing) { transformation: [-0.9898755634773158f,0.1419379048403445f,1.2246467991473532e-16f,-0.3875f,0.1419379048403445f,0.9898755634773158f,0f,0.358f,-1.2122479403666774e-16f,1.738238008404095e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_left_wing) { transformation: [-0.9898755634773158f,-0.1419379048403445f,1.2246467991473532e-16f,0.3875f,-0.1419379048403445f,0.9898755634773158f,0f,0.358f,-1.2122479403666774e-16f,-1.738238008404095e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } -$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.483f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file +$data merge entity $(bone_left_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.15450000000000003f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_foot) { transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.15450000000000003f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_mouth) { transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.35746875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_right_wing) { transformation: [-0.9898755634773158f,0.1419379048403445f,1.2246467991473532e-16f,-0.3875f,0.1419379048403445f,0.9898755634773158f,0f,-0.20450000000000002f,-1.2122479403666774e-16f,1.738238008404095e-17f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_left_wing) { transformation: [-0.9898755634773158f,-0.1419379048403445f,1.2246467991473532e-16f,0.3875f,-0.1419379048403445f,0.9898755634773158f,0f,-0.20450000000000002f,-1.2122479403666774e-16f,-1.738238008404095e-17f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } +$data merge entity $(bone_beat) { transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.07950000000000002f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0, interpolation_duration: 1 } \ No newline at end of file diff --git a/data/animated_java/function/global/remove/everything.mcfunction b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/zzz/0.mcfunction similarity index 64% rename from data/animated_java/function/global/remove/everything.mcfunction rename to animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/zzz/0.mcfunction index de77e85339..651382121d 100644 --- a/data/animated_java/function/global/remove/everything.mcfunction +++ b/animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/zzz/0.mcfunction @@ -1,2 +1,2 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -kill @e[tag=aj.global.entity] \ No newline at end of file +playsound ssbrc:fighter.mega_man.beat_call.loop hostile @a \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/apply_default_pose.mcfunction b/animated_java/data/animated_java/function/beat/apply_default_pose.mcfunction index 38bf8b0320..720ece1721 100644 --- a/animated_java/data/animated_java/function/beat/apply_default_pose.mcfunction +++ b/animated_java/data/animated_java/function/beat/apply_default_pose.mcfunction @@ -1,8 +1,8 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. execute unless entity @s[type=item_display,tag=aj.beat.root] run return run function animated_java:global/errors/function_not_executed_as_root_entity {'export_namespace': 'beat', 'function_path': 'animated_java:beat/apply_default_pose'} -execute on passengers if entity @s[tag=aj.beat.bone.left_foot] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0} -execute on passengers if entity @s[tag=aj.beat.bone.right_foot] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0} -execute on passengers if entity @s[tag=aj.beat.bone.mouth] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.22203125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0} -execute on passengers if entity @s[tag=aj.beat.bone.right_wing] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0} -execute on passengers if entity @s[tag=aj.beat.bone.left_wing] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0} -execute on passengers if entity @s[tag=aj.beat.bone.beat] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.5f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0} \ No newline at end of file +execute on passengers if entity @s[tag=aj.beat.bone.left_foot] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0} +execute on passengers if entity @s[tag=aj.beat.bone.right_foot] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: 0} +execute on passengers if entity @s[tag=aj.beat.bone.mouth] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.34046875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: 0} +execute on passengers if entity @s[tag=aj.beat.bone.right_wing] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: 0} +execute on passengers if entity @s[tag=aj.beat.bone.left_wing] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: 0} +execute on passengers if entity @s[tag=aj.beat.bone.beat] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.0625f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: 0} \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/root/on_load.mcfunction b/animated_java/data/animated_java/function/beat/root/on_load.mcfunction index 7047a3597e..dd6bfc3a7b 100644 --- a/animated_java/data/animated_java/function/beat/root/on_load.mcfunction +++ b/animated_java/data/animated_java/function/beat/root/on_load.mcfunction @@ -1,4 +1,4 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. execute unless entity @s[tag=aj.beat.root] run return 0 -execute on passengers if entity @s[tag=aj.beat.data] unless data entity @s {data:{rigHash: 'e7a07d72bd88a3ece34af11649486fb6a97a28ca3d760713133cc08f1f0a76d6'}} on vehicle run function animated_java:beat/root/zzz/0 +execute on passengers if entity @s[tag=aj.beat.data] unless data entity @s {data:{rigHash: '71a3f460146aea4d6036558930b00e3b30e80b41a218cb33d57c65cc6bf5011b'}} on vehicle run function animated_java:beat/root/zzz/0 scoreboard players set @s aj.is_rig_loaded 1 \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/root/zzz/0.mcfunction b/animated_java/data/animated_java/function/beat/root/zzz/0.mcfunction index 0194822955..7cb6dfb248 100644 --- a/animated_java/data/animated_java/function/beat/root/zzz/0.mcfunction +++ b/animated_java/data/animated_java/function/beat/root/zzz/0.mcfunction @@ -3,7 +3,7 @@ execute store result storage aj:temp x int 1 store result score #this.x aj.i run execute store result storage aj:temp y int 1 store result score #this.y aj.i run data get entity @s Pos[1] 1 execute store result storage aj:temp z int 1 store result score #this.z aj.i run data get entity @s Pos[2] 1 function animated_java:beat/root/outdated_tellraw with storage aj:temp -data modify entity @s data.rigHash set value 'e7a07d72bd88a3ece34af11649486fb6a97a28ca3d760713133cc08f1f0a76d6' +data modify entity @s data.rigHash set value '71a3f460146aea4d6036558930b00e3b30e80b41a218cb33d57c65cc6bf5011b' execute on passengers run data merge entity @s {Glowing: 1b, glow_color_override: 16711680} summon minecraft:text_display ~ ~ ~ {Tags:['aj.global.entity', 'aj.outdated_rig_text_display', 'aj.new'], text:'["",{"text":"This rig instance is outdated!\\nIt will not function correctly and should be removed or re-summoned.","color":"red"}]', billboard: "vertical", transformation:{translation:[0f,3f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[1f,1f,1f]}} ride @e[type=minecraft:text_display,tag=aj.new,limit=1,distance=..0.01] mount @s diff --git a/animated_java/data/animated_java/function/beat/set_default_pose.mcfunction b/animated_java/data/animated_java/function/beat/set_default_pose.mcfunction index 5d516cf910..3a163ac90e 100644 --- a/animated_java/data/animated_java/function/beat/set_default_pose.mcfunction +++ b/animated_java/data/animated_java/function/beat/set_default_pose.mcfunction @@ -1,8 +1,8 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. execute unless entity @s[type=item_display,tag=aj.beat.root] run return run function animated_java:global/errors/function_not_executed_as_root_entity {'export_namespace': 'beat', 'function_path': 'animated_java:beat/set_default_pose'} -execute on passengers if entity @s[tag=aj.beat.bone.left_foot] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: -1} -execute on passengers if entity @s[tag=aj.beat.bone.right_foot] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,0.425f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: -1} -execute on passengers if entity @s[tag=aj.beat.bone.mouth] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,0.22203125f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: -1} -execute on passengers if entity @s[tag=aj.beat.bone.right_wing] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: -1} -execute on passengers if entity @s[tag=aj.beat.bone.left_wing] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,0.375f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: -1} -execute on passengers if entity @s[tag=aj.beat.bone.beat] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,0.5f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: -1} \ No newline at end of file +execute on passengers if entity @s[tag=aj.beat.bone.left_foot] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: -1} +execute on passengers if entity @s[tag=aj.beat.bone.right_foot] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.26875f,0f,1f,0f,-0.1375f,-1.2246467991473532e-16f,0f,-1f,-0.062499999999999965f,0f,0f,0f,1f], start_interpolation: -1} +execute on passengers if entity @s[tag=aj.beat.bone.mouth] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,-4.3761987963281204e-17f,0f,1f,0f,-0.34046875f,-1.2246467991473532e-16f,0f,-1f,0.35734375f,0f,0f,0f,1f], start_interpolation: -1} +execute on passengers if entity @s[tag=aj.beat.bone.right_wing] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,-0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812500000000004f,0f,0f,0f,1f], start_interpolation: -1} +execute on passengers if entity @s[tag=aj.beat.bone.left_wing] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0.3875f,0f,1f,0f,-0.1875f,-1.2246467991473532e-16f,0f,-1f,-0.07812499999999996f,0f,0f,0f,1f], start_interpolation: -1} +execute on passengers if entity @s[tag=aj.beat.bone.beat] run data merge entity @s {transformation: [-1f,0f,1.2246467991473532e-16f,0f,0f,1f,0f,-0.0625f,-1.2246467991473532e-16f,0f,-1f,0f,0f,0f,0f,1f], start_interpolation: -1} \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/summon.mcfunction b/animated_java/data/animated_java/function/beat/summon.mcfunction index 360c315ca6..7b8ba52281 100644 --- a/animated_java/data/animated_java/function/beat/summon.mcfunction +++ b/animated_java/data/animated_java/function/beat/summon.mcfunction @@ -1,5 +1,5 @@ # This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. data modify storage aj:temp args set value {variant:'', animation:'', frame: 0} $execute store success score #success aj.i run data modify storage aj:temp args set value $(args) -summon minecraft:item_display ~ ~ ~ { Tags:['aj.new','aj.global.entity','aj.global.root','aj.beat.root'], teleport_duration: 0, interpolation_duration: 1, Passengers:[{id:"minecraft:marker",Tags:["aj.global.node","aj.global.data","aj.beat.data"],data:{rigHash:"e7a07d72bd88a3ece34af11649486fb6a97a28ca3d760713133cc08f1f0a76d6",locators:{},cameras:{},bones:{data_data:"",bone_left_foot:"",bone_right_foot:"",bone_mouth:"",bone_right_wing:"",bone_left_wing:"",bone_beat:""}}},{Tags:["aj.beat.bone","aj.beat.bone.beat.child","aj.beat.bone.beat.child.bone","aj.beat.bone.beat.decendant","aj.beat.bone.beat.decendant.bone","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.bone.left_foot","aj.beat.bone.left_foot.tree","aj.beat.bone.left_foot.tree.bone","aj.beat.display_node.left_foot","aj.beat.entity","aj.beat.node","aj.beat.node.left_foot","aj.global.bone","aj.global.bone.beat.child","aj.global.bone.beat.child.bone","aj.global.bone.beat.decendant","aj.global.bone.beat.decendant.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.bone.left_foot.tree","aj.global.bone.left_foot.tree.bone","aj.global.display_node.left_foot","aj.global.entity","aj.global.node","aj.global.node.left_foot"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/left_foot","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f},{Tags:["aj.beat.bone","aj.beat.bone.beat.child","aj.beat.bone.beat.child.bone","aj.beat.bone.beat.decendant","aj.beat.bone.beat.decendant.bone","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.bone.right_foot","aj.beat.bone.right_foot.tree","aj.beat.bone.right_foot.tree.bone","aj.beat.display_node.right_foot","aj.beat.entity","aj.beat.node","aj.beat.node.right_foot","aj.global.bone","aj.global.bone.beat.child","aj.global.bone.beat.child.bone","aj.global.bone.beat.decendant","aj.global.bone.beat.decendant.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.bone.right_foot.tree","aj.global.bone.right_foot.tree.bone","aj.global.display_node.right_foot","aj.global.entity","aj.global.node","aj.global.node.right_foot"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/right_foot","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f},{Tags:["aj.beat.bone","aj.beat.bone.beat.child","aj.beat.bone.beat.child.bone","aj.beat.bone.beat.decendant","aj.beat.bone.beat.decendant.bone","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.bone.mouth","aj.beat.bone.mouth.tree","aj.beat.bone.mouth.tree.bone","aj.beat.display_node.mouth","aj.beat.entity","aj.beat.node","aj.beat.node.mouth","aj.global.bone","aj.global.bone.beat.child","aj.global.bone.beat.child.bone","aj.global.bone.beat.decendant","aj.global.bone.beat.decendant.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.bone.mouth.tree","aj.global.bone.mouth.tree.bone","aj.global.display_node.mouth","aj.global.entity","aj.global.node","aj.global.node.mouth"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/mouth","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f},{Tags:["aj.beat.bone","aj.beat.bone.beat.child","aj.beat.bone.beat.child.bone","aj.beat.bone.beat.decendant","aj.beat.bone.beat.decendant.bone","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.bone.right_wing","aj.beat.bone.right_wing.tree","aj.beat.bone.right_wing.tree.bone","aj.beat.display_node.right_wing","aj.beat.entity","aj.beat.node","aj.beat.node.right_wing","aj.global.bone","aj.global.bone.beat.child","aj.global.bone.beat.child.bone","aj.global.bone.beat.decendant","aj.global.bone.beat.decendant.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.bone.right_wing.tree","aj.global.bone.right_wing.tree.bone","aj.global.display_node.right_wing","aj.global.entity","aj.global.node","aj.global.node.right_wing"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/right_wing","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f},{Tags:["aj.beat.bone","aj.beat.bone.beat.child","aj.beat.bone.beat.child.bone","aj.beat.bone.beat.decendant","aj.beat.bone.beat.decendant.bone","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.bone.left_wing","aj.beat.bone.left_wing.tree","aj.beat.bone.left_wing.tree.bone","aj.beat.display_node.left_wing","aj.beat.entity","aj.beat.node","aj.beat.node.left_wing","aj.global.bone","aj.global.bone.beat.child","aj.global.bone.beat.child.bone","aj.global.bone.beat.decendant","aj.global.bone.beat.decendant.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.bone.left_wing.tree","aj.global.bone.left_wing.tree.bone","aj.global.display_node.left_wing","aj.global.entity","aj.global.node","aj.global.node.left_wing"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/left_wing","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f},{Tags:["aj.beat.bone","aj.beat.bone.beat","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.display_node.beat","aj.beat.entity","aj.beat.node","aj.beat.node.beat","aj.global.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.display_node.beat","aj.global.entity","aj.global.node","aj.global.node.beat","aj.global.root.child","aj.global.root.child.bone"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/beat","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f}], } +summon minecraft:item_display ~ ~ ~ { Tags:['aj.new','aj.global.entity','aj.global.root','aj.beat.root'], teleport_duration: 0, interpolation_duration: 1, Passengers:[{id:"minecraft:marker",Tags:["aj.global.node","aj.global.data","aj.beat.data"],data:{rigHash:"71a3f460146aea4d6036558930b00e3b30e80b41a218cb33d57c65cc6bf5011b",locators:{},cameras:{},bones:{data_data:"",bone_left_foot:"",bone_right_foot:"",bone_mouth:"",bone_right_wing:"",bone_left_wing:"",bone_beat:""}}},{Tags:["aj.beat.bone","aj.beat.bone.beat.child","aj.beat.bone.beat.child.bone","aj.beat.bone.beat.decendant","aj.beat.bone.beat.decendant.bone","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.bone.left_foot","aj.beat.bone.left_foot.tree","aj.beat.bone.left_foot.tree.bone","aj.beat.display_node.left_foot","aj.beat.entity","aj.beat.node","aj.beat.node.left_foot","aj.global.bone","aj.global.bone.beat.child","aj.global.bone.beat.child.bone","aj.global.bone.beat.decendant","aj.global.bone.beat.decendant.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.bone.left_foot.tree","aj.global.bone.left_foot.tree.bone","aj.global.display_node.left_foot","aj.global.entity","aj.global.node","aj.global.node.left_foot"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/left_foot","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f},{Tags:["aj.beat.bone","aj.beat.bone.beat.child","aj.beat.bone.beat.child.bone","aj.beat.bone.beat.decendant","aj.beat.bone.beat.decendant.bone","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.bone.right_foot","aj.beat.bone.right_foot.tree","aj.beat.bone.right_foot.tree.bone","aj.beat.display_node.right_foot","aj.beat.entity","aj.beat.node","aj.beat.node.right_foot","aj.global.bone","aj.global.bone.beat.child","aj.global.bone.beat.child.bone","aj.global.bone.beat.decendant","aj.global.bone.beat.decendant.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.bone.right_foot.tree","aj.global.bone.right_foot.tree.bone","aj.global.display_node.right_foot","aj.global.entity","aj.global.node","aj.global.node.right_foot"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/right_foot","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f},{Tags:["aj.beat.bone","aj.beat.bone.beat.child","aj.beat.bone.beat.child.bone","aj.beat.bone.beat.decendant","aj.beat.bone.beat.decendant.bone","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.bone.mouth","aj.beat.bone.mouth.tree","aj.beat.bone.mouth.tree.bone","aj.beat.display_node.mouth","aj.beat.entity","aj.beat.node","aj.beat.node.mouth","aj.global.bone","aj.global.bone.beat.child","aj.global.bone.beat.child.bone","aj.global.bone.beat.decendant","aj.global.bone.beat.decendant.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.bone.mouth.tree","aj.global.bone.mouth.tree.bone","aj.global.display_node.mouth","aj.global.entity","aj.global.node","aj.global.node.mouth"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/mouth","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f},{Tags:["aj.beat.bone","aj.beat.bone.beat.child","aj.beat.bone.beat.child.bone","aj.beat.bone.beat.decendant","aj.beat.bone.beat.decendant.bone","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.bone.right_wing","aj.beat.bone.right_wing.tree","aj.beat.bone.right_wing.tree.bone","aj.beat.display_node.right_wing","aj.beat.entity","aj.beat.node","aj.beat.node.right_wing","aj.global.bone","aj.global.bone.beat.child","aj.global.bone.beat.child.bone","aj.global.bone.beat.decendant","aj.global.bone.beat.decendant.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.bone.right_wing.tree","aj.global.bone.right_wing.tree.bone","aj.global.display_node.right_wing","aj.global.entity","aj.global.node","aj.global.node.right_wing"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/right_wing","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f},{Tags:["aj.beat.bone","aj.beat.bone.beat.child","aj.beat.bone.beat.child.bone","aj.beat.bone.beat.decendant","aj.beat.bone.beat.decendant.bone","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.bone.left_wing","aj.beat.bone.left_wing.tree","aj.beat.bone.left_wing.tree.bone","aj.beat.display_node.left_wing","aj.beat.entity","aj.beat.node","aj.beat.node.left_wing","aj.global.bone","aj.global.bone.beat.child","aj.global.bone.beat.child.bone","aj.global.bone.beat.decendant","aj.global.bone.beat.decendant.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.bone.left_wing.tree","aj.global.bone.left_wing.tree.bone","aj.global.display_node.left_wing","aj.global.entity","aj.global.node","aj.global.node.left_wing"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/left_wing","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f},{Tags:["aj.beat.bone","aj.beat.bone.beat","aj.beat.bone.beat.tree","aj.beat.bone.beat.tree.bone","aj.beat.display_node.beat","aj.beat.entity","aj.beat.node","aj.beat.node.beat","aj.global.bone","aj.global.bone.beat.tree","aj.global.bone.beat.tree.bone","aj.global.display_node.beat","aj.global.entity","aj.global.node","aj.global.node.beat","aj.global.root.child","aj.global.root.child.bone"],id:"minecraft:item_display",transformation:{translation:[0f,0f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,0f,0f]},interpolation_duration:1,teleport_duration:0,item_display:"head",item:{id:"minecraft:feather",Count:1,components:{"minecraft:item_model":"animated_java:blueprint/beat/beat","minecraft:custom_model_data":{strings:["default"]}}},height:48f,width:48f}], } execute as @e[type=item_display,tag=aj.new,limit=1,distance=..0.01] run function animated_java:beat/zzz/0 \ No newline at end of file diff --git a/animated_java/data/animated_java/function/beat/zzz/0.mcfunction b/animated_java/data/animated_java/function/beat/zzz/0.mcfunction index 870f77ec25..b59976fbaf 100644 --- a/animated_java/data/animated_java/function/beat/zzz/0.mcfunction +++ b/animated_java/data/animated_java/function/beat/zzz/0.mcfunction @@ -9,5 +9,4 @@ tp @s ~ ~ ~ ~ ~ execute at @s on passengers run rotate @s ~ ~ data modify entity @s teleport_duration set value 1 execute on passengers run data modify entity @s teleport_duration set value 1 -function ssbrc:fighter/mega_man/logic/abilities/beat_call/init function #animated_java:beat/as_root/on_summon \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/as_own_locator_entities.mcfunction b/animated_java/data/animated_java/function/jukebox_display/as_own_locator_entities.mcfunction deleted file mode 100644 index 00ffb8f239..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/as_own_locator_entities.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -execute unless entity @s[type=item_display,tag=aj.jukebox_display.root] run return run function animated_java:global/errors/function_not_executed_as_root_entity {'export_namespace': 'jukebox_display', 'function_path': 'animated_java:jukebox_display/as_all_locators'} -$data modify storage aj:temp command set value '$(command)' -execute on passengers if entity @s[tag=aj.global.data] run function animated_java:jukebox_display/zzz/4 \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/remove/all.mcfunction b/animated_java/data/animated_java/function/jukebox_display/remove/all.mcfunction deleted file mode 100644 index 300c6aa962..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/remove/all.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -execute as @e[type=item_display,tag=aj.jukebox_display.root] run function animated_java:jukebox_display/remove/this \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/remove/this.mcfunction b/animated_java/data/animated_java/function/jukebox_display/remove/this.mcfunction deleted file mode 100644 index e7ce0a77b4..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/remove/this.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -execute unless entity @s[type=item_display,tag=aj.jukebox_display.root] run return run function animated_java:global/errors/function_not_executed_as_root_entity {'export_namespace': 'jukebox_display', 'function_path': 'animated_java:jukebox_display/remove/this'} -function #animated_java:jukebox_display/as_root/on_remove -execute on passengers if entity @s[tag=aj.global.data] run function animated_java:jukebox_display/remove/zzz/0 -execute on passengers run kill @s -kill @s \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/remove/zzz/0.mcfunction b/animated_java/data/animated_java/function/jukebox_display/remove/zzz/0.mcfunction deleted file mode 100644 index 278d1bca93..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/remove/zzz/0.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -function animated_java:jukebox_display/remove/zzz/kill with entity @s data.locators.particle \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/remove/zzz/kill.mcfunction b/animated_java/data/animated_java/function/jukebox_display/remove/zzz/kill.mcfunction deleted file mode 100644 index 896a23e515..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/remove/zzz/kill.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$execute as $(uuid) run function animated_java:jukebox_display/remove/zzz/kill_passengers \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/remove/zzz/kill_passengers.mcfunction b/animated_java/data/animated_java/function/jukebox_display/remove/zzz/kill_passengers.mcfunction deleted file mode 100644 index 0ca0c0ea7e..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/remove/zzz/kill_passengers.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -execute on passengers run function animated_java:jukebox_display/remove/zzz/kill_passengers -kill @s \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/root/on_load.mcfunction b/animated_java/data/animated_java/function/jukebox_display/root/on_load.mcfunction deleted file mode 100644 index 16a932fd8b..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/root/on_load.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -execute unless entity @s[tag=aj.jukebox_display.root] run return 0 -execute on passengers if entity @s[tag=aj.jukebox_display.data] unless data entity @s {data:{rigHash: 'a6403581178161b5cb900e5b43f078261892a81224ec4f0f3cf2f683b8bcbb14'}} on vehicle run function animated_java:jukebox_display/root/zzz/0 -scoreboard players set @s aj.is_rig_loaded 1 \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/root/on_tick.mcfunction b/animated_java/data/animated_java/function/jukebox_display/root/on_tick.mcfunction deleted file mode 100644 index 8a4afd13dd..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/root/on_tick.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -execute unless entity @s[tag=aj.jukebox_display.root] run return 0 -execute unless score @s aj.is_rig_loaded matches 1 run function #animated_java:global/root/on_load -function #animated_java:jukebox_display/as_root/pre_tick -execute on passengers if entity @s[tag=aj.jukebox_display.data] run function animated_java:jukebox_display/root/zzz/1 -execute at @s on passengers run rotate @s ~ ~ -function #animated_java:jukebox_display/as_root/post_tick \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/root/outdated_tellraw.mcfunction b/animated_java/data/animated_java/function/jukebox_display/root/outdated_tellraw.mcfunction deleted file mode 100644 index 23f5a320a1..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/root/outdated_tellraw.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$tellraw @a ["",[[{"text":"\n[","color":"gray"},{"text":"AJ","color":"aqua"},"] ",[{"text":"(from ","color":"gray","italic":true},"jukebox_display",")"]," -> "],{"text":"ERROR: ","color":"red"},"\n "],{"text":"The ","color":"red"},{"text":"jukebox_display","color":"yellow"},{"text":" rig instance at","color":"red"},[{"text":" [","color":"yellow"},{"score":{"name":"#this.x","objective":"aj.i"}},", ",{"score":{"name":"#this.y","objective":"aj.i"}},", ",{"score":{"name":"#this.z","objective":"aj.i"}},"]"],{"text":" is outdated! It will not function correctly and should be removed or re-summoned.","color":"red"},"\n ",{"text":"[Click Here to Teleport to the Rig Instance]","clickEvent":{"action":"suggest_command","value":"/tp @s $(x) $(y) $(z)"},"color":"aqua","underlined":true},["\n"]] \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/root/zzz/0.mcfunction b/animated_java/data/animated_java/function/jukebox_display/root/zzz/0.mcfunction deleted file mode 100644 index d1494c10d0..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/root/zzz/0.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -execute store result storage aj:temp x int 1 store result score #this.x aj.i run data get entity @s Pos[0] 1 -execute store result storage aj:temp y int 1 store result score #this.y aj.i run data get entity @s Pos[1] 1 -execute store result storage aj:temp z int 1 store result score #this.z aj.i run data get entity @s Pos[2] 1 -function animated_java:jukebox_display/root/outdated_tellraw with storage aj:temp -data modify entity @s data.rigHash set value 'a6403581178161b5cb900e5b43f078261892a81224ec4f0f3cf2f683b8bcbb14' -execute on passengers run data merge entity @s {Glowing: 1b, glow_color_override: 16711680} -summon minecraft:text_display ~ ~ ~ {Tags:['aj.global.entity', 'aj.outdated_rig_text_display', 'aj.new'], text:'["",{"text":"This rig instance is outdated!\\nIt will not function correctly and should be removed or re-summoned.","color":"red"}]', billboard: "vertical", transformation:{translation:[0f,3f,0f],left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[1f,1f,1f]}} -ride @e[type=minecraft:text_display,tag=aj.new,limit=1,distance=..0.01] mount @s -tag @e[type=minecraft:text_display,tag=aj.new,limit=1,distance=..0.01] remove aj.new \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/root/zzz/1.mcfunction b/animated_java/data/animated_java/function/jukebox_display/root/zzz/1.mcfunction deleted file mode 100644 index b09e9d0de9..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/root/zzz/1.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -function animated_java:jukebox_display/root/zzz/2 with entity @s data.locators.particle \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/root/zzz/2.mcfunction b/animated_java/data/animated_java/function/jukebox_display/root/zzz/2.mcfunction deleted file mode 100644 index fea79ed32b..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/root/zzz/2.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$execute as $(uuid) positioned ^$(posx) ^$(posy) ^$(posz) rotated ~$(roty) ~$(rotx) run function animated_java:jukebox_display/root/zzz/3 \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/root/zzz/3.mcfunction b/animated_java/data/animated_java/function/jukebox_display/root/zzz/3.mcfunction deleted file mode 100644 index 39202dc8bf..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/root/zzz/3.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -tp @s ~ ~ ~ ~ ~ -function ssbrc:logic/game/lobby/jukebox/tick \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/set_default_pose.mcfunction b/animated_java/data/animated_java/function/jukebox_display/set_default_pose.mcfunction deleted file mode 100644 index 9f9b96a8eb..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/set_default_pose.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -execute unless entity @s[type=item_display,tag=aj.jukebox_display.root] run return run function animated_java:global/errors/function_not_executed_as_root_entity {'export_namespace': 'jukebox_display', 'function_path': 'animated_java:jukebox_display/set_default_pose'} -execute on passengers if entity @s[tag=aj.jukebox_display.bone.item_display] run data merge entity @s {transformation: [0.10825317547305473f,0.18750000000000003f,-0.125f,-0.24999999999999997f,-0.18207316137948912f,0.1544863441889915f,0.074049533181506f,0.1875f,0.13278032198062525f,0.05897219225296313f,0.20344942033734334f,-0.12500000000000003f,0f,0f,0f,1f], start_interpolation: -1} \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/summon.mcfunction b/animated_java/data/animated_java/function/jukebox_display/summon.mcfunction deleted file mode 100644 index 3db9f9daea..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/summon.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -data modify storage aj:temp args set value {variant:''} -$execute store success score #success aj.i run data modify storage aj:temp args set value $(args) -summon minecraft:item_display ~ ~ ~ { Tags:['aj.new','aj.global.entity','aj.global.root','aj.jukebox_display.root'], teleport_duration: 0, interpolation_duration: 1, Passengers:[{id:"minecraft:marker",Tags:["aj.global.node","aj.global.data","aj.jukebox_display.data"],data:{rigHash:"a6403581178161b5cb900e5b43f078261892a81224ec4f0f3cf2f683b8bcbb14",locators:{particle:{posx:0.015625000000000003f,posy:0.390625f,posz:-0.031249999999999997f,rotx:0f,roty:0f,uuid:""}},cameras:{},bones:{data_data:"",item_display_item_display:""}}},{Tags:["aj.global.display_node.item_display","aj.global.entity","aj.global.item_display","aj.global.node","aj.global.node.item_display","aj.global.root.child","aj.global.root.child.item_display","aj.jukebox_display.display_node.item_display","aj.jukebox_display.entity","aj.jukebox_display.item_display","aj.jukebox_display.item_display.item_display","aj.jukebox_display.node","aj.jukebox_display.node.item_display"],id:"minecraft:item_display",item:{id:"minecraft:jukebox",count:1}}], } -execute as @e[type=item_display,tag=aj.new,limit=1,distance=..0.01] run function animated_java:jukebox_display/zzz/0 \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/zzz/0.mcfunction b/animated_java/data/animated_java/function/jukebox_display/zzz/0.mcfunction deleted file mode 100644 index 413cd30790..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/zzz/0.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -execute store result score @s aj.id run scoreboard players add aj.last_id aj.id 1 -execute on passengers if entity @s[tag=aj.global.data] run function animated_java:jukebox_display/zzz/1 -tag @s remove aj.new -execute if data storage aj:temp args.variant run function animated_java:jukebox_display/zzz/3 -function animated_java:jukebox_display/set_default_pose -tp @s ~ ~ ~ ~ ~ -execute at @s on passengers run rotate @s ~ ~ -data modify entity @s teleport_duration set value 1 -execute on passengers run data modify entity @s teleport_duration set value 1 -function #animated_java:jukebox_display/as_root/on_summon \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/zzz/1.mcfunction b/animated_java/data/animated_java/function/jukebox_display/zzz/1.mcfunction deleted file mode 100644 index bf3138a3fd..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/zzz/1.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -function animated_java:global/internal/gu/convert_uuid_array_to_string with entity @s -data modify entity @s data.bones.data_data set from storage aj:uuid main.out -summon minecraft:marker ^0.015625000000000003 ^0.390625 ^-0.031249999999999997 {Tags:['aj.new', 'aj.global.locator', 'aj.jukebox_display.locator', 'aj.jukebox_display.locator.particle']} -execute as @e[type=minecraft:marker,tag=aj.new,tag=aj.global.locator,limit=1,distance=..0.01] run function animated_java:jukebox_display/zzz/2 -data modify entity @s data.locators.particle.uuid set from storage aj:uuid main.out -execute on vehicle on passengers if entity @s[tag=aj.jukebox_display.node.item_display] run function animated_java:global/internal/gu/convert_uuid_array_to_string with entity @s -data modify entity @s data.bones.item_display_item_display set from storage aj:uuid main.out \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/zzz/2.mcfunction b/animated_java/data/animated_java/function/jukebox_display/zzz/2.mcfunction deleted file mode 100644 index 48c5fa5f4e..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/zzz/2.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -tag @s remove aj.new -function animated_java:global/internal/gu/convert_uuid_array_to_string with entity @s -tp @s ^0.015625 ^0.390625 ^-0.03125 ~0 ~0 \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/zzz/3.mcfunction b/animated_java/data/animated_java/function/jukebox_display/zzz/3.mcfunction deleted file mode 100644 index a2b6580155..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/zzz/3.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -tellraw @a ["",[[{"text":"\n[","color":"gray"},{"text":"AJ","color":"aqua"},"] ",[{"text":"(from ","color":"gray","italic":true},"jukebox_display",")"]," -> "],{"text":"ERROR: ","color":"red"},"\n "],{"text":"No variants are available.","color":"red"},["\n"]] -function animated_java:jukebox_display/remove/this \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/zzz/4.mcfunction b/animated_java/data/animated_java/function/jukebox_display/zzz/4.mcfunction deleted file mode 100644 index 906ca450a9..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/zzz/4.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -data modify storage aj:temp uuid set from entity @s data.locators.particle.uuid -function animated_java:jukebox_display/zzz/execute with storage aj:temp \ No newline at end of file diff --git a/animated_java/data/animated_java/function/jukebox_display/zzz/execute.mcfunction b/animated_java/data/animated_java/function/jukebox_display/zzz/execute.mcfunction deleted file mode 100644 index 2bc57ea3a9..0000000000 --- a/animated_java/data/animated_java/function/jukebox_display/zzz/execute.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$execute as $(uuid) run $(command) \ No newline at end of file diff --git a/animated_java/data/animated_java/tags/function/jukebox_display/as_root/on_remove.json b/animated_java/data/animated_java/tags/function/jukebox_display/as_root/on_remove.json deleted file mode 100644 index dfd7367fa8..0000000000 --- a/animated_java/data/animated_java/tags/function/jukebox_display/as_root/on_remove.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[]} \ No newline at end of file diff --git a/animated_java/data/animated_java/tags/function/jukebox_display/as_root/on_summon.json b/animated_java/data/animated_java/tags/function/jukebox_display/as_root/on_summon.json deleted file mode 100644 index dfd7367fa8..0000000000 --- a/animated_java/data/animated_java/tags/function/jukebox_display/as_root/on_summon.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[]} \ No newline at end of file diff --git a/animated_java/data/animated_java/tags/function/jukebox_display/as_root/post_tick.json b/animated_java/data/animated_java/tags/function/jukebox_display/as_root/post_tick.json deleted file mode 100644 index dfd7367fa8..0000000000 --- a/animated_java/data/animated_java/tags/function/jukebox_display/as_root/post_tick.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[]} \ No newline at end of file diff --git a/animated_java/data/animated_java/tags/function/jukebox_display/as_root/pre_tick.json b/animated_java/data/animated_java/tags/function/jukebox_display/as_root/pre_tick.json deleted file mode 100644 index dfd7367fa8..0000000000 --- a/animated_java/data/animated_java/tags/function/jukebox_display/as_root/pre_tick.json +++ /dev/null @@ -1 +0,0 @@ -{"values":[]} \ No newline at end of file diff --git a/data.ajmeta b/data.ajmeta index d8c04a4707..d94442b9c6 100644 --- a/data.ajmeta +++ b/data.ajmeta @@ -265,6 +265,7 @@ "animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/7.mcfunction", "animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/8.mcfunction", "animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/9.mcfunction", + "animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/zzz/0.mcfunction", "animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/10.mcfunction", "animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/11.mcfunction", "animated_java/data/animated_java/function/beat/animations/idle/zzz/frames/12.mcfunction", @@ -299,6 +300,7 @@ "animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/7.mcfunction", "animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/8.mcfunction", "animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/9.mcfunction", + "animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/zzz/0.mcfunction", "animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/10.mcfunction", "animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/11.mcfunction", "animated_java/data/animated_java/function/beat/animations/attack/zzz/frames/12.mcfunction", @@ -2085,48 +2087,7 @@ ] }, "jukebox_display": { - "files": [ - "animated_java/data/animated_java/function/jukebox_display/invalid_version_warning.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/root/outdated_tellraw.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/root/zzz/0.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/root/on_load.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/root/zzz/3.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/root/zzz/2.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/root/zzz/1.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/root/on_tick.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/zzz/2.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/zzz/1.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/zzz/3.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/zzz/0.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/summon.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/zzz/execute.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/zzz/4.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/as_own_locator_entities.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/remove/all.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/remove/zzz/kill_passengers.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/remove/zzz/kill.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/remove/zzz/0.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/remove/this.mcfunction", - "animated_java/data/animated_java/function/jukebox_display/set_default_pose.mcfunction", - "animated_java/data/animated_java/tags/function/jukebox_display/as_root/pre_tick.json", - "animated_java/data/animated_java/tags/function/jukebox_display/as_root/post_tick.json", - "animated_java/data/animated_java/tags/function/jukebox_display/as_root/on_summon.json", - "animated_java/data/animated_java/tags/function/jukebox_display/as_root/on_remove.json", - "data/animated_java/function/global/on_load.mcfunction", - "data/animated_java/function/global/on_tick.mcfunction", - "data/animated_java/function/global/errors/function_not_executed_as_root_entity.mcfunction", - "data/animated_java/function/global/remove/everything.mcfunction", - "data/animated_java/function/global/internal/gu/load.mcfunction", - "data/animated_java/function/global/internal/gu/zzz/0.mcfunction", - "data/animated_java/function/global/internal/gu/zzz/1.mcfunction", - "data/animated_java/function/global/internal/gu/convert_uuid_array_to_string.mcfunction", - "data/animated_java/function/jukebox_display/on_load.mcfunction", - "data/animated_java/function/jukebox_display/invalid_version_warning.mcfunction", - "data/minecraft/tags/function/load.json", - "data/minecraft/tags/function/tick.json", - "data/animated_java/tags/function/global/on_load.json", - "data/animated_java/tags/function/global/root/on_load.json" - ] + "files": [] }, "lapras": { "files": [ diff --git a/data/animated_java/function/global/errors/function_not_executed_as_root_entity.mcfunction b/data/animated_java/function/global/errors/function_not_executed_as_root_entity.mcfunction deleted file mode 100644 index 615a6078c6..0000000000 --- a/data/animated_java/function/global/errors/function_not_executed_as_root_entity.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$tellraw @a ["",[[{"text":"\n[","color":"gray"},{"text":"AJ","color":"aqua"},"] ",[{"text":"(from ","color":"gray","italic":true},"jukebox_display",")"]," -> "],{"text":"ERROR: ","color":"red"},"\n "],{"text":"This function","color":"blue","underlined":true,"hoverEvent":{"action":"show_text","contents":[{"text":"$(function_path)","color":"yellow"}]}},{"text":" must be executed as the rig's root entity.","color":"red"},"\n",["\n ",{"text":"Click here to learn more","color":"blue","underlined":true,"italic":true,"clickEvent":{"action":"open_url","value":"https://animated-java.dev/docs/exported-rigs/controlling-a-rig-instance"}}],["\n"]] \ No newline at end of file diff --git a/data/animated_java/function/global/internal/gu/convert_uuid_array_to_string.mcfunction b/data/animated_java/function/global/internal/gu/convert_uuid_array_to_string.mcfunction deleted file mode 100644 index 0ab0d045df..0000000000 --- a/data/animated_java/function/global/internal/gu/convert_uuid_array_to_string.mcfunction +++ /dev/null @@ -1,33 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -data modify storage aj:uuid temp set value {0:0,1:0,2:0,3:0,4:0,5:0,6:0,7:0,8:0,9:0,a:0,b:0,c:0,d:0,e:0,f:0} -$data modify storage aj:uuid main.in set value $(UUID) -execute store result score 0= aj.i store result score 1= aj.i run data get storage aj:uuid main.in[0] -execute store result storage aj:uuid temp.0 int 1 run scoreboard players operation 0= aj.i %= 256 aj.i -execute store result score 2= aj.i run scoreboard players operation 1= aj.i /= 256 aj.i -execute store result storage aj:uuid temp.1 int 1 run scoreboard players operation 1= aj.i %= 256 aj.i -execute store result score 3= aj.i run scoreboard players operation 2= aj.i /= 256 aj.i -execute store result storage aj:uuid temp.2 int 1 run scoreboard players operation 2= aj.i %= 256 aj.i -execute store result storage aj:uuid temp.3 int 1 run scoreboard players operation 3= aj.i /= 256 aj.i -execute store result score 0= aj.i store result score 1= aj.i run data get storage aj:uuid main.in[1] -execute store result storage aj:uuid temp.4 int 1 run scoreboard players operation 0= aj.i %= 256 aj.i -execute store result score 2= aj.i run scoreboard players operation 1= aj.i /= 256 aj.i -execute store result storage aj:uuid temp.5 int 1 run scoreboard players operation 1= aj.i %= 256 aj.i -execute store result score 3= aj.i run scoreboard players operation 2= aj.i /= 256 aj.i -execute store result storage aj:uuid temp.6 int 1 run scoreboard players operation 2= aj.i %= 256 aj.i -execute store result storage aj:uuid temp.7 int 1 run scoreboard players operation 3= aj.i /= 256 aj.i -execute store result score 0= aj.i store result score 1= aj.i run data get storage aj:uuid main.in[2] -execute store result storage aj:uuid temp.8 int 1 run scoreboard players operation 0= aj.i %= 256 aj.i -execute store result score 2= aj.i run scoreboard players operation 1= aj.i /= 256 aj.i -execute store result storage aj:uuid temp.9 int 1 run scoreboard players operation 1= aj.i %= 256 aj.i -execute store result score 3= aj.i run scoreboard players operation 2= aj.i /= 256 aj.i -execute store result storage aj:uuid temp.a int 1 run scoreboard players operation 2= aj.i %= 256 aj.i -execute store result storage aj:uuid temp.b int 1 run scoreboard players operation 3= aj.i /= 256 aj.i -execute store result score 0= aj.i store result score 1= aj.i run data get storage aj:uuid main.in[3] -execute store result storage aj:uuid temp.c int 1 run scoreboard players operation 0= aj.i %= 256 aj.i -execute store result score 2= aj.i run scoreboard players operation 1= aj.i /= 256 aj.i -execute store result storage aj:uuid temp.d int 1 run scoreboard players operation 1= aj.i %= 256 aj.i -execute store result score 3= aj.i run scoreboard players operation 2= aj.i /= 256 aj.i -execute store result storage aj:uuid temp.e int 1 run scoreboard players operation 2= aj.i %= 256 aj.i -execute store result storage aj:uuid temp.f int 1 run scoreboard players operation 3= aj.i /= 256 aj.i -function animated_java:global/internal/gu/zzz/0 with storage aj:uuid temp -function animated_java:global/internal/gu/zzz/1 with storage aj:uuid temp \ No newline at end of file diff --git a/data/animated_java/function/global/internal/gu/load.mcfunction b/data/animated_java/function/global/internal/gu/load.mcfunction deleted file mode 100644 index 6d8ffa7589..0000000000 --- a/data/animated_java/function/global/internal/gu/load.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -scoreboard players set 256 aj.i 256 -data modify storage aj:uuid main.hex_chars set value ["00","01","02","03","04","05","06","07","08","09","0a","0b","0c","0d","0e","0f","10","11","12","13","14","15","16","17","18","19","1a","1b","1c","1d","1e","1f","20","21","22","23","24","25","26","27","28","29","2a","2b","2c","2d","2e","2f","30","31","32","33","34","35","36","37","38","39","3a","3b","3c","3d","3e","3f","40","41","42","43","44","45","46","47","48","49","4a","4b","4c","4d","4e","4f","50","51","52","53","54","55","56","57","58","59","5a","5b","5c","5d","5e","5f","60","61","62","63","64","65","66","67","68","69","6a","6b","6c","6d","6e","6f","70","71","72","73","74","75","76","77","78","79","7a","7b","7c","7d","7e","7f","80","81","82","83","84","85","86","87","88","89","8a","8b","8c","8d","8e","8f","90","91","92","93","94","95","96","97","98","99","9a","9b","9c","9d","9e","9f","a0","a1","a2","a3","a4","a5","a6","a7","a8","a9","aa","ab","ac","ad","ae","af","b0","b1","b2","b3","b4","b5","b6","b7","b8","b9","ba","bb","bc","bd","be","bf","c0","c1","c2","c3","c4","c5","c6","c7","c8","c9","ca","cb","cc","cd","ce","cf","d0","d1","d2","d3","d4","d5","d6","d7","d8","d9","da","db","dc","dd","de","df","e0","e1","e2","e3","e4","e5","e6","e7","e8","e9","ea","eb","ec","ed","ee","ef","f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff"] \ No newline at end of file diff --git a/data/animated_java/function/global/internal/gu/zzz/0.mcfunction b/data/animated_java/function/global/internal/gu/zzz/0.mcfunction deleted file mode 100644 index 1a23809243..0000000000 --- a/data/animated_java/function/global/internal/gu/zzz/0.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data modify storage aj:uuid temp.0 set from storage aj:uuid main.hex_chars[$(0)] -$data modify storage aj:uuid temp.1 set from storage aj:uuid main.hex_chars[$(1)] -$data modify storage aj:uuid temp.2 set from storage aj:uuid main.hex_chars[$(2)] -$data modify storage aj:uuid temp.3 set from storage aj:uuid main.hex_chars[$(3)] -$data modify storage aj:uuid temp.4 set from storage aj:uuid main.hex_chars[$(4)] -$data modify storage aj:uuid temp.5 set from storage aj:uuid main.hex_chars[$(5)] -$data modify storage aj:uuid temp.6 set from storage aj:uuid main.hex_chars[$(6)] -$data modify storage aj:uuid temp.7 set from storage aj:uuid main.hex_chars[$(7)] -$data modify storage aj:uuid temp.8 set from storage aj:uuid main.hex_chars[$(8)] -$data modify storage aj:uuid temp.9 set from storage aj:uuid main.hex_chars[$(9)] -$data modify storage aj:uuid temp.a set from storage aj:uuid main.hex_chars[$(a)] -$data modify storage aj:uuid temp.b set from storage aj:uuid main.hex_chars[$(b)] -$data modify storage aj:uuid temp.c set from storage aj:uuid main.hex_chars[$(c)] -$data modify storage aj:uuid temp.d set from storage aj:uuid main.hex_chars[$(d)] -$data modify storage aj:uuid temp.e set from storage aj:uuid main.hex_chars[$(e)] -$data modify storage aj:uuid temp.f set from storage aj:uuid main.hex_chars[$(f)] \ No newline at end of file diff --git a/data/animated_java/function/global/internal/gu/zzz/1.mcfunction b/data/animated_java/function/global/internal/gu/zzz/1.mcfunction deleted file mode 100644 index 889eb986ee..0000000000 --- a/data/animated_java/function/global/internal/gu/zzz/1.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -$data modify storage aj:uuid main.out set value "$(3)$(2)$(1)$(0)-$(7)$(6)-$(5)$(4)-$(b)$(a)-$(9)$(8)$(f)$(e)$(d)$(c)" \ No newline at end of file diff --git a/data/animated_java/function/global/on_load.mcfunction b/data/animated_java/function/global/on_load.mcfunction deleted file mode 100644 index 394ae596e3..0000000000 --- a/data/animated_java/function/global/on_load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -scoreboard objectives add aj.i dummy -scoreboard objectives add aj.id dummy -scoreboard objectives add aj.is_rig_loaded dummy -scoreboard objectives add aj.tween_duration dummy -scoreboard players add aj.last_id aj.id 0 -data modify storage aj:temp args set value {} -scoreboard players reset * aj.is_rig_loaded -function #animated_java:global/on_load \ No newline at end of file diff --git a/data/animated_java/function/global/on_tick.mcfunction b/data/animated_java/function/global/on_tick.mcfunction deleted file mode 100644 index dfe40b44ac..0000000000 --- a/data/animated_java/function/global/on_tick.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -execute as @e[type=item_display,tag=aj.global.root] at @s run function #animated_java:global/root/on_tick \ No newline at end of file diff --git a/data/animated_java/function/jukebox_display/invalid_version_warning.mcfunction b/data/animated_java/function/jukebox_display/invalid_version_warning.mcfunction deleted file mode 100644 index 21274f43af..0000000000 --- a/data/animated_java/function/jukebox_display/invalid_version_warning.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -tellraw @a [[[{"text":"\n[","color":"gray"},{"text":"AJ","color":"aqua"},"] ",[{"text":"(from ","color":"gray","italic":true},"jukebox_display",")"]," -> "],{"text":"ERROR: ","color":"red"},"\n "],[{"text":"Attempting to load an Animated Java Data Pack that was exported for ","color":"red"},{"text":"Minecraft 1.21.4","color":"aqua"},{"text":" in the wrong version!","color":"red"},{"text":"\n Please ensure that the data pack is loaded in the correct version, or that your blueprint settings are configured to target the correct version(s) of Minecraft.","color":"yellow"}],["\n"]] \ No newline at end of file diff --git a/data/animated_java/function/jukebox_display/on_load.mcfunction b/data/animated_java/function/jukebox_display/on_load.mcfunction deleted file mode 100644 index c84a18c51e..0000000000 --- a/data/animated_java/function/jukebox_display/on_load.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -# This file was generated by Animated Java via MC-Build. It is not recommended to edit this file directly. -function animated_java:jukebox_display/invalid_version_warning \ No newline at end of file diff --git a/data/animated_java/tags/function/global/on_load.json b/data/animated_java/tags/function/global/on_load.json index 9e86be7bc9..67798eb6e0 100644 --- a/data/animated_java/tags/function/global/on_load.json +++ b/data/animated_java/tags/function/global/on_load.json @@ -1 +1,21 @@ -{"values":["animated_java:jukebox_display/on_load","animated_java:tyrogue/on_load","animated_java:beat/on_load","animated_java:fgii_graham/on_load","animated_java:tornado/on_load","animated_java:sudowoodo/on_load","animated_java:snorlax/on_load","animated_java:slowpoke/on_load","animated_java:metapod/on_load","animated_java:magnemite/on_load","animated_java:lapras/on_load","animated_java:gyarados/on_load","animated_java:geodude/on_load","animated_java:gastly/on_load","animated_java:dugtrio/on_load","animated_java:diglett/on_load","animated_java:abra/on_load","animated_java:boo/on_load"]} \ No newline at end of file +{ + "values": [ + "animated_java:beat/on_load", + "animated_java:tyrogue/on_load", + "animated_java:fgii_graham/on_load", + "animated_java:tornado/on_load", + "animated_java:sudowoodo/on_load", + "animated_java:snorlax/on_load", + "animated_java:slowpoke/on_load", + "animated_java:metapod/on_load", + "animated_java:magnemite/on_load", + "animated_java:lapras/on_load", + "animated_java:gyarados/on_load", + "animated_java:geodude/on_load", + "animated_java:gastly/on_load", + "animated_java:dugtrio/on_load", + "animated_java:diglett/on_load", + "animated_java:abra/on_load", + "animated_java:boo/on_load" + ] +} \ No newline at end of file diff --git a/data/animated_java/tags/function/global/root/on_load.json b/data/animated_java/tags/function/global/root/on_load.json index a7e5e5a25b..6e2b17261d 100644 --- a/data/animated_java/tags/function/global/root/on_load.json +++ b/data/animated_java/tags/function/global/root/on_load.json @@ -1 +1,21 @@ -{"values":["animated_java:jukebox_display/root/on_load","animated_java:tyrogue/root/on_load","animated_java:beat/root/on_load","animated_java:fgii_graham/root/on_load","animated_java:tornado/root/on_load","animated_java:sudowoodo/root/on_load","animated_java:snorlax/root/on_load","animated_java:slowpoke/root/on_load","animated_java:metapod/root/on_load","animated_java:magnemite/root/on_load","animated_java:lapras/root/on_load","animated_java:gyarados/root/on_load","animated_java:geodude/root/on_load","animated_java:gastly/root/on_load","animated_java:dugtrio/root/on_load","animated_java:diglett/root/on_load","animated_java:abra/root/on_load","animated_java:boo/root/on_load"]} \ No newline at end of file +{ + "values": [ + "animated_java:beat/root/on_load", + "animated_java:tyrogue/root/on_load", + "animated_java:fgii_graham/root/on_load", + "animated_java:tornado/root/on_load", + "animated_java:sudowoodo/root/on_load", + "animated_java:snorlax/root/on_load", + "animated_java:slowpoke/root/on_load", + "animated_java:metapod/root/on_load", + "animated_java:magnemite/root/on_load", + "animated_java:lapras/root/on_load", + "animated_java:gyarados/root/on_load", + "animated_java:geodude/root/on_load", + "animated_java:gastly/root/on_load", + "animated_java:dugtrio/root/on_load", + "animated_java:diglett/root/on_load", + "animated_java:abra/root/on_load", + "animated_java:boo/root/on_load" + ] +} \ No newline at end of file diff --git a/data/animated_java/tags/function/global/root/on_tick.json b/data/animated_java/tags/function/global/root/on_tick.json index da88099131..56938f6a2e 100644 --- a/data/animated_java/tags/function/global/root/on_tick.json +++ b/data/animated_java/tags/function/global/root/on_tick.json @@ -1 +1 @@ -{"values":["animated_java:tyrogue/root/on_tick","animated_java:beat/root/on_tick","animated_java:fgii_graham/root/on_tick","animated_java:tornado/root/on_tick","animated_java:sudowoodo/root/on_tick","animated_java:snorlax/root/on_tick","animated_java:slowpoke/root/on_tick","animated_java:metapod/root/on_tick","animated_java:magnemite/root/on_tick","animated_java:lapras/root/on_tick","animated_java:gyarados/root/on_tick","animated_java:geodude/root/on_tick","animated_java:gastly/root/on_tick","animated_java:dugtrio/root/on_tick","animated_java:diglett/root/on_tick","animated_java:abra/root/on_tick","animated_java:boo/root/on_tick"]} \ No newline at end of file +{"values":["animated_java:beat/root/on_tick","animated_java:tyrogue/root/on_tick","animated_java:fgii_graham/root/on_tick","animated_java:tornado/root/on_tick","animated_java:sudowoodo/root/on_tick","animated_java:snorlax/root/on_tick","animated_java:slowpoke/root/on_tick","animated_java:metapod/root/on_tick","animated_java:magnemite/root/on_tick","animated_java:lapras/root/on_tick","animated_java:gyarados/root/on_tick","animated_java:geodude/root/on_tick","animated_java:gastly/root/on_tick","animated_java:dugtrio/root/on_tick","animated_java:diglett/root/on_tick","animated_java:abra/root/on_tick","animated_java:boo/root/on_tick"]} \ No newline at end of file diff --git a/data/minecraft/tags/function/load.json b/data/minecraft/tags/function/load.json index 002df7bed7..cc001bd068 100644 --- a/data/minecraft/tags/function/load.json +++ b/data/minecraft/tags/function/load.json @@ -1 +1,3 @@ -{"values":["animated_java:global/on_load","animated_java:global/internal/gu/load","ssbrc:load"]} \ No newline at end of file +{ + "values": ["ssbrc:load"] +} diff --git a/data/minecraft/tags/function/tick.json b/data/minecraft/tags/function/tick.json index 4c2b3e3a12..b748f4d8b5 100644 --- a/data/minecraft/tags/function/tick.json +++ b/data/minecraft/tags/function/tick.json @@ -1 +1,3 @@ -{"values":["animated_java:global/on_tick","ssbrc:logic/tick"]} \ No newline at end of file +{ + "values": ["ssbrc:logic/tick"] +} diff --git a/data/ssbrc/advancement/utility/use_item/any.json b/data/ssbrc/advancement/utility/use_item/any.json index 81f193dd5b..3d8865fa68 100644 --- a/data/ssbrc/advancement/utility/use_item/any.json +++ b/data/ssbrc/advancement/utility/use_item/any.json @@ -1,27 +1,27 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": {} - } - } - } - } - } -} +{ + "parent": "ssbrc:utility/use_item/root", + "criteria": { + "requirement": { + "trigger": "minecraft:using_item", + "conditions": { + "player": [ + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "cooldown": { + "max": 0 + } + } + } + ], + "item": { + "items": "#ssbrc:equipment_no_coas", + "predicates": { + "minecraft:custom_data": {} + } + } + } + } + } +} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/spirit_orb/revert.json b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/spirit_orb/revert.json index dfec060e64..c89132107b 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/spirit_orb/revert.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/spirit_orb/revert.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_properties", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/spirit_orb/transform.json b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/spirit_orb/transform.json index bbaea56edc..cccf48b47d 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/spirit_orb/transform.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/spirit_orb/transform.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:inverted", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/werebear/petrifying_breath.json b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/werebear/petrifying_breath.json index 8d28154e8b..ecc5265461 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/werebear/petrifying_breath.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/werebear/petrifying_breath.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/weredragon/electrocution.json b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/weredragon/electrocution.json index 7b54c3686b..dbc9002e6c 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/weredragon/electrocution.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/weredragon/electrocution.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/weretiger/sabretooth.json b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/weretiger/sabretooth.json index 2c15c619bf..151711c42c 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/weretiger/sabretooth.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/weretiger/sabretooth.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/werewolf/flame_hands.json b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/werewolf/flame_hands.json index e07cda5ac5..db05302775 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/werewolf/flame_hands.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/altered_beast/werewolf/flame_hands.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/alucard/blood_metamorphosis.json b/data/ssbrc/advancement/utility/use_item/fighter/alucard/blood_metamorphosis.json index 84a688d8b3..3edb0c7495 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/alucard/blood_metamorphosis.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/alucard/blood_metamorphosis.json @@ -6,30 +6,17 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"blood_metamorphosis\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"blood_metamorphosis\"}" + "minecraft:custom_data": "{item:\"blood_metamorphosis\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/alucard/holy_water.json b/data/ssbrc/advancement/utility/use_item/fighter/alucard/holy_water.json index aba3e33366..15692dd3b9 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/alucard/holy_water.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/alucard/holy_water.json @@ -6,29 +6,17 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.2": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"holy_water\"}" + "minecraft:custom_data": "{item:\"holy_water\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/byleth/black_eagles/aymr/charge.json b/data/ssbrc/advancement/utility/use_item/fighter/byleth/black_eagles/aymr/charge.json index 12085bf148..dbb2a298a0 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/byleth/black_eagles/aymr/charge.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/byleth/black_eagles/aymr/charge.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:reference", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/byleth/black_eagles/ground_pound.json b/data/ssbrc/advancement/utility/use_item/fighter/byleth/black_eagles/ground_pound.json index b086a83a9e..c577445d86 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/byleth/black_eagles/ground_pound.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/byleth/black_eagles/ground_pound.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:reference", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/spin_attack/charge.json b/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/spin_attack/charge.json index 546cbe9a9a..5cd53685cc 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/spin_attack/charge.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/spin_attack/charge.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/spin_attack/deactivate.json b/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/spin_attack/deactivate.json index 70f42f5165..757302e96d 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/spin_attack/deactivate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/spin_attack/deactivate.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/steed_charge.json b/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/steed_charge.json index f1a541d981..79ffedfba4 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/steed_charge.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/byleth/blue_lions/steed_charge.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/byleth/golden_deer/failnaught.json b/data/ssbrc/advancement/utility/use_item/fighter/byleth/golden_deer/failnaught.json index 12ad11c4d1..dce885ff6e 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/byleth/golden_deer/failnaught.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/byleth/golden_deer/failnaught.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/falcon_charge.json b/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/falcon_charge.json index 91abb59ab9..42ee71efcd 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/falcon_charge.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/falcon_charge.json @@ -6,36 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"falcon_punch_missed\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - }, - "charge.2": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/falcon_punch.json b/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/falcon_punch.json index aa5b96a1aa..01c837012f 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/falcon_punch.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/falcon_punch.json @@ -4,37 +4,6 @@ "requirement": { "trigger": "minecraft:using_item", "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"falcon_punch_missed\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } - } - ], "item": { "items": "#ssbrc:equipment", "predicates": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/raptor_boost.json b/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/raptor_boost.json index 92b1aebfa7..4a7a0e1498 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/raptor_boost.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/captain_falcon/raptor_boost.json @@ -6,42 +6,17 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"falcon_punch_missed\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - }, - "duration.1": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"fists_of_fury\"}" + "minecraft:custom_data": "{item:\"fists_of_fury\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/cloud/blade_beam.json b/data/ssbrc/advancement/utility/use_item/fighter/cloud/blade_beam.json index ddc1626d03..f70ffabb42 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/cloud/blade_beam.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/cloud/blade_beam.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_properties", @@ -22,15 +16,6 @@ "nbt": "{Tags:[\"operator\"]}" } }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.2": { - "max": 0 - } - } - }, { "condition": "minecraft:inverted", "term": { @@ -42,7 +27,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"buster_sword\"}" + "minecraft:custom_data": "{item:\"buster_sword\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/cloud/cross_slash.json b/data/ssbrc/advancement/utility/use_item/fighter/cloud/cross_slash.json index 73ba847e62..536e0523aa 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/cloud/cross_slash.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/cloud/cross_slash.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_properties", @@ -26,9 +20,6 @@ "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown.2": { - "max": 0 - }, "resource": { "min": { "type": "minecraft:score", @@ -52,7 +43,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"buster_sword\"}" + "minecraft:custom_data": "{item:\"buster_sword\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/cloud/mode_switch/operator.json b/data/ssbrc/advancement/utility/use_item/fighter/cloud/mode_switch/operator.json index 252d35caec..a71cb229df 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/cloud/mode_switch/operator.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/cloud/mode_switch/operator.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_properties", @@ -22,15 +16,6 @@ "nbt": "{Tags:[\"punisher\"]}" } }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - } - } - }, { "condition": "minecraft:reference", "name": "ssbrc:flag/sneaking" @@ -39,7 +24,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"buster_sword\"}" + "minecraft:custom_data": "{item:\"buster_sword\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/cloud/mode_switch/punisher.json b/data/ssbrc/advancement/utility/use_item/fighter/cloud/mode_switch/punisher.json index 2892cb59bb..76a7961e50 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/cloud/mode_switch/punisher.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/cloud/mode_switch/punisher.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_properties", @@ -22,15 +16,6 @@ "nbt": "{Tags:[\"operator\"]}" } }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - } - } - }, { "condition": "minecraft:reference", "name": "ssbrc:flag/sneaking" @@ -39,7 +24,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"buster_sword\"}" + "minecraft:custom_data": "{item:\"buster_sword\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_beam/charge.json b/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_beam/charge.json deleted file mode 100644 index 1a78d396d8..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_beam/charge.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - }, - "duration.1": { - "max": 0 - } - } - }, - { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"phazon_beam\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/dark_samus/logic/abilities/phazon_beam/charge" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_beam/default.json b/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_beam/default.json deleted file mode 100644 index a6577083f0..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_beam/default.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - }, - "duration.1": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"phazon_beam\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/dark_samus/logic/abilities/phazon_beam/activate" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_beam/overload.json b/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_beam/overload.json deleted file mode 100644 index 4f0df3cf5c..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_beam/overload.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "duration.1": { - "min": 1 - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"phazon_beam\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/dark_samus/logic/abilities/phazon_overload/tick_active" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_overload.json b/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_overload.json index b24098692d..685e4fc50e 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_overload.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/dark_samus/phazon_overload.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/donkey_kong/barrel.json b/data/ssbrc/advancement/utility/use_item/fighter/donkey_kong/barrel.json index 24fc45f31e..86bf75425d 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/donkey_kong/barrel.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/donkey_kong/barrel.json @@ -6,29 +6,17 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"barrel\"}" + "minecraft:custom_data": "{item:\"barrel\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/donkey_kong/orange_grenade.json b/data/ssbrc/advancement/utility/use_item/fighter/donkey_kong/orange_grenade.json index d6aaa05c8a..00a4f73c47 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/donkey_kong/orange_grenade.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/donkey_kong/orange_grenade.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/fox/krazoan_fireball.json b/data/ssbrc/advancement/utility/use_item/fighter/fox/krazoan_fireball.json index 18072514d9..e807da4bf2 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/fox/krazoan_fireball.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/fox/krazoan_fireball.json @@ -6,26 +6,14 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, - "duration.2": { - "max": 0 - }, - "duration.3": { + "duration.1": { "max": 0 } } @@ -34,7 +22,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"krazoan_staff\"}" + "minecraft:custom_data": "{item:\"krazoan_staff\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/fox/reflector.json b/data/ssbrc/advancement/utility/use_item/fighter/fox/reflector.json index 95681bd29e..9e4848f34d 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/fox/reflector.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/fox/reflector.json @@ -6,26 +6,14 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, - "duration.2": { - "max": 0 - }, - "duration.3": { + "duration.1": { "max": 0 } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/giegue/pk_beam.json b/data/ssbrc/advancement/utility/use_item/fighter/giegue/pk_beam.json index f3baf1e2cb..6b62901faf 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/giegue/pk_beam.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/giegue/pk_beam.json @@ -6,26 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.2": { - "max": 0 - }, - "charge.1": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/giegue/pk_freeze.json b/data/ssbrc/advancement/utility/use_item/fighter/giegue/pk_freeze.json index dbed55d1dc..b1abd183c9 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/giegue/pk_freeze.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/giegue/pk_freeze.json @@ -6,26 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - }, - "charge.1": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/greninja/night_slash.json b/data/ssbrc/advancement/utility/use_item/fighter/greninja/night_slash.json index 2c49318567..7e1c4d0849 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/greninja/night_slash.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/greninja/night_slash.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:inverted", @@ -24,24 +18,15 @@ "nbt": "{Tags:[\"shadow_sneak\"]}" } } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - }, - "cooldown.2": { - "max": 0 - } - } } ], "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"night_slash\"}" + "minecraft:custom_data": "{item:\"night_slash\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/greninja/water_shuriken.json b/data/ssbrc/advancement/utility/use_item/fighter/greninja/water_shuriken.json index 7917807e24..101085d789 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/greninja/water_shuriken.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/greninja/water_shuriken.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "charge.1": { "min": 1 - }, - "cooldown": { - "max": 0 } } } @@ -31,7 +22,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"water_shuriken\"}" + "minecraft:custom_data": "{item:\"water_shuriken\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/bang/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/bang/activate.json index 6e6cce95a9..86bcd36526 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/bang/activate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/bang/activate.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "duration.2": { "max": 0 }, diff --git a/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/bang/insufficient.json b/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/bang/insufficient.json index a72066b4a5..ddf84b2138 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/bang/insufficient.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/bang/insufficient.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "duration.2": { "max": 0 } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/kaclang/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/kaclang/activate.json index df98c8e9ba..0ee9c82be4 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/kaclang/activate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/kaclang/activate.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "duration.2": { "max": 0 }, diff --git a/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/kaclang/insufficient.json b/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/kaclang/insufficient.json index 0ffd96864f..bc541d6390 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/kaclang/insufficient.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/kaclang/insufficient.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "duration.2": { "max": 0 } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/magic_burst.json b/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/magic_burst.json index b478e1c6e8..b641f65882 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/magic_burst.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/hero/spells/magic_burst.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/jigglypuff/hyper_voice.json b/data/ssbrc/advancement/utility/use_item/fighter/jigglypuff/hyper_voice.json index 4d060de402..c47667602f 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/jigglypuff/hyper_voice.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/jigglypuff/hyper_voice.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/jigglypuff/rest.json b/data/ssbrc/advancement/utility/use_item/fighter/jigglypuff/rest.json index 905492cbd2..9b99f9483d 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/jigglypuff/rest.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/jigglypuff/rest.json @@ -6,39 +6,17 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "charge.1": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"rest\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"rest\"}" + "minecraft:custom_data": "{item:\"rest\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/joker/amrita_shower.json b/data/ssbrc/advancement/utility/use_item/fighter/joker/amrita_shower.json index 07039e62c9..6bff5fc5bb 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/joker/amrita_shower.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/joker/amrita_shower.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "duration.1": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/joker/eiagon.json b/data/ssbrc/advancement/utility/use_item/fighter/joker/eiagon.json index 04088ba322..123a402a8d 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/joker/eiagon.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/joker/eiagon.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "duration.1": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/joker/hama.json b/data/ssbrc/advancement/utility/use_item/fighter/joker/hama.json index bece002214..47b0f1dd18 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/joker/hama.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/joker/hama.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "duration.1": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/joker/mask.json b/data/ssbrc/advancement/utility/use_item/fighter/joker/mask.json index aeb97719e1..fd9efc7271 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/joker/mask.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/joker/mask.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/joker/phantom_show.json b/data/ssbrc/advancement/utility/use_item/fighter/joker/phantom_show.json index ef80a6b30c..ae12c5c3c4 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/joker/phantom_show.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/joker/phantom_show.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "duration.1": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/joker/tt33/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/joker/tt33/activate.json deleted file mode 100644 index e819e3d262..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/joker/tt33/activate.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "weapon_1.ammo": { - "min": 1 - }, - "cooldown.1": { - "max": 0 - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"tt33\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/joker/logic/abilities/tt33/activate" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/joker/tt33/misfire.json b/data/ssbrc/advancement/utility/use_item/fighter/joker/tt33/misfire.json deleted file mode 100644 index 721fe1247d..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/joker/tt33/misfire.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "weapon_1.ammo": { - "max": 0 - }, - "cooldown.1": { - "max": 0 - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"tt33\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/joker/logic/abilities/tt33/misfire" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/king_k_rool/blunderbuss.json b/data/ssbrc/advancement/utility/use_item/fighter/king_k_rool/blunderbuss.json index 6e1864ec78..9e457495fa 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/king_k_rool/blunderbuss.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/king_k_rool/blunderbuss.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/link/boomerang.json b/data/ssbrc/advancement/utility/use_item/fighter/link/boomerang.json index 2cfaf37e48..f72aeabcad 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/link/boomerang.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/link/boomerang.json @@ -6,20 +6,17 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"link.boomerang\"}" + "minecraft:custom_data": "{item:\"link.boomerang\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/link/sword_beam.json b/data/ssbrc/advancement/utility/use_item/fighter/link/sword_beam.json deleted file mode 100644 index 047b55b0b6..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/link/sword_beam.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"master_sword\",awakened:\"true\"}", - "minecraft:damage": { - "damage": 0 - } - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/link/logic/abilities/sword_beam/activate" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/link/sword_spin/deactivate.json b/data/ssbrc/advancement/utility/use_item/fighter/link/sword_spin/deactivate.json deleted file mode 100644 index 5db9a46b32..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/link/sword_spin/deactivate.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "charge.output": { - "min": 1 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"master_sword\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/link/logic/abilities/sword_spin/deactivate" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/luigi/ice_ball.json b/data/ssbrc/advancement/utility/use_item/fighter/luigi/ice_ball.json deleted file mode 100644 index 79dca47b03..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/luigi/ice_ball.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"ice_ball\"}", - "minecraft:damage": { - "damage": 0 - } - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/luigi/logic/abilities/ice_ball/activate" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mario/fireball.json b/data/ssbrc/advancement/utility/use_item/fighter/mario/fireball.json deleted file mode 100644 index 7330380679..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/mario/fireball.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"fireball\"}", - "minecraft:damage": { - "damage": 0 - } - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/mario/logic/abilities/fireball/activate" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/air_shooter.json b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/air_shooter.json index d6d05f5ecc..26ab6c7364 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/air_shooter.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/air_shooter.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "mega_man.air_shooter": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/beat_call/forward.json b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/beat_call/forward.json index 99ae197a19..24b1ce7c87 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/beat_call/forward.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/beat_call/forward.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_properties", @@ -28,9 +22,6 @@ "scores": { "mega_man.beat_call": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/beat_call/recall.json b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/beat_call/recall.json index 2f9219d52e..3109460ee2 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/beat_call/recall.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/beat_call/recall.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/drill_bomb.json b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/drill_bomb.json index 58c7e4a2ad..c382039dc9 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/drill_bomb.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/drill_bomb.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "mega_man.drill_bomb": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/hyper_bomb.json b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/hyper_bomb.json index 685ffe77fa..bd40c77eee 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/hyper_bomb.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/hyper_bomb.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "mega_man.hyper_bomb": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/junk_shield/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/junk_shield/activate.json index cf978039ce..d267ffaab9 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/junk_shield/activate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/junk_shield/activate.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:inverted", @@ -31,9 +25,6 @@ "scores": { "mega_man.junk_shield": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/junk_shield/unleash.json b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/junk_shield/unleash.json index 2f1f13467f..c8d7891e0a 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/junk_shield/unleash.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/junk_shield/unleash.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_properties", @@ -21,15 +15,6 @@ "predicate": { "nbt": "{Tags:[\"junk_shield\"]}" } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/metal_blade.json b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/metal_blade.json index 02ff34d82b..bae4a271b2 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/metal_blade.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/metal_blade.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "mega_man.metal_blade": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/pile_driver/tick.json b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/pile_driver/tick.json index 9333a064e7..ebf49fbd74 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/pile_driver/tick.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/pile_driver/tick.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -22,9 +16,6 @@ "mega_man.pile_driver": { "min": 1 }, - "cooldown": { - "max": 0 - }, "duration.2": { "max": 0 } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/remote_mine/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/remote_mine/activate.json index 15de092a99..8f88c748da 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/remote_mine/activate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/remote_mine/activate.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:inverted", @@ -31,9 +25,6 @@ "scores": { "mega_man.remote_mine": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/remote_mine/explode.json b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/remote_mine/explode.json index a8f9ce3b34..5ae3b6eb20 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/mega_man/remote_mine/explode.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/mega_man/remote_mine/explode.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_properties", @@ -21,15 +15,6 @@ "predicate": { "nbt": "{Tags:[\"remote_mine\"]}" } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_fire.json b/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_fire.json index 2bbec27601..295304a926 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_fire.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_fire.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_flash/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_flash/activate.json index 63e5880bda..ab58e4112c 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_flash/activate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_flash/activate.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:inverted", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_flash/explode.json b/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_flash/explode.json index 3ee7c1948d..2d5c286c6e 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_flash/explode.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/ness/pk_flash/explode.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_properties", @@ -21,15 +15,6 @@ "predicate": { "nbt": "{Tags:[\"pk_flash\"]}" } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/pikachu/electric_terrain.json b/data/ssbrc/advancement/utility/use_item/fighter/pikachu/electric_terrain.json index 784c9a2d6c..1600a80eec 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/pikachu/electric_terrain.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/pikachu/electric_terrain.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/pikachu/thunder_jolt.json b/data/ssbrc/advancement/utility/use_item/fighter/pikachu/thunder_jolt.json index f603627f91..74c435d96b 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/pikachu/thunder_jolt.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/pikachu/thunder_jolt.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/pit/palutena_bow.json b/data/ssbrc/advancement/utility/use_item/fighter/pit/palutena_bow.json index fe6b1de1af..cdb75bd635 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/pit/palutena_bow.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/pit/palutena_bow.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "charge.output": 1 } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/charizard/earthquake.json b/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/charizard/earthquake.json index 23e3e04542..4eb9f9aa79 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/charizard/earthquake.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/charizard/earthquake.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "duration.1": { "max": 0 } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/charizard/flare_blitz.json b/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/charizard/flare_blitz.json index 87c794fb05..e66c86a20a 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/charizard/flare_blitz.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/charizard/flare_blitz.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "duration.1": { "max": 0 } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/ivysaur/leech_seed.json b/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/ivysaur/leech_seed.json index b6cf49fb33..54135c99c1 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/ivysaur/leech_seed.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/ivysaur/leech_seed.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "charge.1": { "min": 1 - }, - "cooldown": { - "max": 0 } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/ivysaur/poison_powder.json b/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/ivysaur/poison_powder.json index 0e3e4ddb25..75b5539bd1 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/ivysaur/poison_powder.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/ivysaur/poison_powder.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/squirtle/water_gun.json b/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/squirtle/water_gun.json index c79dfcb223..357ac18357 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/squirtle/water_gun.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/pokemon_trainer/squirtle/water_gun.json @@ -6,26 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - }, - "duration.1": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/rob/robo_beam.json b/data/ssbrc/advancement/utility/use_item/fighter/rob/robo_beam.json index 964c333898..1ff95d64ed 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/rob/robo_beam.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/rob/robo_beam.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "charge.1": { "min": 1 - }, - "cooldown.1": { - "max": 0 } } } @@ -31,7 +22,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"robo_beam\"}" + "minecraft:custom_data": "{item:\"robo_beam\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/ryu/satsui_no_hado_rage.json b/data/ssbrc/advancement/utility/use_item/fighter/ryu/satsui_no_hado_rage.json index fd2de50584..7cdd6d82a5 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/ryu/satsui_no_hado_rage.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/ryu/satsui_no_hado_rage.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_blast.json b/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_blast.json index e80f28caa7..6b132de83f 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_blast.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_blast.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_control.json b/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_control.json index e460422330..b30eee6cbf 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_control.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_control.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_spear.json b/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_spear.json index 9b057deb82..03b2a9a411 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_spear.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shadow/chaos_spear.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "charge.1": { "max": 0 } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/chaos_sphere/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/chaos_sphere/activate.json index ae7355c5b2..b381460425 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/chaos_sphere/activate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/chaos_sphere/activate.json @@ -6,23 +6,14 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown.1": { - "max": 0 - }, - "cooldown.3": { + "duration.2": { "max": 0 }, "magic": { @@ -41,7 +32,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"chaos_sphere\"}" + "minecraft:custom_data": "{item:\"chaos_sphere\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/chaos_sphere/insufficient.json b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/chaos_sphere/insufficient.json index 422292e7b2..88b4a29bc4 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/chaos_sphere/insufficient.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/chaos_sphere/insufficient.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -50,7 +44,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"chaos_sphere\"}" + "minecraft:custom_data": "{item:\"chaos_sphere\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/flare_wand/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/flare_wand/activate.json index 39fe2839e3..066708c0e3 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/flare_wand/activate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/flare_wand/activate.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -41,7 +35,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"flare_wand\"}" + "minecraft:custom_data": "{item:\"flare_wand\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/flare_wand/insufficient.json b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/flare_wand/insufficient.json index b69260864d..2ea7a420e2 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/flare_wand/insufficient.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/flare_wand/insufficient.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -50,7 +44,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"flare_wand\"}" + "minecraft:custom_data": "{item:\"flare_wand\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/phase_locket/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/phase_locket/activate.json index 653b97f5ba..b195d51d12 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/phase_locket/activate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/phase_locket/activate.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/phase_locket/insufficient.json b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/phase_locket/insufficient.json index 0e599653dd..8732605224 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/phase_locket/insufficient.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/phase_locket/insufficient.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -53,7 +47,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"phase_locket\"}" + "minecraft:custom_data": "{item:\"phase_locket\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/propeller_dagger/tick.json b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/propeller_dagger/tick.json index 381a0c66ed..87b4c46ca8 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/propeller_dagger/tick.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/propeller_dagger/tick.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -44,7 +38,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"propeller_dagger\"}" + "minecraft:custom_data": "{item:\"propeller_dagger\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/throwing_anchor/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/throwing_anchor/activate.json index 4185a0ff89..f8764df7a7 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/throwing_anchor/activate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/throwing_anchor/activate.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -41,7 +35,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"throwing_anchor\"}" + "minecraft:custom_data": "{item:\"throwing_anchor\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/throwing_anchor/insufficient.json b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/throwing_anchor/insufficient.json index 9b00c159b5..ffe1b92d1e 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/throwing_anchor/insufficient.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/throwing_anchor/insufficient.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -50,7 +44,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"throwing_anchor\"}" + "minecraft:custom_data": "{item:\"throwing_anchor\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/war_horn/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/war_horn/activate.json index 4d82d6ce28..a4bfb93f4e 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/war_horn/activate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/war_horn/activate.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/war_horn/insufficient.json b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/war_horn/insufficient.json index 4d26013896..3db12d5a0d 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/war_horn/insufficient.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/shovel_knight/war_horn/insufficient.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/snake/anti_personnel_mine.json b/data/ssbrc/advancement/utility/use_item/fighter/snake/anti_personnel_mine.json index 7dd3c338bb..11dcd1baf5 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/snake/anti_personnel_mine.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/snake/anti_personnel_mine.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "snake.anti_personnel_mine.ammo": { "min": 1 - }, - "cooldown": { - "max": 0 } } }, diff --git a/data/ssbrc/advancement/utility/use_item/fighter/snake/famas/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/snake/famas/activate.json deleted file mode 100644 index 2f711f1d95..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/snake/famas/activate.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - }, - "weapon_3.mags": { - "min": 0 - }, - "weapon_3.ammo": { - "min": 1 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"reloading\"]}" - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"famas\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/snake/logic/abilities/famas/activate" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/snake/famas/misfire.json b/data/ssbrc/advancement/utility/use_item/fighter/snake/famas/misfire.json deleted file mode 100644 index 9f9bd72e2d..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/snake/famas/misfire.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - }, - "weapon_3.mags": { - "max": 0 - }, - "weapon_3.ammo": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"reloading\"]}" - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"famas\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/snake/logic/abilities/famas/misfire" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/snake/psg1/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/snake/psg1/activate.json deleted file mode 100644 index a60c9e85cc..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/snake/psg1/activate.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - }, - "weapon_2.mags": { - "min": 0 - }, - "weapon_2.ammo": { - "min": 1 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"reloading\"]}" - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"psg1\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/snake/logic/abilities/psg1/activate" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/snake/psg1/misfire.json b/data/ssbrc/advancement/utility/use_item/fighter/snake/psg1/misfire.json deleted file mode 100644 index 8240f7c81b..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/snake/psg1/misfire.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - }, - "weapon_2.mags": { - "max": 0 - }, - "weapon_2.ammo": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"reloading\"]}" - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"psg1\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/snake/logic/abilities/psg1/misfire" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/snake/s1000/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/snake/s1000/activate.json deleted file mode 100644 index f2c74f3dde..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/snake/s1000/activate.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - }, - "weapon_1.mags": { - "min": 0 - }, - "weapon_1.ammo": { - "min": 1 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"reloading\"]}" - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"s1000\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/snake/logic/abilities/s1000/activate" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/snake/s1000/misfire.json b/data/ssbrc/advancement/utility/use_item/fighter/snake/s1000/misfire.json deleted file mode 100644 index dd95790967..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/snake/s1000/misfire.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - }, - "weapon_1.mags": { - "max": 0 - }, - "weapon_1.ammo": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"reloading\"]}" - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"s1000\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/snake/logic/abilities/s1000/misfire" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/snake/smoke_grenade.json b/data/ssbrc/advancement/utility/use_item/fighter/snake/smoke_grenade.json index f34b70c0f7..70135e1680 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/snake/smoke_grenade.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/snake/smoke_grenade.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -21,9 +15,6 @@ "scores": { "snake.smoke_grenade.ammo": { "min": 1 - }, - "cooldown": { - "max": 0 } } }, diff --git a/data/ssbrc/advancement/utility/use_item/fighter/snake/socom/activate.json b/data/ssbrc/advancement/utility/use_item/fighter/snake/socom/activate.json deleted file mode 100644 index 9082c7a29f..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/snake/socom/activate.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - }, - "weapon_4.mags": { - "min": 0 - }, - "weapon_4.ammo": { - "min": 1 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"reloading\"]}" - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"socom\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/snake/logic/abilities/socom/activate" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/snake/socom/misfire.json b/data/ssbrc/advancement/utility/use_item/fighter/snake/socom/misfire.json deleted file mode 100644 index 9156e54c89..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/snake/socom/misfire.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - }, - "weapon_4.mags": { - "max": 0 - }, - "weapon_4.ammo": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"reloading\"]}" - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"socom\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/snake/logic/abilities/socom/misfire" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/sora/blizzard.json b/data/ssbrc/advancement/utility/use_item/fighter/sora/blizzard.json deleted file mode 100644 index c39a512ce9..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/sora/blizzard.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:reference", - "name": "ssbrc:fighter/sora/no_spells" - }, - { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" - } - ] - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{spell:\"blizzard\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/sora/logic/abilities/blizzard/check" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/sora/drive_forms/valor.json b/data/ssbrc/advancement/utility/use_item/fighter/sora/drive_forms/valor.json index 354856227f..a941bcda71 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/sora/drive_forms/valor.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/sora/drive_forms/valor.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/sora/drive_forms/wisdom.json b/data/ssbrc/advancement/utility/use_item/fighter/sora/drive_forms/wisdom.json index 6cfe139b31..e3c5552cfb 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/sora/drive_forms/wisdom.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/sora/drive_forms/wisdom.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/sora/fire.json b/data/ssbrc/advancement/utility/use_item/fighter/sora/fire.json deleted file mode 100644 index 8e6e73507a..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/sora/fire.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:reference", - "name": "ssbrc:fighter/sora/no_spells" - }, - { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" - } - ] - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{spell:\"fire\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/sora/logic/abilities/fire/check" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/sora/spell_switch/blizzard.json b/data/ssbrc/advancement/utility/use_item/fighter/sora/spell_switch/blizzard.json deleted file mode 100644 index e9dc56aa5f..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/sora/spell_switch/blizzard.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:reference", - "name": "ssbrc:fighter/sora/no_spells" - } - }, - { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{spell:\"fire\"}", - "minecraft:damage": { - "damage": 0 - } - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/sora/logic/spell_switch/blizzard" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/sora/spell_switch/fire.json b/data/ssbrc/advancement/utility/use_item/fighter/sora/spell_switch/fire.json deleted file mode 100644 index ff00608f79..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/sora/spell_switch/fire.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:reference", - "name": "ssbrc:fighter/sora/no_spells" - } - }, - { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{spell:\"thunder\"}", - "minecraft:damage": { - "damage": 0 - } - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/sora/logic/spell_switch/fire/hand" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/sora/spell_switch/thunder.json b/data/ssbrc/advancement/utility/use_item/fighter/sora/spell_switch/thunder.json deleted file mode 100644 index e49c2fd991..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/sora/spell_switch/thunder.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:reference", - "name": "ssbrc:fighter/sora/no_spells" - } - }, - { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{spell:\"blizzard\"}", - "minecraft:damage": { - "damage": 0 - } - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/sora/logic/spell_switch/thunder" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/sora/strike_raid.json b/data/ssbrc/advancement/utility/use_item/fighter/sora/strike_raid.json deleted file mode 100644 index 1236c75062..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/sora/strike_raid.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" - } - }, - { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "predicates": { - "minecraft:custom_data": "{item:\"keyblade\"}" - } - }, - "offhand": { - "predicates": { - "minecraft:custom_data": "{item:\"keyblade\"}" - } - } - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"keyblade\"}", - "minecraft:damage": { - "damage": 0 - } - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/sora/logic/abilities/strike_raid/activate" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/sora/thunder.json b/data/ssbrc/advancement/utility/use_item/fighter/sora/thunder.json deleted file mode 100644 index 9e3b0b0b0f..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/sora/thunder.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:reference", - "name": "ssbrc:fighter/sora/no_spells" - }, - { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" - } - ] - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{spell:\"thunder\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/sora/logic/abilities/thunder/check" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/steve/mining.json b/data/ssbrc/advancement/utility/use_item/fighter/steve/mining.json index 34083c552c..803ce4aafd 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/steve/mining.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/steve/mining.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/arbok/acid.json b/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/arbok/acid.json index b1a288dc86..bf08025d97 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/arbok/acid.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/arbok/acid.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/meowth/fury_swipes.json b/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/meowth/fury_swipes.json index d8d4e41e13..92212d5036 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/meowth/fury_swipes.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/meowth/fury_swipes.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/meowth/payday.json b/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/meowth/payday.json index ea2f4429d3..c571ddaa26 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/meowth/payday.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/meowth/payday.json @@ -6,23 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/wobbuffet/destiny_bond.json b/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/wobbuffet/destiny_bond.json index 19c4190c91..6de786ac74 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/wobbuffet/destiny_bond.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/wobbuffet/destiny_bond.json @@ -6,26 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - }, - "duration.3": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/wobbuffet/splash.json b/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/wobbuffet/splash.json index e0d23578cb..548dbb6fe3 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/wobbuffet/splash.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/team_rocket/wobbuffet/splash.json @@ -6,26 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - }, - "duration.3": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:inverted", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/wolf/blaster.json b/data/ssbrc/advancement/utility/use_item/fighter/wolf/blaster.json index 5fe62ffd97..4b6abc9f9f 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/wolf/blaster.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/wolf/blaster.json @@ -6,29 +6,17 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.1": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"wolf.blaster\"}" + "minecraft:custom_data": "{item:\"wolf.blaster\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/link/sword_spin/charge.json b/data/ssbrc/advancement/utility/use_item/fighter/wolf/grenade.json similarity index 51% rename from data/ssbrc/advancement/utility/use_item/fighter/link/sword_spin/charge.json rename to data/ssbrc/advancement/utility/use_item/fighter/wolf/grenade.json index 7ab843479a..8dea7f4eb8 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/link/sword_spin/charge.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/wolf/grenade.json @@ -6,39 +6,39 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { "charge.output": { - "min": 20 + "min": { + "type": "minecraft:score", + "target": { + "type": "minecraft:fixed", + "name": "wolf.grenade.timer" + }, + "score": "const" + } } } - }, - { - "condition": "minecraft:reference", - "name": "ssbrc:flag/sneaking" } ], "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"master_sword\"}" + "minecraft:custom_data": "{item:\"grenade\"}", + "minecraft:damage": { + "damage": 0 + } } } } } }, "rewards": { - "function": "ssbrc:fighter/link/logic/abilities/sword_spin/charge/check" + "function": "ssbrc:fighter/wolf/logic/abilities/grenade/explode_in_hand" } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/wolf/grenade/charge.json b/data/ssbrc/advancement/utility/use_item/fighter/wolf/grenade/charge.json deleted file mode 100644 index e5311b7fb1..0000000000 --- a/data/ssbrc/advancement/utility/use_item/fighter/wolf/grenade/charge.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "parent": "ssbrc:utility/use_item/root", - "criteria": { - "requirement": { - "trigger": "minecraft:using_item", - "conditions": { - "player": [ - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.2": { - "max": 0 - } - } - } - ], - "item": { - "items": "#ssbrc:equipment", - "predicates": { - "minecraft:custom_data": "{item:\"grenade\"}" - } - } - } - } - }, - "rewards": { - "function": "ssbrc:fighter/wolf/logic/abilities/grenade/charge" - } -} diff --git a/data/ssbrc/advancement/utility/use_item/fighter/wolf/wolf_flash.json b/data/ssbrc/advancement/utility/use_item/fighter/wolf/wolf_flash.json index 8d9d7a34b5..fad6f4d2bb 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/wolf/wolf_flash.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/wolf/wolf_flash.json @@ -6,29 +6,17 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } - }, - { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown.3": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"wolf_slash\"}" + "minecraft:custom_data": "{item:\"wolf_slash\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/activate/eyes.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/activate/eyes.json index 71fc6f1a4d..429f821f94 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/activate/eyes.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/activate/eyes.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/activate/feet.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/activate/feet.json index 36f6f34c6d..86b5a5c013 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/activate/feet.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/activate/feet.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/recall.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/recall.json index a1d160655b..31b87fb254 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/recall.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/recall.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/stop.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/stop.json index 404637d66c..65296670f4 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/stop.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/drone/stop.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/gatling_gun.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/gatling_gun.json index ac96b8a4a7..ae614a49f7 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/gatling_gun.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/gatling_gun.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/missile_launcher.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/missile_launcher.json index 0be2482ec0..f287b4c066 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/missile_launcher.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/missile_launcher.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/gatling_gun.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/gatling_gun.json index 77a0eef4de..48d0047a16 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/gatling_gun.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/gatling_gun.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/missile_launcher.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/missile_launcher.json index 53d10bc690..614d44af19 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/missile_launcher.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/missile_launcher.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/omnishot.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/omnishot.json index 8779839422..add3f675ed 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/omnishot.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/omnishot.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/railgun.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/railgun.json index 249cb8703e..52268ce566 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/railgun.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/railgun.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/triple_shot.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/triple_shot.json index a67f83427e..846076238a 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/triple_shot.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/power_ups/triple_shot.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/railgun.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/railgun.json index 995b6ecaaf..35dd3b3735 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/railgun.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/railgun.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/yar/triple_shot.json b/data/ssbrc/advancement/utility/use_item/fighter/yar/triple_shot.json index fb8d5d2b90..5555d1b8f9 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/yar/triple_shot.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/yar/triple_shot.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/zelda/bomb.json b/data/ssbrc/advancement/utility/use_item/fighter/zelda/bomb.json index 40cd126bec..9c5ed1f05b 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/zelda/bomb.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/zelda/bomb.json @@ -6,13 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "cooldown": { - "max": 0 - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/advancement/utility/use_item/fighter/zelda/boomerang.json b/data/ssbrc/advancement/utility/use_item/fighter/zelda/boomerang.json index fb7382be5d..c98ecba745 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/zelda/boomerang.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/zelda/boomerang.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -35,7 +29,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"zelda.boomerang\"}" + "minecraft:custom_data": "{item:\"zelda.boomerang\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/zelda/fire_rod/alternate.json b/data/ssbrc/advancement/utility/use_item/fighter/zelda/fire_rod/alternate.json index 2f413edcda..9a19888d80 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/zelda/fire_rod/alternate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/zelda/fire_rod/alternate.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "magic": { "min": { "type": "minecraft:score", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/zelda/fire_rod/default.json b/data/ssbrc/advancement/utility/use_item/fighter/zelda/fire_rod/default.json index 4d40e86d14..52a23dfd67 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/zelda/fire_rod/default.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/zelda/fire_rod/default.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "magic": { "min": { "type": "minecraft:score", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/zelda/great_fairy_blessing.json b/data/ssbrc/advancement/utility/use_item/fighter/zelda/great_fairy_blessing.json index d10c6d1547..e69571e19d 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/zelda/great_fairy_blessing.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/zelda/great_fairy_blessing.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "zelda.rupee.remove": { "max": 0 } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/zelda/ice_rod/alternate.json b/data/ssbrc/advancement/utility/use_item/fighter/zelda/ice_rod/alternate.json index 3259176468..cfda3700cc 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/zelda/ice_rod/alternate.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/zelda/ice_rod/alternate.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown.1": { - "max": 0 - }, "magic": { "min": { "type": "minecraft:score", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/zelda/ice_rod/default.json b/data/ssbrc/advancement/utility/use_item/fighter/zelda/ice_rod/default.json index c81d54eac6..935ff6a9c2 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/zelda/ice_rod/default.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/zelda/ice_rod/default.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown.1": { - "max": 0 - }, "magic": { "min": { "type": "minecraft:score", diff --git a/data/ssbrc/advancement/utility/use_item/fighter/zelda/inventory_refresh.json b/data/ssbrc/advancement/utility/use_item/fighter/zelda/inventory_refresh.json index 1664c99be2..4b6c89738c 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/zelda/inventory_refresh.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/zelda/inventory_refresh.json @@ -6,22 +6,13 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", "entity": "this", "scores": { - "cooldown": { - "max": 0 - }, "zelda.rupee.remove": { "max": 0 } diff --git a/data/ssbrc/advancement/utility/use_item/fighter/zelda/magic_boomerang.json b/data/ssbrc/advancement/utility/use_item/fighter/zelda/magic_boomerang.json index f912597d8d..b0d1aeebec 100644 --- a/data/ssbrc/advancement/utility/use_item/fighter/zelda/magic_boomerang.json +++ b/data/ssbrc/advancement/utility/use_item/fighter/zelda/magic_boomerang.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:entity_scores", @@ -35,7 +29,10 @@ "item": { "items": "#ssbrc:equipment", "predicates": { - "minecraft:custom_data": "{item:\"magic_boomerang\"}" + "minecraft:custom_data": "{item:\"magic_boomerang\"}", + "minecraft:damage": { + "damage": 0 + } } } } diff --git a/data/ssbrc/advancement/utility/use_item/item/angel_feather.json b/data/ssbrc/advancement/utility/use_item/item/angel_feather.json index 0296ac3637..5eb0780a07 100644 --- a/data/ssbrc/advancement/utility/use_item/item/angel_feather.json +++ b/data/ssbrc/advancement/utility/use_item/item/angel_feather.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" }, { "condition": "minecraft:inverted", diff --git a/data/ssbrc/advancement/utility/use_item/item/power_pellet.json b/data/ssbrc/advancement/utility/use_item/item/power_pellet.json index dd6e33b69b..4adeff3d41 100644 --- a/data/ssbrc/advancement/utility/use_item/item/power_pellet.json +++ b/data/ssbrc/advancement/utility/use_item/item/power_pellet.json @@ -6,14 +6,8 @@ "conditions": { "player": [ { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Tags:[\"silenced\"]}" - } - } + "condition": "minecraft:reference", + "name": "ssbrc:universal_cooldown" } ], "item": { diff --git a/data/ssbrc/function/admin/event/none.mcfunction b/data/ssbrc/function/admin/event/none.mcfunction new file mode 100644 index 0000000000..472e847358 --- /dev/null +++ b/data/ssbrc/function/admin/event/none.mcfunction @@ -0,0 +1,3 @@ +data modify storage ssbrc:data world.event set value "none" + +place template ssbrc:lobby/default -544 3 -1963 diff --git a/data/ssbrc/function/admin/event/winter.mcfunction b/data/ssbrc/function/admin/event/winter.mcfunction new file mode 100644 index 0000000000..98c25879cb --- /dev/null +++ b/data/ssbrc/function/admin/event/winter.mcfunction @@ -0,0 +1,3 @@ +data modify storage ssbrc:data world.event set value "winter" + +place template ssbrc:lobby/winter -544 3 -1963 diff --git a/data/ssbrc/function/fighter/alucard/logic/abilities/holy_water/activate.mcfunction b/data/ssbrc/function/fighter/alucard/logic/abilities/holy_water/activate.mcfunction index 2331c050d7..baec964c5b 100644 --- a/data/ssbrc/function/fighter/alucard/logic/abilities/holy_water/activate.mcfunction +++ b/data/ssbrc/function/fighter/alucard/logic/abilities/holy_water/activate.mcfunction @@ -1,13 +1,12 @@ -function ssbrc:logic/fighter/ability/init - -execute anchored eyes positioned ^ ^ ^ summon minecraft:marker run function ssbrc:fighter/alucard/logic/abilities/holy_water/init/marker - -function ssbrc:fighter/alucard/logic/abilities/blood_metamorphosis/deactivate - -function ssbrc:logic/item/cooldown/set/const {type:"2",value:"300"} - -item replace entity @s weapon.mainhand with minecraft:air - -playsound ssbrc:fighter.alucard.holy_water.activate player @a - -function ssbrc:logic/fighter/ability/deinit +function ssbrc:logic/fighter/ability/init + +execute anchored eyes positioned ^ ^ ^ summon minecraft:marker run function ssbrc:fighter/alucard/logic/abilities/holy_water/init/marker + +function ssbrc:fighter/alucard/logic/abilities/blood_metamorphosis/deactivate + +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"holy_water"} +say hi + +playsound ssbrc:fighter.alucard.holy_water.activate player @a + +function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/alucard/logic/tick.mcfunction b/data/ssbrc/function/fighter/alucard/logic/tick.mcfunction index e0ea041e59..3cea99e5f9 100644 --- a/data/ssbrc/function/fighter/alucard/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/alucard/logic/tick.mcfunction @@ -1,4 +1,6 @@ # Holy Water +function ssbrc:logic/item/cooldown/decrease {item:"holy_water"} + execute unless items entity @s[scores={cooldown.2=1,duration.1=..0}] container.* minecraft:nether_star[minecraft:custom_data~{item:"holy_water"}] run function ssbrc:logic/item/init/slot {item:"holy_water",slot:"hotbar.1",type:"skin"} # Mist diff --git a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/check.mcfunction b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/check.mcfunction index 57c373e4aa..c2d629db25 100644 --- a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/check.mcfunction +++ b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/check.mcfunction @@ -2,9 +2,9 @@ function ssbrc:logic/fighter/ability/init execute unless score @s[scores={charge.1=1..}] charge.1 matches 28..36 run tag @s add falcon_punch_missed -execute if score @s charge.1 matches ..0 run function ssbrc:fighter/captain_falcon/logic/abilities/falcon_punch/activate +execute if score @s[predicate=ssbrc:universal_cooldown] charge.1 matches ..0 run function ssbrc:fighter/captain_falcon/logic/abilities/falcon_punch/activate execute if score @s charge.1 matches 28..36 rotated ~ 0.0 run function ssbrc:fighter/captain_falcon/logic/abilities/falcon_punch/unleash -scoreboard players add @s cooldown 3 +scoreboard players add @s cooldown 5 function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/display/active.mcfunction b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/display/active.mcfunction index 77458ca6fc..43519ebb7f 100644 --- a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/display/active.mcfunction +++ b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/display/active.mcfunction @@ -2,16 +2,17 @@ particle minecraft:flame ~ ~0.75 ~ 0.2 0.4 0.2 0.01 5 force @a scoreboard players add @s charge.1 2 -title @s[scores={charge.1=1..3}] actionbar [{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -title @s[scores={charge.1=4..6}] actionbar [{"text":"\u25ae","color":"red"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -title @s[scores={charge.1=7..9}] actionbar [{"text":"\u25ae\u25ae","color":"red"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -title @s[scores={charge.1=10..12}] actionbar [{"text":"\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae","color":"black"},{"text":"\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -title @s[scores={charge.1=13..15}] actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -title @s[scores={charge.1=16..18}] actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -title @s[scores={charge.1=19..21}] actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae","color":"yellow"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -title @s[scores={charge.1=22..24}] actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae","color":"yellow"},{"text":"\u25ae","color":"black"},{"text":"\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -title @s[scores={charge.1=25..27}] actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -title @s[scores={charge.1=28..30}] actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae","color":"white"},{"text":"\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -title @s[scores={charge.1=31..33}] actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae","color":"green"},{"text":"\u25ae","color":"white"},{"text":"\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -title @s[scores={charge.1=34..36}] actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae","color":"green"},{"text":"\u25ae","color":"white"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] -tag @s[scores={charge.1=37..}] add falcon_punch_missed +execute if score @s charge.1 matches 1..3 run return run title @s actionbar [{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] +execute if score @s charge.1 matches 4..6 run return run title @s actionbar [{"text":"\u25ae","color":"red"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] +execute if score @s charge.1 matches 7..9 run return run title @s actionbar [{"text":"\u25ae\u25ae","color":"red"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] +execute if score @s charge.1 matches 10..12 run return run title @s actionbar [{"text":"\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae","color":"black"},{"text":"\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] +execute if score @s charge.1 matches 13..15 run return run title @s actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] +execute if score @s charge.1 matches 16..18 run return run title @s actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] +execute if score @s charge.1 matches 19..21 run return run title @s actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae","color":"yellow"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] +execute if score @s charge.1 matches 22..24 run return run title @s actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae","color":"yellow"},{"text":"\u25ae","color":"black"},{"text":"\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] +execute if score @s charge.1 matches 25..27 run return run title @s actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae","color":"black"},{"text":"\u25ae\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] +execute if score @s charge.1 matches 28..30 run return run title @s actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae","color":"white"},{"text":"\u25ae\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] +execute if score @s charge.1 matches 31..33 run return run title @s actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae","color":"green"},{"text":"\u25ae","color":"white"},{"text":"\u25ae","color":"green"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] +execute if score @s charge.1 matches 34..36 run return run title @s actionbar [{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae","color":"green"},{"text":"\u25ae","color":"white"},{"text":"\u25ae\u25ae\u25ae\u25ae","color":"yellow"},{"text":"\u25ae\u25ae\u25ae\u25ae\u25ae","color":"red"}] + +tag @s add falcon_punch_missed diff --git a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/tick.mcfunction b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/tick.mcfunction index 0c36c57057..4afc223688 100644 --- a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/tick.mcfunction +++ b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/falcon_punch/tick.mcfunction @@ -1,4 +1,4 @@ execute unless entity @s[tag=falcon_punch_missed] run function ssbrc:fighter/captain_falcon/logic/abilities/falcon_punch/display/active execute if entity @s[tag=falcon_punch_missed] run function ssbrc:fighter/captain_falcon/logic/abilities/falcon_punch/display/missed -execute if entity @s[scores={charge.1=84..}] run function ssbrc:fighter/captain_falcon/logic/abilities/falcon_punch/deactivate +execute if score @s charge.1 matches 84.. run function ssbrc:fighter/captain_falcon/logic/abilities/falcon_punch/deactivate diff --git a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/activate.mcfunction b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/activate.mcfunction index 7ae6e71714..3105193e72 100644 --- a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/activate.mcfunction +++ b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/activate.mcfunction @@ -5,6 +5,7 @@ execute positioned ~ ~0.1 ~ summon minecraft:marker run function ssbrc:fighter/c effect give @s minecraft:levitation infinite 0 true scoreboard players set @s duration.1 6 +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"fists_of_fury"} playsound ssbrc:fighter.captain_falcon.raptor_boost.activate player @a diff --git a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/deactivate.mcfunction b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/deactivate.mcfunction index 55611430b0..77f4d9588d 100644 --- a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/deactivate.mcfunction +++ b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/deactivate.mcfunction @@ -2,5 +2,3 @@ execute unless entity @s[tag=raptor_boost_hit] run function ssbrc:logic/fighter/ tag @s remove raptor_boost_hit effect clear @s minecraft:levitation - -function ssbrc:logic/item/cooldown/set/const {type:"1",value:"60"} diff --git a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/hit.mcfunction b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/hit.mcfunction index 3545eb472d..48f4181042 100644 --- a/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/hit.mcfunction +++ b/data/ssbrc/function/fighter/captain_falcon/logic/abilities/raptor_boost/hit.mcfunction @@ -1,6 +1,6 @@ function ssbrc:logic/damage/generic {amount:"5.0",type:"generic",kb_resist:"0.0",source:" by @a[tag=self,limit=1]"} -function ssbrc:logic/fighter/motion/set {force:8000} +function ssbrc:logic/fighter/motion/y {force:1.8,safe_launch:"false"} function ssbrc:fighter/captain_falcon/logic/abilities/raptor_boost/raycast/abort execute as @a[tag=self,limit=1] run function ssbrc:fighter/captain_falcon/logic/abilities/raptor_boost/success diff --git a/data/ssbrc/function/fighter/captain_falcon/logic/tick.mcfunction b/data/ssbrc/function/fighter/captain_falcon/logic/tick.mcfunction index bac98f229b..920d6ba024 100644 --- a/data/ssbrc/function/fighter/captain_falcon/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/captain_falcon/logic/tick.mcfunction @@ -1,6 +1,8 @@ # Raptor Boost execute if score @s duration.1 matches 1 run function ssbrc:fighter/captain_falcon/logic/abilities/raptor_boost/deactivate +function ssbrc:logic/item/cooldown/decrease {item:"fists_of_fury"} + # Falcon Punch execute if score @s charge.1 matches 1.. run function ssbrc:fighter/captain_falcon/logic/abilities/falcon_punch/tick diff --git a/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/blade_beam/activate.mcfunction b/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/blade_beam/activate.mcfunction index fe0320b8c0..70a1e8d1eb 100644 --- a/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/blade_beam/activate.mcfunction +++ b/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/blade_beam/activate.mcfunction @@ -3,7 +3,7 @@ function ssbrc:logic/fighter/ability/init scoreboard players operation limit temp = @s resource execute rotated ~ 0.0 positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/cloud/logic/abilities/buster_sword/blade_beam/init -function ssbrc:logic/item/cooldown/set/const {type:"2",value:"20"} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"buster_sword"} execute unless score @s resource >= cloud.limit.max const run playsound ssbrc:fighter.cloud.blade_beam.activate player @a execute if score @s resource >= cloud.limit.max const run function ssbrc:fighter/cloud/logic/abilities/buster_sword/blade_beam/limit_break diff --git a/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/mode_switch/operator.mcfunction b/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/mode_switch/operator.mcfunction index 1f004353d8..3de9fcacae 100644 --- a/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/mode_switch/operator.mcfunction +++ b/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/mode_switch/operator.mcfunction @@ -1,10 +1,10 @@ function ssbrc:fighter/cloud/logic/abilities/buster_sword/mode_switch/default -function ssbrc:logic/item/init/default/replace {search_key:"item",search_value:"buster_sword",slot:"weapon.mainhand",variant:"default"} +function ssbrc:logic/item/init/variant/slot {item:"buster_sword",slot:"weapon.mainhand",variant:"default"} tellraw @s [{"translate":"ssbrc.fighter.cloud.mode_switch","bold":true,"color":"yellow"},{"translate":"ssbrc.fighter.cloud.operator","bold":false,"color":"green"}] -function ssbrc:logic/item/cooldown/set/const {type:"1",value:"100"} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"buster_sword"} playsound ssbrc:fighter.cloud.mode_switch.operator player @a diff --git a/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/mode_switch/punisher.mcfunction b/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/mode_switch/punisher.mcfunction index c0b6a15bc7..de9df00cce 100644 --- a/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/mode_switch/punisher.mcfunction +++ b/data/ssbrc/function/fighter/cloud/logic/abilities/buster_sword/mode_switch/punisher.mcfunction @@ -11,7 +11,7 @@ attribute @s minecraft:movement_speed modifier add ssbrc:punisher -0.7 add_multi tellraw @s [{"translate":"ssbrc.fighter.cloud.mode_switch","bold":true,"color":"yellow"},{"translate":"ssbrc.fighter.cloud.punisher","bold":false,"color":"blue"}] -function ssbrc:logic/item/cooldown/set/const {type:"1",value:"20"} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"buster_sword"} playsound ssbrc:fighter.cloud.mode_switch.punisher player @a diff --git a/data/ssbrc/function/fighter/cloud/logic/tick.mcfunction b/data/ssbrc/function/fighter/cloud/logic/tick.mcfunction index 0c5de6f23e..582ecce9aa 100644 --- a/data/ssbrc/function/fighter/cloud/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/cloud/logic/tick.mcfunction @@ -1,2 +1,4 @@ +function ssbrc:logic/item/cooldown/decrease {item:"buster_sword"} + # Cross Slash execute if score @s duration.1 matches 1.. anchored eyes rotated ~ 0.0 positioned ^ ^-0.75 ^1 run function ssbrc:fighter/cloud/logic/abilities/buster_sword/cross_slash/tick diff --git a/data/ssbrc/function/fighter/dark_samus/logic/abilities/phazon_beam/activate.mcfunction b/data/ssbrc/function/fighter/dark_samus/logic/abilities/phazon_beam/activate.mcfunction index bbc3d5985c..e08c8ebd14 100644 --- a/data/ssbrc/function/fighter/dark_samus/logic/abilities/phazon_beam/activate.mcfunction +++ b/data/ssbrc/function/fighter/dark_samus/logic/abilities/phazon_beam/activate.mcfunction @@ -1,10 +1,5 @@ -function ssbrc:logic/fighter/ability/init - scoreboard players operation charge temp = @s charge.output execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/dark_samus/logic/abilities/phazon_beam/init advancement grant @s[scores={charge.output=10..}] only ssbrc:ui/popup/dark_samus -scoreboard players set @s charge.output 0 - -scoreboard players add @s cooldown 10 -function ssbrc:logic/fighter/ability/deinit +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"phazon_beam"} diff --git a/data/ssbrc/function/fighter/dark_samus/logic/abilities/phazon_beam/charge.mcfunction b/data/ssbrc/function/fighter/dark_samus/logic/abilities/phazon_beam/charge.mcfunction deleted file mode 100644 index c77bed4d63..0000000000 --- a/data/ssbrc/function/fighter/dark_samus/logic/abilities/phazon_beam/charge.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -execute if predicate ssbrc:random_chance/50 run particle minecraft:soul_fire_flame ^ ^1 ^1 0.0 0.0 0.0 0.01 1 force @a - -advancement revoke @s only ssbrc:utility/use_item/fighter/dark_samus/phazon_beam/charge diff --git a/data/ssbrc/function/fighter/dark_samus/logic/abilities/phazon_overload/tick_active.mcfunction b/data/ssbrc/function/fighter/dark_samus/logic/abilities/phazon_overload/tick_active.mcfunction index f29516ef6a..a891b43e5b 100644 --- a/data/ssbrc/function/fighter/dark_samus/logic/abilities/phazon_overload/tick_active.mcfunction +++ b/data/ssbrc/function/fighter/dark_samus/logic/abilities/phazon_overload/tick_active.mcfunction @@ -7,5 +7,3 @@ execute anchored eyes positioned ^ ^-0.75 ^1 run function ssbrc:fighter/dark_sam function ssbrc:logic/damage/generic {amount:"2.0",type:"pierce",kb_resist:"1.0",source:""} effect give @s minecraft:poison 1 0 true - -function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/dark_samus/logic/tick.mcfunction b/data/ssbrc/function/fighter/dark_samus/logic/tick.mcfunction index a8a4e41d37..061b289c8c 100644 --- a/data/ssbrc/function/fighter/dark_samus/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/dark_samus/logic/tick.mcfunction @@ -1 +1,7 @@ +# Phazon Beam +execute if items entity @s[tag=!silenced,scores={charge.output=1..,cooldown=..0,duration.1=..0},predicate=ssbrc:flag/sneaking] weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"phazon_beam"}] if predicate ssbrc:random_chance/50 run particle minecraft:soul_fire_flame ^ ^1 ^1 0.0 0.0 0.0 0.01 1 normal @a + +function ssbrc:logic/item/cooldown/decrease {item:"phazon_beam"} + +# Phazon Overload execute if score @s duration.1 matches 1.. run function ssbrc:fighter/dark_samus/logic/abilities/phazon_overload/tick diff --git a/data/ssbrc/function/fighter/dark_samus/logic/use_item.mcfunction b/data/ssbrc/function/fighter/dark_samus/logic/use_item.mcfunction new file mode 100644 index 0000000000..d6aaa8e431 --- /dev/null +++ b/data/ssbrc/function/fighter/dark_samus/logic/use_item.mcfunction @@ -0,0 +1,3 @@ +execute if items entity @s[scores={duration.1=..0}] weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"phazon_beam"},minecraft:damage~{damage:0}] run return run function ssbrc:fighter/dark_samus/logic/abilities/phazon_beam/activate + +execute if items entity @s[scores={duration.1=1..}] weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"phazon_beam"}] run function ssbrc:fighter/dark_samus/logic/abilities/phazon_overload/tick_active diff --git a/data/ssbrc/function/fighter/donkey_kong/logic/abilities/barrel/activate.mcfunction b/data/ssbrc/function/fighter/donkey_kong/logic/abilities/barrel/activate.mcfunction index 92670cfe3b..d55a427763 100644 --- a/data/ssbrc/function/fighter/donkey_kong/logic/abilities/barrel/activate.mcfunction +++ b/data/ssbrc/function/fighter/donkey_kong/logic/abilities/barrel/activate.mcfunction @@ -2,8 +2,6 @@ function ssbrc:logic/fighter/ability/init execute anchored eyes positioned ^ ^ ^1 summon minecraft:armor_stand run function ssbrc:fighter/donkey_kong/logic/abilities/barrel/init/projectile -function ssbrc:logic/item/cooldown/set/const {type:"1",value:"10"} - item replace entity @s weapon.mainhand with minecraft:air playsound ssbrc:fighter.donkey_kong.barrel.activate player @a diff --git a/data/ssbrc/function/fighter/donkey_kong/logic/abilities/barrel/regain.mcfunction b/data/ssbrc/function/fighter/donkey_kong/logic/abilities/barrel/regain.mcfunction index a56a98ee1e..99774a707d 100644 --- a/data/ssbrc/function/fighter/donkey_kong/logic/abilities/barrel/regain.mcfunction +++ b/data/ssbrc/function/fighter/donkey_kong/logic/abilities/barrel/regain.mcfunction @@ -1,3 +1,4 @@ function ssbrc:logic/player/data/temp/copy/check -function ssbrc:logic/item/init/slot {item:"barrel",slot:"hotbar.0",type:"skin"} +function ssbrc:logic/item/give/default {item:"barrel",type:"skin"} +function ssbrc:logic/item/durability/reset/item {item:"barrel"} diff --git a/data/ssbrc/function/fighter/donkey_kong/logic/abilities/orange_grenade/activate.mcfunction b/data/ssbrc/function/fighter/donkey_kong/logic/abilities/orange_grenade/activate.mcfunction index b27b6a64d4..7c236cb76c 100644 --- a/data/ssbrc/function/fighter/donkey_kong/logic/abilities/orange_grenade/activate.mcfunction +++ b/data/ssbrc/function/fighter/donkey_kong/logic/abilities/orange_grenade/activate.mcfunction @@ -2,11 +2,10 @@ function ssbrc:logic/fighter/ability/init execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/donkey_kong/logic/abilities/orange_grenade/init -scoreboard players remove @s charge.1 1 - -function ssbrc:logic/item/durability/reset/hand {key:"item",value:"orange_grenade"} -clear @s[scores={charge.1=..0}] minecraft:nether_star[minecraft:custom_data~{item:"orange_grenade"}] - playsound ssbrc:fighter.donkey_kong.orange_grenade.activate player @a function ssbrc:logic/fighter/ability/deinit + +scoreboard players remove @s charge.1 1 +execute if score @s charge.1 matches ..0 run return run clear @s minecraft:nether_star[minecraft:custom_data~{item:"orange_grenade"}] +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"orange_grenade"} diff --git a/data/ssbrc/function/fighter/donkey_kong/logic/tick.mcfunction b/data/ssbrc/function/fighter/donkey_kong/logic/tick.mcfunction index 9124bbb05f..85c219795e 100644 --- a/data/ssbrc/function/fighter/donkey_kong/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/donkey_kong/logic/tick.mcfunction @@ -1,3 +1,6 @@ +# Barrel +function ssbrc:logic/item/cooldown/decrease {item:"barrel"} + # Orange Grenade function ssbrc:logic/item/cooldown/decrease {item:"orange_grenade"} diff --git a/data/ssbrc/function/fighter/fox/logic/abilities/blaster/activate.mcfunction b/data/ssbrc/function/fighter/fox/logic/abilities/blaster/activate.mcfunction index 68292f88ff..dddea3b5ee 100644 --- a/data/ssbrc/function/fighter/fox/logic/abilities/blaster/activate.mcfunction +++ b/data/ssbrc/function/fighter/fox/logic/abilities/blaster/activate.mcfunction @@ -1,5 +1,6 @@ execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/fox/logic/abilities/blaster/init function ssbrc:logic/item/durability/reset/hand {key:"item",value:"fox.blaster"} +function ssbrc:logic/item/durability/reset/item {item:"krazoan_staff"} playsound ssbrc:fighter.fox.blaster.activate player @a diff --git a/data/ssbrc/function/fighter/fox/logic/abilities/fire_fox/activate.mcfunction b/data/ssbrc/function/fighter/fox/logic/abilities/fire_fox/activate.mcfunction index 787dfbeed4..c85e681033 100644 --- a/data/ssbrc/function/fighter/fox/logic/abilities/fire_fox/activate.mcfunction +++ b/data/ssbrc/function/fighter/fox/logic/abilities/fire_fox/activate.mcfunction @@ -1,7 +1,7 @@ execute summon minecraft:marker run function ssbrc:fighter/fox/logic/abilities/fire_fox/init function ssbrc:logic/item/cooldown/set/const {type:"3",value:"15"} -scoreboard players set @s duration.3 15 +scoreboard players set @s duration.1 15 scoreboard players set @s charge.3 0 diff --git a/data/ssbrc/function/fighter/fox/logic/abilities/fire_fox/raycast/abort.mcfunction b/data/ssbrc/function/fighter/fox/logic/abilities/fire_fox/raycast/abort.mcfunction index bf4fdd9f13..989ff55637 100644 --- a/data/ssbrc/function/fighter/fox/logic/abilities/fire_fox/raycast/abort.mcfunction +++ b/data/ssbrc/function/fighter/fox/logic/abilities/fire_fox/raycast/abort.mcfunction @@ -1,6 +1,6 @@ scoreboard players set entity_hit temp 1 -scoreboard players set @a[tag=self,limit=1] duration.3 2 +scoreboard players set @a[tag=self,limit=1] duration.1 2 scoreboard players reset ray_length temp diff --git a/data/ssbrc/function/fighter/fox/logic/abilities/krazoan_fireball/activate.mcfunction b/data/ssbrc/function/fighter/fox/logic/abilities/krazoan_fireball/activate.mcfunction index 2d091496f9..90af9505c4 100644 --- a/data/ssbrc/function/fighter/fox/logic/abilities/krazoan_fireball/activate.mcfunction +++ b/data/ssbrc/function/fighter/fox/logic/abilities/krazoan_fireball/activate.mcfunction @@ -2,7 +2,8 @@ function ssbrc:logic/fighter/ability/init execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/fox/logic/abilities/krazoan_fireball/init -scoreboard players add @s cooldown 30 +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"krazoan_staff"} +function ssbrc:logic/item/durability/reset/item {item:"fox.blaster"} playsound ssbrc:fighter.fox.krazoan_staff.activate player @a diff --git a/data/ssbrc/function/fighter/fox/logic/abilities/reflector/activate.mcfunction b/data/ssbrc/function/fighter/fox/logic/abilities/reflector/activate.mcfunction index 4cb556bf6c..84677ef8d5 100644 --- a/data/ssbrc/function/fighter/fox/logic/abilities/reflector/activate.mcfunction +++ b/data/ssbrc/function/fighter/fox/logic/abilities/reflector/activate.mcfunction @@ -1,7 +1,7 @@ execute anchored eyes positioned ^ ^ ^2 run particle minecraft:sonic_boom ~ ~ ~ 0.0 0.0 0.0 0.0 1 force @a scoreboard players set @s duration.2 15 -function ssbrc:logic/fighter/effects/mobility/immobilize {type:"air_stall",duration:20} +function ssbrc:logic/fighter/effects/mobility/immobilize {type:"air_stall",duration:15} function ssbrc:logic/item/durability/reset/hand {key:"item",value:"reflector"} diff --git a/data/ssbrc/function/fighter/fox/logic/tick.mcfunction b/data/ssbrc/function/fighter/fox/logic/tick.mcfunction index 406f6c0b59..56275cd751 100644 --- a/data/ssbrc/function/fighter/fox/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/fox/logic/tick.mcfunction @@ -1,3 +1,6 @@ +# Krazoan Staff +function ssbrc:logic/item/cooldown/decrease {item:"krazoan_staff"} + # Blaster function ssbrc:logic/item/cooldown/decrease {item:"fox.blaster"} @@ -7,6 +10,6 @@ execute if score @s duration.2 matches 1.. anchored eyes positioned ^ ^ ^2 as @e function ssbrc:logic/item/cooldown/decrease {item:"reflector"} # Fire Fox -execute if entity @s[scores={duration.2=..0,duration.3=..0}] run function ssbrc:fighter/fox/logic/abilities/fire_fox/check +execute if entity @s[scores={duration.1=..0,duration.2=..0}] run function ssbrc:fighter/fox/logic/abilities/fire_fox/check -execute if score @s duration.3 matches 1 run function ssbrc:fighter/fox/logic/abilities/fire_fox/deactivate +execute if score @s duration.1 matches 1 run function ssbrc:fighter/fox/logic/abilities/fire_fox/deactivate diff --git a/data/ssbrc/function/fighter/fox/logic/use_item.mcfunction b/data/ssbrc/function/fighter/fox/logic/use_item.mcfunction index f7aaabf7c7..a5f3f84478 100644 --- a/data/ssbrc/function/fighter/fox/logic/use_item.mcfunction +++ b/data/ssbrc/function/fighter/fox/logic/use_item.mcfunction @@ -1 +1 @@ -execute if items entity @s[scores={duration.2=..0,duration.3=..0}] weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"fox.blaster"},minecraft:damage~{damage:0}] run function ssbrc:fighter/fox/logic/abilities/blaster/activate +execute if items entity @s[scores={duration.1=..0,duration.2=..0}] weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"fox.blaster"},minecraft:damage~{damage:0}] run function ssbrc:fighter/fox/logic/abilities/blaster/activate diff --git a/data/ssbrc/function/fighter/greninja/logic/abilities/shadow_sneak/end.mcfunction b/data/ssbrc/function/fighter/greninja/logic/abilities/shadow_sneak/end.mcfunction index 1ab5c69779..5c73f96680 100644 --- a/data/ssbrc/function/fighter/greninja/logic/abilities/shadow_sneak/end.mcfunction +++ b/data/ssbrc/function/fighter/greninja/logic/abilities/shadow_sneak/end.mcfunction @@ -1,5 +1,5 @@ scoreboard players set entity_hit temp 1 -function ssbrc:logic/item/cooldown/set/const {type:"2",value:"40"} +function ssbrc:logic/item/durability/reset/item {item:"night_slash"} tag @s remove shadow_sneak diff --git a/data/ssbrc/function/fighter/greninja/logic/abilities/water_shuriken/activate.mcfunction b/data/ssbrc/function/fighter/greninja/logic/abilities/water_shuriken/activate.mcfunction index 233c612714..a914655638 100644 --- a/data/ssbrc/function/fighter/greninja/logic/abilities/water_shuriken/activate.mcfunction +++ b/data/ssbrc/function/fighter/greninja/logic/abilities/water_shuriken/activate.mcfunction @@ -5,7 +5,7 @@ execute anchored eyes positioned ^ ^ ^1 summon minecraft:item_display run functi scoreboard players remove @s charge.1 1 item replace entity @s[scores={charge.1=..0}] weapon.mainhand with minecraft:air -scoreboard players add @s cooldown 3 +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"water_shuriken"} playsound ssbrc:fighter.greninja.water_shuriken.activate player @a diff --git a/data/ssbrc/function/fighter/greninja/logic/abilities/water_shuriken/charge.mcfunction b/data/ssbrc/function/fighter/greninja/logic/abilities/water_shuriken/charge.mcfunction index 98e6fb2c38..66ee104e79 100644 --- a/data/ssbrc/function/fighter/greninja/logic/abilities/water_shuriken/charge.mcfunction +++ b/data/ssbrc/function/fighter/greninja/logic/abilities/water_shuriken/charge.mcfunction @@ -1,2 +1,3 @@ scoreboard players add @s charge.2 1 -execute if entity @s[scores={charge.2=40..}] run function ssbrc:fighter/greninja/logic/abilities/water_shuriken/give + +execute if score @s charge.2 matches 40.. run function ssbrc:fighter/greninja/logic/abilities/water_shuriken/give diff --git a/data/ssbrc/function/fighter/greninja/logic/tick.mcfunction b/data/ssbrc/function/fighter/greninja/logic/tick.mcfunction index 10c7532ab5..2b93941a1d 100644 --- a/data/ssbrc/function/fighter/greninja/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/greninja/logic/tick.mcfunction @@ -1,8 +1,12 @@ +# Night Slash +function ssbrc:logic/item/cooldown/decrease {item:"night_slash"} + +execute if entity @s[tag=shadow_sneak,predicate=ssbrc:flag/sneaking] run function ssbrc:fighter/greninja/logic/abilities/shadow_sneak/deactivate + # Water Shuriken +function ssbrc:logic/item/cooldown/decrease {item:"water_shuriken"} + execute unless items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"water_shuriken"}] run title @s actionbar "" execute if items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"water_shuriken"}] run title @s actionbar {"score":{"name":"@s","objective":"charge.1"},"color":"blue"} -execute if entity @s[scores={charge.1=..3}] run function ssbrc:fighter/greninja/logic/abilities/water_shuriken/charge - -# Shadow Sneak -execute if entity @s[tag=shadow_sneak,predicate=ssbrc:flag/sneaking] run function ssbrc:fighter/greninja/logic/abilities/shadow_sneak/deactivate +execute if score @s charge.1 matches ..3 run function ssbrc:fighter/greninja/logic/abilities/water_shuriken/charge diff --git a/data/ssbrc/function/fighter/jigglypuff/logic/abilities/rest/deactivate.mcfunction b/data/ssbrc/function/fighter/jigglypuff/logic/abilities/rest/deactivate.mcfunction index e3e134136e..16b4062db9 100644 --- a/data/ssbrc/function/fighter/jigglypuff/logic/abilities/rest/deactivate.mcfunction +++ b/data/ssbrc/function/fighter/jigglypuff/logic/abilities/rest/deactivate.mcfunction @@ -4,7 +4,6 @@ function ssbrc:logic/player/data/temp/set {mode:"store",key:"form",value:"defaul function ssbrc:logic/item/modify {search_key:"item",search_value:"rest",path:"ssbrc:fighter/jigglypuff/rest/default"} scoreboard players set @s charge.1 0 -scoreboard players set @s charge.2 0 function ssbrc:logic/fighter/effects/mobility/mobilize diff --git a/data/ssbrc/function/fighter/jigglypuff/logic/abilities/rest/tick.mcfunction b/data/ssbrc/function/fighter/jigglypuff/logic/abilities/rest/tick.mcfunction index 2544bd6ec6..7872720c40 100644 --- a/data/ssbrc/function/fighter/jigglypuff/logic/abilities/rest/tick.mcfunction +++ b/data/ssbrc/function/fighter/jigglypuff/logic/abilities/rest/tick.mcfunction @@ -1,12 +1,14 @@ scoreboard players add @s charge.1 1 -scoreboard players add @s charge.2 1 -execute if entity @s[scores={charge.1=1}] run playsound ssbrc:fighter.jigglypuff.rest.snore.in player @a +scoreboard players operation loop temp = @s charge.1 +scoreboard players operation loop temp %= 60 const -execute if entity @s[scores={charge.1=15}] if predicate ssbrc:random_chance/10 run function ssbrc:fighter/jigglypuff/logic/abilities/rest/deactivate +execute if score @s charge.1 matches 1 run playsound ssbrc:fighter.jigglypuff.rest.snore.in player @a -execute if entity @s[scores={charge.1=30}] run playsound ssbrc:fighter.jigglypuff.rest.snore.out player @a +execute if score @s charge.1 matches 15 if predicate ssbrc:random_chance/10 run function ssbrc:fighter/jigglypuff/logic/abilities/rest/deactivate -scoreboard players set @s[scores={charge.1=60..}] charge.1 0 +execute if score @s charge.1 matches 30 run playsound ssbrc:fighter.jigglypuff.rest.snore.out player @a -execute if entity @s[scores={charge.2=400..}] run function ssbrc:fighter/jigglypuff/logic/abilities/rest/deactivate +scoreboard players reset loop temp + +execute if entity @s[scores={charge.1=400..}] run function ssbrc:fighter/jigglypuff/logic/abilities/rest/deactivate diff --git a/data/ssbrc/function/fighter/jigglypuff/logic/tick.mcfunction b/data/ssbrc/function/fighter/jigglypuff/logic/tick.mcfunction index 92e111844d..9dfba439dc 100644 --- a/data/ssbrc/function/fighter/jigglypuff/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/jigglypuff/logic/tick.mcfunction @@ -4,7 +4,7 @@ function ssbrc:logic/item/cooldown/decrease {item:"hyper_voice"} # Rest execute if data storage ssbrc:temp player.temp_data{form:"rest"} run function ssbrc:fighter/jigglypuff/logic/abilities/rest/tick -execute unless data storage ssbrc:temp player.temp_data{form:"rest"} run function ssbrc:logic/item/cooldown/decrease {item:"hyper_voice"} +execute unless data storage ssbrc:temp player.temp_data{form:"rest"} run function ssbrc:logic/item/cooldown/decrease {item:"rest"} # Hot Air execute unless data storage ssbrc:temp player.temp_data{form:"rest"} if entity @s[scores={cooldown.2=..0},predicate=ssbrc:flag/sneaking] run function ssbrc:fighter/jigglypuff/logic/abilities/hot_air/tick diff --git a/data/ssbrc/function/fighter/joker/logic/abilities/dream_needle/tick.mcfunction b/data/ssbrc/function/fighter/joker/logic/abilities/dream_needle/tick.mcfunction index 9126b000db..69c79cd81a 100644 --- a/data/ssbrc/function/fighter/joker/logic/abilities/dream_needle/tick.mcfunction +++ b/data/ssbrc/function/fighter/joker/logic/abilities/dream_needle/tick.mcfunction @@ -1,3 +1,3 @@ particle minecraft:dust_color_transition{from_color:[1.0,0.5,1.0],to_color:[1.0,0.8,1.0],scale:0.5} ~ ~ ~ 0.0 0.0 0.0 0.0 1 normal @a -execute positioned ~-0.05 ~-0.05 ~-0.05 as @e[tag=!self,predicate=ssbrc:target,dx=0] positioned ~-0.9 ~-0.9 ~-0.9 if entity @s[dx=0] run function ssbrc:fighter/joker/logic/abilities/dream_needle/hit +execute positioned ~-0.125 ~-0.125 ~-0.125 as @e[tag=!self,predicate=ssbrc:target,dx=0] positioned ~-0.75 ~-0.75 ~-0.75 if entity @s[dx=0] run function ssbrc:fighter/joker/logic/abilities/dream_needle/hit diff --git a/data/ssbrc/function/fighter/joker/logic/abilities/tt33/activate.mcfunction b/data/ssbrc/function/fighter/joker/logic/abilities/tt33/activate.mcfunction index 2de390e771..f2ce5711ca 100644 --- a/data/ssbrc/function/fighter/joker/logic/abilities/tt33/activate.mcfunction +++ b/data/ssbrc/function/fighter/joker/logic/abilities/tt33/activate.mcfunction @@ -1,10 +1,4 @@ -function ssbrc:logic/fighter/ability/init - execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/joker/logic/abilities/tt33/init scoreboard players remove @s weapon_1.ammo 1 scoreboard players operation @s hud = hud_frequency const - -function ssbrc:logic/item/cooldown/set/const {type:"1",value:"5"} - -function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/joker/logic/abilities/tt33/check.mcfunction b/data/ssbrc/function/fighter/joker/logic/abilities/tt33/check.mcfunction new file mode 100644 index 0000000000..7d456c08fd --- /dev/null +++ b/data/ssbrc/function/fighter/joker/logic/abilities/tt33/check.mcfunction @@ -0,0 +1,5 @@ +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"tt33"} + +execute if score @s weapon_1.ammo matches 1.. run return run function ssbrc:fighter/joker/logic/abilities/tt33/activate + +playsound ssbrc:generic_misfire player @a diff --git a/data/ssbrc/function/fighter/joker/logic/abilities/tt33/misfire.mcfunction b/data/ssbrc/function/fighter/joker/logic/abilities/tt33/misfire.mcfunction deleted file mode 100644 index dde1b36263..0000000000 --- a/data/ssbrc/function/fighter/joker/logic/abilities/tt33/misfire.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -function ssbrc:logic/fighter/projectile/misfire {type:"1",amount:"5"} - -advancement revoke @s only ssbrc:utility/use_item/fighter/joker/tt33/misfire diff --git a/data/ssbrc/function/fighter/joker/logic/abilities/tt33/move_forward.mcfunction b/data/ssbrc/function/fighter/joker/logic/abilities/tt33/move_forward.mcfunction index 1bd8a649e7..7b434f7288 100644 --- a/data/ssbrc/function/fighter/joker/logic/abilities/tt33/move_forward.mcfunction +++ b/data/ssbrc/function/fighter/joker/logic/abilities/tt33/move_forward.mcfunction @@ -1,6 +1,6 @@ execute unless block ~ ~ ~ #ssbrc:passthrough run return run kill @s -execute unless entity @s[tag=dream_needle] positioned ~-0.05 ~-0.05 ~-0.05 as @e[tag=!self,predicate=ssbrc:target,dx=0] positioned ~-0.9 ~-0.9 ~-0.9 if entity @s[dx=0] run function ssbrc:fighter/joker/logic/abilities/tt33/hit +execute unless entity @s[tag=dream_needle] positioned ~-0.125 ~-0.125 ~-0.125 as @e[tag=!self,predicate=ssbrc:target,dx=0] positioned ~-0.9 ~-0.9 ~-0.9 if entity @s[dx=0] run function ssbrc:fighter/joker/logic/abilities/tt33/hit execute if entity @s[tag=dream_needle] run function ssbrc:fighter/joker/logic/abilities/dream_needle/tick execute if score entity_hit temp matches 1 run return run kill @s diff --git a/data/ssbrc/function/fighter/joker/logic/hud.mcfunction b/data/ssbrc/function/fighter/joker/logic/hud.mcfunction index 45e6cb20f0..15a84c40ff 100644 --- a/data/ssbrc/function/fighter/joker/logic/hud.mcfunction +++ b/data/ssbrc/function/fighter/joker/logic/hud.mcfunction @@ -1,4 +1,4 @@ -execute if items entity @s weapon.* minecraft:nether_star[minecraft:custom_data~{item:"tt33"}] run return run title @s actionbar {"score":{"name":"@s","objective":"weapon_1.ammo"},"color":"red"} +execute if items entity @s weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"tt33"}] run return run title @s actionbar {"score":{"name":"@s","objective":"weapon_1.ammo"},"color":"red"} function ssbrc:fighter/joker/logic/abilities/persona_awakening/calculate title @s actionbar ["",{"translate":"ssbrc.fighter.joker.persona_awakening","bold":true},{"nbt":"player.temp_data.hud.1","storage":"ssbrc:temp","interpret":true,"separator":""}] diff --git a/data/ssbrc/function/fighter/joker/logic/tick.mcfunction b/data/ssbrc/function/fighter/joker/logic/tick.mcfunction index ba53bfe2b7..a9eef9b7f2 100644 --- a/data/ssbrc/function/fighter/joker/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/joker/logic/tick.mcfunction @@ -1,3 +1,5 @@ +function ssbrc:logic/item/cooldown/decrease {item:"tt33"} + # Persona Awakening execute if score @s duration.1 matches 1.. run function ssbrc:fighter/joker/logic/abilities/persona_awakening/tick diff --git a/data/ssbrc/function/fighter/joker/logic/use_item.mcfunction b/data/ssbrc/function/fighter/joker/logic/use_item.mcfunction new file mode 100644 index 0000000000..6207e0d311 --- /dev/null +++ b/data/ssbrc/function/fighter/joker/logic/use_item.mcfunction @@ -0,0 +1 @@ +execute if items entity @s weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"tt33"},minecraft:damage~{damage:0}] run function ssbrc:fighter/joker/logic/abilities/tt33/check diff --git a/data/ssbrc/function/fighter/link/logic/abilities/boomerang/regain.mcfunction b/data/ssbrc/function/fighter/link/logic/abilities/boomerang/regain.mcfunction index c05d71c47f..f03ede0ccf 100644 --- a/data/ssbrc/function/fighter/link/logic/abilities/boomerang/regain.mcfunction +++ b/data/ssbrc/function/fighter/link/logic/abilities/boomerang/regain.mcfunction @@ -1,4 +1,5 @@ loot give @s loot ssbrc:fighter/link/boomerang +function ssbrc:logic/item/durability/reset/item {item:"link.boomerang"} kill @n[type=minecraft:item_display,tag=link.boomerang,predicate=ssbrc:id_match] diff --git a/data/ssbrc/function/fighter/link/logic/abilities/sword_beam/activate.mcfunction b/data/ssbrc/function/fighter/link/logic/abilities/sword_beam/activate.mcfunction index 49f31b3da4..aa65be70f7 100644 --- a/data/ssbrc/function/fighter/link/logic/abilities/sword_beam/activate.mcfunction +++ b/data/ssbrc/function/fighter/link/logic/abilities/sword_beam/activate.mcfunction @@ -2,6 +2,6 @@ function ssbrc:logic/fighter/ability/init execute anchored eyes positioned ^ ^ ^ run function ssbrc:fighter/link/logic/abilities/sword_beam/summon -scoreboard players add @s cooldown 20 +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"master_sword"} function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/activate/dormant.mcfunction b/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/activate/dormant.mcfunction index fe23da5360..5896d0091a 100644 --- a/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/activate/dormant.mcfunction +++ b/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/activate/dormant.mcfunction @@ -1,6 +1,6 @@ execute if score @s charge.output matches ..50 as @e[tag=!self,predicate=ssbrc:target,distance=..2] run function ssbrc:logic/damage/generic {amount:"8.0",type:"generic",kb_resist:"0.0",source:" by @a[tag=self,limit=1]"} execute if entity @s[scores={charge.output=51..},predicate=!ssbrc:fighter/link/master_sword_awakened] as @e[tag=!self,predicate=ssbrc:target,distance=..2.25] run function ssbrc:logic/damage/generic {amount:"10.0",type:"generic",kb_resist:"0.0",source:" by @a[tag=self,limit=1]"} -execute if entity @s[predicate=ssbrc:fighter/link/master_sword_awakened] run function ssbrc:fighter/link/logic/abilities/sword_spin/activate/default +execute if predicate ssbrc:fighter/link/master_sword_awakened run function ssbrc:fighter/link/logic/abilities/sword_spin/activate/default tag @s add no_spin tag @s remove sword_spin diff --git a/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/charge/check.mcfunction b/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/charge/check.mcfunction index 9e4f91531e..69dd93cad4 100644 --- a/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/charge/check.mcfunction +++ b/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/charge/check.mcfunction @@ -1,5 +1,5 @@ tag @s add sword_spin -execute positioned ~ ~0.75 ~ run function ssbrc:fighter/link/logic/abilities/sword_spin/charge/default +execute if score @s charge.output matches 1 run function ssbrc:fighter/link/logic/abilities/sword_spin/shield -advancement revoke @s only ssbrc:utility/use_item/fighter/link/sword_spin/charge +execute positioned ~ ~0.75 ~ run function ssbrc:fighter/link/logic/abilities/sword_spin/charge/default diff --git a/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/charge/default.mcfunction b/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/charge/default.mcfunction index e2b062f569..a4f6e69d90 100644 --- a/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/charge/default.mcfunction +++ b/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/charge/default.mcfunction @@ -2,6 +2,6 @@ scoreboard players operation sword_spin temp = @s charge.output scoreboard players operation sword_spin temp %= 5 const execute if score sword_spin temp matches 0 run function ssbrc:fighter/link/logic/abilities/sword_spin/raycast/start -execute if entity @s[scores={charge.output=..80}] run function ssbrc:fighter/link/logic/abilities/sword_spin/particles/speed {type:"1"} +execute if score @s charge.output matches ..80 run function ssbrc:fighter/link/logic/abilities/sword_spin/particles/speed {type:"1"} execute if entity @s[scores={charge.output=81..},predicate=!ssbrc:fighter/link/master_sword_awakened] run function ssbrc:fighter/link/logic/abilities/sword_spin/particles/speed {type:"1"} -execute if entity @s[predicate=ssbrc:fighter/link/master_sword_awakened] run function ssbrc:fighter/link/logic/abilities/sword_spin/charge/awakened +execute if predicate ssbrc:fighter/link/master_sword_awakened run function ssbrc:fighter/link/logic/abilities/sword_spin/charge/awakened diff --git a/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/deactivate.mcfunction b/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/deactivate.mcfunction deleted file mode 100644 index fbc89026e6..0000000000 --- a/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/deactivate.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -tag @s remove sword_spin - -scoreboard players set @s charge.output 0 - -advancement revoke @s only ssbrc:utility/use_item/fighter/link/sword_spin/deactivate diff --git a/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/shield.mcfunction b/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/shield.mcfunction new file mode 100644 index 0000000000..18befce232 --- /dev/null +++ b/data/ssbrc/function/fighter/link/logic/abilities/sword_spin/shield.mcfunction @@ -0,0 +1,9 @@ +execute unless items entity @s weapon.offhand minecraft:shield[minecraft:custom_data~{item:"hylian_shield"}] unless items entity @s container.* minecraft:shield[minecraft:custom_data~{item:"hylian_shield"}] run return run tag @s add shield_broken + +function ssbrc:logic/item/component/get {search_key:"item",search_value:"hylian_shield",component:"minecraft:damage",output_type:"score",output_path:"@s durability"} +clear @s minecraft:shield[minecraft:custom_data~{item:"hylian_shield"}] + +scoreboard players set durability temp 30 +scoreboard players operation durability temp -= @s durability +scoreboard players operation durability temp *= 100 const +scoreboard players operation durability temp /= 30 const diff --git a/data/ssbrc/function/fighter/link/logic/tick.mcfunction b/data/ssbrc/function/fighter/link/logic/tick.mcfunction index 7a6904a5f3..8d832f2ab4 100644 --- a/data/ssbrc/function/fighter/link/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/link/logic/tick.mcfunction @@ -1,9 +1,16 @@ -# Health -execute if items entity @s[scores={health=40..}] container.* minecraft:nether_star[minecraft:custom_data~{item:"master_sword",awakened:"false"}] run function ssbrc:fighter/link/logic/master_sword/enable +# Master Sword +function ssbrc:logic/item/cooldown/decrease {item:"master_sword"} -execute if entity @s[scores={health=..6}] run function ssbrc:fighter/link/logic/low_health_alert/check +execute if items entity @s[tag=!silenced,scores={charge.output=20..},predicate=ssbrc:flag/sneaking] weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"master_sword"}] run function ssbrc:fighter/link/logic/abilities/sword_spin/charge/check -# Sword Spin -execute if entity @s[scores={rotation=1000..}] run function ssbrc:fighter/link/logic/abilities/sword_spin/tick +execute if score @s rotation matches 1000.. run function ssbrc:fighter/link/logic/abilities/sword_spin/tick tag @s[tag=no_spin,predicate=!ssbrc:flag/in_air] remove no_spin + +# Boomerang +function ssbrc:logic/item/cooldown/decrease {item:"link.boomerang"} + +# Health +execute if items entity @s[scores={health=40..}] container.* minecraft:nether_star[minecraft:custom_data~{item:"master_sword",awakened:"false"}] run function ssbrc:fighter/link/logic/master_sword/enable + +execute if score @s health matches ..6 run function ssbrc:fighter/link/logic/low_health_alert/check diff --git a/data/ssbrc/function/fighter/link/logic/use_item.mcfunction b/data/ssbrc/function/fighter/link/logic/use_item.mcfunction new file mode 100644 index 0000000000..22dd9abd1f --- /dev/null +++ b/data/ssbrc/function/fighter/link/logic/use_item.mcfunction @@ -0,0 +1,3 @@ +execute if items entity @s[scores={health=40..},predicate=!ssbrc:flag/sneaking] weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"master_sword"},minecraft:damage~{damage:0}] run function ssbrc:fighter/link/logic/abilities/sword_beam/activate + +execute if items entity @s[predicate=ssbrc:flag/sneaking] weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"master_sword"}] run function ssbrc:fighter/link/logic/abilities/sword_spin/activate/check diff --git a/data/ssbrc/function/fighter/luigi/logic/abilities/ice_ball/activate.mcfunction b/data/ssbrc/function/fighter/luigi/logic/abilities/ice_ball/activate.mcfunction index e7b19b1d2b..6ea55c3992 100644 --- a/data/ssbrc/function/fighter/luigi/logic/abilities/ice_ball/activate.mcfunction +++ b/data/ssbrc/function/fighter/luigi/logic/abilities/ice_ball/activate.mcfunction @@ -1,9 +1,5 @@ -function ssbrc:logic/fighter/ability/init - execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/luigi/logic/abilities/ice_ball/init function ssbrc:logic/item/durability/reset/hand {key:"item",value:"ice_ball"} playsound ssbrc:fighter.luigi.ice_ball.activate player @a - -function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/luigi/logic/use_item.mcfunction b/data/ssbrc/function/fighter/luigi/logic/use_item.mcfunction new file mode 100644 index 0000000000..5b92bd58e2 --- /dev/null +++ b/data/ssbrc/function/fighter/luigi/logic/use_item.mcfunction @@ -0,0 +1 @@ +execute if items entity @s weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"ice_ball"},minecraft:damage~{damage:0}] run function ssbrc:fighter/luigi/logic/abilities/ice_ball/activate diff --git a/data/ssbrc/function/fighter/mario/logic/abilities/fireball/activate.mcfunction b/data/ssbrc/function/fighter/mario/logic/abilities/fireball/activate.mcfunction index 653109952f..aaa8e0963a 100644 --- a/data/ssbrc/function/fighter/mario/logic/abilities/fireball/activate.mcfunction +++ b/data/ssbrc/function/fighter/mario/logic/abilities/fireball/activate.mcfunction @@ -1,9 +1,5 @@ -function ssbrc:logic/fighter/ability/init - execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/mario/logic/abilities/fireball/init function ssbrc:logic/item/durability/reset/hand {key:"item",value:"fireball"} playsound ssbrc:fighter.mario.fireball.activate player @a - -function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/mario/logic/use_item.mcfunction b/data/ssbrc/function/fighter/mario/logic/use_item.mcfunction new file mode 100644 index 0000000000..2cbe0453af --- /dev/null +++ b/data/ssbrc/function/fighter/mario/logic/use_item.mcfunction @@ -0,0 +1 @@ +execute if items entity @s weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"fireball"},minecraft:damage~{damage:0}] run function ssbrc:fighter/mario/logic/abilities/fireball/activate diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/activate.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/activate.mcfunction index e5d242fdb4..5be35afb78 100644 --- a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/activate.mcfunction +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/activate.mcfunction @@ -2,9 +2,7 @@ tag @s add beat_call function ssbrc:logic/fighter/ability/init -execute positioned ~ ~2 ~ run function animated_java:beat/summon {args:{animation:"idle",start_animation:true}} - -data modify storage ssbrc:mega_man form set value "mega_buster" +execute positioned ~ ~2 ~ summon minecraft:bee run function ssbrc:fighter/mega_man/logic/abilities/beat_call/init/entity playsound ssbrc:fighter.mega_man.beat_call.activate player @a diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/check.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/check.mcfunction deleted file mode 100644 index de4785b93b..0000000000 --- a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/check.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -data modify storage ssbrc:mega_man form set value "mega_buster" - -execute if entity @s[tag=!silenced,tag=!beat_call,scores={mega_man.beat_call=1..,charge.1=..0}] run function ssbrc:fighter/mega_man/logic/abilities/beat_call/activate diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/entity/forward.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/entity/forward.mcfunction index 3c24ca50d8..ef17bc195f 100644 --- a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/entity/forward.mcfunction +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/entity/forward.mcfunction @@ -1,3 +1,6 @@ function ssbrc:fighter/mega_man/logic/abilities/beat_call/commands/entity/reset tag @s add forward + +execute if data storage ssbrc:temp player.temp_data{skin:"gold"} on passengers if entity @s[tag=aj.beat.root] run return run function animated_java:beat/variants/gold_angry/apply +execute on passengers if entity @s[tag=aj.beat.root] run function animated_java:beat/variants/default_angry/apply diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/forward.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/forward.mcfunction index 93cd3c172c..02028844e2 100644 --- a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/forward.mcfunction +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/forward.mcfunction @@ -1,8 +1,8 @@ -execute as @n[type=minecraft:item_display,tag=beat,predicate=ssbrc:id_match] run function ssbrc:fighter/mega_man/logic/abilities/beat_call/commands/entity/forward +function ssbrc:logic/player/data/temp/copy/check + +execute as @n[type=minecraft:bee,tag=beat,predicate=ssbrc:id_match] run function ssbrc:fighter/mega_man/logic/abilities/beat_call/commands/entity/forward scoreboard players remove @s mega_man.beat_call 1 function ssbrc:logic/item/modify {search_key:"item",search_value:"beat_call",path:"{\"function\":\"minecraft:set_custom_data\",\"tag\":\"{command:\\\"null\\\"}\"}"} -playsound ssbrc:fighter.mega_man.beat_call.activate player @a - advancement revoke @s only ssbrc:utility/use_item/fighter/mega_man/beat_call/forward diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/recall.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/recall.mcfunction index 421e4c8e82..16d850065f 100644 --- a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/recall.mcfunction +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/commands/recall.mcfunction @@ -1,5 +1,5 @@ tag @n[tag=beat_call.target,distance=..3] remove beat_call.target -execute as @n[type=minecraft:item_display,tag=beat,predicate=ssbrc:id_match] run function ssbrc:fighter/mega_man/logic/abilities/beat_call/commands/entity/recall +execute as @n[type=minecraft:bee,tag=beat,predicate=ssbrc:id_match] run function ssbrc:fighter/mega_man/logic/abilities/beat_call/commands/entity/recall advancement revoke @s only ssbrc:utility/use_item/fighter/mega_man/beat_call/recall diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/deactivate.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/deactivate.mcfunction index 06f622b3b8..dff79fccb2 100644 --- a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/deactivate.mcfunction +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/deactivate.mcfunction @@ -1,3 +1,3 @@ tag @s remove beat_call -execute as @n[type=minecraft:item_display,tag=beat,predicate=ssbrc:id_match] run function animated_java:beat/remove/this +execute as @n[type=minecraft:bee,tag=beat,predicate=ssbrc:id_match] at @s run function ssbrc:fighter/mega_man/logic/abilities/beat_call/kill diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/init.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/init.mcfunction deleted file mode 100644 index de4d90251d..0000000000 --- a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/init.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -tag @s add beat - -function ssbrc:logic/init/id - -scoreboard players set @s health 40 -scoreboard players set @s temp 10 -scoreboard players add @s cooldown 0 - -data merge entity @s {CustomName:'"fighter/mega_man/logic/abilities/beat_call/commands/entity/dead"',CustomNameVisible:0b} - -summon minecraft:interaction ~ ~ ~ {Tags:["beat.hitbox","hitbox"],height:1.0,width:1.0} -ride @n[type=minecraft:interaction,tag=beat.hitbox,distance=..0.01] mount @s diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/init/entity.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/init/entity.mcfunction new file mode 100644 index 0000000000..7cc48cfa72 --- /dev/null +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/init/entity.mcfunction @@ -0,0 +1,15 @@ +tag @s add beat + +teleport @s ~ ~ ~ ~ ~ + +function ssbrc:logic/init/entity/nonliving + +attribute @s minecraft:max_health base set 1024.0 +data modify entity @s Health set value 1024.0 + +effect give @s minecraft:invisibility infinite 0 true +function ssbrc:fighter/mega_man/logic/abilities/beat_call/init/model +ride @n[type=minecraft:item_display,tag=aj.beat.root,distance=..0.01] mount @s + +scoreboard players set @s temp 10 +scoreboard players add @s cooldown 0 diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/init/model.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/init/model.mcfunction new file mode 100644 index 0000000000..49e4b4cb8a --- /dev/null +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/init/model.mcfunction @@ -0,0 +1,3 @@ +execute if data storage ssbrc:temp player.temp_data{skin:"gold"} run return run function animated_java:beat/summon {args:{variant:"gold",animation:"idle",start_animation:true}} + +function animated_java:beat/summon {args:{variant:"default",animation:"idle",start_animation:true}} diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/kill.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/kill.mcfunction new file mode 100644 index 0000000000..7893c91b89 --- /dev/null +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/kill.mcfunction @@ -0,0 +1,4 @@ +execute on passengers if entity @s[tag=aj.beat.root] run function animated_java:beat/remove/this + +teleport @s ~ ~-100 ~ +kill @s diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/perch.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/perch.mcfunction new file mode 100644 index 0000000000..03005ced86 --- /dev/null +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/perch.mcfunction @@ -0,0 +1,4 @@ +tag @s remove recall + +execute if data storage ssbrc:temp player.temp_data{skin:"gold"} on passengers if entity @s[tag=aj.beat.root] run return run function animated_java:beat/variants/gold/apply +execute on passengers if entity @s[tag=aj.beat.root] run function animated_java:beat/variants/default/apply diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/reset.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/reset.mcfunction index a21b43e16a..5eaeb05d9c 100644 --- a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/reset.mcfunction +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/reset.mcfunction @@ -1,5 +1,6 @@ -execute if entity @e[type=minecraft:item_display,tag=beat,tag=dead,predicate=ssbrc:id_match] run return run function ssbrc:fighter/mega_man/logic/abilities/beat_call/death +execute if entity @e[type=minecraft:bee,tag=beat,tag=dead,predicate=ssbrc:id_match,distance=..3] run return run function ssbrc:fighter/mega_man/logic/abilities/beat_call/death execute unless items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"beat_call"}] run return run function ssbrc:fighter/mega_man/logic/abilities/beat_call/deactivate -tag @n[type=minecraft:item_display,tag=beat,predicate=ssbrc:id_match] remove recall +function ssbrc:logic/player/data/temp/copy/check +execute as @n[type=minecraft:bee,tag=beat,predicate=ssbrc:id_match,distance=..3] run function ssbrc:fighter/mega_man/logic/abilities/beat_call/perch diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/tick.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/tick.mcfunction index 2411dd7ac1..e864aa484b 100644 --- a/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/tick.mcfunction +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/beat_call/tick.mcfunction @@ -1,10 +1,14 @@ +execute store result score @s health run data get entity @s Health 1.0 +scoreboard players operation @s health -= yar.drone.drone.health.threshold const + scoreboard players operation percentage temp = @s health scoreboard players operation percentage temp *= 100 const -scoreboard players operation percentage temp /= 40 const +scoreboard players operation percentage temp /= yar.drone.health const execute if score percentage temp matches ..50 run particle minecraft:electric_spark ~ ~0.5 ~ 0.2 0.2 0.2 0.5 1 normal @a execute if score percentage temp matches ..25 run particle minecraft:smoke ~ ~0.5 ~ 0.2 0.2 0.2 0.01 1 normal @a execute if score percentage temp matches ..10 run particle minecraft:small_flame ~ ~0.5 ~ 0.2 0.2 0.2 0.025 1 normal @a +execute unless entity @s[tag=dead] if score percentage temp matches ..0 run function ssbrc:fighter/mega_man/logic/abilities/beat_call/commands/entity/dead scoreboard players add @s rotation 4 scoreboard players set @s[scores={rotation=360..}] rotation 0 @@ -16,5 +20,3 @@ execute if score in_electric_terrain temp matches 1 run return -1 function ssbrc:fighter/mega_man/logic/abilities/beat_call/move with storage ssbrc:temp execute if entity @s[tag=attack,scores={cooldown=..0}] run function ssbrc:fighter/mega_man/logic/abilities/beat_call/hit - -execute on passengers if entity @s[tag=beat.hitbox] if data entity @s attack run function ssbrc:logic/entity/hit diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/metal_blade/activate.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/metal_blade/activate.mcfunction index 4b89ac9042..2ac0b0bd8b 100644 --- a/data/ssbrc/function/fighter/mega_man/logic/abilities/metal_blade/activate.mcfunction +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/metal_blade/activate.mcfunction @@ -2,6 +2,8 @@ function ssbrc:logic/fighter/ability/init execute anchored eyes positioned ^ ^ ^1 summon minecraft:item_display run function ssbrc:fighter/mega_man/logic/abilities/metal_blade/init +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"metal_blade"} + scoreboard players add @s cooldown 20 scoreboard players remove @s mega_man.metal_blade 1 diff --git a/data/ssbrc/function/fighter/mega_man/logic/abilities/remote_mine/activate.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/abilities/remote_mine/activate.mcfunction index 1cb1828afd..40b1f6c3c9 100644 --- a/data/ssbrc/function/fighter/mega_man/logic/abilities/remote_mine/activate.mcfunction +++ b/data/ssbrc/function/fighter/mega_man/logic/abilities/remote_mine/activate.mcfunction @@ -4,6 +4,8 @@ function ssbrc:logic/fighter/ability/init execute anchored eyes positioned ^ ^ ^1 summon minecraft:item_display run function ssbrc:fighter/mega_man/logic/abilities/remote_mine/init +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"remote_mine"} + scoreboard players add @s cooldown 10 scoreboard players remove @s mega_man.remote_mine 1 diff --git a/data/ssbrc/function/fighter/mega_man/logic/armor/check/beat_call.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/armor/check/beat_call.mcfunction new file mode 100644 index 0000000000..4c04826f8f --- /dev/null +++ b/data/ssbrc/function/fighter/mega_man/logic/armor/check/beat_call.mcfunction @@ -0,0 +1,3 @@ +execute if items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"beat_call"}] if entity @s[tag=!silenced,tag=!beat_call,scores={mega_man.beat_call=1..,charge.1=..0}] run return run function ssbrc:fighter/mega_man/logic/abilities/beat_call/activate + +execute if entity @s[tag=beat_call] unless items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"beat_call"}] if entity @n[type=minecraft:bee,tag=beat,tag=!attack,tag=!forward,tag=!recall,predicate=ssbrc:id_match] run function ssbrc:fighter/mega_man/logic/abilities/beat_call/deactivate diff --git a/data/ssbrc/function/fighter/mega_man/logic/armor/get.mcfunction b/data/ssbrc/function/fighter/mega_man/logic/armor/get.mcfunction index 5634dfd819..e816977848 100644 --- a/data/ssbrc/function/fighter/mega_man/logic/armor/get.mcfunction +++ b/data/ssbrc/function/fighter/mega_man/logic/armor/get.mcfunction @@ -1,14 +1,8 @@ -execute if data storage ssbrc:temp player.temp_data{skin:"default"} run data modify storage ssbrc:mega_man skin set value "default" +function ssbrc:fighter/mega_man/logic/armor/check/skin -execute if data storage ssbrc:temp player.temp_data{skin:"gold"} run data modify storage ssbrc:mega_man skin set value "gold" -execute if data storage ssbrc:temp player.temp_data{skin:"gold"} if items entity @s weapon.mainhand * unless items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"mega_buster"}] unless items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"beat_call"}] run data modify storage ssbrc:mega_man skin set value "default" +function ssbrc:fighter/mega_man/logic/armor/check/form -execute if data storage ssbrc:temp player.temp_data{skin:"star_force"} run data modify storage ssbrc:mega_man skin set value "star_force" - -execute if items entity @s weapon.mainhand #ssbrc:equipment[minecraft:custom_data~{group:"mega_buster"}] unless items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"beat_call"}] run data modify storage ssbrc:mega_man form set from entity @s SelectedItem.components.minecraft:custom_data.item -execute unless items entity @s[tag=beat_call] weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"beat_call"}] if entity @n[type=minecraft:item_display,tag=beat,tag=!attack,tag=!forward,tag=!recall,predicate=ssbrc:id_match] run function ssbrc:fighter/mega_man/logic/abilities/beat_call/deactivate -execute if items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"beat_call"}] run function ssbrc:fighter/mega_man/logic/abilities/beat_call/check -execute unless items entity @s weapon.mainhand #ssbrc:equipment[minecraft:custom_data~{group:"mega_buster"}] run data modify storage ssbrc:mega_man form set value "mega_buster" +function ssbrc:fighter/mega_man/logic/armor/check/beat_call function ssbrc:fighter/mega_man/logic/armor/set with storage ssbrc:mega_man diff --git a/data/ssbrc/function/fighter/pokemon_trainer/logic/squirtle/tick.mcfunction b/data/ssbrc/function/fighter/pokemon_trainer/logic/squirtle/tick.mcfunction index 75d50cd339..240f80227a 100644 --- a/data/ssbrc/function/fighter/pokemon_trainer/logic/squirtle/tick.mcfunction +++ b/data/ssbrc/function/fighter/pokemon_trainer/logic/squirtle/tick.mcfunction @@ -1,5 +1,5 @@ # Water Gun -execute if entity @s[scores={charge.1=1..}] anchored eyes positioned ^ ^ ^ run function ssbrc:fighter/pokemon_trainer/logic/squirtle/water_gun/charge +execute if score @s charge.1 matches 1.. anchored eyes positioned ^ ^ ^ run function ssbrc:fighter/pokemon_trainer/logic/squirtle/water_gun/charge function ssbrc:logic/item/cooldown/decrease {item:"water_gun"} diff --git a/data/ssbrc/function/fighter/rob/logic/abilities/robo_beam/check.mcfunction b/data/ssbrc/function/fighter/rob/logic/abilities/robo_beam/check.mcfunction index 4f1a26caf6..8dee97aba0 100644 --- a/data/ssbrc/function/fighter/rob/logic/abilities/robo_beam/check.mcfunction +++ b/data/ssbrc/function/fighter/rob/logic/abilities/robo_beam/check.mcfunction @@ -8,6 +8,6 @@ scoreboard players remove @s[scores={shadow.chaos_control=1..}] charge.1 40 execute unless score robo_beam temp matches 100.. run playsound ssbrc:fighter.rob.robo_beam.activate.fail player @a execute if score robo_beam temp matches 100.. run function ssbrc:fighter/rob/logic/abilities/robo_beam/activate -function ssbrc:logic/item/cooldown/set/const {type:"1",value:"20"} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"robo_beam"} function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/rob/logic/tick.mcfunction b/data/ssbrc/function/fighter/rob/logic/tick.mcfunction index 72535625b0..cef19568ff 100644 --- a/data/ssbrc/function/fighter/rob/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/rob/logic/tick.mcfunction @@ -1,4 +1,6 @@ # Robo Beam +function ssbrc:logic/item/cooldown/decrease {item:"robo_beam"} + execute if score @s charge.1 < rob.robo_beam.max const run function ssbrc:fighter/rob/logic/abilities/robo_beam/charge # Robo Burner diff --git a/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/activate/default.mcfunction b/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/activate/default.mcfunction index b93e12ad85..02da33c0a4 100644 --- a/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/activate/default.mcfunction +++ b/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/activate/default.mcfunction @@ -1,3 +1,5 @@ -function ssbrc:logic/item/cooldown/set/const {type:"1",value:"5"} +item modify entity @s weapon.mainhand {function:"minecraft:set_components",components:{"minecraft:max_damage":5}} + +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"collarbone_breaker"} playsound ssbrc:fighter.ryu.hadouken.activate.weak player @a diff --git a/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/activate/heavy.mcfunction b/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/activate/heavy.mcfunction index 7a20827afb..7db22fdc04 100644 --- a/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/activate/heavy.mcfunction +++ b/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/activate/heavy.mcfunction @@ -1,3 +1,5 @@ -function ssbrc:logic/item/cooldown/set/const {type:"1",value:"10"} +item modify entity @s weapon.mainhand {function:"minecraft:set_components",components:{"minecraft:max_damage":10}} + +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"collarbone_breaker"} playsound ssbrc:fighter.ryu.hadouken.activate.strong player @a diff --git a/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/check.mcfunction b/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/check.mcfunction index 938a448c61..787e22264b 100644 --- a/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/check.mcfunction +++ b/data/ssbrc/function/fighter/ryu/logic/abilities/hadouken/check.mcfunction @@ -3,4 +3,4 @@ execute store result score hadouken temp if entity @e[type=minecraft:marker,tag= scoreboard players set ryu.hadouken.limit const 1 execute if score @s duration.1 matches 2.. run scoreboard players add ryu.hadouken.limit const 1 -execute if score hadouken temp < ryu.hadouken.limit const run function ssbrc:fighter/ryu/logic/abilities/hadouken/activate +execute if items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"collarbone_breaker"}] if items entity @s weapon.offhand minecraft:nether_star[minecraft:custom_data~{item:"collarbone_breaker"}] if score hadouken temp < ryu.hadouken.limit const run function ssbrc:fighter/ryu/logic/abilities/hadouken/activate diff --git a/data/ssbrc/function/fighter/ryu/logic/tick.mcfunction b/data/ssbrc/function/fighter/ryu/logic/tick.mcfunction index f4d5a41d6e..1b513ff352 100644 --- a/data/ssbrc/function/fighter/ryu/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/ryu/logic/tick.mcfunction @@ -1,10 +1,12 @@ +function ssbrc:logic/item/cooldown/decrease {item:"collarbone_breaker"} + # Tatsumaki Senpukyaku scoreboard players add @s[predicate=ssbrc:flag/sneaking] charge.2 1 execute if score @s[scores={cooldown.2=..0},predicate=!ssbrc:flag/sneaking] charge.2 >= ryu.tatsumaki_senpukyaku const positioned ~ ~0.1 ~ run function ssbrc:fighter/ryu/logic/abilities/tatsumaki_senpukyaku/check scoreboard players set @s[scores={charge.2=1..},predicate=!ssbrc:flag/sneaking] charge.2 0 -execute if entity @s[scores={duration.2=1}] run function ssbrc:fighter/ryu/logic/abilities/tatsumaki_senpukyaku/deactivate +execute if score @s duration.2 matches 1 run function ssbrc:fighter/ryu/logic/abilities/tatsumaki_senpukyaku/deactivate # Satsui no Hado Rage -execute if entity @s[scores={duration.1=1..}] run function ssbrc:fighter/ryu/logic/abilities/satsui_no_hado_rage/tick +execute if score @s duration.1 matches 1.. run function ssbrc:fighter/ryu/logic/abilities/satsui_no_hado_rage/tick diff --git a/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/activate.mcfunction b/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/activate.mcfunction index eca4a7cf0f..b43416c3a9 100644 --- a/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/activate.mcfunction +++ b/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/activate.mcfunction @@ -4,7 +4,9 @@ scoreboard players operation chaos_spear temp = shadow.chaos_spear.cost const function ssbrc:fighter/shadow/logic/abilities/chaos_spear/chaos_energy/check function ssbrc:fighter/shadow/logic/chaos_meter/calculate -execute if score chaos_energy temp < shadow.chaos_spear.cost const run function ssbrc:logic/item/modify {search_key:"item",search_value:"chaos_spear",path:"ssbrc:fighter/shadow/chaos_spear/disabled"} execute if score @s shadow.meter.dark < shadow.chaos_meter.max const run clear @s minecraft:nether_star[minecraft:custom_data~{item:"chaos_blast"}] execute if score @s shadow.meter.hero < shadow.chaos_meter.max const run clear @s minecraft:nether_star[minecraft:custom_data~{item:"chaos_control"}] + +execute if score chaos_energy temp < shadow.chaos_spear.cost const run return run function ssbrc:logic/item/modify {search_key:"item",search_value:"chaos_spear",path:"ssbrc:fighter/shadow/chaos_spear/disabled"} +function ssbrc:logic/item/durability/reset/item {item:"chaos_spear"} diff --git a/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/move_forward.mcfunction b/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/move_forward.mcfunction index 519a005846..8338d054d3 100644 --- a/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/move_forward.mcfunction +++ b/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/move_forward.mcfunction @@ -11,7 +11,7 @@ particle minecraft:dust_color_transition{from_color:[1.0,1.0,0.0],to_color:[1.0, particle minecraft:dust_color_transition{from_color:[1.0,1.0,0.0],to_color:[1.0,1.0,0.5],scale:1.0} ^0.30 ^ ^-0.50 0.03 0.03 0.03 0.0 1 force @a particle minecraft:dust_color_transition{from_color:[1.0,1.0,0.0],to_color:[1.0,1.0,0.5],scale:1.0} ^-0.30 ^ ^-0.50 0.03 0.03 0.03 0.0 1 force @a -execute positioned ~-0.25 ~-0.15 ~-0.25 as @e[tag=!self,predicate=ssbrc:target,dx=0] positioned ~-0.5 ~-0.7 ~-0.5 if entity @s[dx=0] run function ssbrc:fighter/shadow/logic/abilities/chaos_spear/hit +execute positioned ~-0.5 ~-0.15 ~-0.5 as @e[tag=!self,predicate=ssbrc:target,dx=0] positioned ~ ~-0.7 ~ if entity @s[dx=0] run function ssbrc:fighter/shadow/logic/abilities/chaos_spear/hit execute if score entity_hit temp matches 1 run return run kill @s teleport @s ^ ^ ^0.25 diff --git a/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/summon.mcfunction b/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/summon.mcfunction index 7432fc0933..6f05a7c7d8 100644 --- a/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/summon.mcfunction +++ b/data/ssbrc/function/fighter/shadow/logic/abilities/chaos_spear/summon.mcfunction @@ -2,6 +2,4 @@ execute positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/sha scoreboard players set @s charge.1 0 -function ssbrc:logic/item/durability/reset/item {item:"chaos_spear"} - playsound ssbrc:fighter.shadow.chaos_spear.activate player @a diff --git a/data/ssbrc/function/fighter/shovel_knight/logic/abilities/chaos_sphere/activate.mcfunction b/data/ssbrc/function/fighter/shovel_knight/logic/abilities/chaos_sphere/activate.mcfunction index 3b944ae95d..af28b60c7b 100644 --- a/data/ssbrc/function/fighter/shovel_knight/logic/abilities/chaos_sphere/activate.mcfunction +++ b/data/ssbrc/function/fighter/shovel_knight/logic/abilities/chaos_sphere/activate.mcfunction @@ -5,6 +5,6 @@ execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssb scoreboard players operation @s magic -= shovel_knight.chaos_sphere.cost const function ssbrc:fighter/shovel_knight/logic/magic/update -function ssbrc:logic/item/cooldown/set/score {type:"1",value:"shovel_knight.chaos_sphere.cooldown"} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"chaos_sphere"} function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/snake/logic/abilities/famas/activate.mcfunction b/data/ssbrc/function/fighter/snake/logic/abilities/famas/activate.mcfunction index 4b082e41b9..ee07d00290 100644 --- a/data/ssbrc/function/fighter/snake/logic/abilities/famas/activate.mcfunction +++ b/data/ssbrc/function/fighter/snake/logic/abilities/famas/activate.mcfunction @@ -4,9 +4,6 @@ execute store result score temp health run scoreboard players get @s health execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/snake/logic/abilities/famas/init scoreboard players remove @s weapon_3.ammo 1 - -scoreboard players add @s cooldown 4 - execute if entity @s[scores={weapon_3.mags=1..,weapon_3.ammo=0}] run function ssbrc:fighter/snake/logic/abilities/famas/reload/start playsound ssbrc:generic_fire player @a diff --git a/data/ssbrc/function/fighter/snake/logic/abilities/famas/check.mcfunction b/data/ssbrc/function/fighter/snake/logic/abilities/famas/check.mcfunction new file mode 100644 index 0000000000..f96bb61ca5 --- /dev/null +++ b/data/ssbrc/function/fighter/snake/logic/abilities/famas/check.mcfunction @@ -0,0 +1,5 @@ +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"famas"} + +execute if score @s weapon_3.ammo matches 1.. run return run function ssbrc:fighter/snake/logic/abilities/famas/activate + +playsound ssbrc:generic_misfire player @a diff --git a/data/ssbrc/function/fighter/snake/logic/abilities/psg1/activate.mcfunction b/data/ssbrc/function/fighter/snake/logic/abilities/psg1/activate.mcfunction index 3a59fa571f..4e8ce824c8 100644 --- a/data/ssbrc/function/fighter/snake/logic/abilities/psg1/activate.mcfunction +++ b/data/ssbrc/function/fighter/snake/logic/abilities/psg1/activate.mcfunction @@ -4,9 +4,6 @@ execute store result score temp health run scoreboard players get @s health execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/snake/logic/abilities/psg1/init scoreboard players remove @s weapon_2.ammo 1 - -scoreboard players add @s cooldown 20 - execute if entity @s[scores={weapon_2.mags=1..,weapon_2.ammo=0}] run function ssbrc:fighter/snake/logic/abilities/psg1/reload/start playsound ssbrc:sniper_fire player @a diff --git a/data/ssbrc/function/fighter/snake/logic/abilities/psg1/check.mcfunction b/data/ssbrc/function/fighter/snake/logic/abilities/psg1/check.mcfunction new file mode 100644 index 0000000000..49ed5743b3 --- /dev/null +++ b/data/ssbrc/function/fighter/snake/logic/abilities/psg1/check.mcfunction @@ -0,0 +1,5 @@ +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"psg1"} + +execute if score @s weapon_2.ammo matches 1.. run return run function ssbrc:fighter/snake/logic/abilities/psg1/activate + +playsound ssbrc:generic_misfire player @a diff --git a/data/ssbrc/function/fighter/snake/logic/abilities/s1000/activate.mcfunction b/data/ssbrc/function/fighter/snake/logic/abilities/s1000/activate.mcfunction index ad66be7b48..9b8305d44e 100644 --- a/data/ssbrc/function/fighter/snake/logic/abilities/s1000/activate.mcfunction +++ b/data/ssbrc/function/fighter/snake/logic/abilities/s1000/activate.mcfunction @@ -3,11 +3,9 @@ function ssbrc:logic/fighter/ability/init execute store result score temp health run scoreboard players get @s health execute anchored eyes positioned ^ ^ ^1 run function ssbrc:fighter/snake/logic/abilities/s1000/projectile -scoreboard players remove @s weapon_1.ammo 1 - -scoreboard players add @s cooldown 20 scoreboard players set @s weapon_1.fire_rate 20 +scoreboard players remove @s weapon_1.ammo 1 execute if entity @s[scores={weapon_1.mags=1..,weapon_1.ammo=0}] run function ssbrc:fighter/snake/logic/abilities/s1000/reload/start playsound ssbrc:shotgun_fire player @a diff --git a/data/ssbrc/function/fighter/snake/logic/abilities/s1000/check.mcfunction b/data/ssbrc/function/fighter/snake/logic/abilities/s1000/check.mcfunction new file mode 100644 index 0000000000..3bc31b98ec --- /dev/null +++ b/data/ssbrc/function/fighter/snake/logic/abilities/s1000/check.mcfunction @@ -0,0 +1,5 @@ +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"s1000"} + +execute if score @s weapon_1.ammo matches 1.. run return run function ssbrc:fighter/snake/logic/abilities/s1000/activate + +playsound ssbrc:generic_misfire player @a diff --git a/data/ssbrc/function/fighter/snake/logic/abilities/socom/activate.mcfunction b/data/ssbrc/function/fighter/snake/logic/abilities/socom/activate.mcfunction index be7fc1e639..cb17a739a0 100644 --- a/data/ssbrc/function/fighter/snake/logic/abilities/socom/activate.mcfunction +++ b/data/ssbrc/function/fighter/snake/logic/abilities/socom/activate.mcfunction @@ -4,9 +4,6 @@ execute store result score temp health run scoreboard players get @s health execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/snake/logic/abilities/socom/init scoreboard players remove @s weapon_4.ammo 1 - -scoreboard players add @s cooldown 5 - execute if entity @s[scores={weapon_4.mags=1..,weapon_4.ammo=0}] run function ssbrc:fighter/snake/logic/abilities/socom/reload/start playsound ssbrc:generic_fire player @a diff --git a/data/ssbrc/function/fighter/snake/logic/abilities/socom/check.mcfunction b/data/ssbrc/function/fighter/snake/logic/abilities/socom/check.mcfunction new file mode 100644 index 0000000000..8ca03b545a --- /dev/null +++ b/data/ssbrc/function/fighter/snake/logic/abilities/socom/check.mcfunction @@ -0,0 +1,5 @@ +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"socom"} + +execute if score @s weapon_4.ammo matches 1.. run return run function ssbrc:fighter/snake/logic/abilities/socom/activate + +playsound ssbrc:generic_misfire player @a diff --git a/data/ssbrc/function/fighter/snake/logic/hud/check.mcfunction b/data/ssbrc/function/fighter/snake/logic/hud/check.mcfunction index 002f467f9c..33d1888e03 100644 --- a/data/ssbrc/function/fighter/snake/logic/hud/check.mcfunction +++ b/data/ssbrc/function/fighter/snake/logic/hud/check.mcfunction @@ -1,9 +1,9 @@ -execute unless items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{group:"snake.weapon"}] run title @s actionbar "" +execute unless items entity @s weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{group:"snake.weapon"}] run title @s actionbar "" -execute if items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"psg1"}] run function ssbrc:fighter/snake/logic/hud/display {id:"2"} -execute if items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"famas"}] run function ssbrc:fighter/snake/logic/hud/display {id:"3"} -execute if items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"s1000"}] run function ssbrc:fighter/snake/logic/hud/display {id:"1"} -execute if items entity @s weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"socom"}] run function ssbrc:fighter/snake/logic/hud/display {id:"4"} +execute if items entity @s weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"psg1"}] run function ssbrc:fighter/snake/logic/hud/display {id:"2"} +execute if items entity @s weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"famas"}] run function ssbrc:fighter/snake/logic/hud/display {id:"3"} +execute if items entity @s weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"s1000"}] run function ssbrc:fighter/snake/logic/hud/display {id:"1"} +execute if items entity @s weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"socom"}] run function ssbrc:fighter/snake/logic/hud/display {id:"4"} execute if items entity @s[scores={snake.anti_personnel_mine.ammo=0..}] weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"anti_personnel_mine"}] run title @s actionbar {"score":{"name":"@s","objective":"snake.anti_personnel_mine.ammo"},"color":"green"} execute if items entity @s[scores={snake.smoke_grenade.ammo=0..}] weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"smoke_grenade"}] run title @s actionbar {"score":{"name":"@s","objective":"snake.smoke_grenade.ammo"},"color":"green"} diff --git a/data/ssbrc/function/fighter/snake/logic/tick.mcfunction b/data/ssbrc/function/fighter/snake/logic/tick.mcfunction index 303afb4b30..296e14f498 100644 --- a/data/ssbrc/function/fighter/snake/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/snake/logic/tick.mcfunction @@ -6,19 +6,29 @@ execute if entity @s[tag=!reloading] run function ssbrc:fighter/snake/logic/hud/ title @s[tag=reloading] actionbar {"translate":"ssbrc.fighter.snake.reloading","color":"gray"} # Reload -execute if entity @s[scores={weapon_1.reload=1..}] run function ssbrc:fighter/snake/logic/abilities/s1000/reload/tick -execute if entity @s[scores={weapon_2.reload=1..}] run function ssbrc:fighter/snake/logic/abilities/psg1/reload/tick -execute if entity @s[scores={weapon_3.reload=1..}] run function ssbrc:fighter/snake/logic/abilities/famas/reload/tick -execute if entity @s[scores={weapon_4.reload=1..}] run function ssbrc:fighter/snake/logic/abilities/socom/reload/tick +execute if score @s weapon_1.reload matches 1.. run function ssbrc:fighter/snake/logic/abilities/s1000/reload/tick +execute if score @s weapon_2.reload matches 1.. run function ssbrc:fighter/snake/logic/abilities/psg1/reload/tick +execute if score @s weapon_3.reload matches 1.. run function ssbrc:fighter/snake/logic/abilities/famas/reload/tick +execute if score @s weapon_4.reload matches 1.. run function ssbrc:fighter/snake/logic/abilities/socom/reload/tick + +# Famas +function ssbrc:logic/item/cooldown/decrease {item:"famas"} # PSG-1 +function ssbrc:logic/item/cooldown/decrease {item:"psg1"} + attribute @s[predicate=!ssbrc:fighter/snake/psg1_zoom] minecraft:movement_speed modifier remove ssbrc:fighter/snake/psg1 attribute @s[predicate=ssbrc:fighter/snake/psg1_zoom] minecraft:movement_speed modifier add ssbrc:fighter/snake/psg1 -1.0 add_multiplied_base # S1000 +function ssbrc:logic/item/cooldown/decrease {item:"s1000"} + scoreboard players remove @s[scores={weapon_1.fire_rate=1..}] weapon_1.fire_rate 1 execute if entity @s[scores={weapon_1.ammo=1..,weapon_1.fire_rate=15}] run playsound ssbrc:shotgun_reload player @a +# Socom +function ssbrc:logic/item/cooldown/decrease {item:"socom"} + # Anti-Personnel Mine execute if entity @s[tag=anti_personnel_mine] run function ssbrc:logic/item/cooldown/decrease {item:"anti_personnel_mine"} diff --git a/data/ssbrc/function/fighter/snake/logic/use_item.mcfunction b/data/ssbrc/function/fighter/snake/logic/use_item.mcfunction new file mode 100644 index 0000000000..83e3210b19 --- /dev/null +++ b/data/ssbrc/function/fighter/snake/logic/use_item.mcfunction @@ -0,0 +1,7 @@ +execute if items entity @s[tag=!reloading] weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"famas"},minecraft:damage~{damage:0}] run return run function ssbrc:fighter/snake/logic/abilities/famas/check + +execute if items entity @s[tag=!reloading] weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"psg1"},minecraft:damage~{damage:0}] run return run function ssbrc:fighter/snake/logic/abilities/psg1/check + +execute if items entity @s[tag=!reloading] weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"s1000"},minecraft:damage~{damage:0}] run return run function ssbrc:fighter/snake/logic/abilities/s1000/check + +execute if items entity @s[tag=!reloading] weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"socom"},minecraft:damage~{damage:0}] run function ssbrc:fighter/snake/logic/abilities/socom/check diff --git a/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/blizzaga/activate.mcfunction b/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/blizzaga/activate.mcfunction index d8ea8037ba..da21e3660b 100644 --- a/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/blizzaga/activate.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/blizzaga/activate.mcfunction @@ -1,10 +1,9 @@ -function ssbrc:logic/fighter/ability/init - execute anchored eyes positioned ^ ^ ^1 run function ssbrc:fighter/sora/logic/abilities/blizzard/blizzaga/projectile scoreboard players operation @s magic -= sora.spell.cost temp function ssbrc:fighter/sora/logic/magic/update -scoreboard players add @s cooldown 40 +item modify entity @s weapon.mainhand {"function":"minecraft:set_components","components":{"minecraft:max_damage":40}} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"keyblade"} playsound ssbrc:fighter.sora.blizzaga.activate player @a diff --git a/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/blizzaza/check.mcfunction b/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/blizzaza/check.mcfunction index 30258f621d..b81ff50d4a 100644 --- a/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/blizzaza/check.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/blizzaza/check.mcfunction @@ -1,5 +1,3 @@ -function ssbrc:logic/fighter/ability/init - scoreboard players add @s charge.4 1 scoreboard players operation sora.spell.test temp = sora.spell.cost temp @@ -12,4 +10,5 @@ execute if score @s charge.4 matches 3.. if score @s magic >= sora.spell.test te scoreboard players operation @s magic -= sora.spell.cost temp function ssbrc:fighter/sora/logic/magic/update -scoreboard players add @s cooldown 10 +item modify entity @s weapon.mainhand {"function":"minecraft:set_components","components":{"minecraft:max_damage":10}} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"keyblade"} diff --git a/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/check.mcfunction b/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/check.mcfunction index 5d30bada83..c15ad6ceff 100644 --- a/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/check.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/abilities/blizzard/check.mcfunction @@ -3,5 +3,3 @@ execute if data storage ssbrc:temp player.temp_data{form:"wisdom"} run scoreboar execute unless data storage ssbrc:temp player.temp_data{form:"wisdom"} if score @s magic >= sora.spell.cost temp run function ssbrc:fighter/sora/logic/abilities/blizzard/blizzaga/activate execute if data storage ssbrc:temp player.temp_data{form:"wisdom"} if score @s magic >= sora.spell.cost temp run function ssbrc:fighter/sora/logic/abilities/blizzard/blizzaza/check - -function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/sora/logic/abilities/fire/check.mcfunction b/data/ssbrc/function/fighter/sora/logic/abilities/fire/check.mcfunction index 7a45cd974a..a51024f895 100644 --- a/data/ssbrc/function/fighter/sora/logic/abilities/fire/check.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/abilities/fire/check.mcfunction @@ -3,5 +3,3 @@ execute if data storage ssbrc:temp player.temp_data{form:"wisdom"} run scoreboar execute unless data storage ssbrc:temp player.temp_data{form:"wisdom"} if score @s magic >= sora.spell.cost temp run function ssbrc:fighter/sora/logic/abilities/fire/firaga/activate execute if data storage ssbrc:temp player.temp_data{form:"wisdom"} if score @s magic >= sora.spell.cost temp run function ssbrc:fighter/sora/logic/abilities/fire/firaza/activate - -function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/sora/logic/abilities/fire/firaga/activate.mcfunction b/data/ssbrc/function/fighter/sora/logic/abilities/fire/firaga/activate.mcfunction index fca627ac48..08c147c329 100644 --- a/data/ssbrc/function/fighter/sora/logic/abilities/fire/firaga/activate.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/abilities/fire/firaga/activate.mcfunction @@ -1,10 +1,9 @@ -function ssbrc:logic/fighter/ability/init - execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/sora/logic/abilities/fire/firaga/init scoreboard players operation @s magic -= sora.spell.cost temp function ssbrc:fighter/sora/logic/magic/update -scoreboard players add @s cooldown 20 +item modify entity @s weapon.mainhand {"function":"minecraft:set_components","components":{"minecraft:max_damage":40}} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"keyblade"} playsound ssbrc:fighter.sora.firaga.activate player @a diff --git a/data/ssbrc/function/fighter/sora/logic/abilities/fire/firaza/activate.mcfunction b/data/ssbrc/function/fighter/sora/logic/abilities/fire/firaza/activate.mcfunction index 70b8dac445..d138f397a8 100644 --- a/data/ssbrc/function/fighter/sora/logic/abilities/fire/firaza/activate.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/abilities/fire/firaza/activate.mcfunction @@ -3,7 +3,9 @@ scoreboard players set @s charge.3 1 scoreboard players operation @s magic -= sora.spell.cost temp function ssbrc:fighter/sora/logic/magic/update -scoreboard players add @s cooldown 60 +item modify entity @s weapon.mainhand {"function":"minecraft:set_components","components":{"minecraft:max_damage":60}} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"keyblade"} + scoreboard players set @s rotation 0 playsound ssbrc:fighter.sora.firaza.activate player @a diff --git a/data/ssbrc/function/fighter/sora/logic/abilities/thunder/check.mcfunction b/data/ssbrc/function/fighter/sora/logic/abilities/thunder/check.mcfunction index ee92916891..ffa671a46e 100644 --- a/data/ssbrc/function/fighter/sora/logic/abilities/thunder/check.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/abilities/thunder/check.mcfunction @@ -6,5 +6,3 @@ execute if score in_electric_terrain temp matches 1 run scoreboard players opera execute unless data storage ssbrc:temp player.temp_data{form:"wisdom"} if score @s magic >= sora.spell.cost temp rotated ~ 0.0 run function ssbrc:fighter/sora/logic/abilities/thunder/thundaga/activate execute if data storage ssbrc:temp player.temp_data{form:"wisdom"} if score @s magic >= sora.spell.cost temp anchored eyes positioned ^ ^ ^ run function ssbrc:fighter/sora/logic/abilities/thunder/thundaza/activate - -function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/sora/logic/abilities/thunder/thundaga/activate.mcfunction b/data/ssbrc/function/fighter/sora/logic/abilities/thunder/thundaga/activate.mcfunction index dc8426f028..ad753691aa 100644 --- a/data/ssbrc/function/fighter/sora/logic/abilities/thunder/thundaga/activate.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/abilities/thunder/thundaga/activate.mcfunction @@ -1,8 +1,7 @@ -function ssbrc:logic/fighter/ability/init - execute summon minecraft:marker run function ssbrc:fighter/sora/logic/abilities/thunder/thundaga/init scoreboard players operation @s magic -= sora.spell.cost temp function ssbrc:fighter/sora/logic/magic/update -scoreboard players add @s cooldown 60 +item modify entity @s weapon.mainhand {"function":"minecraft:set_components","components":{"minecraft:max_damage":60}} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"keyblade"} diff --git a/data/ssbrc/function/fighter/sora/logic/abilities/thunder/thundaza/raycast/success.mcfunction b/data/ssbrc/function/fighter/sora/logic/abilities/thunder/thundaza/raycast/success.mcfunction index ab7531753b..900923737a 100644 --- a/data/ssbrc/function/fighter/sora/logic/abilities/thunder/thundaza/raycast/success.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/abilities/thunder/thundaza/raycast/success.mcfunction @@ -1,8 +1,7 @@ -function ssbrc:logic/fighter/ability/init - execute summon minecraft:marker run function ssbrc:fighter/sora/logic/abilities/thunder/thundaza/init scoreboard players operation @s magic -= sora.spell.cost temp function ssbrc:fighter/sora/logic/magic/update -scoreboard players add @s cooldown 30 +item modify entity @s weapon.mainhand {"function":"minecraft:set_components","components":{"minecraft:max_damage":30}} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"keyblade"} diff --git a/data/ssbrc/function/fighter/sora/logic/spell_switch/blizzard.mcfunction b/data/ssbrc/function/fighter/sora/logic/spell_switch/blizzard.mcfunction index ff66a09134..d1d6048d9a 100644 --- a/data/ssbrc/function/fighter/sora/logic/spell_switch/blizzard.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/spell_switch/blizzard.mcfunction @@ -1,10 +1,8 @@ function ssbrc:fighter/sora/logic/spell_switch/display/start {slot:"weapon.mainhand",spell:"blizza",spell_color:"aqua"} execute if score wisdom_form temp matches 1 run item modify entity @s weapon.mainhand {"function":"minecraft:set_lore","entity":"this","lore":[{"translate":"ssbrc.fighter.sora.keyblade.blizzaza.description.2","color":"gray","bold":false,"italic":false}],"mode":"append"} -item modify entity @s weapon.mainhand [{"function":"minecraft:set_components","components":{"minecraft:max_damage":40}},{"function":"minecraft:set_lore","entity":"this","lore":[{"translate":"ssbrc.tooltip.effect.frostbite","color":"gray","bold":false,"italic":false}],"mode":"append"}] +item modify entity @s weapon.mainhand {"function":"minecraft:set_lore","entity":"this","lore":[{"translate":"ssbrc.tooltip.effect.frostbite","color":"gray","bold":false,"italic":false}],"mode":"append"} function ssbrc:fighter/sora/logic/spell_switch/display/spell_order {slot:"weapon.mainhand",spell_1:"blizzard",spell_1_color:"aqua",spell_2:"thunder",spell_2_color:"yellow",spell_3:"fire",spell_3_color:"red"} advancement grant @s only ssbrc:ui/popup/sora - -advancement revoke @s only ssbrc:utility/use_item/fighter/sora/spell_switch/blizzard diff --git a/data/ssbrc/function/fighter/sora/logic/spell_switch/fire/hand.mcfunction b/data/ssbrc/function/fighter/sora/logic/spell_switch/fire/hand.mcfunction index ac4ada84dd..f2b46ee8cb 100644 --- a/data/ssbrc/function/fighter/sora/logic/spell_switch/fire/hand.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/spell_switch/fire/hand.mcfunction @@ -1 +1,3 @@ -function ssbrc:fighter/sora/logic/spell_switch/fire/set {slot:"weapon.mainhand"} +execute if items entity @s weapon.mainhand minecraft:carrot_on_a_stick run return run function ssbrc:fighter/sora/logic/spell_switch/fire/set {slot:"weapon.mainhand"} + +execute if items entity @s weapon.offhand minecraft:carrot_on_a_stick run function ssbrc:fighter/sora/logic/spell_switch/fire/set {slot:"weapon.offhand"} diff --git a/data/ssbrc/function/fighter/sora/logic/spell_switch/fire/set.mcfunction b/data/ssbrc/function/fighter/sora/logic/spell_switch/fire/set.mcfunction index b9ebd0bf14..b99550f1ba 100644 --- a/data/ssbrc/function/fighter/sora/logic/spell_switch/fire/set.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/spell_switch/fire/set.mcfunction @@ -1,7 +1,5 @@ $function ssbrc:fighter/sora/logic/spell_switch/display/start {slot:"$(slot)",spell:"fira",spell_color:"red"} -$item modify entity @s $(slot) [{"function":"minecraft:set_components","components":{"minecraft:max_damage":20}},{"function":"minecraft:set_lore","entity":"this","lore":[{"translate":"ssbrc.tooltip.effect.burning","color":"gray","bold":false,"italic":false}],"mode":"append"}] +$item modify entity @s $(slot) {"function":"minecraft:set_lore","entity":"this","lore":[{"translate":"ssbrc.tooltip.effect.burning","color":"gray","bold":false,"italic":false}],"mode":"append"} $function ssbrc:fighter/sora/logic/spell_switch/display/spell_order {slot:"$(slot)",spell_1:"fire",spell_1_color:"red",spell_2:"blizzard",spell_2_color:"aqua",spell_3:"thunder",spell_3_color:"yellow"} - -advancement revoke @s only ssbrc:utility/use_item/fighter/sora/spell_switch/fire diff --git a/data/ssbrc/function/fighter/sora/logic/spell_switch/thunder.mcfunction b/data/ssbrc/function/fighter/sora/logic/spell_switch/thunder.mcfunction index a07d7a476d..abf88273ed 100644 --- a/data/ssbrc/function/fighter/sora/logic/spell_switch/thunder.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/spell_switch/thunder.mcfunction @@ -1,7 +1,3 @@ function ssbrc:fighter/sora/logic/spell_switch/display/start {slot:"weapon.mainhand",spell:"thunda",spell_color:"yellow"} -item modify entity @s weapon.mainhand {"function":"minecraft:set_components","components":{"minecraft:max_damage":60}} - function ssbrc:fighter/sora/logic/spell_switch/display/spell_order {slot:"weapon.mainhand",spell_1:"thunder",spell_1_color:"yellow",spell_2:"fire",spell_2_color:"red",spell_3:"blizzard",spell_3_color:"aqua"} - -advancement revoke @s only ssbrc:utility/use_item/fighter/sora/spell_switch/thunder diff --git a/data/ssbrc/function/fighter/sora/logic/tick.mcfunction b/data/ssbrc/function/fighter/sora/logic/tick.mcfunction index 0c88436798..07db837aeb 100644 --- a/data/ssbrc/function/fighter/sora/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/sora/logic/tick.mcfunction @@ -1,3 +1,5 @@ +function ssbrc:logic/item/cooldown/decrease {item:"keyblade"} + # Health execute if score @s health matches ..6 run function ssbrc:fighter/sora/logic/low_health_alert/check diff --git a/data/ssbrc/function/fighter/sora/logic/use_item.mcfunction b/data/ssbrc/function/fighter/sora/logic/use_item.mcfunction new file mode 100644 index 0000000000..5d119843f5 --- /dev/null +++ b/data/ssbrc/function/fighter/sora/logic/use_item.mcfunction @@ -0,0 +1,9 @@ +execute unless items entity @s weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"keyblade"},minecraft:damage~{damage:0}] run return -1 + +execute if data storage ssbrc:temp player.temp_data{form:"valor"} if items entity @s[predicate=!ssbrc:flag/sneaking] weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"keyblade"},minecraft:damage~{damage:0}] if items entity @s weapon.offhand minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"keyblade"},minecraft:damage~{damage:0}] run function ssbrc:fighter/sora/logic/abilities/strike_raid/activate + +execute if predicate ssbrc:fighter/sora/no_spells run return -1 + +execute if predicate ssbrc:flag/sneaking run return run function ssbrc:fighter/sora/logic/use_item/spell_switch + +function ssbrc:fighter/sora/logic/use_item/spell diff --git a/data/ssbrc/function/fighter/sora/logic/use_item/spell.mcfunction b/data/ssbrc/function/fighter/sora/logic/use_item/spell.mcfunction new file mode 100644 index 0000000000..5a0b0001e7 --- /dev/null +++ b/data/ssbrc/function/fighter/sora/logic/use_item/spell.mcfunction @@ -0,0 +1,5 @@ +execute if items entity @s weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{spell:"fire"}] run return run function ssbrc:fighter/sora/logic/abilities/fire/check + +execute if items entity @s weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{spell:"blizzard"}] run return run function ssbrc:fighter/sora/logic/abilities/blizzard/check + +execute if items entity @s weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{spell:"thunder"}] run function ssbrc:fighter/sora/logic/abilities/thunder/check diff --git a/data/ssbrc/function/fighter/sora/logic/use_item/spell_switch.mcfunction b/data/ssbrc/function/fighter/sora/logic/use_item/spell_switch.mcfunction new file mode 100644 index 0000000000..dfde6b7318 --- /dev/null +++ b/data/ssbrc/function/fighter/sora/logic/use_item/spell_switch.mcfunction @@ -0,0 +1,5 @@ +execute if items entity @s weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{spell:"fire"}] run return run function ssbrc:fighter/sora/logic/spell_switch/blizzard + +execute if items entity @s weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{spell:"blizzard"}] run return run function ssbrc:fighter/sora/logic/spell_switch/thunder + +execute if items entity @s weapon.* minecraft:carrot_on_a_stick[minecraft:custom_data~{spell:"thunder"}] run function ssbrc:fighter/sora/logic/spell_switch/fire/hand diff --git a/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/destiny_bond/activate.mcfunction b/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/destiny_bond/activate.mcfunction index 5ac24b2756..7272b10031 100644 --- a/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/destiny_bond/activate.mcfunction +++ b/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/destiny_bond/activate.mcfunction @@ -1,6 +1,6 @@ tag @s add destiny_bond -scoreboard players set @s duration.3 100 +scoreboard players set @s duration.1 60 function ssbrc:logic/fighter/effects/mobility/immobilize {type:"default",duration:100} function ssbrc:logic/item/durability/reset/hand {key:"item",value:"destiny_bond"} diff --git a/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/destiny_bond/kill.mcfunction b/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/destiny_bond/kill.mcfunction index 6ffa1390ad..c589dfdf7c 100644 --- a/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/destiny_bond/kill.mcfunction +++ b/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/destiny_bond/kill.mcfunction @@ -1,3 +1,3 @@ -damage @s 999.9 ssbrc:generic by @p[tag=destiny_bond,scores={duration.3=1..}] +damage @s 999.9 ssbrc:generic by @p[tag=destiny_bond] playsound ssbrc:fighter.team_rocket.wobbuffet.destiny_bond.kill player @a diff --git a/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/tick.mcfunction b/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/tick.mcfunction index 310a6b24c2..8d329023c3 100644 --- a/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/tick.mcfunction +++ b/data/ssbrc/function/fighter/team_rocket/logic/wobbuffet/tick.mcfunction @@ -1,7 +1,7 @@ # Destiny Bond -execute if score @s duration.3 matches 40.. run particle minecraft:dust{color:[0.0,0.0,0.0],scale:0.5} ~ ~0.75 ~ 0.5 1.0 0.5 0.0 5 force @a +execute if score @s duration.1 matches 1.. run particle minecraft:dust{color:[0.0,0.0,0.0],scale:0.5} ~ ~0.75 ~ 0.5 1.0 0.5 0.0 5 force @a -tag @s[scores={duration.3=40}] remove destiny_bond +tag @s[scores={duration.1=1}] remove destiny_bond function ssbrc:logic/item/cooldown/decrease {item:"destiny_bond"} diff --git a/data/ssbrc/function/fighter/wolf/logic/abilities/blaster/activate.mcfunction b/data/ssbrc/function/fighter/wolf/logic/abilities/blaster/activate.mcfunction index 760c650770..cb84399321 100644 --- a/data/ssbrc/function/fighter/wolf/logic/abilities/blaster/activate.mcfunction +++ b/data/ssbrc/function/fighter/wolf/logic/abilities/blaster/activate.mcfunction @@ -2,7 +2,7 @@ function ssbrc:logic/fighter/ability/init execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/wolf/logic/abilities/blaster/init with storage ssbrc:temp player.temp_data -function ssbrc:logic/item/cooldown/set/const {type:"1",value:"40"} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"wolf.blaster"} playsound ssbrc:fighter.wolf.blaster.activate player @a diff --git a/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/activate.mcfunction b/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/activate.mcfunction index 7783ee6467..72b588c631 100644 --- a/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/activate.mcfunction +++ b/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/activate.mcfunction @@ -1,5 +1,5 @@ execute anchored eyes positioned ^ ^ ^1 summon minecraft:marker run function ssbrc:fighter/wolf/logic/abilities/grenade/init/marker -function ssbrc:logic/item/cooldown/set/const {type:"2",value:"20"} +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"grenade"} playsound ssbrc:fighter.wolf.grenade.throw player @a diff --git a/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/charge.mcfunction b/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/charge.mcfunction deleted file mode 100644 index 7edcbb06a0..0000000000 --- a/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/charge.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -execute if score @s charge.output >= wolf.grenade.timer const run function ssbrc:fighter/wolf/logic/abilities/grenade/explode_in_hand - -advancement revoke @s only ssbrc:utility/use_item/fighter/wolf/grenade/charge diff --git a/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/check.mcfunction b/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/check.mcfunction index 2f54029621..a07ecffa6f 100644 --- a/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/check.mcfunction +++ b/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/check.mcfunction @@ -1 +1 @@ -execute if entity @s[tag=!silenced,scores={cooldown.2=..0}] run function ssbrc:fighter/wolf/logic/abilities/grenade/activate +execute if items entity @s[predicate=ssbrc:universal_cooldown] weapon.* #ssbrc:equipment[minecraft:custom_data~{item:"grenade"},minecraft:damage~{damage:0}] run function ssbrc:fighter/wolf/logic/abilities/grenade/activate diff --git a/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/explode_in_hand.mcfunction b/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/explode_in_hand.mcfunction index 37260bde3e..52b1c7840d 100644 --- a/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/explode_in_hand.mcfunction +++ b/data/ssbrc/function/fighter/wolf/logic/abilities/grenade/explode_in_hand.mcfunction @@ -9,3 +9,5 @@ playsound minecraft:entity.generic.explode player @a item modify entity @s weapon.mainhand {"function":"minecraft:set_components","components":{"minecraft:item_model":"ssbrc:fighter/wolf/item/grenade/default"}} scoreboard players set @s charge.output 0 + +advancement revoke @s only ssbrc:utility/use_item/fighter/wolf/grenade diff --git a/data/ssbrc/function/fighter/wolf/logic/abilities/wolf_flash/activate.mcfunction b/data/ssbrc/function/fighter/wolf/logic/abilities/wolf_flash/activate.mcfunction index e180fa1a45..491904e2fc 100644 --- a/data/ssbrc/function/fighter/wolf/logic/abilities/wolf_flash/activate.mcfunction +++ b/data/ssbrc/function/fighter/wolf/logic/abilities/wolf_flash/activate.mcfunction @@ -2,4 +2,6 @@ function ssbrc:logic/fighter/ability/init execute positioned ~ ~0.1 ~ summon minecraft:marker run function ssbrc:fighter/wolf/logic/abilities/wolf_flash/init +function ssbrc:logic/item/durability/reset/hand {key:"item",value:"wolf_slash"} + function ssbrc:logic/fighter/ability/deinit diff --git a/data/ssbrc/function/fighter/wolf/logic/tick.mcfunction b/data/ssbrc/function/fighter/wolf/logic/tick.mcfunction new file mode 100644 index 0000000000..71fba3d484 --- /dev/null +++ b/data/ssbrc/function/fighter/wolf/logic/tick.mcfunction @@ -0,0 +1,5 @@ +function ssbrc:logic/item/cooldown/decrease {item:"wolf_slash"} + +function ssbrc:logic/item/cooldown/decrease {item:"wolf.blaster"} + +function ssbrc:logic/item/cooldown/decrease {item:"grenade"} diff --git a/data/ssbrc/function/fighter/zelda/logic/abilities/boomerang/regain.mcfunction b/data/ssbrc/function/fighter/zelda/logic/abilities/boomerang/regain.mcfunction index a2acd7b796..0a1e373822 100644 --- a/data/ssbrc/function/fighter/zelda/logic/abilities/boomerang/regain.mcfunction +++ b/data/ssbrc/function/fighter/zelda/logic/abilities/boomerang/regain.mcfunction @@ -1,4 +1,5 @@ loot give @s loot ssbrc:fighter/zelda/boomerang +function ssbrc:logic/item/durability/reset/item {item:"zelda.boomerang"} kill @n[type=minecraft:item_display,tag=zelda.boomerang,predicate=ssbrc:id_match] diff --git a/data/ssbrc/function/fighter/zelda/logic/abilities/magic_boomerang/regain.mcfunction b/data/ssbrc/function/fighter/zelda/logic/abilities/magic_boomerang/regain.mcfunction index cfb25ef995..f92dcc60ee 100644 --- a/data/ssbrc/function/fighter/zelda/logic/abilities/magic_boomerang/regain.mcfunction +++ b/data/ssbrc/function/fighter/zelda/logic/abilities/magic_boomerang/regain.mcfunction @@ -1,4 +1,5 @@ loot give @s loot ssbrc:fighter/zelda/magic_boomerang +function ssbrc:logic/item/durability/reset/item {item:"magic_boomerang"} kill @n[type=minecraft:item_display,tag=magic_boomerang,predicate=ssbrc:id_match] diff --git a/data/ssbrc/function/fighter/zelda/logic/tick.mcfunction b/data/ssbrc/function/fighter/zelda/logic/tick.mcfunction index 077f86c878..90426ead01 100644 --- a/data/ssbrc/function/fighter/zelda/logic/tick.mcfunction +++ b/data/ssbrc/function/fighter/zelda/logic/tick.mcfunction @@ -1,12 +1,16 @@ # Dungeon Items execute if items entity @s container.* minecraft:nether_star[minecraft:custom_data~{item:"bomb"}] run function ssbrc:fighter/zelda/logic/abilities/bomb/in_kit +function ssbrc:logic/item/cooldown/decrease {item:"zelda.boomerang"} + execute if items entity @s container.* minecraft:nether_star[minecraft:custom_data~{item:"fire_rod"}] run function ssbrc:logic/item/cooldown/decrease {item:"fire_rod"} execute if items entity @s container.* minecraft:nether_star[minecraft:custom_data~{item:"ice_rod"}] run function ssbrc:logic/item/cooldown/decrease {item:"ice_rod"} execute if items entity @s container.* minecraft:nether_star[minecraft:custom_data~{extra:"magic_rod"}] run function ssbrc:fighter/zelda/logic/magic/update +function ssbrc:logic/item/cooldown/decrease {item:"magic_boomerang"} + # Passive Items execute if items entity @s container.* minecraft:nether_star[minecraft:custom_data~{item:"goron_locket"}] run effect clear @s minecraft:wither @@ -14,7 +18,6 @@ execute if items entity @s[scores={health=7..}] container.* minecraft:nether_sta execute if items entity @s container.* minecraft:nether_star[minecraft:custom_data~{item:"torch_of_wisdom"}] as @e[predicate=ssbrc:target,predicate=!ssbrc:team_match,tag=cloaked,distance=..10] run function ssbrc:logic/fighter/effects/glowing/uncloak -execute if items entity @s container.* minecraft:nether_star[minecraft:custom_data~{item:"ring_of_risk"}] run function ssbrc:fighter/zelda/logic/passive_items/ring_of_risk execute if items entity @s[scores={health=11..}] container.* minecraft:nether_star[minecraft:custom_data~{item:"ring_of_risk"}] run attribute @s minecraft:attack_damage modifier remove ssbrc:fighter/zelda/ring_of_risk # Rupees diff --git a/data/ssbrc/function/logic/fighter/damage/dealt/joker.mcfunction b/data/ssbrc/function/logic/fighter/damage/dealt/joker.mcfunction index 5e8b3381f3..26d3c9e913 100644 --- a/data/ssbrc/function/logic/fighter/damage/dealt/joker.mcfunction +++ b/data/ssbrc/function/logic/fighter/damage/dealt/joker.mcfunction @@ -1,3 +1,3 @@ scoreboard players operation @s charge.1 += @s flag.damage_dealt -execute unless items entity @s[scores={duration.1=..0}] weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"tt33"}] run function ssbrc:fighter/joker/logic/abilities/persona_awakening/check +execute unless items entity @s[scores={duration.1=..0}] weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"tt33"}] run function ssbrc:fighter/joker/logic/abilities/persona_awakening/check diff --git a/data/ssbrc/function/logic/fighter/damage/taken/joker.mcfunction b/data/ssbrc/function/logic/fighter/damage/taken/joker.mcfunction index 6e481c05af..ad3904b392 100644 --- a/data/ssbrc/function/logic/fighter/damage/taken/joker.mcfunction +++ b/data/ssbrc/function/logic/fighter/damage/taken/joker.mcfunction @@ -3,6 +3,6 @@ execute if entity @s[tag=rebels_guard] run scoreboard players operation damage_t scoreboard players operation @s charge.1 += damage_taken temp scoreboard players reset damage_taken temp -execute unless items entity @s[scores={duration.1=..0}] weapon.mainhand minecraft:nether_star[minecraft:custom_data~{item:"tt33"}] run return run function ssbrc:fighter/joker/logic/abilities/persona_awakening/check +execute unless items entity @s[scores={duration.1=..0}] weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{item:"tt33"}] run return run function ssbrc:fighter/joker/logic/abilities/persona_awakening/check execute if entity @s[scores={duration.1=1..,charge.1=300..}] run function ssbrc:fighter/joker/logic/abilities/persona_awakening/deactivate diff --git a/data/ssbrc/function/logic/fighter/grounded.mcfunction b/data/ssbrc/function/logic/fighter/grounded.mcfunction index e39e756b15..e52f954f83 100644 --- a/data/ssbrc/function/logic/fighter/grounded.mcfunction +++ b/data/ssbrc/function/logic/fighter/grounded.mcfunction @@ -1,4 +1,8 @@ scoreboard players set @s jump 0 +execute if entity @s[tag=safe_launch] run effect clear @s minecraft:slow_falling + tag @s remove launched +tag @s remove safe_launch + attribute @s minecraft:safe_fall_distance modifier remove ssbrc:launched diff --git a/data/ssbrc/function/logic/fighter/item/activate.mcfunction b/data/ssbrc/function/logic/fighter/item/activate.mcfunction new file mode 100644 index 0000000000..4d7e91a046 --- /dev/null +++ b/data/ssbrc/function/logic/fighter/item/activate.mcfunction @@ -0,0 +1,5 @@ +$execute if entity @s[predicate=ssbrc:universal_cooldown] run function ssbrc:fighter/$(name)/logic/use_item + +scoreboard players set @s charge.input 0 +scoreboard players set @s charge.output 0 +scoreboard players set @s charge.step 0 diff --git a/data/ssbrc/function/logic/fighter/item/refresh.mcfunction b/data/ssbrc/function/logic/fighter/item/refresh.mcfunction new file mode 100644 index 0000000000..86db825f54 --- /dev/null +++ b/data/ssbrc/function/logic/fighter/item/refresh.mcfunction @@ -0,0 +1,3 @@ +scoreboard players set @s charge.step 0 + +scoreboard players remove @s charge.input 1 diff --git a/data/ssbrc/function/logic/fighter/item/tick.mcfunction b/data/ssbrc/function/logic/fighter/item/tick.mcfunction new file mode 100644 index 0000000000..4d7562f7de --- /dev/null +++ b/data/ssbrc/function/logic/fighter/item/tick.mcfunction @@ -0,0 +1,14 @@ +scoreboard players add @s charge.step 1 +scoreboard players add @s charge.output 1 + +execute if items entity @s[predicate=!ssbrc:flag/sneaking] weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{chargable:"true",hybrid_charge:"true"}] run return run function ssbrc:logic/fighter/get {function:"ssbrc:logic/fighter/item/activate"} + +execute if items entity @s[predicate=!ssbrc:flag/sneaking] weapon.offhand minecraft:carrot_on_a_stick[minecraft:custom_data~{chargable:"true",hybrid_charge:"true"}] run return run function ssbrc:logic/fighter/get {function:"ssbrc:logic/fighter/item/activate"} + +execute if items entity @s[scores={charge.step=6}] weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{chargable:"true"}] run return run function ssbrc:logic/fighter/get {function:"ssbrc:logic/fighter/item/activate"} + +execute if items entity @s[scores={charge.step=6}] weapon.offhand minecraft:carrot_on_a_stick[minecraft:custom_data~{chargable:"true"}] run return run function ssbrc:logic/fighter/get {function:"ssbrc:logic/fighter/item/activate"} + +execute if items entity @s weapon.mainhand minecraft:carrot_on_a_stick unless items entity @s weapon.mainhand minecraft:carrot_on_a_stick[minecraft:custom_data~{chargable:"false"}] run return run function ssbrc:logic/fighter/get {function:"ssbrc:logic/fighter/item/activate"} + +execute if items entity @s weapon.offhand minecraft:carrot_on_a_stick unless items entity @s weapon.offhand minecraft:carrot_on_a_stick[minecraft:custom_data~{chargable:"false"}] run function ssbrc:logic/fighter/get {function:"ssbrc:logic/fighter/item/activate"} diff --git a/data/ssbrc/function/logic/fighter/motion/launch.mcfunction b/data/ssbrc/function/logic/fighter/motion/launch.mcfunction deleted file mode 100644 index 2e3e0e96f6..0000000000 --- a/data/ssbrc/function/logic/fighter/motion/launch.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -scoreboard players operation $y player_motion.api.launch = @s player_motion.storage.force - -function player_motion:api/launch_xyz -tag @s add launched -attribute @s minecraft:safe_fall_distance modifier add ssbrc:launched -1 add_multiplied_total - -scoreboard players reset @s player_motion.storage.force -scoreboard players reset @s player_motion.storage.timer diff --git a/data/ssbrc/function/logic/fighter/motion/reset.mcfunction b/data/ssbrc/function/logic/fighter/motion/reset.mcfunction new file mode 100644 index 0000000000..72c5f1d659 --- /dev/null +++ b/data/ssbrc/function/logic/fighter/motion/reset.mcfunction @@ -0,0 +1,4 @@ +attribute @s minecraft:gravity modifier remove ssbrc:launched +attribute @s minecraft:jump_strength modifier remove ssbrc:launched + +scoreboard players reset @s player_motion.timer diff --git a/data/ssbrc/function/logic/fighter/motion/set.mcfunction b/data/ssbrc/function/logic/fighter/motion/set.mcfunction deleted file mode 100644 index fdb486e0ae..0000000000 --- a/data/ssbrc/function/logic/fighter/motion/set.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -$scoreboard players set @s player_motion.storage.force $(force) - -scoreboard players set @s player_motion.storage.timer 3 diff --git a/data/ssbrc/function/logic/fighter/motion/y.mcfunction b/data/ssbrc/function/logic/fighter/motion/y.mcfunction new file mode 100644 index 0000000000..6d16330578 --- /dev/null +++ b/data/ssbrc/function/logic/fighter/motion/y.mcfunction @@ -0,0 +1,10 @@ +$attribute @s minecraft:gravity modifier add ssbrc:launched -$(force) add_multiplied_total +attribute @s minecraft:jump_strength modifier add ssbrc:launched -1 add_multiplied_total + +tag @s add launched +scoreboard players set @s player_motion.timer 4 + +$data modify storage ssbrc:cache motion.safe set value "$(safe_launch)" +attribute @s minecraft:safe_fall_distance modifier remove ssbrc:launched +execute if data storage ssbrc:cache motion{safe:"true"} run return run tag @s add safe_launch +attribute @s minecraft:safe_fall_distance modifier add ssbrc:launched -1 add_multiplied_total diff --git a/data/ssbrc/function/logic/fighter/projectile/misfire.mcfunction b/data/ssbrc/function/logic/fighter/projectile/misfire.mcfunction index 977b976595..ea1bf79d81 100644 --- a/data/ssbrc/function/logic/fighter/projectile/misfire.mcfunction +++ b/data/ssbrc/function/logic/fighter/projectile/misfire.mcfunction @@ -1,3 +1,3 @@ playsound ssbrc:generic_misfire player @a -$function ssbrc:logic/item/cooldown/set/const {type:"$(type)",value:"$(amount)"} +$function ssbrc:logic/item/durability/reset/hand {key:"$(key)",value:"$(value)"} diff --git a/data/ssbrc/function/logic/fighter/reset_tags.mcfunction b/data/ssbrc/function/logic/fighter/reset_tags.mcfunction index 61110ffee7..37ff9aa332 100644 --- a/data/ssbrc/function/logic/fighter/reset_tags.mcfunction +++ b/data/ssbrc/function/logic/fighter/reset_tags.mcfunction @@ -12,6 +12,7 @@ tag @s remove ignore_feedback tag @s remove intangible tag @s remove launched tag @s remove natural_shiny +tag @s remove safe_launch tag @s remove shield_broken tag @s remove silenced diff --git a/data/ssbrc/function/logic/fighter/tick.mcfunction b/data/ssbrc/function/logic/fighter/tick.mcfunction index 35a75d80b4..7119582916 100644 --- a/data/ssbrc/function/logic/fighter/tick.mcfunction +++ b/data/ssbrc/function/logic/fighter/tick.mcfunction @@ -24,16 +24,19 @@ execute if entity @e[type=minecraft:marker,tag=electric_terrain,distance=..12] r tag @s[tag=vented] add silenced execute unless score @s[predicate=ssbrc:input/jump] jump matches 1.. run function ssbrc:logic/fighter/jump -execute unless predicate ssbrc:flag/in_air run function ssbrc:logic/fighter/grounded +execute if entity @s[tag=safe_launch,scores={motion_y=..-100}] unless block ~ ~-10 ~ #ssbrc:passthrough_charge run effect give @s minecraft:slow_falling 1 0 true +execute if entity @s[tag=launched,predicate=!ssbrc:flag/in_air] unless score @s player_motion.timer matches 1.. run function ssbrc:logic/fighter/grounded -execute if score @s use_item matches 1.. run function ssbrc:logic/fighter/get {function:"ssbrc:logic/fighter/use_item"} function ssbrc:logic/fighter/get {function:"ssbrc:logic/fighter/tick_specific"} +execute if score @s charge.input matches 1.. run function ssbrc:logic/fighter/item/tick +execute if score @s charge.input matches 2.. run function ssbrc:logic/fighter/item/refresh + execute store result score @s selected_item run data get entity @s SelectedItemSlot execute unless score @s selected_item.prev = @s selected_item run function ssbrc:logic/fighter/change_slot -execute if entity @s[scores={charge.output=1..},advancements={ssbrc:utility/use_item/any=false}] run function ssbrc:logic/fighter/charge/activate -execute if items entity @s[advancements={ssbrc:utility/use_item/any=true}] weapon.mainhand #ssbrc:equipment[minecraft:custom_data~{chargable:"true"}] run function ssbrc:logic/fighter/charge/tick +execute if items entity @s[scores={charge.output=1..},advancements={ssbrc:utility/use_item/any=false}] weapon.* #ssbrc:equipment_no_coas[minecraft:custom_data~{chargable:"true"}] run function ssbrc:logic/fighter/charge/activate +execute if items entity @s[advancements={ssbrc:utility/use_item/any=true}] weapon.mainhand #ssbrc:equipment_no_coas[minecraft:custom_data~{chargable:"true"}] run function ssbrc:logic/fighter/charge/tick execute if score @s flag.damage_dealt matches 1.. run function ssbrc:logic/fighter/damage/dealt execute if score @s flag.damage_taken matches 1.. run function ssbrc:logic/fighter/damage/taken @@ -51,14 +54,14 @@ scoreboard players add @s hud 1 execute if score @s hud >= hud_frequency const run function ssbrc:logic/fighter/get {function:"ssbrc:logic/fighter/hud"} # Items -execute if entity @s[tag=angel_feather] run particle minecraft:dust_color_transition{from_color:[1.0,1.0,0.0],to_color:[1.0,1.0,1.0],scale:0.5} ~ ~0.75 ~ 0.2 0.3 0.2 0.0 3 normal @a +execute if entity @s[tag=angel_feather] run particle minecraft:dust_color_transition{from_color:[0.0,1.0,1.0],to_color:[1.0,1.0,1.0],scale:0.5} ~ ~0.75 ~ 0.2 0.3 0.2 0.0 3 normal @a # Fighter Effects execute if data storage ssbrc:temp player.temp_data{skin:"gold"} run function ssbrc:logic/fighter/gold_trail scoreboard players reset @s flag.walking -scoreboard players remove @s[scores={player_motion.storage.timer=1..}] player_motion.storage.timer 1 -execute if score @s player_motion.storage.timer matches 1 run function ssbrc:logic/fighter/motion/launch +scoreboard players remove @s[scores={player_motion.timer=1..}] player_motion.timer 1 +execute if score @s player_motion.timer matches 1 run function ssbrc:logic/fighter/motion/reset execute if score @s immobile matches 1.. run function ssbrc:logic/fighter/effects/mobility/tick execute if entity @s[tag=immobile.pivot.queue,tag=!immobile.pivot,predicate=!ssbrc:flag/in_air] run function ssbrc:logic/fighter/effects/mobility/pivot/activate diff --git a/data/ssbrc/function/logic/fighter/use_item.mcfunction b/data/ssbrc/function/logic/fighter/use_item.mcfunction deleted file mode 100644 index 2962e00629..0000000000 --- a/data/ssbrc/function/logic/fighter/use_item.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -$execute if entity @s[tag=!silenced,scores={cooldown=..0}] run function ssbrc:fighter/$(name)/logic/use_item - -scoreboard players reset @s use_item diff --git a/data/ssbrc/function/logic/game/data/scoreboards/create.mcfunction b/data/ssbrc/function/logic/game/data/scoreboards/create.mcfunction index 435965cb69..b2b76b885f 100644 --- a/data/ssbrc/function/logic/game/data/scoreboards/create.mcfunction +++ b/data/ssbrc/function/logic/game/data/scoreboards/create.mcfunction @@ -11,7 +11,9 @@ scoreboard objectives add charge.1 dummy scoreboard objectives add charge.2 dummy scoreboard objectives add charge.3 dummy scoreboard objectives add charge.4 dummy +scoreboard objectives add charge.input minecraft.used:minecraft.carrot_on_a_stick scoreboard objectives add charge.output dummy +scoreboard objectives add charge.step dummy scoreboard objectives add combo.count dummy scoreboard objectives add combo.duration dummy scoreboard objectives add const dummy @@ -29,7 +31,6 @@ scoreboard objectives add durability dummy scoreboard objectives add duration.1 dummy scoreboard objectives add duration.2 dummy scoreboard objectives add duration.3 dummy -scoreboard objectives add event dummy scoreboard objectives add fall_distance minecraft.custom:minecraft.fall_one_cm scoreboard objectives add favorite.temp dummy scoreboard objectives add fiends_cauldron dummy @@ -86,8 +87,7 @@ scoreboard players enable @a options_trigger scoreboard objectives add pac_maze.scoreboard dummy scoreboard objectives add petrified dummy scoreboard objectives add piercing dummy -scoreboard objectives add player_motion.storage.force dummy -scoreboard objectives add player_motion.storage.timer dummy +scoreboard objectives add player_motion.timer dummy scoreboard objectives add point dummy scoreboard objectives add points dummy scoreboard objectives add popup_timer dummy @@ -134,7 +134,6 @@ scoreboard objectives add timer.stat.death dummy scoreboard objectives add timer.stat.kill dummy scoreboard objectives add tornado dummy scoreboard objectives add tower_of_fate.barrier dummy -scoreboard objectives add use_item minecraft.used:minecraft.carrot_on_a_stick scoreboard objectives add walk_distance minecraft.custom:minecraft.walk_one_cm scoreboard objectives add weapon_3.ammo dummy scoreboard objectives add weapon_3.mags dummy diff --git a/data/ssbrc/function/logic/game/data/scoreboards/remove.mcfunction b/data/ssbrc/function/logic/game/data/scoreboards/remove.mcfunction index 8ab4791868..9736914047 100644 --- a/data/ssbrc/function/logic/game/data/scoreboards/remove.mcfunction +++ b/data/ssbrc/function/logic/game/data/scoreboards/remove.mcfunction @@ -9,7 +9,9 @@ scoreboard objectives remove charge.1 scoreboard objectives remove charge.2 scoreboard objectives remove charge.3 scoreboard objectives remove charge.4 +scoreboard objectives remove charge.input scoreboard objectives remove charge.output +scoreboard objectives remove charge.step scoreboard objectives remove combo.count scoreboard objectives remove combo.duration scoreboard objectives remove const @@ -25,7 +27,6 @@ scoreboard objectives remove durability scoreboard objectives remove duration.1 scoreboard objectives remove duration.2 scoreboard objectives remove duration.3 -#scoreboard objectives remove event scoreboard objectives remove fall_distance scoreboard objectives remove favorite.temp scoreboard objectives remove fiends_cauldron @@ -78,8 +79,7 @@ scoreboard objectives remove options_trigger scoreboard objectives remove pac_maze.scoreboard scoreboard objectives remove petrified scoreboard objectives remove piercing -scoreboard objectives remove player_motion.storage.force -scoreboard objectives remove player_motion.storage.timer +scoreboard objectives remove player_motion.timer scoreboard objectives remove point scoreboard objectives remove points scoreboard objectives remove popup_timer @@ -122,7 +122,6 @@ scoreboard objectives remove timer.stat.death scoreboard objectives remove timer.stat.kill scoreboard objectives remove tornado scoreboard objectives remove tower_of_fate.barrier -scoreboard objectives remove use_item scoreboard objectives remove walk_distance scoreboard objectives remove weapon_1.ammo scoreboard objectives remove weapon_1.fire_rate diff --git a/data/ssbrc/function/logic/lobby/credits/reset.mcfunction b/data/ssbrc/function/logic/lobby/credits/reset.mcfunction index c4c1957a75..35e466ddcb 100644 --- a/data/ssbrc/function/logic/lobby/credits/reset.mcfunction +++ b/data/ssbrc/function/logic/lobby/credits/reset.mcfunction @@ -57,10 +57,11 @@ summon minecraft:item_display -551.5 -2.925 -1952.5 {CustomName:'"lostpuppet"',T # Testers summon minecraft:text_display -534.5 -1.5 -1939.1 {Tags:["credits_text"],text:'{"translate":"ssbrc.credits.testers","bold":true,"color":"yellow"}',background:0,Rotation:[180f,0f],alignment:"center"} -summon minecraft:text_display -534.5 -4.5 -1939.1 {Tags:["credits_text"],text:'[{"text":"3DSCarnaje\\n\\n"},{"text":"AlexisFTW\\n\\n"},{"text":"AndrewAwesome87\\n\\n"},{"text":"Mewion\\n\\n"},{"text":"MysticGamer123\\n\\n"},{"text":"P5eudonym\\n\\n"},{"text":"RulerOEverything"}]',background:0,Rotation:[180f,0f],alignment:"center"} +summon minecraft:text_display -533.0 -4.5 -1939.1 {Tags:["credits_text"],text:'[{"text":"3DSCarnaje\\n\\n"},{"text":"AlexisFTW\\n\\n"},{"text":"alouby\\n\\n"},{"text":"AndrewAwesome87\\n\\n"},{"text":"anoyaki\\n\\n"},{"text":"DeepGnomes"}]',background:0,Rotation:[180f,0f],alignment:"center"} +summon minecraft:text_display -536.0 -4.5 -1939.1 {Tags:["credits_text"],text:'[{"text":"Doldrainsnake\\n\\n"},{"text":"Mewion\\n\\n"},{"text":"MysticGamer123\\n\\n"},{"text":"P5eudonym\\n\\n"},{"text":"RulerOEverything\\n\\n"},{"text":"Wizard_Five"}]',background:0,Rotation:[180f,0f],alignment:"center"} # Special Thanks summon minecraft:text_display -534.5 -1.5 -1949.9 {Tags:["credits_text"],text:'{"translate":"ssbrc.credits.special_thanks","bold":true,"color":"yellow"}',background:0,alignment:"center"} -summon minecraft:text_display -537.0 -4.75 -1949.9 {Tags:["credits_text"],text:'["",{"text":"MCC Discord (Link)\\n"},{"text":"So much. Thank you ♡\\n\\n","color":"gray"},{"text":"Cobblemon (Link)\\n"},{"text":"Pokémon Assets\\n\\n","color":"gray"},{"text":"DawnKiro\\n"},{"text":"Shaders\\n\\n","color":"gray"},{"text":"Simplly\\n"},{"text":"Lobby","color":"gray"}]',background:0,alignment:"center"} -summon minecraft:text_display -532.0 -4.75 -1949.9 {Tags:["credits_text"],text:'["",{"text":"Sushironi\\n"},{"text":"Various Contributions\\n\\n","color":"gray"},{"text":"Misc Building\\n"},{"text":"Mongoose1716\\nLIL_BOI_BLU\\n\\n","color":"gray"},{"text":"ComicalFont\\n"},{"text":"Dream Land\\n\\n","color":"gray"},{"text":"YaBoiDenver\\n"},{"text":"???","color":"gray"}]',background:0,alignment:"center"} +summon minecraft:text_display -537.0 -4.75 -1949.9 {Tags:["credits_text"],text:'["",{"text":"MCC Discord\\n"},{"text":"So much. Thank you ♡\\n\\n","color":"gray"},{"text":"Cobblemon\\n"},{"text":"Pokémon Assets\\n\\n","color":"gray"},{"text":"DawnKiro\\n"},{"text":"Shaders\\n\\n","color":"gray"},{"text":"Simplly\\n"},{"text":"Lobby","color":"gray"}]',background:0,alignment:"center"} +summon minecraft:text_display -532.0 -4.75 -1949.9 {Tags:["credits_text"],text:'["",{"text":"Sushironi\\n"},{"text":"Various Contributions\\n\\n","color":"gray"},{"text":"Misc Building\\n"},{"text":"Mongoose1716\\nLIL_BOI_BLU\\n\\n","color":"gray"},{"text":"ComicalFont\\n"},{"text":"Dream Land\\n\\n","color":"gray"},{"text":"Kill3rCreeper\\n"},{"text":"Samus Skins","color":"gray"}]',background:0,alignment:"center"} diff --git a/data/ssbrc/function/logic/lobby/reset.mcfunction b/data/ssbrc/function/logic/lobby/reset.mcfunction index 0590789a68..5662aefd22 100644 --- a/data/ssbrc/function/logic/lobby/reset.mcfunction +++ b/data/ssbrc/function/logic/lobby/reset.mcfunction @@ -23,8 +23,8 @@ execute positioned -535.5 8.0 -1944.5 run summon minecraft:item_display ~ ~ ~ {T execute positioned -525.5 5.25 -1936.5 run summon minecraft:item_display ~ ~ ~ {CustomName:'"sandbag"',Tags:["selectable","standard_highlight"],item:{id:"minecraft:emerald",components:{"minecraft:item_model":"ssbrc:item/sandbag/default"}},Rotation:[-145f,0f]} # OST Pack -execute positioned -525.5 5.5 -1952.5 run function animated_java:jukebox_display/summon {args:{}} -execute positioned -525.5 4.15 -1951.99 run summon minecraft:text_display ~ ~ ~ {text:'["Click the note to download the music pack!"]',transformation:[0.5f,0f,0f,0f,0f,0.5f,0f,0f,0f,0f,0.5f,0f,0f,0f,0f,1f],line_width:70,alignment:"center"} +summon minecraft:item_display -525.5 5.5 -1952.5 {CustomName:'"assets"',Tags:["selectable","standard_highlight"],item:{id:"minecraft:jukebox"},transformation:{left_rotation:[0.20f,0.35f,-0.1f,0.9f],right_rotation:[0f,0f,0f,1f],scale:[0.5f,0.5f,0.5f],translation:[0f,0f,0f]}} +execute positioned -525.5 4.25 -1951.99 run summon minecraft:text_display ~ ~ ~ {text:'{"text":"Click the jukebox to download the music pack!","color":"yellow"}',transformation:[0.5f,0f,0f,0f,0f,0.5f,0f,0f,0f,0f,0.5f,0f,0f,0f,0f,1f],line_width:75,alignment:"center",background:0} setblock 0 16 0 minecraft:shulker_box replace setblock 0 17 0 minecraft:birch_sign replace diff --git a/data/ssbrc/function/logic/lobby/tick.mcfunction b/data/ssbrc/function/logic/lobby/tick.mcfunction index 9faf14e890..15326e4185 100644 --- a/data/ssbrc/function/logic/lobby/tick.mcfunction +++ b/data/ssbrc/function/logic/lobby/tick.mcfunction @@ -26,4 +26,4 @@ execute if score @s sandbag.stand_on matches 400 run function ssbrc:logic/player execute if score @s sandbag.stand_on matches 500 positioned -525.5 6.0 -1936.5 run function ssbrc:logic/player/selector/events/sandbag/stand_on/5 # Seasonal -execute if score winter event matches 1 run particle minecraft:snowflake -520.5 12.5 -1944.5 10.0 3.0 10.0 0.0 15 normal @s +execute if data storage ssbrc:data world{event:"winter"} run particle minecraft:snowflake -520.5 12.5 -1944.5 10.0 3.0 10.0 0.0 15 normal @s diff --git a/data/ssbrc/function/logic/player/selector/highlight_object.mcfunction b/data/ssbrc/function/logic/player/selector/highlight_object.mcfunction index fa89a6009d..bc99df809a 100644 --- a/data/ssbrc/function/logic/player/selector/highlight_object.mcfunction +++ b/data/ssbrc/function/logic/player/selector/highlight_object.mcfunction @@ -4,6 +4,7 @@ execute if entity @n[distance=..0.1,tag=standard_highlight] run scoreboard playe execute if entity @n[distance=..0.1,tag=stage_icon] run scoreboard players set highlight temp 4 execute if entity @n[distance=..0.1,tag=logo] run scoreboard players set highlight temp 5 +execute if entity @n[distance=..0.1,name=assets] run particle minecraft:dust_color_transition{from_color:[0.0,1.0,0.0],to_color:[1.0,1.0,1.0],scale:0.5} ~ ~ ~ 0.15 0.15 0.15 0.0 5 force @s execute if score highlight temp matches 1 run particle minecraft:dust_color_transition{from_color:[0.0,1.0,0.0],to_color:[1.0,1.0,1.0],scale:1.0} ~ ~ ~ 0.2 0.4 0.2 0.0 5 force @s execute if score highlight temp matches 2 run particle minecraft:dust_color_transition{from_color:[1.0,1.0,0.0],to_color:[1.0,1.0,1.0],scale:1.0} ~ ~ ~ 0.2 0.4 0.2 0.0 5 force @s diff --git a/data/ssbrc/function/stage/palutenas_temple/logic/bounce_pad.mcfunction b/data/ssbrc/function/stage/palutenas_temple/logic/bounce_pad.mcfunction index c9446218c6..53fe0d183b 100644 --- a/data/ssbrc/function/stage/palutenas_temple/logic/bounce_pad.mcfunction +++ b/data/ssbrc/function/stage/palutenas_temple/logic/bounce_pad.mcfunction @@ -1,6 +1,3 @@ -scoreboard players set $y player_motion.api.launch 12000 -function player_motion:api/launch_xyz - -tag @s add bounce_pad +function ssbrc:logic/fighter/motion/y {force:10,safe_launch:"true"} playsound ssbrc:stage.palutenas_temple.spring block @a diff --git a/data/ssbrc/function/stage/palutenas_temple/logic/tick.mcfunction b/data/ssbrc/function/stage/palutenas_temple/logic/tick.mcfunction index e9b939682b..fd66cdc8fe 100644 --- a/data/ssbrc/function/stage/palutenas_temple/logic/tick.mcfunction +++ b/data/ssbrc/function/stage/palutenas_temple/logic/tick.mcfunction @@ -1,4 +1,4 @@ -execute as @a[predicate=ssbrc:player] run function ssbrc:stage/palutenas_temple/logic/tick_players +execute as @a[predicate=ssbrc:player] unless score @s player_motion.timer matches 1.. run function ssbrc:stage/palutenas_temple/logic/tick_players execute if score hazards options matches 1 run function ssbrc:stage/palutenas_temple/logic/hazards diff --git a/data/ssbrc/function/stage/palutenas_temple/logic/tick_players.mcfunction b/data/ssbrc/function/stage/palutenas_temple/logic/tick_players.mcfunction index 467f651703..1c618e4b23 100644 --- a/data/ssbrc/function/stage/palutenas_temple/logic/tick_players.mcfunction +++ b/data/ssbrc/function/stage/palutenas_temple/logic/tick_players.mcfunction @@ -1,5 +1,5 @@ -execute positioned 49958.0 212.063 24958.0 if entity @s[tag=!bounce_pad,dy=0] run function ssbrc:stage/palutenas_temple/logic/bounce_pad -execute positioned 49966.0 214.063 24947.0 if entity @s[tag=!bounce_pad,dy=0] run function ssbrc:stage/palutenas_temple/logic/bounce_pad -execute positioned 49975.0 212.063 24955.0 if entity @s[tag=!bounce_pad,dy=0] run function ssbrc:stage/palutenas_temple/logic/bounce_pad +execute positioned 49958.0 212.063 24958.0 if entity @s[dy=0] run return run function ssbrc:stage/palutenas_temple/logic/bounce_pad -tag @s[tag=bounce_pad,scores={motion_y=..-100}] remove bounce_pad +execute positioned 49966.0 214.063 24947.0 if entity @s[dy=0] run return run function ssbrc:stage/palutenas_temple/logic/bounce_pad + +execute positioned 49975.0 212.063 24955.0 if entity @s[dy=0] run return run function ssbrc:stage/palutenas_temple/logic/bounce_pad diff --git a/data/ssbrc/item_modifier/fighter/cloud/buster_sword/operator.json b/data/ssbrc/item_modifier/fighter/cloud/buster_sword/operator.json index 8d2b234526..fc042f019b 100644 --- a/data/ssbrc/item_modifier/fighter/cloud/buster_sword/operator.json +++ b/data/ssbrc/item_modifier/fighter/cloud/buster_sword/operator.json @@ -1,7 +1,7 @@ [ { "function": "minecraft:reference", - "name": "ssbrc:init/preset/hybrid" + "name": "ssbrc:init/tooltip/ability/hybrid" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/item_modifier/fighter/cloud/buster_sword/punisher.json b/data/ssbrc/item_modifier/fighter/cloud/buster_sword/punisher.json index 8e12e48c1a..2f5a62a857 100644 --- a/data/ssbrc/item_modifier/fighter/cloud/buster_sword/punisher.json +++ b/data/ssbrc/item_modifier/fighter/cloud/buster_sword/punisher.json @@ -1,7 +1,7 @@ [ { "function": "minecraft:reference", - "name": "ssbrc:init/preset/hybrid" + "name": "ssbrc:init/tooltip/ability/hybrid" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/item_modifier/fighter/joker/ability.json b/data/ssbrc/item_modifier/fighter/joker/ability.json index 662acd1a6a..e7a8241b6d 100644 --- a/data/ssbrc/item_modifier/fighter/joker/ability.json +++ b/data/ssbrc/item_modifier/fighter/joker/ability.json @@ -5,7 +5,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_custom_data", diff --git a/data/ssbrc/item_modifier/fighter/joker/mask.json b/data/ssbrc/item_modifier/fighter/joker/mask.json index 7c508ae1c7..0b6d45f307 100644 --- a/data/ssbrc/item_modifier/fighter/joker/mask.json +++ b/data/ssbrc/item_modifier/fighter/joker/mask.json @@ -9,7 +9,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/item_modifier/fighter/joker/portrait.json b/data/ssbrc/item_modifier/fighter/joker/portrait.json index ffc44acd0d..0d1af51030 100644 --- a/data/ssbrc/item_modifier/fighter/joker/portrait.json +++ b/data/ssbrc/item_modifier/fighter/joker/portrait.json @@ -5,7 +5,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:reference", diff --git a/data/ssbrc/item_modifier/fighter/link/boomerang.json b/data/ssbrc/item_modifier/fighter/link/boomerang.json index ca829454f5..6802b27b83 100644 --- a/data/ssbrc/item_modifier/fighter/link/boomerang.json +++ b/data/ssbrc/item_modifier/fighter/link/boomerang.json @@ -1,7 +1,7 @@ [ { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:reference", diff --git a/data/ssbrc/item_modifier/fighter/link/master_sword/disable.json b/data/ssbrc/item_modifier/fighter/link/master_sword/disable.json index cfd65aab53..57d4b73c6b 100644 --- a/data/ssbrc/item_modifier/fighter/link/master_sword/disable.json +++ b/data/ssbrc/item_modifier/fighter/link/master_sword/disable.json @@ -1,10 +1,4 @@ -[ - { - "function": "minecraft:reference", - "name": "ssbrc:init/ability/disable" - }, - { - "function": "minecraft:set_custom_data", - "tag": "{awakened:\"false\"}" - } -] +{ + "function": "minecraft:set_custom_data", + "tag": "{awakened:\"false\"}" +} diff --git a/data/ssbrc/item_modifier/fighter/link/master_sword/enable.json b/data/ssbrc/item_modifier/fighter/link/master_sword/enable.json index 0f168f0690..5079ce98c2 100644 --- a/data/ssbrc/item_modifier/fighter/link/master_sword/enable.json +++ b/data/ssbrc/item_modifier/fighter/link/master_sword/enable.json @@ -1,7 +1,7 @@ [ { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/coas/hybrid" }, { "function": "minecraft:set_custom_data", diff --git a/data/ssbrc/item_modifier/fighter/samus/arm_cannon.json b/data/ssbrc/item_modifier/fighter/samus/arm_cannon.json index 5012b68ffa..8fdab149ac 100644 --- a/data/ssbrc/item_modifier/fighter/samus/arm_cannon.json +++ b/data/ssbrc/item_modifier/fighter/samus/arm_cannon.json @@ -5,11 +5,11 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/coas" + "name": "ssbrc:init/ability/cooldown" }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_custom_data", diff --git a/data/ssbrc/item_modifier/fighter/sora/keyblades/init.json b/data/ssbrc/item_modifier/fighter/sora/keyblades/init.json index a3717d43d7..c048b70493 100644 --- a/data/ssbrc/item_modifier/fighter/sora/keyblades/init.json +++ b/data/ssbrc/item_modifier/fighter/sora/keyblades/init.json @@ -29,7 +29,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/cooldown" }, { "function": "minecraft:set_custom_data", diff --git a/data/ssbrc/item_modifier/fighter/steve/pickaxe.json b/data/ssbrc/item_modifier/fighter/steve/pickaxe.json index 0775116679..7362680cbe 100644 --- a/data/ssbrc/item_modifier/fighter/steve/pickaxe.json +++ b/data/ssbrc/item_modifier/fighter/steve/pickaxe.json @@ -9,7 +9,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/item_modifier/fighter/yar/railgun.json b/data/ssbrc/item_modifier/fighter/yar/railgun.json index 603a3ad224..7dca1867b6 100644 --- a/data/ssbrc/item_modifier/fighter/yar/railgun.json +++ b/data/ssbrc/item_modifier/fighter/yar/railgun.json @@ -5,6 +5,6 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" } ] diff --git a/data/ssbrc/item_modifier/fighter/zelda/passive_item.json b/data/ssbrc/item_modifier/fighter/zelda/passive_item.json index 46fef0d5ce..282bb3eeec 100644 --- a/data/ssbrc/item_modifier/fighter/zelda/passive_item.json +++ b/data/ssbrc/item_modifier/fighter/zelda/passive_item.json @@ -5,7 +5,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_custom_data", diff --git a/data/ssbrc/item_modifier/init/ability/coas.json b/data/ssbrc/item_modifier/init/ability/coas.json deleted file mode 100644 index cdf37807e9..0000000000 --- a/data/ssbrc/item_modifier/init/ability/coas.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "function": "minecraft:set_components", - "components": { - "minecraft:damage": 0, - "max_stack_size": 1 - } -} diff --git a/data/ssbrc/item_modifier/init/ability/coas/charge.json b/data/ssbrc/item_modifier/init/ability/coas/charge.json new file mode 100644 index 0000000000..ab320133e7 --- /dev/null +++ b/data/ssbrc/item_modifier/init/ability/coas/charge.json @@ -0,0 +1,10 @@ +[ + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/cooldown" + }, + { + "function": "minecraft:set_custom_data", + "tag": "{chargable:\"true\"}" + } +] diff --git a/data/ssbrc/item_modifier/init/ability/coas/hybrid.json b/data/ssbrc/item_modifier/init/ability/coas/hybrid.json new file mode 100644 index 0000000000..1ae00fb9a9 --- /dev/null +++ b/data/ssbrc/item_modifier/init/ability/coas/hybrid.json @@ -0,0 +1,10 @@ +[ + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/coas/charge" + }, + { + "function": "minecraft:set_custom_data", + "tag": "{hybrid_charge:\"true\"}" + } +] diff --git a/data/ssbrc/item_modifier/init/animation/smooth.json b/data/ssbrc/item_modifier/init/ability/stats.json similarity index 80% rename from data/ssbrc/item_modifier/init/animation/smooth.json rename to data/ssbrc/item_modifier/init/ability/stats.json index c8a9098ce7..9e52d0c980 100644 --- a/data/ssbrc/item_modifier/init/animation/smooth.json +++ b/data/ssbrc/item_modifier/init/ability/stats.json @@ -7,14 +7,14 @@ { "type": "minecraft:attack_damage", "id": "ssbrc:attack_damage", - "amount": 0, - "operation": "add_multiplied_base", + "amount": -1, + "operation": "add_multiplied_total", "slot": "mainhand" }, { "type": "minecraft:attack_speed", "id": "ssbrc:attack_speed", - "amount": 0, + "amount": 3, "operation": "add_multiplied_base", "slot": "mainhand" } diff --git a/data/ssbrc/item_modifier/init/animation/instant.json b/data/ssbrc/item_modifier/init/animation/instant.json deleted file mode 100644 index 81f0475f80..0000000000 --- a/data/ssbrc/item_modifier/init/animation/instant.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "function": "minecraft:set_components", - "components": { - "minecraft:attribute_modifiers": { - "modifiers": [ - { - "type": "minecraft:attack_damage", - "id": "ssbrc:attack_damage", - "amount": 0, - "operation": "add_multiplied_base", - "slot": "mainhand" - }, - { - "type": "minecraft:attack_speed", - "id": "ssbrc:attack_speed", - "amount": -1024, - "operation": "add_multiplied_base", - "slot": "mainhand" - } - ], - "show_in_tooltip": false - } - } - } -] diff --git a/data/ssbrc/item_modifier/init/preset/defensive.json b/data/ssbrc/item_modifier/init/preset/defensive.json index 3b29e1464f..4270676e83 100644 --- a/data/ssbrc/item_modifier/init/preset/defensive.json +++ b/data/ssbrc/item_modifier/init/preset/defensive.json @@ -5,7 +5,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_components", diff --git a/data/ssbrc/item_modifier/init/preset/gun.json b/data/ssbrc/item_modifier/init/preset/gun.json index 6225391206..b165c3747a 100644 --- a/data/ssbrc/item_modifier/init/preset/gun.json +++ b/data/ssbrc/item_modifier/init/preset/gun.json @@ -1,37 +1,37 @@ -[ - { - "function": "minecraft:reference", - "name": "ssbrc:init/preset/ranged" - }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" - }, - { - "function": "minecraft:set_lore", - "entity": "this", - "lore": [ - { - "text": "- [", - "color": "gray", - "bold": false, - "italic": false, - "extra": [ - { - "keybind": "key.use", - "color": "gray", - "bold": false, - "italic": false - }, - { - "translate": "ssbrc.ability.activate", - "color": "gray", - "bold": false, - "italic": false - } - ] - } - ], - "mode": "append" - } -] +[ + { + "function": "minecraft:reference", + "name": "ssbrc:init/preset/ranged" + }, + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/cooldown" + }, + { + "function": "minecraft:set_lore", + "entity": "this", + "lore": [ + { + "text": "- [", + "color": "gray", + "bold": false, + "italic": false, + "extra": [ + { + "keybind": "key.use", + "color": "gray", + "bold": false, + "italic": false + }, + { + "translate": "ssbrc.ability.activate", + "color": "gray", + "bold": false, + "italic": false + } + ] + } + ], + "mode": "append" + } +] diff --git a/data/ssbrc/item_modifier/init/preset/item/activation.json b/data/ssbrc/item_modifier/init/preset/item/activation.json index 5fd66b8277..f6837d2545 100644 --- a/data/ssbrc/item_modifier/init/preset/item/activation.json +++ b/data/ssbrc/item_modifier/init/preset/item/activation.json @@ -1,18 +1,18 @@ -[ - { - "function": "minecraft:reference", - "name": "ssbrc:init/tooltip/item/activation" - }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/tooltip/activate" - }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/ability/default" - }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" - } -] +[ + { + "function": "minecraft:reference", + "name": "ssbrc:init/tooltip/item/activation" + }, + { + "function": "minecraft:reference", + "name": "ssbrc:init/tooltip/activate" + }, + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/default" + }, + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/stats" + } +] diff --git a/data/ssbrc/item_modifier/init/preset/magic.json b/data/ssbrc/item_modifier/init/preset/magic.json index 648decdac1..048319a847 100644 --- a/data/ssbrc/item_modifier/init/preset/magic.json +++ b/data/ssbrc/item_modifier/init/preset/magic.json @@ -1,10 +1,10 @@ -[ - { - "function": "minecraft:reference", - "name": "ssbrc:init/tooltip/ability/magic" - }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" - } -] +[ + { + "function": "minecraft:reference", + "name": "ssbrc:init/tooltip/ability/magic" + }, + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/stats" + } +] diff --git a/data/ssbrc/item_modifier/init/preset/ranged.json b/data/ssbrc/item_modifier/init/preset/ranged.json index 6f52902a08..27a185f59e 100644 --- a/data/ssbrc/item_modifier/init/preset/ranged.json +++ b/data/ssbrc/item_modifier/init/preset/ranged.json @@ -1,10 +1,10 @@ -[ - { - "function": "minecraft:reference", - "name": "ssbrc:init/tooltip/ability/ranged" - }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" - } -] +[ + { + "function": "minecraft:reference", + "name": "ssbrc:init/tooltip/ability/ranged" + }, + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/stats" + } +] diff --git a/data/ssbrc/item_modifier/init/preset/ui.json b/data/ssbrc/item_modifier/init/preset/ui.json index 5db33233d6..3cfcf5d4bc 100644 --- a/data/ssbrc/item_modifier/init/preset/ui.json +++ b/data/ssbrc/item_modifier/init/preset/ui.json @@ -1,14 +1,14 @@ -[ - { - "function": "minecraft:reference", - "name": "ssbrc:init/tooltip/separator" - }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" - }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" - } -] +[ + { + "function": "minecraft:reference", + "name": "ssbrc:init/tooltip/separator" + }, + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/default" + }, + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/stats" + } +] diff --git a/data/ssbrc/item_modifier/init/pulling.json b/data/ssbrc/item_modifier/init/pulling.json index 20c8e184af..5d3070068e 100644 --- a/data/ssbrc/item_modifier/init/pulling.json +++ b/data/ssbrc/item_modifier/init/pulling.json @@ -1,10 +1,10 @@ -[ - { - "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" - }, - { - "function": "minecraft:set_custom_data", - "tag": "{pulling:\"true\"}" - } -] +[ + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/stats" + }, + { + "function": "minecraft:set_custom_data", + "tag": "{pulling:\"true\"}" + } +] diff --git a/data/ssbrc/loot_table/fighter/altered_beast/electrocution.json b/data/ssbrc/loot_table/fighter/altered_beast/electrocution.json index 5df1b9c629..0fcb7f11dc 100644 --- a/data/ssbrc/loot_table/fighter/altered_beast/electrocution.json +++ b/data/ssbrc/loot_table/fighter/altered_beast/electrocution.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/altered_beast/petrifying_breath.json b/data/ssbrc/loot_table/fighter/altered_beast/petrifying_breath.json index 9dd0b96ce2..8bb8ae68a7 100644 --- a/data/ssbrc/loot_table/fighter/altered_beast/petrifying_breath.json +++ b/data/ssbrc/loot_table/fighter/altered_beast/petrifying_breath.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/altered_beast/sabretooth.json b/data/ssbrc/loot_table/fighter/altered_beast/sabretooth.json index 5508b9f142..ad6bc28189 100644 --- a/data/ssbrc/loot_table/fighter/altered_beast/sabretooth.json +++ b/data/ssbrc/loot_table/fighter/altered_beast/sabretooth.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_components", diff --git a/data/ssbrc/loot_table/fighter/alucard/holy_water.json b/data/ssbrc/loot_table/fighter/alucard/holy_water.json index 6849051d70..8527604228 100644 --- a/data/ssbrc/loot_table/fighter/alucard/holy_water.json +++ b/data/ssbrc/loot_table/fighter/alucard/holy_water.json @@ -55,6 +55,12 @@ ], "mode": "append" }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:max_damage": 300 + } + }, { "function": "minecraft:set_custom_data", "tag": "{item:\"holy_water\"}" diff --git a/data/ssbrc/loot_table/fighter/byleth/failnaught.json b/data/ssbrc/loot_table/fighter/byleth/failnaught.json index cf6274f764..259653d819 100644 --- a/data/ssbrc/loot_table/fighter/byleth/failnaught.json +++ b/data/ssbrc/loot_table/fighter/byleth/failnaught.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/byleth/steed_charge.json b/data/ssbrc/loot_table/fighter/byleth/steed_charge.json index 21c6dcc84b..9141a4cf41 100644 --- a/data/ssbrc/loot_table/fighter/byleth/steed_charge.json +++ b/data/ssbrc/loot_table/fighter/byleth/steed_charge.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/captain_falcon/falcon_charge.json b/data/ssbrc/loot_table/fighter/captain_falcon/falcon_charge.json index c86cf33f33..6a110db947 100644 --- a/data/ssbrc/loot_table/fighter/captain_falcon/falcon_charge.json +++ b/data/ssbrc/loot_table/fighter/captain_falcon/falcon_charge.json @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/captain_falcon/falcon_punch.json b/data/ssbrc/loot_table/fighter/captain_falcon/falcon_punch.json index f582de723f..c64f92552b 100644 --- a/data/ssbrc/loot_table/fighter/captain_falcon/falcon_punch.json +++ b/data/ssbrc/loot_table/fighter/captain_falcon/falcon_punch.json @@ -14,11 +14,11 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/captain_falcon/fists_of_fury.json b/data/ssbrc/loot_table/fighter/captain_falcon/fists_of_fury.json index 9a75678cf1..6c9136beb9 100644 --- a/data/ssbrc/loot_table/fighter/captain_falcon/fists_of_fury.json +++ b/data/ssbrc/loot_table/fighter/captain_falcon/fists_of_fury.json @@ -8,6 +8,14 @@ "type": "minecraft:item", "name": "minecraft:nether_star", "functions": [ + { + "function": "minecraft:reference", + "name": "ssbrc:init/tooltip/ability/melee" + }, + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/default" + }, { "function": "minecraft:set_components", "components": { @@ -29,17 +37,10 @@ } ], "show_in_tooltip": false - } + }, + "minecraft:max_damage": 60 } }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/preset/melee" - }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" - }, { "function": "minecraft:set_lore", "entity": "this", diff --git a/data/ssbrc/loot_table/fighter/cloud/buster_sword.json b/data/ssbrc/loot_table/fighter/cloud/buster_sword.json index 5925864051..77f5b0b8ac 100644 --- a/data/ssbrc/loot_table/fighter/cloud/buster_sword.json +++ b/data/ssbrc/loot_table/fighter/cloud/buster_sword.json @@ -8,6 +8,10 @@ "type": "minecraft:item", "name": "minecraft:nether_star", "functions": [ + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/default" + }, { "function": "minecraft:set_components", "components": { @@ -29,13 +33,10 @@ } ], "show_in_tooltip": false - } + }, + "minecraft:max_damage": 20 } }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" - }, { "function": "minecraft:reference", "name": "ssbrc:fighter/cloud/buster_sword/operator", diff --git a/data/ssbrc/loot_table/fighter/dark_samus/phazon_beam.json b/data/ssbrc/loot_table/fighter/dark_samus/phazon_beam.json index e30c640a44..1cb4765763 100644 --- a/data/ssbrc/loot_table/fighter/dark_samus/phazon_beam.json +++ b/data/ssbrc/loot_table/fighter/dark_samus/phazon_beam.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:set_components", @@ -38,11 +38,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" - }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/unbreakable" + "name": "ssbrc:init/ability/coas/hybrid" }, { "function": "minecraft:set_lore", @@ -109,6 +105,12 @@ ], "mode": "append" }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:max_damage": 10 + } + }, { "function": "minecraft:set_custom_data", "tag": "{item:\"phazon_beam\",path:\"dark_samus/logic/abilities/phazon_beam/check\",damage:1.5}" diff --git a/data/ssbrc/loot_table/fighter/donkey_kong/barrel.json b/data/ssbrc/loot_table/fighter/donkey_kong/barrel.json index 4a8c591676..2f2c38673e 100644 --- a/data/ssbrc/loot_table/fighter/donkey_kong/barrel.json +++ b/data/ssbrc/loot_table/fighter/donkey_kong/barrel.json @@ -10,11 +10,11 @@ "functions": [ { "function": "minecraft:reference", - "name": "ssbrc:init/preset/hybrid" + "name": "ssbrc:init/tooltip/ability/hybrid" }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_components", diff --git a/data/ssbrc/loot_table/fighter/donkey_kong/orange_grenade.json b/data/ssbrc/loot_table/fighter/donkey_kong/orange_grenade.json index d833cee2ca..72c38c9d1b 100644 --- a/data/ssbrc/loot_table/fighter/donkey_kong/orange_grenade.json +++ b/data/ssbrc/loot_table/fighter/donkey_kong/orange_grenade.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/fox/blaster.json b/data/ssbrc/loot_table/fighter/fox/blaster.json index b6406bddb9..7df4e17b8d 100644 --- a/data/ssbrc/loot_table/fighter/fox/blaster.json +++ b/data/ssbrc/loot_table/fighter/fox/blaster.json @@ -14,7 +14,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/coas" + "name": "ssbrc:init/ability/cooldown" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/fox/krazoan_staff.json b/data/ssbrc/loot_table/fighter/fox/krazoan_staff.json index f0b0edcb00..da52241516 100644 --- a/data/ssbrc/loot_table/fighter/fox/krazoan_staff.json +++ b/data/ssbrc/loot_table/fighter/fox/krazoan_staff.json @@ -10,11 +10,11 @@ "functions": [ { "function": "minecraft:reference", - "name": "ssbrc:init/preset/hybrid" + "name": "ssbrc:init/tooltip/ability/hybrid" }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_components", diff --git a/data/ssbrc/loot_table/fighter/fox/reflector.json b/data/ssbrc/loot_table/fighter/fox/reflector.json index cc968d5ef9..f68fa146be 100644 --- a/data/ssbrc/loot_table/fighter/fox/reflector.json +++ b/data/ssbrc/loot_table/fighter/fox/reflector.json @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:reference", diff --git a/data/ssbrc/loot_table/fighter/giegue/pk_beam.json b/data/ssbrc/loot_table/fighter/giegue/pk_beam.json index 28e78e84b8..b0c71ee452 100644 --- a/data/ssbrc/loot_table/fighter/giegue/pk_beam.json +++ b/data/ssbrc/loot_table/fighter/giegue/pk_beam.json @@ -36,7 +36,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/giegue/pk_freeze.json b/data/ssbrc/loot_table/fighter/giegue/pk_freeze.json index ea604e89f7..9708ef809a 100644 --- a/data/ssbrc/loot_table/fighter/giegue/pk_freeze.json +++ b/data/ssbrc/loot_table/fighter/giegue/pk_freeze.json @@ -36,7 +36,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/greninja/night_slash.json b/data/ssbrc/loot_table/fighter/greninja/night_slash.json index 4a26d948d2..4e25ba5f1a 100644 --- a/data/ssbrc/loot_table/fighter/greninja/night_slash.json +++ b/data/ssbrc/loot_table/fighter/greninja/night_slash.json @@ -54,7 +54,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/preset/melee" + "name": "ssbrc:init/tooltip/ability/melee" }, { "function": "minecraft:set_lore", @@ -118,6 +118,7 @@ { "function": "minecraft:set_components", "components": { + "minecraft:max_damage": 40, "minecraft:item_model": "ssbrc:fighter/greninja/item/night_slash" } }, diff --git a/data/ssbrc/loot_table/fighter/greninja/water_shuriken.json b/data/ssbrc/loot_table/fighter/greninja/water_shuriken.json index 36ea800238..f1c45c1d82 100644 --- a/data/ssbrc/loot_table/fighter/greninja/water_shuriken.json +++ b/data/ssbrc/loot_table/fighter/greninja/water_shuriken.json @@ -24,7 +24,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_lore", @@ -56,6 +56,7 @@ { "function": "minecraft:set_components", "components": { + "minecraft:max_damage": 3, "minecraft:item_model": "ssbrc:fighter/greninja/item/water_shuriken" } }, diff --git a/data/ssbrc/loot_table/fighter/hero/spells/bang.json b/data/ssbrc/loot_table/fighter/hero/spells/bang.json index 522d73195f..e537ad5150 100644 --- a/data/ssbrc/loot_table/fighter/hero/spells/bang.json +++ b/data/ssbrc/loot_table/fighter/hero/spells/bang.json @@ -22,7 +22,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/hero/spells/kaclang.json b/data/ssbrc/loot_table/fighter/hero/spells/kaclang.json index bf7e4a0669..039aade65e 100644 --- a/data/ssbrc/loot_table/fighter/hero/spells/kaclang.json +++ b/data/ssbrc/loot_table/fighter/hero/spells/kaclang.json @@ -22,7 +22,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/hero/spells/magic_burst.json b/data/ssbrc/loot_table/fighter/hero/spells/magic_burst.json index e6fa259622..1a965a5d90 100644 --- a/data/ssbrc/loot_table/fighter/hero/spells/magic_burst.json +++ b/data/ssbrc/loot_table/fighter/hero/spells/magic_burst.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/jigglypuff/hyper_voice.json b/data/ssbrc/loot_table/fighter/jigglypuff/hyper_voice.json index 6f22efcbc6..f8fd9c59d6 100644 --- a/data/ssbrc/loot_table/fighter/jigglypuff/hyper_voice.json +++ b/data/ssbrc/loot_table/fighter/jigglypuff/hyper_voice.json @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/jigglypuff/rest.json b/data/ssbrc/loot_table/fighter/jigglypuff/rest.json index 59df8a5512..2eb7269b2b 100644 --- a/data/ssbrc/loot_table/fighter/jigglypuff/rest.json +++ b/data/ssbrc/loot_table/fighter/jigglypuff/rest.json @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/joker/tt33.json b/data/ssbrc/loot_table/fighter/joker/tt33.json index 973db3a51f..cecc1075b5 100644 --- a/data/ssbrc/loot_table/fighter/joker/tt33.json +++ b/data/ssbrc/loot_table/fighter/joker/tt33.json @@ -6,15 +6,21 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:reference", "name": "ssbrc:init/preset/gun" }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:max_damage": 5 + } + }, { "function": "minecraft:set_custom_data", - "tag": "{item:\"tt33\"}" + "tag": "{item:\"tt33\",cooldown:5}" } ] } diff --git a/data/ssbrc/loot_table/fighter/king_k_rool/blunderbuss.json b/data/ssbrc/loot_table/fighter/king_k_rool/blunderbuss.json index ef4e560876..bf13d129d6 100644 --- a/data/ssbrc/loot_table/fighter/king_k_rool/blunderbuss.json +++ b/data/ssbrc/loot_table/fighter/king_k_rool/blunderbuss.json @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/link/boomerang.json b/data/ssbrc/loot_table/fighter/link/boomerang.json index c2d2bb29bf..4f6cc3c0f8 100644 --- a/data/ssbrc/loot_table/fighter/link/boomerang.json +++ b/data/ssbrc/loot_table/fighter/link/boomerang.json @@ -28,6 +28,7 @@ { "function": "minecraft:set_components", "components": { + "minecraft:max_damage": 10, "minecraft:item_model": "ssbrc:fighter/link/item/boomerang" } }, diff --git a/data/ssbrc/loot_table/fighter/link/master_sword.json b/data/ssbrc/loot_table/fighter/link/master_sword.json index 3f60a0e67d..8c70ab2299 100644 --- a/data/ssbrc/loot_table/fighter/link/master_sword.json +++ b/data/ssbrc/loot_table/fighter/link/master_sword.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:set_components", @@ -40,7 +40,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/preset/hybrid" + "name": "ssbrc:init/tooltip/ability/hybrid" }, { "function": "minecraft:set_lore", @@ -105,6 +105,12 @@ "function": "minecraft:reference", "name": "ssbrc:fighter/link/master_sword/enable" }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:max_damage": 20 + } + }, { "function": "minecraft:set_custom_data", "tag": "{item:\"master_sword\",path:\"link/logic/abilities/sword_spin/activate/check\",damage:6}" diff --git a/data/ssbrc/loot_table/fighter/luigi/ice_ball.json b/data/ssbrc/loot_table/fighter/luigi/ice_ball.json index bb1e82945b..1a11d587da 100644 --- a/data/ssbrc/loot_table/fighter/luigi/ice_ball.json +++ b/data/ssbrc/loot_table/fighter/luigi/ice_ball.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:reference", @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/mario/fireball.json b/data/ssbrc/loot_table/fighter/mario/fireball.json index b0f0340912..578612b006 100644 --- a/data/ssbrc/loot_table/fighter/mario/fireball.json +++ b/data/ssbrc/loot_table/fighter/mario/fireball.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:reference", @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/mega_man/air_shooter.json b/data/ssbrc/loot_table/fighter/mega_man/air_shooter.json index f9a23d3c89..d46d9ef262 100644 --- a/data/ssbrc/loot_table/fighter/mega_man/air_shooter.json +++ b/data/ssbrc/loot_table/fighter/mega_man/air_shooter.json @@ -14,7 +14,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/mega_man/beat_call.json b/data/ssbrc/loot_table/fighter/mega_man/beat_call.json index 6a35394a6f..2222197f48 100644 --- a/data/ssbrc/loot_table/fighter/mega_man/beat_call.json +++ b/data/ssbrc/loot_table/fighter/mega_man/beat_call.json @@ -14,7 +14,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/mega_man/drill_bomb.json b/data/ssbrc/loot_table/fighter/mega_man/drill_bomb.json index cb1f187596..ebcd41a606 100644 --- a/data/ssbrc/loot_table/fighter/mega_man/drill_bomb.json +++ b/data/ssbrc/loot_table/fighter/mega_man/drill_bomb.json @@ -14,7 +14,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/mega_man/hyper_bomb.json b/data/ssbrc/loot_table/fighter/mega_man/hyper_bomb.json index 4510c89866..8de1972b74 100644 --- a/data/ssbrc/loot_table/fighter/mega_man/hyper_bomb.json +++ b/data/ssbrc/loot_table/fighter/mega_man/hyper_bomb.json @@ -14,7 +14,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/mega_man/junk_shield.json b/data/ssbrc/loot_table/fighter/mega_man/junk_shield.json index 8764469723..872e7351eb 100644 --- a/data/ssbrc/loot_table/fighter/mega_man/junk_shield.json +++ b/data/ssbrc/loot_table/fighter/mega_man/junk_shield.json @@ -24,7 +24,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/mega_man/mega_buster.json b/data/ssbrc/loot_table/fighter/mega_man/mega_buster.json index 82a4801744..f6e33188d4 100644 --- a/data/ssbrc/loot_table/fighter/mega_man/mega_buster.json +++ b/data/ssbrc/loot_table/fighter/mega_man/mega_buster.json @@ -14,7 +14,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/coas" + "name": "ssbrc:init/ability/cooldown" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/mega_man/metal_blade.json b/data/ssbrc/loot_table/fighter/mega_man/metal_blade.json index 77d42e81c1..c60a51d7e1 100644 --- a/data/ssbrc/loot_table/fighter/mega_man/metal_blade.json +++ b/data/ssbrc/loot_table/fighter/mega_man/metal_blade.json @@ -14,7 +14,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/mega_man/remote_mine.json b/data/ssbrc/loot_table/fighter/mega_man/remote_mine.json index c1462dcecf..cf1b25a3df 100644 --- a/data/ssbrc/loot_table/fighter/mega_man/remote_mine.json +++ b/data/ssbrc/loot_table/fighter/mega_man/remote_mine.json @@ -14,7 +14,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/ness/pk_fire.json b/data/ssbrc/loot_table/fighter/ness/pk_fire.json index c9f8b14564..0d6c6aa9bd 100644 --- a/data/ssbrc/loot_table/fighter/ness/pk_fire.json +++ b/data/ssbrc/loot_table/fighter/ness/pk_fire.json @@ -36,7 +36,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/ness/pk_flash.json b/data/ssbrc/loot_table/fighter/ness/pk_flash.json index fc82a47171..864fd14b09 100644 --- a/data/ssbrc/loot_table/fighter/ness/pk_flash.json +++ b/data/ssbrc/loot_table/fighter/ness/pk_flash.json @@ -36,7 +36,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/pikachu/electric_terrain.json b/data/ssbrc/loot_table/fighter/pikachu/electric_terrain.json index 008323c578..0066892af1 100644 --- a/data/ssbrc/loot_table/fighter/pikachu/electric_terrain.json +++ b/data/ssbrc/loot_table/fighter/pikachu/electric_terrain.json @@ -24,7 +24,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:reference", diff --git a/data/ssbrc/loot_table/fighter/pikachu/thunder_jolt.json b/data/ssbrc/loot_table/fighter/pikachu/thunder_jolt.json index 432ef3fef6..8f180ae106 100644 --- a/data/ssbrc/loot_table/fighter/pikachu/thunder_jolt.json +++ b/data/ssbrc/loot_table/fighter/pikachu/thunder_jolt.json @@ -24,7 +24,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:reference", diff --git a/data/ssbrc/loot_table/fighter/pokemon_trainer/earthquake.json b/data/ssbrc/loot_table/fighter/pokemon_trainer/earthquake.json index cfa9f4f415..d3568ce746 100644 --- a/data/ssbrc/loot_table/fighter/pokemon_trainer/earthquake.json +++ b/data/ssbrc/loot_table/fighter/pokemon_trainer/earthquake.json @@ -24,11 +24,11 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/pokemon_trainer/flare_blitz.json b/data/ssbrc/loot_table/fighter/pokemon_trainer/flare_blitz.json index b142d75c6a..d28e2a14fa 100644 --- a/data/ssbrc/loot_table/fighter/pokemon_trainer/flare_blitz.json +++ b/data/ssbrc/loot_table/fighter/pokemon_trainer/flare_blitz.json @@ -24,11 +24,11 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/pokemon_trainer/leech_seed.json b/data/ssbrc/loot_table/fighter/pokemon_trainer/leech_seed.json index 2a0e24258c..326cf6e9a0 100644 --- a/data/ssbrc/loot_table/fighter/pokemon_trainer/leech_seed.json +++ b/data/ssbrc/loot_table/fighter/pokemon_trainer/leech_seed.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/pokemon_trainer/poison_powder.json b/data/ssbrc/loot_table/fighter/pokemon_trainer/poison_powder.json index f9b3a98ef1..df40810631 100644 --- a/data/ssbrc/loot_table/fighter/pokemon_trainer/poison_powder.json +++ b/data/ssbrc/loot_table/fighter/pokemon_trainer/poison_powder.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/pokemon_trainer/water_gun.json b/data/ssbrc/loot_table/fighter/pokemon_trainer/water_gun.json index 285a835d92..ae404f0858 100644 --- a/data/ssbrc/loot_table/fighter/pokemon_trainer/water_gun.json +++ b/data/ssbrc/loot_table/fighter/pokemon_trainer/water_gun.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/rob/robo_beam.json b/data/ssbrc/loot_table/fighter/rob/robo_beam.json index 4525d23d5f..f3f7ea71db 100644 --- a/data/ssbrc/loot_table/fighter/rob/robo_beam.json +++ b/data/ssbrc/loot_table/fighter/rob/robo_beam.json @@ -14,7 +14,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_lore", @@ -55,6 +55,12 @@ ], "mode": "append" }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:max_damage": 20 + } + }, { "function": "minecraft:set_custom_data", "tag": "{item:\"robo_beam\"}" diff --git a/data/ssbrc/loot_table/fighter/ryu/collarbone_breaker.json b/data/ssbrc/loot_table/fighter/ryu/collarbone_breaker.json index da0642877e..0bc363ce20 100644 --- a/data/ssbrc/loot_table/fighter/ryu/collarbone_breaker.json +++ b/data/ssbrc/loot_table/fighter/ryu/collarbone_breaker.json @@ -34,7 +34,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/preset/hybrid" + "name": "ssbrc:init/tooltip/ability/hybrid" }, { "function": "minecraft:reference", diff --git a/data/ssbrc/loot_table/fighter/shadow/chaos_blast.json b/data/ssbrc/loot_table/fighter/shadow/chaos_blast.json index eac4747ac0..55a8515c78 100644 --- a/data/ssbrc/loot_table/fighter/shadow/chaos_blast.json +++ b/data/ssbrc/loot_table/fighter/shadow/chaos_blast.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/shadow/chaos_control.json b/data/ssbrc/loot_table/fighter/shadow/chaos_control.json index 38e3f03bb6..e55c138a27 100644 --- a/data/ssbrc/loot_table/fighter/shadow/chaos_control.json +++ b/data/ssbrc/loot_table/fighter/shadow/chaos_control.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/shadow/chaos_spear.json b/data/ssbrc/loot_table/fighter/shadow/chaos_spear.json index 4dc6ad1059..a27faefde2 100644 --- a/data/ssbrc/loot_table/fighter/shadow/chaos_spear.json +++ b/data/ssbrc/loot_table/fighter/shadow/chaos_spear.json @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", @@ -54,7 +54,7 @@ { "function": "minecraft:set_components", "components": { - "minecraft:max_damage": 20 + "minecraft:max_damage": 35 } }, { diff --git a/data/ssbrc/loot_table/fighter/shovel_knight/chaos_sphere.json b/data/ssbrc/loot_table/fighter/shovel_knight/chaos_sphere.json index b7e5299c89..292ec18503 100644 --- a/data/ssbrc/loot_table/fighter/shovel_knight/chaos_sphere.json +++ b/data/ssbrc/loot_table/fighter/shovel_knight/chaos_sphere.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/shovel_knight/flare_wand.json b/data/ssbrc/loot_table/fighter/shovel_knight/flare_wand.json index f5ba1134ca..4fa76e496b 100644 --- a/data/ssbrc/loot_table/fighter/shovel_knight/flare_wand.json +++ b/data/ssbrc/loot_table/fighter/shovel_knight/flare_wand.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/shovel_knight/phase_locket.json b/data/ssbrc/loot_table/fighter/shovel_knight/phase_locket.json index 957689154e..2f1c523417 100644 --- a/data/ssbrc/loot_table/fighter/shovel_knight/phase_locket.json +++ b/data/ssbrc/loot_table/fighter/shovel_knight/phase_locket.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/shovel_knight/propeller_dagger.json b/data/ssbrc/loot_table/fighter/shovel_knight/propeller_dagger.json index 97024d1f9f..a81c650e38 100644 --- a/data/ssbrc/loot_table/fighter/shovel_knight/propeller_dagger.json +++ b/data/ssbrc/loot_table/fighter/shovel_knight/propeller_dagger.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/shovel_knight/throwing_anchor.json b/data/ssbrc/loot_table/fighter/shovel_knight/throwing_anchor.json index 2257738338..9a0c02d567 100644 --- a/data/ssbrc/loot_table/fighter/shovel_knight/throwing_anchor.json +++ b/data/ssbrc/loot_table/fighter/shovel_knight/throwing_anchor.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/shovel_knight/war_horn/default.json b/data/ssbrc/loot_table/fighter/shovel_knight/war_horn/default.json index abae349e55..1edecab93c 100644 --- a/data/ssbrc/loot_table/fighter/shovel_knight/war_horn/default.json +++ b/data/ssbrc/loot_table/fighter/shovel_knight/war_horn/default.json @@ -24,7 +24,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/shovel_knight/war_horn/disabled.json b/data/ssbrc/loot_table/fighter/shovel_knight/war_horn/disabled.json index 36be3b5b91..b098cc18b1 100644 --- a/data/ssbrc/loot_table/fighter/shovel_knight/war_horn/disabled.json +++ b/data/ssbrc/loot_table/fighter/shovel_knight/war_horn/disabled.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/snake/anti_personnel_mine.json b/data/ssbrc/loot_table/fighter/snake/anti_personnel_mine.json index e653f0d81c..6b57f735df 100644 --- a/data/ssbrc/loot_table/fighter/snake/anti_personnel_mine.json +++ b/data/ssbrc/loot_table/fighter/snake/anti_personnel_mine.json @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/snake/famas.json b/data/ssbrc/loot_table/fighter/snake/famas.json index 0b36eb6883..5102204164 100644 --- a/data/ssbrc/loot_table/fighter/snake/famas.json +++ b/data/ssbrc/loot_table/fighter/snake/famas.json @@ -6,12 +6,18 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:reference", "name": "ssbrc:init/preset/gun" }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:max_damage": 4 + } + }, { "function": "minecraft:set_custom_data", "tag": "{item:\"famas\",group:\"snake.weapon\"}" diff --git a/data/ssbrc/loot_table/fighter/snake/psg1.json b/data/ssbrc/loot_table/fighter/snake/psg1.json index 43cc46a13e..aa7b56eeea 100644 --- a/data/ssbrc/loot_table/fighter/snake/psg1.json +++ b/data/ssbrc/loot_table/fighter/snake/psg1.json @@ -6,12 +6,18 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:reference", "name": "ssbrc:init/preset/gun" }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:max_damage": 20 + } + }, { "function": "minecraft:set_custom_data", "tag": "{item:\"psg1\",group:\"snake.weapon\"}" diff --git a/data/ssbrc/loot_table/fighter/snake/s1000.json b/data/ssbrc/loot_table/fighter/snake/s1000.json index f8e34232a6..e36c070f24 100644 --- a/data/ssbrc/loot_table/fighter/snake/s1000.json +++ b/data/ssbrc/loot_table/fighter/snake/s1000.json @@ -6,12 +6,18 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:reference", "name": "ssbrc:init/preset/gun" }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:max_damage": 20 + } + }, { "function": "minecraft:set_custom_data", "tag": "{item:\"s1000\",group:\"snake.weapon\"}" diff --git a/data/ssbrc/loot_table/fighter/snake/smoke_grenade.json b/data/ssbrc/loot_table/fighter/snake/smoke_grenade.json index 1de0fcf919..f08f5c0488 100644 --- a/data/ssbrc/loot_table/fighter/snake/smoke_grenade.json +++ b/data/ssbrc/loot_table/fighter/snake/smoke_grenade.json @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/snake/socom.json b/data/ssbrc/loot_table/fighter/snake/socom.json index 5f80d1d9d8..d5bc022dd3 100644 --- a/data/ssbrc/loot_table/fighter/snake/socom.json +++ b/data/ssbrc/loot_table/fighter/snake/socom.json @@ -6,12 +6,18 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:reference", "name": "ssbrc:init/preset/gun" }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:max_damage": 5 + } + }, { "function": "minecraft:set_custom_data", "tag": "{item:\"socom\",group:\"snake.weapon\"}" diff --git a/data/ssbrc/loot_table/fighter/snake/status/detected.json b/data/ssbrc/loot_table/fighter/snake/status/detected.json index 6ed1308313..ba9a8cfd6a 100644 --- a/data/ssbrc/loot_table/fighter/snake/status/detected.json +++ b/data/ssbrc/loot_table/fighter/snake/status/detected.json @@ -24,7 +24,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/snake/status/undetected.json b/data/ssbrc/loot_table/fighter/snake/status/undetected.json index d0537f4432..9d33146e71 100644 --- a/data/ssbrc/loot_table/fighter/snake/status/undetected.json +++ b/data/ssbrc/loot_table/fighter/snake/status/undetected.json @@ -24,7 +24,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/sora/keyblade_primary.json b/data/ssbrc/loot_table/fighter/sora/keyblade_primary.json index d0b26b1532..dc7beb70f1 100644 --- a/data/ssbrc/loot_table/fighter/sora/keyblade_primary.json +++ b/data/ssbrc/loot_table/fighter/sora/keyblade_primary.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:reference", diff --git a/data/ssbrc/loot_table/fighter/sora/keyblade_secondary.json b/data/ssbrc/loot_table/fighter/sora/keyblade_secondary.json index 920ddb80e5..281c331413 100644 --- a/data/ssbrc/loot_table/fighter/sora/keyblade_secondary.json +++ b/data/ssbrc/loot_table/fighter/sora/keyblade_secondary.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:reference", diff --git a/data/ssbrc/loot_table/fighter/sora/keyblade_strike_raid.json b/data/ssbrc/loot_table/fighter/sora/keyblade_strike_raid.json index 2e02c2c4bc..4077dc84c7 100644 --- a/data/ssbrc/loot_table/fighter/sora/keyblade_strike_raid.json +++ b/data/ssbrc/loot_table/fighter/sora/keyblade_strike_raid.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:reference", diff --git a/data/ssbrc/loot_table/fighter/sora/keyblade_wisdom.json b/data/ssbrc/loot_table/fighter/sora/keyblade_wisdom.json index d0b26b1532..dc7beb70f1 100644 --- a/data/ssbrc/loot_table/fighter/sora/keyblade_wisdom.json +++ b/data/ssbrc/loot_table/fighter/sora/keyblade_wisdom.json @@ -6,7 +6,7 @@ "entries": [ { "type": "minecraft:item", - "name": "minecraft:nether_star", + "name": "minecraft:carrot_on_a_stick", "functions": [ { "function": "minecraft:reference", diff --git a/data/ssbrc/loot_table/fighter/team_rocket/arbok/acid.json b/data/ssbrc/loot_table/fighter/team_rocket/arbok/acid.json index 451a1cfde5..9fb3890be3 100644 --- a/data/ssbrc/loot_table/fighter/team_rocket/arbok/acid.json +++ b/data/ssbrc/loot_table/fighter/team_rocket/arbok/acid.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/team_rocket/meowth/fury_swipes.json b/data/ssbrc/loot_table/fighter/team_rocket/meowth/fury_swipes.json index 3da2069ed5..baf014e6ea 100644 --- a/data/ssbrc/loot_table/fighter/team_rocket/meowth/fury_swipes.json +++ b/data/ssbrc/loot_table/fighter/team_rocket/meowth/fury_swipes.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/team_rocket/meowth/payday.json b/data/ssbrc/loot_table/fighter/team_rocket/meowth/payday.json index d99fa15dbf..a18e8c0b74 100644 --- a/data/ssbrc/loot_table/fighter/team_rocket/meowth/payday.json +++ b/data/ssbrc/loot_table/fighter/team_rocket/meowth/payday.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/team_rocket/wobbuffet/destiny_bond.json b/data/ssbrc/loot_table/fighter/team_rocket/wobbuffet/destiny_bond.json index 783dc7790c..80ac0e7be9 100644 --- a/data/ssbrc/loot_table/fighter/team_rocket/wobbuffet/destiny_bond.json +++ b/data/ssbrc/loot_table/fighter/team_rocket/wobbuffet/destiny_bond.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/team_rocket/wobbuffet/splash.json b/data/ssbrc/loot_table/fighter/team_rocket/wobbuffet/splash.json index 314e1dc62c..211d88b755 100644 --- a/data/ssbrc/loot_table/fighter/team_rocket/wobbuffet/splash.json +++ b/data/ssbrc/loot_table/fighter/team_rocket/wobbuffet/splash.json @@ -24,11 +24,11 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/wolf/blaster.json b/data/ssbrc/loot_table/fighter/wolf/blaster.json index 0d4e8baa87..bba6a8028d 100644 --- a/data/ssbrc/loot_table/fighter/wolf/blaster.json +++ b/data/ssbrc/loot_table/fighter/wolf/blaster.json @@ -14,7 +14,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" + "name": "ssbrc:init/ability/default" }, { "function": "minecraft:set_lore", @@ -43,6 +43,12 @@ ], "mode": "append" }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:max_damage": 40 + } + }, { "function": "minecraft:set_custom_data", "tag": "{item:\"wolf.blaster\"}" diff --git a/data/ssbrc/loot_table/fighter/wolf/grenade.json b/data/ssbrc/loot_table/fighter/wolf/grenade.json index 3972f1db89..c31bd05fcf 100644 --- a/data/ssbrc/loot_table/fighter/wolf/grenade.json +++ b/data/ssbrc/loot_table/fighter/wolf/grenade.json @@ -62,6 +62,7 @@ { "function": "minecraft:set_components", "components": { + "minecraft:max_damage": 20, "minecraft:item_model": "ssbrc:fighter/wolf/item/grenade/default" } }, diff --git a/data/ssbrc/loot_table/fighter/wolf/wolf_slash.json b/data/ssbrc/loot_table/fighter/wolf/wolf_slash.json index f0fab3ef88..bba8db92c2 100644 --- a/data/ssbrc/loot_table/fighter/wolf/wolf_slash.json +++ b/data/ssbrc/loot_table/fighter/wolf/wolf_slash.json @@ -8,6 +8,14 @@ "type": "minecraft:item", "name": "minecraft:nether_star", "functions": [ + { + "function": "minecraft:reference", + "name": "ssbrc:init/tooltip/ability/hybrid" + }, + { + "function": "minecraft:reference", + "name": "ssbrc:init/ability/default" + }, { "function": "minecraft:set_components", "components": { @@ -29,17 +37,10 @@ } ], "show_in_tooltip": false - } + }, + "minecraft:max_damage": 80 } }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/preset/hybrid" - }, - { - "function": "minecraft:reference", - "name": "ssbrc:init/ability/charge" - }, { "function": "minecraft:set_lore", "entity": "this", diff --git a/data/ssbrc/loot_table/fighter/yar/drone.json b/data/ssbrc/loot_table/fighter/yar/drone.json index fcf9ea4a01..a5749c6963 100644 --- a/data/ssbrc/loot_table/fighter/yar/drone.json +++ b/data/ssbrc/loot_table/fighter/yar/drone.json @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/yar/power_ups/omnishot.json b/data/ssbrc/loot_table/fighter/yar/power_ups/omnishot.json index 27279510c2..566e975f66 100644 --- a/data/ssbrc/loot_table/fighter/yar/power_ups/omnishot.json +++ b/data/ssbrc/loot_table/fighter/yar/power_ups/omnishot.json @@ -45,7 +45,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_components", diff --git a/data/ssbrc/loot_table/fighter/yar/railgun.json b/data/ssbrc/loot_table/fighter/yar/railgun.json index 31de0a101e..82fb198d7a 100644 --- a/data/ssbrc/loot_table/fighter/yar/railgun.json +++ b/data/ssbrc/loot_table/fighter/yar/railgun.json @@ -18,7 +18,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/yar/ray_blaster.json b/data/ssbrc/loot_table/fighter/yar/ray_blaster.json index cf6df8f69f..7400ca7636 100644 --- a/data/ssbrc/loot_table/fighter/yar/ray_blaster.json +++ b/data/ssbrc/loot_table/fighter/yar/ray_blaster.json @@ -14,7 +14,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/ability/coas" + "name": "ssbrc:init/ability/cooldown" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/zelda/boomerang.json b/data/ssbrc/loot_table/fighter/zelda/boomerang.json index 7b1ede3b55..0a95e81029 100644 --- a/data/ssbrc/loot_table/fighter/zelda/boomerang.json +++ b/data/ssbrc/loot_table/fighter/zelda/boomerang.json @@ -29,6 +29,7 @@ { "function": "minecraft:set_components", "components": { + "minecraft:max_damage": 10, "minecraft:item_model": "ssbrc:fighter/zelda/item/boomerang" } }, diff --git a/data/ssbrc/loot_table/fighter/zelda/great_fairy_blessing.json b/data/ssbrc/loot_table/fighter/zelda/great_fairy_blessing.json index c06f15c409..d09b23d661 100644 --- a/data/ssbrc/loot_table/fighter/zelda/great_fairy_blessing.json +++ b/data/ssbrc/loot_table/fighter/zelda/great_fairy_blessing.json @@ -28,7 +28,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/zelda/inventory_refresh.json b/data/ssbrc/loot_table/fighter/zelda/inventory_refresh.json index 0ce7a82aa9..87a82b1b13 100644 --- a/data/ssbrc/loot_table/fighter/zelda/inventory_refresh.json +++ b/data/ssbrc/loot_table/fighter/zelda/inventory_refresh.json @@ -24,7 +24,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/instant" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/loot_table/fighter/zelda/magic_boomerang.json b/data/ssbrc/loot_table/fighter/zelda/magic_boomerang.json index 1ed0abd730..5c2fd99d6d 100644 --- a/data/ssbrc/loot_table/fighter/zelda/magic_boomerang.json +++ b/data/ssbrc/loot_table/fighter/zelda/magic_boomerang.json @@ -46,6 +46,7 @@ { "function": "minecraft:set_components", "components": { + "minecraft:max_damage": 10, "minecraft:item_model": "ssbrc:fighter/zelda/item/magic_boomerang" } }, diff --git a/data/ssbrc/loot_table/fighter/zelda/red_potion.json b/data/ssbrc/loot_table/fighter/zelda/red_potion.json index a84ff39861..33ebd0b996 100644 --- a/data/ssbrc/loot_table/fighter/zelda/red_potion.json +++ b/data/ssbrc/loot_table/fighter/zelda/red_potion.json @@ -24,7 +24,7 @@ }, { "function": "minecraft:reference", - "name": "ssbrc:init/animation/smooth" + "name": "ssbrc:init/ability/stats" }, { "function": "minecraft:set_lore", diff --git a/data/ssbrc/predicate/universal_cooldown.json b/data/ssbrc/predicate/universal_cooldown.json new file mode 100644 index 0000000000..72787ed67d --- /dev/null +++ b/data/ssbrc/predicate/universal_cooldown.json @@ -0,0 +1,24 @@ +[ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "nbt": "{Tags:[\"silenced\"]}" + } + } + }, + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "cooldown": { + "max": 0 + }, + "immobile": { + "max": 0 + } + } + } +] diff --git a/data/ssbrc/structure/lobby.nbt b/data/ssbrc/structure/lobby.nbt deleted file mode 100644 index 747d0144b4..0000000000 Binary files a/data/ssbrc/structure/lobby.nbt and /dev/null differ diff --git a/data/ssbrc/structure/lobby/default.nbt b/data/ssbrc/structure/lobby/default.nbt new file mode 100644 index 0000000000..6ba79b90ff Binary files /dev/null and b/data/ssbrc/structure/lobby/default.nbt differ diff --git a/data/ssbrc/structure/lobby/winter.nbt b/data/ssbrc/structure/lobby/winter.nbt new file mode 100644 index 0000000000..c9ec6bbd3a Binary files /dev/null and b/data/ssbrc/structure/lobby/winter.nbt differ diff --git a/data/ssbrc/tags/item/equipment.json b/data/ssbrc/tags/item/equipment.json index 38e03169cb..dab714c683 100644 --- a/data/ssbrc/tags/item/equipment.json +++ b/data/ssbrc/tags/item/equipment.json @@ -1,16 +1,6 @@ { "values": [ - "#minecraft:axes", - "#minecraft:shovels", - "#minecraft:swords", - "minecraft:bow", - "minecraft:carrot_on_a_stick", - "minecraft:crossbow", - "minecraft:goat_horn", - "minecraft:gunpowder", - "minecraft:nether_star", - "minecraft:paper", - "minecraft:shield", - "minecraft:string" + "#ssbrc:equipment_no_coas", + "minecraft:carrot_on_a_stick" ] } diff --git a/data/ssbrc/tags/item/equipment_no_coas.json b/data/ssbrc/tags/item/equipment_no_coas.json new file mode 100644 index 0000000000..60d0fee9c0 --- /dev/null +++ b/data/ssbrc/tags/item/equipment_no_coas.json @@ -0,0 +1,15 @@ +{ + "values": [ + "#minecraft:axes", + "#minecraft:shovels", + "#minecraft:swords", + "minecraft:bow", + "minecraft:crossbow", + "minecraft:goat_horn", + "minecraft:gunpowder", + "minecraft:nether_star", + "minecraft:paper", + "minecraft:shield", + "minecraft:string" + ] +} diff --git a/spyglass.json b/spyglass.json index 879ddc395d..d52e2d68d2 100644 --- a/spyglass.json +++ b/spyglass.json @@ -1,5 +1,5 @@ -{ - "env": { - "gameVersion": "Latest Snapshot" - } -} +{ + "env": { + "gameVersion": "Latest Release" + } +}