Skip to content

Commit

Permalink
Asset Files for SaltMons v12
Browse files Browse the repository at this point in the history 
Changelog:
- Adds Kyurem
- Fixes some minor textures on Heatran
- Brand new idle animation for Lopunny-Mega, sped up the walking animation for Lopunny-Mega, and improved idle animation for Samurott-Hisui
  • Loading branch information
@Salt-Kitchen
Salt-Kitchen committed Sep 14, 2023
1 parent 00c5dcb commit f99ca8c
Show file tree
Hide file tree
Showing 11 changed files with 657 additions and 35 deletions.
162 changes: 162 additions & 0 deletions resourcepacks/assets/cobblemon/bedrock/animations/kyurem/kyurem.animation.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
{
"format_version": "1.8.0",
"animations": {
"animation.kyurem.ground_walk": {
"loop": true,
"bones": {
"body": {
"rotation": ["-330 + Math.cos((query.anim_time) * 180) * 1.5", 0, 0],
"position": [0, "(math.sin(q.anim_time*360)*0.3)", "(math.sin(q.anim_time*180)*0.1)"]
},
"body2": {
"rotation": ["355 + Math.cos((query.anim_time) * 360) * 1", 0, 0]
},
"body3": {
"rotation": ["-12.5 - Math.cos((query.anim_time) * 180) * 1", 0, 0]
},
"neck": {
"rotation": [-7.5, 0, 0]
},
"head": {
"rotation": ["-365 + math.sin(q.anim_time*180) * 2", 0, 0]
},
"top": {
"rotation": [0, 0, 0]
},
"armleft": {
"rotation": ["15.0005 + Math.cos((query.anim_time) * 180) * 3.5", 31.99975, "26.824 + Math.cos((query.anim_time) * 180) * 5"]
},
"left_elbow": {
"rotation": [0, 42.5, 0]
},
"finger1": {
"rotation": [0, 15, 0]
},
"finger2": {
"rotation": [0, -15, 0]
},
"armright": {
"rotation": ["15.0005 + Math.cos((query.anim_time) * 180) * 3.5", -31.99975, "-26.824 + Math.cos((query.anim_time) * 180) * 8"]
},
"right_elbow": {
"rotation": [0, -42.5, 0]
},
"finger3": {
"rotation": [0, -15, 0]
},
"finger4": {
"rotation": [0, 15, 0]
},
"left": {
"rotation": ["0-math.sin(q.anim_time*180*1)*20", 0, 0],
"position": [0, 0, "0-math.sin(q.anim_time*180*1)*0.7"]
},
"leftfoot": {
"rotation": ["math.sin((q.anim_time - 0.5) * 180)* 16", 0, 0]
},
"right": {
"rotation": ["math.sin(q.anim_time*180*1)* 20", 0, 0],
"position": [0, 0, "0+math.sin(q.anim_time*180*1)*0.7"]
},
"rightfoot": {
"rotation": ["math.sin((q.anim_time - 1.4) * 180)* 16", 0, 0]
}
}
},
"animation.kyurem.ground_idle": {
"loop": true,
"bones": {
"body": {
"rotation": ["-330 + Math.cos((query.anim_time) * 120) * 1.5", 0, 0]
},
"body2": {
"rotation": [355, 0, 0]
},
"body3": {
"rotation": ["-12.5 - Math.cos((query.anim_time) * 140) * 1", 0, 0]
},
"neck": {
"rotation": [-7.5, 0, 0]
},
"head": {
"rotation": ["-365 + math.sin(q.anim_time*120) * 2", 0, 0]
},
"top": {
"rotation": [0, 0, 0]
},
"armleft": {
"rotation": [15.00046, 31.99975, "26.824 + Math.cos((query.anim_time) * 120) * 2"]
},
"left_elbow": {
"rotation": [0, 42.5, 0]
},
"finger1": {
"rotation": [0, 15, 0]
},
"finger2": {
"rotation": [0, -15, 0]
},
"armright": {
"rotation": [15.00046, -31.99975, "-26.824 + Math.cos((query.anim_time) * 120) * 2"]
},
"right_elbow": {
"rotation": [0, -42.5, 0]
},
"finger3": {
"rotation": [0, -15, 0]
},
"finger4": {
"rotation": [0, 15, 0]
}
}
},
"animation.kyurem.faint": {
"loop": "hold_on_last_frame",
"animation_length": 3.5,
"bones": {
"body": {
"rotation": ["6 + Math.cos((query.anim_time) * 55) * 25", 0, 0]
},
"body2": {
"rotation": ["-14 + Math.cos((query.anim_time) * 55) * 10", 0, 0]
},
"body3": {
"rotation": ["-12.5 - Math.cos((query.anim_time) * 140) * 1", 0, 0]
},
"neck": {
"rotation": ["-14.0719 + Math.cos((query.anim_time) * 105) * 5", "13.9639 - Math.cos((query.anim_time) * 105) * 15", -0.82522]
},
"head": {
"rotation": ["-365 + math.sin(q.anim_time*120) * 2", 0, 0]
},
"top": {
"rotation": [0, 0, 0]
},
"armleft": {
"rotation": [15.00046, 31.99975, "26.824 + Math.cos((query.anim_time) * 120) * 2"]
},
"left_elbow": {
"rotation": [0, 42.5, 0]
},
"finger1": {
"rotation": [0, 15, 0]
},
"finger2": {
"rotation": [0, -15, 0]
},
"armright": {
"rotation": [15.00046, -31.99975, "-26.824 + Math.cos((query.anim_time) * 120) * 2"]
},
"right_elbow": {
"rotation": [0, -42.5, 0]
},
"finger3": {
"rotation": [0, -15, 0]
},
"finger4": {
"rotation": [0, 15, 0]
}
}
}
}
}
94 changes: 64 additions & 30 deletions resourcepacks/assets/cobblemon/bedrock/animations/lopunnymega/lopunnymega.animation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"rotation": ["Math.cos((query.anim_time) * 80) * 5", 0, 0]
},
"ear_right": {
"rotation": [0, 0, "-32.5 + Math.cos((query.anim_time - 0.05) * 180) * 3 "]
"rotation": [0, 0, "-32.5 + Math.cos((query.anim_time) * 720) * 2"]
},
"ear_right3": {
"rotation": [0, 0, "-20 + Math.cos((query.anim_time - 0.1) * 180) * 2"]
Expand All @@ -20,7 +20,7 @@
"rotation": [0, 0, "-20 + Math.cos((query.anim_time - 0.15) * 180) * 3"]
},
"ear_left": {
"rotation": [0, 0, "32.5 + Math.cos((query.anim_time - 0.05) * 180) * 3"]
"rotation": [0, 0, "32.5 - Math.cos((query.anim_time) * 720) * 2"]
},
"ear_left3": {
"rotation": [0, 0, "20 + Math.cos((query.anim_time - 0.1) * 180) * 2"]
Expand All @@ -29,7 +29,7 @@
"rotation": [0, 0, "20 + Math.cos((query.anim_time - 0.15) * 180) * 3"]
},
"arm_right": {
"rotation": [0, "-5 + Math.cos((query.anim_time) * 400) * 0.7", "-51.1662 + Math.cos((query.anim_time) * 400) * 0.9"]
"rotation": [0, "-5 + Math.cos((query.anim_time) * 400) * 0.7", "-51.1662 + Math.cos((query.anim_time) * 720) * 3"]
},
"arm_right2": {
"rotation": [0, "-40 0", 0]
Expand All @@ -38,7 +38,7 @@
"rotation": [0, -12.5, 0]
},
"arm_left": {
"rotation": [9.5109, "54.3801 + Math.cos((query.anim_time) * 400) * 1", 12.8382]
"rotation": [9.5109, "54.3801 + Math.cos((query.anim_time) * 400) * 1", "12.8382 + Math.cos((query.anim_time) * 720) * 3"]
},
"arm_left2": {
"rotation": [0, 45, 0]
Expand All @@ -50,27 +50,44 @@
"rotation": [0, 0, 0]
},
"leg_left": {
"rotation": ["-85 + Math.cos((query.anim_time) * 80) * 8", 0, 0]
"rotation": [-50, 0, 0],
"position": ["Math.cos((query.anim_time) * 360) * 0.2", "-1.5 - Math.cos((query.anim_time) * 360) * 0.7", -0.5]
},
"leg_left2": {
"rotation": [117.5, 0, 0]
"rotation": [57.5, 0, 0]
},
"torso_upper": {
"rotation": [0, 0, "Math.sin((query.anim_time) * 90) * 1"]
"rotation": [0, 0, "Math.sin((query.anim_time) * 90) * 1"],
"position": [
"Math.cos((query.anim_time) * 360) * 0.2",
"-1 - Math.cos((query.anim_time) * 720) * 0.5",
"-0.5 - Math.cos((query.anim_time) * 360) * 0.5"
]
},
"tail": {
"position": [0, 0, -1]
},
"leg_right": {
"rotation": [15, 0, 0],
"position": ["Math.cos((query.anim_time) * 360) * 0.2", "0 + Math.cos((query.anim_time) * 360) * 0.7", 0]
},
"leg_right2": {
"rotation": [-7.5, 0, 0],
"position": [0, 0, -0.25]
}
}
},
"animation.lopunnymega.ground_walk": {
"animation.lopunnymega.faint": {
"loop": true,
"bones": {
"torso_top": {
"rotation": [0, 0, "Math.sin((query.anim_time) * 90) * 1"]
},
"head": {
"rotation": ["Math.cos((query.anim_time) * 80) * 2", 0, 0]
"rotation": ["Math.cos((query.anim_time) * 80) * 5", 0, 0]
},
"ear_right": {
"rotation": [0, 0, "-32.5 + Math.cos((query.anim_time - 0.05) * 180) * 3 "]
"rotation": [0, 0, "-32.5 + Math.cos((query.anim_time) * 720) * 2"]
},
"ear_right3": {
"rotation": [0, 0, "-20 + Math.cos((query.anim_time - 0.1) * 180) * 2"]
Expand All @@ -79,7 +96,7 @@
"rotation": [0, 0, "-20 + Math.cos((query.anim_time - 0.15) * 180) * 3"]
},
"ear_left": {
"rotation": [0, 0, "32.5 + Math.cos((query.anim_time - 0.05) * 180) * 3"]
"rotation": [0, 0, "32.5 - Math.cos((query.anim_time) * 720) * 2"]
},
"ear_left3": {
"rotation": [0, 0, "20 + Math.cos((query.anim_time - 0.1) * 180) * 2"]
Expand All @@ -88,48 +105,62 @@
"rotation": [0, 0, "20 + Math.cos((query.anim_time - 0.15) * 180) * 3"]
},
"arm_right": {
"rotation": [0, "-5 + Math.cos((query.anim_time - 3) * 180) * 12", -51.1662]
"rotation": [0, "-5 + Math.cos((query.anim_time) * 400) * 0.7", "-51.1662 + Math.cos((query.anim_time) * 720) * 3"]
},
"arm_right2": {
"rotation": [0, 0, 0]
"rotation": [0, "-40 0", 0]
},
"arm_right_hand": {
"rotation": [0, -12.5, 0]
},
"arm_left": {
"rotation": [0.6088, "-0.2066 + Math.cos((query.anim_time - 3) * 180) * 12", 51.1662]
"rotation": [9.5109, "54.3801 + Math.cos((query.anim_time) * 400) * 1", "12.8382 + Math.cos((query.anim_time) * 720) * 3"]
},
"arm_left2": {
"rotation": [0, 0, 0]
"rotation": [0, 45, 0]
},
"arm_left_hand": {
"rotation": [0, 0, 0]
"rotation": [0, 7.5, -15]
},
"torso_bottom": {
"rotation": [0, 0, 0]
},
"leg_left": {
"rotation": ["Math.cos((query.anim_time - 3) * 180) * 16", 0, 0]
"rotation": [-50, 0, 0],
"position": ["Math.cos((query.anim_time) * 360) * 0.2", "-1.5 - Math.cos((query.anim_time) * 360) * 0.7", -0.5]
},
"leg_left2": {
"rotation": [0, 0, 0]
"rotation": [57.5, 0, 0]
},
"torso_upper": {
"rotation": [0, 0, "Math.sin((query.anim_time) * 45) * 0.5"]
"rotation": [0, 0, "Math.sin((query.anim_time) * 90) * 1"],
"position": [
"Math.cos((query.anim_time) * 360) * 0.2",
"-1 - Math.cos((query.anim_time) * 720) * 0.5",
"-0.5 - Math.cos((query.anim_time) * 360) * 0.5"
]
},
"tail": {
"position": [0, 0, -1]
},
"leg_right": {
"rotation": ["Math.cos((query.anim_time) * 180) * 16", 0, 0]
"rotation": [15, 0, 0],
"position": ["Math.cos((query.anim_time) * 360) * 0.2", "0 + Math.cos((query.anim_time) * 360) * 0.7", 0]
},
"leg_right2": {
"rotation": [-7.5, 0, 0],
"position": [0, 0, -0.25]
}
}
},
"animation.lopunnymega.faint": {
"animation.lopunnymega.ground_walk": {
"loop": true,
"bones": {
"torso_top": {
"rotation": [0, 0, "Math.sin((query.anim_time) * 90) * 1"]
},
"head": {
"rotation": ["Math.cos((query.anim_time) * 80) * 5", 0, 0]
"rotation": ["Math.cos((query.anim_time) * 80) * 2", 0, 0]
},
"ear_right": {
"rotation": [0, 0, "-32.5 + Math.cos((query.anim_time - 0.05) * 180) * 3 "]
Expand All @@ -150,34 +181,37 @@
"rotation": [0, 0, "20 + Math.cos((query.anim_time - 0.15) * 180) * 3"]
},
"arm_right": {
"rotation": [0, "-5 + Math.cos((query.anim_time) * 400) * 0.7", "-51.1662 + Math.cos((query.anim_time) * 400) * 0.9"]
"rotation": [0, "-5 + Math.cos((query.anim_time - 3.7) * 240) * 12", -51.1662]
},
"arm_right2": {
"rotation": [0, "-40 0", 0]
"rotation": [0, 0, 0]
},
"arm_right_hand": {
"rotation": [0, -12.5, 0]
},
"arm_left": {
"rotation": [9.5109, "54.3801 + Math.cos((query.anim_time) * 400) * 1", 12.8382]
"rotation": [0.6088, "-0.2066 + Math.cos((query.anim_time - 3.7) * 240) * 12", 51.1662]
},
"arm_left2": {
"rotation": [0, 45, 0]
"rotation": [0, 0, 0]
},
"arm_left_hand": {
"rotation": [0, 7.5, -15]
"rotation": [0, 0, 0]
},
"torso_bottom": {
"rotation": [0, 0, 0]
},
"leg_left": {
"rotation": ["-85 + Math.cos((query.anim_time) * 80) * 8", 0, 0]
"rotation": ["Math.cos((query.anim_time - 3.7) * 240) * 16", 0, 0]
},
"leg_left2": {
"rotation": [117.5, 0, 0]
"rotation": [0, 0, 0]
},
"torso_upper": {
"rotation": [0, 0, "Math.sin((query.anim_time) * 90) * 1"]
"rotation": [0, 0, "Math.sin((query.anim_time) * 45) * 0.5"]
},
"leg_right": {
"rotation": ["Math.cos((query.anim_time) * 240) * 16", 0, 0]
}
}
}
Expand Down
Loading

0 comments on commit f99ca8c

Please sign in to comment.