Merge branch 'main' of https://github.com/Diviously/DeviousLeagueMC

Wendrous · Sep 14, 2023 · 892b77e · 892b77e
2 parents f99ca8c + 4e0c19b
commit 892b77e
Show file tree

Hide file tree

Showing 103 changed files with 21,596 additions and 1 deletion.
diff --git a/resourcepacks/assets/cobblemon/bedrock/animations/astro.animation.json b/resourcepacks/assets/cobblemon/bedrock/animations/astro.animation.json
diff --git a/resourcepacks/assets/cobblemon/bedrock/animations/bitterwind.animation.json b/resourcepacks/assets/cobblemon/bedrock/animations/bitterwind.animation.json
diff --git a/resourcepacks/assets/cobblemon/bedrock/animations/chienpao/chienpao.animation.json b/resourcepacks/assets/cobblemon/bedrock/animations/chienpao/chienpao.animation.json
@@ -0,0 +1,196 @@
+{
+	"format_version": "1.8.0",
+	"animations": {
+		"animation.chienpao.ground_idle": {
+			"loop": true,
+			"bones": {
+				"head": {
+					"rotation": ["2.2688+1", 24.73906, -12.40748]
+				},
+				"chest": {
+					"rotation": [-10, 0, 0]
+				},
+				"tail1": {
+					"rotation": ["-52.5+1*(math.sin(q.anim_time*90*3)*1+1)+1*(math.sin(q.anim_time*90*3/2)*1+1)", 0, 0]
+				},
+				"tail2": {
+					"rotation": [20, 0, 0]
+				},
+				"tail3": {
+					"rotation": ["35+1*(math.sin(q.anim_time*90*3)*1+1)+1*(math.sin(q.anim_time*90*3/2)*1+1)", 0, 0]
+				},
+				"tail4": {
+					"rotation": ["-32.5+25*2-2*(math.sin(q.anim_time*90*3-90)*1+1)", 0, 0]
+				},
+				"tail5": {
+					"rotation": [50, 0, 0]
+				},
+				"tail6": {
+					"rotation": [47.5, 0, 0]
+				},
+				"tail7": {
+					"rotation": [45, 0, 0]
+				},
+				"neck2": {
+					"rotation": ["3.8061+1*(math.sin(q.anim_time*90*3)*1+1)+1*(math.sin(q.anim_time*90*3/2)*1+1)", 18.62164, -10.7198]
+				},
+				"leg_front_right1": {
+					"rotation": [0, 0, 7.5]
+				},
+				"leg_front_right2": {
+					"rotation": [0, 0, -7.5],
+					"position": [0.2, 0, 0]
+				},
+				"leg_back_right1": {
+					"rotation": [0, 0, 7.5]
+				},
+				"leg_back_right2": {
+					"rotation": [0, 0, -7.5]
+				},
+				"leg_front_left1": {
+					"rotation": [0, 0, -7.5]
+				},
+				"leg_front_left2": {
+					"rotation": [0, 0, 7.5],
+					"position": [-0.2, 0, 0]
+				},
+				"leg_back_left1": {
+					"rotation": [0, 0, -7.5]
+				},
+				"leg_back_left2": {
+					"rotation": [0, 0, 7.5]
+				},
+				"body": {
+					"rotation": [0, -77.5, 0]
+				},
+				"neck": {
+					"rotation": [0, 22.5, 0],
+					"position": [0, "-0.05*(math.sin(q.anim_time*90*3-60)*1+1)", 0]
+				},
+				"torso": {
+					"position": [0, "math.sin(q.anim_time*90*2+180)*0.1", 0]
+				}
+			}
+		},
+		"animation.chienpao.ground_walk": {
+			"loop": true,
+			"bones": {
+				"head": {
+					"rotation": ["5-math.sin(q.anim_time*90*3*2-280-180)*3", 0, 0]
+				},
+				"chest": {
+					"rotation": [-10, 0, 0]
+				},
+				"tail1": {
+					"rotation": ["-52.5+math.sin(q.anim_time*90*3*2-90)*2", "math.cos(q.anim_time*90*3-90)*20", 0],
+					"position": [0, "math.clamp(math.sin(q.anim_time*90*3*2-300)*0.2, 0, 1)", 0]
+				},
+				"tail2": {
+					"rotation": ["20+math.sin(q.anim_time*90*3*2-90-30)*2", "0+math.cos(q.anim_time*90*3-90-30)*10 ", 0]
+				},
+				"tail3": {
+					"rotation": ["35+math.sin(q.anim_time*90*3*2-90-60)*2", "math.cos(q.anim_time*90*3-90-60)*10", 0]
+				},
+				"tail4": {
+					"rotation": ["25+math.sin(q.anim_time*90*3*2-90-120)*2", "0+math.cos(q.anim_time*90*3-90-120)*10", 0]
+				},
+				"tail5": {
+					"rotation": ["10+math.sin(q.anim_time*90*3*2-90-150)*2", "0+math.cos(q.anim_time*90*3-90-120)*25", 0]
+				},
+				"tail6": {
+					"rotation": ["2.5+math.sin(q.anim_time*90*3*2-90-180)*2", "0+math.cos(q.anim_time*90*3-90-120)*10", 0]
+				},
+				"tail7": {
+					"rotation": ["12.5+math.sin(q.anim_time*90*3*2-90-60)*2", "math.cos(q.anim_time*90*3-90-180)*30", 0]
+				},
+				"neck2": {
+					"rotation": [7.5, 0, 0]
+				},
+				"leg_front_right1": {
+					"rotation": ["10+math.sin(q.anim_time*90*3+180)*20+math.clamp(math.sin(q.anim_time*90*3-20+180)*20, 0, 20)", 0, 7.5],
+					"position": [0, "-0.4+math.clamp(math.sin(q.anim_time*90*3+60+180)*0.8, -0.2, 1)", "0.5+math.cos(q.anim_time*90*3+180+180)*0.1"]
+				},
+				"leg_front_right2": {
+					"rotation": [
+						"-25+math.sin(q.anim_time*90*3+90+180)*20+math.clamp(math.sin(q.anim_time*90*3+90+30+180)*20, -20, 0)+math.clamp(math.sin(q.anim_time*90*3+110+180)*10, 0, 20)+math.clamp(math.sin(q.anim_time*90*3+70+180)*10, 0, 20)",
+						0,
+						-7.5
+					],
+					"position": [0.2, 0, "-0.8-math.sin(q.anim_time*90*3-90+180)*0.8"]
+				},
+				"leg_back_right1": {
+					"rotation": ["15+math.sin(q.anim_time*90*3-40)*20", 0, 7.5],
+					"position": [
+						0,
+						"math.clamp(-math.sin(query.anim_time*90*3+45+180)*0.6,0.3,2)-0.3-math.clamp(-math.sin(query.anim_time*90*3+45)*0.9,0.6,0.9)-0.4+math.clamp(-math.sin(query.anim_time*90*3-40)*1.5,0.7,0.9)+math.clamp(-math.sin(query.anim_time*90*3-35+180)*2,1,2)-1",
+						0
+					]
+				},
+				"leg_back_right2": {
+					"rotation": ["-10+math.sin(q.anim_time*90*3+40)*20+math.clamp(math.sin(q.anim_time*90*3+40)*10, -20, 0)", 0, -7.5]
+				},
+				"leg_front_left1": {
+					"rotation": ["10+math.sin(q.anim_time*90*3)*20+math.clamp(math.sin(q.anim_time*90*3-20)*20, 0, 20)", 0, -7.5],
+					"position": [0, "-0.4+math.clamp(math.sin(q.anim_time*90*3+60)*0.8, -0.2, 1)", "+math.cos(q.anim_time*90*3+180)*0.1"]
+				},
+				"leg_front_left2": {
+					"rotation": [
+						"-25+math.sin(q.anim_time*90*3+90)*20+math.clamp(math.sin(q.anim_time*90*3+90+30)*20, -20, 0)+math.clamp(math.sin(q.anim_time*90*3+110)*10, 0, 20)+math.clamp(math.sin(q.anim_time*90*3+70)*10, 0, 20)",
+						0,
+						7.5
+					],
+					"position": [-0.2, 0, "-0.8-math.sin(q.anim_time*90*3-90)*0.8"]
+				},
+				"leg_back_left1": {
+					"rotation": ["15+math.sin(q.anim_time*90*3+180-40)*20", 0, -7.5],
+					"position": [0, "-math.sin(q.anim_time*90*3-20)*0.5", 0]
+				},
+				"leg_back_left2": {
+					"rotation": ["-10+math.sin(q.anim_time*90*3+180+40)*20+math.clamp(math.sin(q.anim_time*90*3+180+40)*10, -20, 0)", 0, 7.5]
+				},
+				"body": {
+					"position": [
+						"math.sin(q.anim_time*90*3-220)*0.25",
+						"math.sin(q.anim_time*90*3*2-240)*0.1 +math.clamp(math.sin(q.anim_time*90*3*2-240)*0.1, 0, 1)",
+						"-math.clamp(math.sin(query.anim_time*90*3*2)*0.4,0,0.35)+math.clamp(math.sin(-query.anim_time*90*3*2)*0.4,0,0.35)"
+					]
+				},
+				"torso": {
+					"position": ["math.sin(q.anim_time*90*3-200)*0.25", "0.2+math.clamp(math.sin(q.anim_time*90*3*2-240)*0.25, -0.2, 1)", 0]
+				},
+				"neck": {
+					"rotation": ["1+math.sin(q.anim_time*90*3*2-240+180)*2", 0, 0],
+					"position": [0, 0, "-0.2+math.sin(q.anim_time*90*3*2-240)*0.2"]
+				},
+				"leg_front_right3": {
+					"rotation": [
+						"53+math.clamp(-math.sin(q.anim_time*90*3-100)*60-math.clamp(math.sin(q.anim_time*90*3-0)*60, -60, 0)-math.clamp(math.sin(q.anim_time*90*3-10)*30, 0, 30), -50, 100)+math.clamp(math.sin(q.anim_time*90*3-90-20+180)*10, -30, 0)",
+						0,
+						0
+					]
+				},
+				"leg_front_left3": {
+					"rotation": [
+						"53+math.clamp(-math.sin(q.anim_time*90*3-100-180)*60-math.clamp(math.sin(q.anim_time*90*3-0-180)*60, -60, 0)-math.clamp(math.sin(q.anim_time*90*3-10-180)*30, 0, 30), -50, 100)+math.clamp(math.sin(q.anim_time*90*3-20-80)*10, -30, 0)",
+						0,
+						0
+					]
+				},
+				"leg_back_right3": {
+					"rotation": [
+						"math.sin(q.anim_time*90*3+10+180)*10-math.clamp(math.sin(q.anim_time*90*3-20+180)*60, -60, 0)-math.clamp(math.sin(q.anim_time*90*3-20+180)*20, 0, 30)+math.clamp(math.sin(q.anim_time*90*3-20-40+180)*10, 0, 20)",
+						0,
+						0
+					]
+				},
+				"leg_back_left3": {
+					"rotation": [
+						"math.sin(q.anim_time*90*3+10)*10-math.clamp(math.sin(q.anim_time*90*3-20)*60, -60, 0)-math.clamp(math.sin(q.anim_time*90*3-20)*20, 0, 30) +math.clamp(math.sin(q.anim_time*90*3-20-40)*10, 0, 20)",
+						0,
+						0
+					]
+				}
+			}
+		}
+	}
+}