Merge branch 'implement_pokemon' into 'main'

for merging when the last of the QA fixes are finished

See merge request cable-mc/cobblemon!2302
This commit is contained in:
Polymeta
2026-06-05 08:28:27 +00:00
8 changed files with 285 additions and 182 deletions
@@ -41,45 +41,6 @@
}
}
},
"animation.arbok.summary_idle": {
"loop": true,
"bones": {
"body_upper": {
"rotation": ["-math.sin(q.anim_time*90*2+90)*0.25", 20, "math.sin(q.anim_time*90*2+90)*4"],
"position": [0, 0, 0]
},
"hood": {
"rotation": ["-10-math.sin(q.anim_time*90*4+90)*1", "-15+math.sin(q.anim_time*90*2+90)*6", -17.5]
},
"neck": {
"rotation": ["math.sin(q.anim_time*90*4)*0.75", 0, 0]
},
"tail": {
"rotation": [0, "40-math.sin(q.anim_time*90*2+90)*0.5", 0]
},
"tail2": {
"rotation": [0, "-55-math.sin(q.anim_time*90*2-90)*0.5", 0]
},
"tail4": {
"rotation": [0, "-55-math.sin(q.anim_time*90*2)*0.5", 0]
},
"tail5": {
"rotation": [0, "55-math.sin(q.anim_time*90*2+90)*0.5", 0]
},
"tail6": {
"rotation": [0, "60-math.sin(q.anim_time*90*2)*0.5", 0]
},
"body": {
"position": ["math.sin(q.anim_time*90*2+30*2)*0.06", 0, "-math.sin(q.anim_time*90*2+30*3)*0.04"]
},
"head": {
"rotation": ["math.sin(q.anim_time*90*4+90)*0.5", 0, "-math.sin(q.anim_time*90*2+90)*2"]
},
"head_correction": {
"rotation": [12.5, 0, 0]
}
}
},
"animation.arbok.tongue_flick": {
"loop": true,
"bones": {
@@ -107,6 +68,47 @@
}
}
},
"animation.arbok.sleep": {
"loop": true,
"bones": {
"body_upper": {
"rotation": [46.00798, 4.21261, 8.68723]
},
"hood": {
"rotation": [-17.79674, 5.06499, 5.86553]
},
"neck": {
"rotation": [-7.5, 7.5, 12.5]
},
"head_angle": {
"rotation": [14.60967, -3.73171, 11.93845]
},
"eyelid_right": {
"position": [-0.1, 0, 0]
},
"eyelid_left": {
"position": [0.1, 0, 0]
},
"jaw": {
"rotation": [22.5, 0, 0]
},
"tail": {
"rotation": [0, 22.5, 0]
},
"tail2": {
"rotation": [0, -37.5, 0]
},
"tail4": {
"rotation": [0, -45, 0]
},
"tail5": {
"rotation": [0, -55, 0]
},
"tail6": {
"rotation": [0, -47.5, 0]
}
}
},
"animation.arbok.faint": {
"animation_length": 3,
"bones": {
@@ -188,19 +190,15 @@
"1.15": ["-30+math.sin(q.anim_time*90*4)*0.75", 0, 0],
"1.45": ["-40+math.sin(q.anim_time*90*4)*0.75", 0, 0],
"1.8": ["-40+math.sin(q.anim_time*90*4)*0.75", 0, 0],
"1.95": ["-122.5+math.sin(q.anim_time*90*4)*0.75", 0, 0],
"2.1": ["-130.0586+math.sin(q.anim_time*90*4)*0.75", 0.27122, 1.21042],
"2.2": ["-60.1318+math.sin(q.anim_time*90*4)*0.75", -0.59839, 2.25911],
"2.3": ["-90+math.sin(q.anim_time*90*4)*0.75", 0, 0],
"2.4": [-87.5, 0, 0]
"1.95": ["-40+math.sin(q.anim_time*90*4)*0.75", 0, 0],
"2.1": ["-40+math.sin(q.anim_time*90*4)*0.75", 0, 0],
"2.2": ["-40+math.sin(q.anim_time*90*4)*0.75", 0, 0],
"2.3": ["-40+math.sin(q.anim_time*90*4)*0.75", 0, 0],
"2.4": [-40, 0, 0]
},
"position": {
"1.8": [0, 0, 0],
"1.85": [0, -0.5, 0],
"1.9": [0, -0.5, 0],
"1.95": [0, -1, 0],
"2.0": [0, -1, 0],
"2.15": [0, -0.5, 0]
"1.95": [0, 0, 0],
"2.1": [0, 0, 2]
}
},
"head": {
@@ -226,18 +224,20 @@
"0.35": [-13, 0, 0],
"0.7": [42.5, 0, 0],
"1.25": [22.5, 0, 0],
"1.95": [25, 0, 0],
"1.75": [24.29, 0, 0],
"1.95": [-30, 0, 0],
"2.05": [-60, 0, 0],
"2.1": [-67.5, 0, 0],
"2.2": [-27.5, 0, 0],
"2.1": [-42.5, 0, 0],
"2.2": [-2.5, 0, 0],
"2.25": [-47.5, 0, 0],
"2.3": [-12.5, 0, 0]
"2.3": [-40, 0, 0],
"2.55": [-42.5, 0, 0]
},
"position": {
"0.0": [0, 0, 0],
"2.0": [0, 0, 0],
"2.05": [0, 2, 0.8],
"2.1": [0, 2.25, 1.25],
"2.1": [0, 1.25, 1.25],
"2.2": [0, 0, 0],
"2.25": [0, 1.3, 0],
"2.3": [0, 0, 0]
@@ -245,28 +245,44 @@
},
"eyelid_right": {
"position": {
"0.0": [-0.1, 0, 0],
"0.1": [-0.1, 0, 0],
"0.15": [0, 0, 0],
"0.5": [0, 0, 0],
"0.55": [-0.1, 0, 0],
"0.85": [-0.1, 0, 0],
"0.9": [0, 0, 0],
"1.95": [0, 0, 0],
"2.0": [-0.1, 0, 0]
"0.0": [-0.1, 0, -0.1],
"0.15": {
"pre": [-0.1, 0, -0.1],
"post": [0, 0, 0]
},
"0.55": {
"pre": [0, 0, 0],
"post": [-0.1, 0, -0.1]
},
"0.9": {
"pre": [-0.1, 0, -0.1],
"post": [0, 0, 0]
},
"2.0": {
"pre": [0, 0, 0],
"post": [-0.1, 0, -0.1]
}
}
},
"eyelid_left": {
"position": {
"0.0": [0.1, 0, 0],
"0.1": [0.1, 0, 0],
"0.15": [0, 0, 0],
"0.5": [0, 0, 0],
"0.55": [0.1, 0, 0],
"0.85": [0.1, 0, 0],
"0.9": [0, 0, 0],
"1.95": [0, 0, 0],
"2.0": [0.1, 0, 0]
"0.0": [0.1, 0, -0.1],
"0.15": {
"pre": [0.1, 0, -0.1],
"post": [0, 0, 0]
},
"0.55": {
"pre": [0, 0, 0],
"post": [0.1, 0, -0.1]
},
"0.9": {
"pre": [0.1, 0, -0.1],
"post": [0, 0, 0]
},
"2.0": {
"pre": [0, 0, 0],
"post": [0.1, 0, -0.1]
}
}
},
"jaw": {
@@ -281,8 +297,8 @@
"1.75": [32.5, 0, 0],
"1.8": [32.5, 0, 0],
"1.85": [65, 0, 0],
"2.15": [65, 0, 0],
"2.2": [-2.5, 0, 0]
"2.05": [65, 0, 0],
"2.1": [-2.5, 0, 0]
}
},
"tongue_opening": {
@@ -295,87 +311,59 @@
"tongue": {
"rotation": {
"0.0": [0, 0, 0],
"0.25": [0, 0, 0],
"0.3": [-7.5, 0, 0],
"0.25": [-7.5, 0, 0],
"0.3": [-15, 0, 0],
"0.35": [-7.5, 0, 0],
"0.4": [0, 0, 0],
"0.4": [-5, 0, 0],
"1.35": [0, 0, 0],
"1.85": [0, 0, 0],
"1.9": [-7.5, 0, 0],
"1.75": [0, 0, 0],
"1.85": [-35, 0, 0],
"2.0": [-32.5, 0, 0],
"2.1": [-37.5, 0, 0],
"2.15": [-10, 0, 0],
"2.2": [0, 0, 0]
"2.05": [-35, 0, 0],
"2.1": [0, 0, 0]
},
"position": {
"0.0": [0, 0, 0],
"1.85": [0, 0, 0],
"1.9": [0, 0, 0.3],
"2.0": [0, 0, 1.4],
"2.1": [0, 0, 1.7],
"2.15": [0, 0, 0.4]
"0.15": [0, 0, 0.75],
"0.25": [0, 0, -3.25],
"0.35": [0, 0, -3.25],
"0.45": [0, 0, 0.75],
"1.75": [0, 0, 0.75],
"1.85": [0, 0, -3.25]
}
},
"tongue2": {
"rotation": {
"0.0": [0, 0, 0],
"0.3": [2.14, 0, 0],
"0.15": [-1.43, 0, 0],
"0.25": [3.45, 0, 0],
"0.3": [9.64, 0, 0],
"0.35": [2.5, 0, 0],
"0.4": [0, 0, 0],
"0.75": [0, 0, 0],
"1.35": [0, 0, 0],
"1.75": [0, 0, 0],
"1.95": [0, 0, 0],
"2.0": [-12.5, 0, 0],
"2.1": [-12.5, 0, 0],
"2.15": [-37.5, 0, 0],
"2.2": [17.5, 0, 0]
},
"position": {
"0.0": [0, 0, 0],
"0.1": [0, 0, 0],
"0.15": [0, -4, 0],
"0.3": [0, -4, 0],
"0.35": [0, 0, 0],
"0.4": [0, 0, 0],
"1.35": [0, 0, 0],
"1.4": [0, -4, 0],
"1.95": [0, -4, 0],
"2.1": [0, -4, 0]
"2.05": [-12.5, 0, 0],
"2.1": [0, 0, 0]
}
},
"tongue3": {
"rotation": {
"0.0": [0, 0, 0],
"0.15": [0, 0, 0],
"0.2": [52.5, 0, 0],
"0.3": [52.5, 0, 0],
"0.2": [7.5, 0, 0],
"0.25": [22.5, 0, 0],
"0.3": [22.5, 0, 0],
"0.35": [7.5, 0, 0],
"0.4": [0, 0, 0],
"1.35": [0, 0, 0],
"1.4": [0, 0, 0],
"1.45": [0, 0, 0],
"1.5": [30, 0, 0],
"1.75": [47.5, 0, 0],
"1.75": [0, 0, 0],
"1.85": [47.5, 0, 0],
"1.95": [47.5, 0, 0],
"2.0": [-20, 0, 0],
"2.1": [-20, 0, 0],
"2.15": [-45, 0, 0],
"2.2": [-45, 0, 0],
"2.25": [47.5, 0, 0],
"2.3": [-17.5, 0, 0],
"2.35": [-10.5, 0, 0]
},
"position": {
"0.0": [0, 0, 0],
"0.15": [0, 0, 0],
"0.2": [0, -4, 0],
"0.35": [0, -4, 0],
"0.4": [0, 0, 0],
"1.35": [0, 0, 0],
"1.4": [0, 0, 0],
"1.45": [0, -2, 0],
"1.5": [0, -4, 0],
"1.95": [0, -4, 0],
"2.1": [0, -4, 0]
"2.05": [-20, 0, 0],
"2.1": [10, 0, 0]
}
},
"tongue4": {
@@ -384,15 +372,17 @@
"0.2": [0, 0, 0],
"0.25": [35, 0, 0],
"0.3": [35, 0, 0],
"0.35": [-15, 0, 0],
"0.35": [-40, 0, 0],
"0.4": [0, 0, 0],
"1.35": [0, 0, 0],
"1.45": [0, 0, 0],
"1.7": [27.5, 0, 0],
"1.75": [0, 0, 0],
"1.95": [27.5, 0, 0],
"2.0": [-27.5, 0, 0],
"2.25": [-27.5, 0, 0],
"2.3": [-5, 0, 0]
"2.1": [-27.5, 0, 0],
"2.2": [-5, 0, 0],
"2.25": [30, 0, 0],
"2.3": [-35, 0, 0],
"2.7": [25, 0, 0]
}
},
"tail": {
@@ -487,47 +477,17 @@
"2.1": [17.68298, 22.5065, 0.4769],
"2.15": [2.42242, 22.53562, -0.24157]
}
}
}
},
"animation.arbok.sleep": {
"loop": true,
"bones": {
"body_upper": {
"rotation": [46.00798, 4.21261, 8.68723]
},
"hood": {
"rotation": [-17.79674, 5.06499, 5.86553]
},
"neck": {
"rotation": [-7.5, 7.5, 12.5]
},
"head_angle": {
"rotation": [14.60967, -3.73171, 11.93845]
},
"eyelid_right": {
"position": [-0.1, 0, 0]
},
"eyelid_left": {
"position": [0.1, 0, 0]
},
"jaw": {
"rotation": [22.5, 0, 0]
},
"tail": {
"rotation": [0, 22.5, 0]
},
"tail2": {
"rotation": [0, -37.5, 0]
},
"tail4": {
"rotation": [0, -45, 0]
},
"tail5": {
"rotation": [0, -55, 0]
},
"tail6": {
"rotation": [0, -47.5, 0]
"hood4": {
"rotation": {
"1.95": [0, 0, 0],
"2.05": [-44.17, 0, 0],
"2.1": [-40, 0, 0],
"2.15": [-30, 0, 0],
"2.2": [-32.5, 0, 0],
"2.35": [-32.5, 0, 0],
"2.55": [-30.5, 0, 0]
}
}
}
},
@@ -637,6 +597,45 @@
}
}
},
"animation.arbok.summary_idle": {
"loop": true,
"bones": {
"body_upper": {
"rotation": ["-math.sin(q.anim_time*90*2+90)*0.25", 20, "math.sin(q.anim_time*90*2+90)*4"],
"position": [0, 0, 0]
},
"hood": {
"rotation": ["-10-math.sin(q.anim_time*90*4+90)*1", "-15+math.sin(q.anim_time*90*2+90)*6", -17.5]
},
"neck": {
"rotation": ["math.sin(q.anim_time*90*4)*0.75", 0, 0]
},
"tail": {
"rotation": [0, "40-math.sin(q.anim_time*90*2+90)*0.5", 0]
},
"tail2": {
"rotation": [0, "-55-math.sin(q.anim_time*90*2-90)*0.5", 0]
},
"tail4": {
"rotation": [0, "-55-math.sin(q.anim_time*90*2)*0.5", 0]
},
"tail5": {
"rotation": [0, "55-math.sin(q.anim_time*90*2+90)*0.5", 0]
},
"tail6": {
"rotation": [0, "60-math.sin(q.anim_time*90*2)*0.5", 0]
},
"body": {
"position": ["math.sin(q.anim_time*90*2+30*2)*0.06", 0, "-math.sin(q.anim_time*90*2+30*3)*0.04"]
},
"head": {
"rotation": ["math.sin(q.anim_time*90*4+90)*0.5", 0, "-math.sin(q.anim_time*90*2+90)*2"]
},
"head_correction": {
"rotation": [12.5, 0, 0]
}
}
},
"animation.arbok.pose": {
"loop": true,
"bones": {
@@ -80,6 +80,14 @@
{"origin": [4.51, 15, -8.515], "size": [1, 2, 2], "uv": [23, 35]}
]
},
{
"name": "locator_eye_left",
"parent": "pupil_left",
"pivot": [5, 16, -8.5],
"locators": {
"eye2": [5, 16, -8.5]
}
},
{
"name": "eyelid_left",
"parent": "eye_left",
@@ -104,6 +112,14 @@
{"origin": [-5.51, 15, -8.515], "size": [1, 2, 2], "uv": [0, 32]}
]
},
{
"name": "locator_eye_right",
"parent": "pupil_right",
"pivot": [-5, 16, -8.5],
"locators": {
"eye1": [-5, 16, -8.5]
}
},
{
"name": "eyelid_right",
"parent": "eye_right",
@@ -163,6 +163,14 @@
{"origin": [11.01, 48, -27.02], "size": [1, 1, 0], "uv": [163, 1]}
]
},
{
"name": "locator_eye_left",
"parent": "shine_left",
"pivot": [11.5, 48.5, -27],
"locators": {
"eye2": [11.5, 48.5, -27]
}
},
{
"name": "eyelid_left",
"parent": "eye_left",
@@ -195,6 +203,14 @@
{"origin": [-12.01, 48, -27.02], "size": [1, 1, 0], "uv": [163, 2]}
]
},
{
"name": "locator_eye_right",
"parent": "shine_right",
"pivot": [-11.5, 48.5, -27],
"locators": {
"eye1": [-11.5, 48.5, -27]
}
},
{
"name": "eyelid_right",
"parent": "eye_right",
@@ -6,9 +6,9 @@
"identifier": "geometry.dracozolt",
"texture_width": 256,
"texture_height": 128,
"visible_bounds_width": 11,
"visible_bounds_height": 4.5,
"visible_bounds_offset": [0, 1.75, 0]
"visible_bounds_width": 12,
"visible_bounds_height": 5,
"visible_bounds_offset": [0, 1.5, 0]
},
"bones": [
{
@@ -388,6 +388,15 @@
{"origin": [1.42, 45.52, -6], "size": [1, 2, 2], "inflate": 0.02, "uv": [72, 0]}
]
},
{
"name": "locator_eye_left",
"parent": "eye_left",
"pivot": [2.5, 47, -5],
"rotation": [-35, -90, 0],
"locators": {
"eye2": [2.5, 47, -5]
}
},
{
"name": "eye_right",
"parent": "eyes",
@@ -417,6 +426,15 @@
{"origin": [-2.42, 45.52, -6], "size": [1, 2, 2], "inflate": 0.02, "uv": [78, 0], "mirror": true}
]
},
{
"name": "locator_eye_right",
"parent": "eye_right",
"pivot": [-2.5, 47, -5],
"rotation": [-35, 90, 0],
"locators": {
"eye1": [-2.5, 47, -5]
}
},
{
"name": "head_fur",
"parent": "head_rotation",
@@ -346,6 +346,15 @@
{"origin": [1.42, 58.52, -5], "size": [1, 2, 2], "inflate": 0.02, "uv": [32, 0]}
]
},
{
"name": "locator_eye_left",
"parent": "eye_left",
"pivot": [2.5, 60, -4],
"rotation": [-35, -90, 0],
"locators": {
"eye2": [2.5, 60, -4]
}
},
{
"name": "eye_right",
"parent": "eyes",
@@ -375,6 +384,15 @@
{"origin": [-2.42, 58.52, -5], "size": [1, 2, 2], "inflate": 0.02, "uv": [38, 0], "mirror": true}
]
},
{
"name": "locator_eye_right",
"parent": "eye_right",
"pivot": [-2.5, 60, -4],
"rotation": [-35, 90, 0],
"locators": {
"eye1": [-2.5, 60, -4]
}
},
{
"name": "head_fur",
"parent": "head_rotation",
@@ -7,8 +7,8 @@
"texture_width": 256,
"texture_height": 256,
"visible_bounds_width": 8,
"visible_bounds_height": 8,
"visible_bounds_offset": [0, 3, 0]
"visible_bounds_height": 9,
"visible_bounds_offset": [0, 3.5, 0]
},
"bones": [
{
@@ -177,6 +177,15 @@
{"origin": [13.51, 24.75, 92.25], "size": [0, 3, 1], "uv": [67, 1]}
]
},
{
"name": "locator_eye_right",
"parent": "pupil_left",
"pivot": [13.5, 26.2, 92.75],
"rotation": [0, -90, 0],
"locators": {
"eye1": [13.5, 26.2, 92.75]
}
},
{
"name": "inner_eyelid_left",
"parent": "eye_left",
@@ -210,6 +219,15 @@
{"origin": [-13.51, 24.75, 92.25], "size": [0, 3, 1], "uv": [67, 21]}
]
},
{
"name": "locator_eye_left",
"parent": "pupil_right",
"pivot": [-13.5, 26.2, 92.75],
"rotation": [0, 90, 0],
"locators": {
"eye2": [-13.5, 26.2, 92.75]
}
},
{
"name": "inner_eyelid_right",
"parent": "eye_right",
@@ -89,6 +89,15 @@
{"origin": [13.51, 48.75, -6.25], "size": [0, 3, 1], "uv": [67, 1]}
]
},
{
"name": "locator_eye_right",
"parent": "pupil_left",
"pivot": [13.5, 50.25, -5.75],
"rotation": [0, -90, 0],
"locators": {
"eye1": [13.5, 50.25, -5.75]
}
},
{
"name": "inner_eyelid_left",
"parent": "eye_left",
@@ -122,6 +131,15 @@
{"origin": [-13.51, 48.75, -6.25], "size": [0, 3, 1], "uv": [67, 21]}
]
},
{
"name": "locator_eye_left",
"parent": "pupil_right",
"pivot": [-13.5, 50.25, -5.75],
"rotation": [0, 90, 0],
"locators": {
"eye2": [-13.5, 50.25, -5.75]
}
},
{
"name": "inner_eyelid_right",
"parent": "eye_right",
@@ -47,7 +47,7 @@
"poseTypes": ["SHOULDER_LEFT"],
"animations": [
"q.look('head')",
"q.bedrock('popplio', 'shoulder_left')"
"q.bedrock('popplio', 'ground_idle')"
],
"quirks": [
"q.bedrock_quirk('popplio', 'blink')"
@@ -63,7 +63,7 @@
"poseTypes": ["SHOULDER_RIGHT"],
"animations": [
"q.look('head')",
"q.bedrock('popplio', 'shoulder_right')"
"q.bedrock('popplio', 'ground_idle')"
],
"quirks": [
"q.bedrock_quirk('popplio', 'blink')"