diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0736_grubbin/grubbin.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0736_grubbin/grubbin.animation.json new file mode 100644 index 0000000000..54d5c9bb72 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0736_grubbin/grubbin.animation.json @@ -0,0 +1,355 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.grubbin.ground_idle": { + "loop": true, + "bones": { + "head": { + "rotation": ["5+math.sin(q.anim_time*90*6)", "0+0.5*math.sin(q.anim_time*90*3)", 0] + }, + "tail": { + "rotation": [0, 0, 0] + }, + "body": { + "rotation": [0, 0, 0] + }, + "midsection": { + "rotation": [0, 0, 0] + } + } + }, + "animation.grubbin.ground_walk": { + "loop": true, + "bones": { + "midsection": { + "rotation": ["0-0.5*math.sin(q.anim_time*90*6)*3", 0, 0] + }, + "head": { + "rotation": ["0-math.sin(q.anim_time*90*6)*1", 0, 0] + }, + "tail": { + "rotation": ["0+math.sin(q.anim_time*90*6)*3", 0, 0] + }, + "arm_left": { + "rotation": ["0+math.sin(q.anim_time*90*6-90+180)*15", 0, "0-math.sin(q.anim_time*90*6+33*6)*5"] + }, + "arm_right": { + "rotation": ["0+math.sin(q.anim_time*90*6-90+180)*15", 0, "0+math.sin(q.anim_time*90*6+33*6)*5"] + }, + "leg_front_right": { + "rotation": ["0+math.sin(q.anim_time*90*6)*15", 0, "0-math.sin(q.anim_time*90*6+33*6+30)*5"] + }, + "leg_back_right": { + "rotation": ["0+math.sin(q.anim_time*90*6-90+180+30)*15", 0, "0-math.sin(q.anim_time*90*6+33*6+15)*5"] + }, + "leg_front_left": { + "rotation": ["0+math.sin(q.anim_time*90*6)*15", 0, "0+math.sin(q.anim_time*90*6+33*6+30)*5"] + }, + "leg_back_left": { + "rotation": ["0+math.sin(q.anim_time*90*6-90+180+30)*15", 0, "0+math.sin(q.anim_time*90*6+33*6+15)*5"] + } + } + }, + "animation.grubbin.blink": { + "animation_length": 0.1667, + "bones": { + "eye_right": { + "position": { + "0.0": [0.1, 0, 0], + "0.125": {"pre": [0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "eye_left": { + "position": { + "0.0": [-0.1, 0, 0], + "0.125": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "eyelid_left": { + "position": { + "0.0": [0.1, 0, 0], + "0.125": {"pre": [0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "eyelid_right": { + "position": { + "0.0": [-0.1, 0, 0], + "0.125": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "ditto_eyelid_left": { + "position": { + "0.0": [0.1, 0, 0], + "0.125": {"pre": [0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "ditto_eyelid_right": { + "position": { + "0.0": [-0.1, 0, 0], + "0.125": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]} + } + } + } + }, + "animation.grubbin.cry": { + "animation_length": 0.75, + "bones": { + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [-15, 0, 0], + "0.1667": [-17.5, 0, 0], + "0.5417": [-17.78, 0, 0], + "0.625": [-15, 0, 0], + "0.75": [0, 0, 0] + } + }, + "mouth_opened": { + "position": { + "0.0": [0, 0, 0], + "0.0417": {"pre": [0, 0, 0], "post": [0, -0.1, -0.1]}, + "0.5417": {"pre": [0, -0.1, -0.1], "post": [0, 0, 0]} + } + }, + "ditto_mouth": { + "position": { + "0.0": [0, 0, 0], + "0.0417": {"pre": [0, 0, 0], "post": [0, 0, 0.1]}, + "0.5417": {"pre": [0, 0, 0.1], "post": [0, 0, 0]} + } + }, + "ditto_mouth_open": { + "position": { + "0.0": [0, 0, 0], + "0.0417": {"pre": [0, 0, 0], "post": [0, 0, -0.1]}, + "0.5417": {"pre": [0, 0, -0.1], "post": [0, 0, 0]} + } + } + } + }, + "animation.grubbin.physical": { + "animation_length": 3, + "bones": { + "body": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-27.5, 10, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 22.5, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [0, 22.5, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 42.5, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": [0, 0, 0], + "0.4167": [-1, 1.75, 0.5], + "0.75": [0, 0, -1], + "1.0417": [0, 0, -1], + "1.25": [-1.5, 0, 0.25] + } + }, + "midsection": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-2.2978, -6.6486, -3.4787], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [-16.2925, -11.2398, -1.9568], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [7.5, -15, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [0, -15, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [0, -15, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-14.8142, -19.5172, 7.932], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-23.1652, 9.2223, 1.9727], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": [0, 0, 0], + "0.4167": [0, 0, 0], + "1.0417": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": { + "post": [5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-35.4132, -8.1778, 5.7751], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [12.1359, -10.4967, 1.6011], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [12.1359, -10.4967, 1.6011], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [15.8612, -20.7049, 0.1476], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [12.8861, -24.0031, 4.9488], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-26.1035, 22.5432, -2.3104], + "lerp_mode": "catmullrom" + } + } + }, + "mandible_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.5417": [0, -26.88, 0], + "0.6667": [0, -26.88, 0], + "0.7083": [0, 15, 0], + "1.0833": [0, 15, 0] + } + }, + "mandible_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.5417": [0, 26.88, 0], + "0.6667": [0, 26.88, 0], + "0.7083": [0, -15, 0], + "1.0833": [0, -15, 0] + } + }, + "arm_left": { + "rotation": { + "0.0": [0, 0, 0], + "1.5": [37.5, 0, 0] + } + }, + "arm_right": { + "rotation": { + "0.0": [0, 0, 0], + "1.5": [37.5, 0, 0] + } + }, + "leg_front_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.3333": [27.5, 0, 0], + "0.5833": [27.5, 0, 0], + "0.7083": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.3333": [0, -0.44351, 0.23087], + "0.5833": [0, -0.44351, 0.23087], + "0.7083": [0, 0, 0] + } + }, + "leg_front_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.3333": [27.5, 0, 0], + "0.5833": [27.5, 0, 0], + "0.7083": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.3333": [0, -0.44351, 0.23087], + "0.5833": [0, -0.44351, 0.23087], + "0.7083": [0, 0, 0] + } + }, + "tail": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.grubbin.new": { + "loop": true, + "bones": { + "grubbin": { + "scale": 0.75 + } + } + }, + "animation.grubbin.ditto_face": { + "loop": true, + "bones": { + "eye_right": { + "scale": 0 + }, + "mandible_left": { + "position": [0.5, 0, 0] + }, + "mandible_right": { + "position": [-0.5, 0, 0] + }, + "ditto_eye_left": { + "position": [0.1, 0, 0] + }, + "ditto_mouth": { + "position": [0, 0, -0.1] + }, + "ditto_eye_right": { + "position": [-0.1, 0, 0] + }, + "ditto_mouth_open": { + "position": [0, 0, -0.1] + }, + "face": { + "scale": 0 + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0736_grubbin/grubbin.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0736_grubbin/grubbin.geo.json new file mode 100644 index 0000000000..aa14207a9a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0736_grubbin/grubbin.geo.json @@ -0,0 +1,506 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.grubbin", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 3, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "grubbin", + "pivot": [0, 0, 0] + }, + { + "name": "locator_root", + "parent": "grubbin", + "pivot": [0, 0, 0], + "locators": { + "root": [0, 0, 0] + } + }, + { + "name": "locator_top", + "parent": "grubbin", + "pivot": [0, 6.5, 0], + "locators": { + "top": [0, 6.5, 0] + } + }, + { + "name": "body", + "parent": "grubbin", + "pivot": [0, 3.5, 0], + "rotation": [0, 0, 0] + }, + { + "name": "locator_middle", + "parent": "body", + "pivot": [0, 3, 0], + "locators": { + "middle": [0, 3, 0] + } + }, + { + "name": "locator_target", + "parent": "body", + "pivot": [0, 3, -10], + "locators": { + "target": [0, 3, -10] + } + }, + { + "name": "midsection", + "parent": "body", + "pivot": [0, 3, 3.5], + "cubes": [ + {"origin": [-3.5, 1, -0.5], "size": [7, 6, 5], "inflate": 0.25, "uv": [0, 0]}, + {"origin": [-7, 2, 0.76], "size": [2, 2, 0], "pivot": [-4, 2.5, -0.2], "rotation": [0, 90, 0], "uv": [34, 23]} + ] + }, + { + "name": "head", + "parent": "midsection", + "pivot": [0, 3.75, -1], + "cubes": [ + {"origin": [-3.5, 1.01, -4.25], "size": [7, 4, 4], "uv": [0, 11]}, + {"origin": [-3.5, 3.75, -4.5], "size": [7, 3, 4], "inflate": 0.23, "uv": [0, 19]} + ] + }, + { + "name": "locator_head", + "parent": "head", + "pivot": [0, 6.95, -3.5], + "locators": { + "head": [0, 6.95, -3.5] + } + }, + { + "name": "locator_item_face", + "parent": "head", + "pivot": [0, 5.25, -4.7], + "locators": { + "item_face": [0, 5.25, -4.7] + } + }, + { + "name": "locator_face", + "parent": "head", + "pivot": [0, 2.5, -9.75], + "locators": { + "face": [0, 2.5, -9.75], + "special": [0, 2.5, -9.75] + } + }, + { + "name": "locator_item", + "parent": "head", + "pivot": [0, 2.5, -9.75], + "locators": { + "item": [0, 2.5, -9.75] + } + }, + { + "name": "locator_item_hat", + "parent": "head", + "pivot": [0, 6.95, -2.5], + "locators": { + "item_hat": [0, 6.95, -2.5] + } + }, + { + "name": "locator_mouth", + "parent": "head", + "pivot": [0, 2.5, -4.25], + "locators": { + "mouth": [0, 2.5, -4.25] + } + }, + { + "name": "face", + "parent": "head", + "pivot": [-2, 0.5, 0] + }, + { + "name": "mouth_closed", + "parent": "face", + "pivot": [-2, 0.5, 0], + "cubes": [ + {"origin": [-1, 1.01, -4.25], "size": [2, 3, 1], "inflate": 0.01, "uv": [16, 34]} + ] + }, + { + "name": "mouth_opened", + "parent": "face", + "pivot": [-2, 0.5, 0.1], + "cubes": [ + {"origin": [-0.5, 1.11, -4.15], "size": [1, 3, 1], "inflate": 0.02, "uv": [34, 38]}, + {"origin": [-1, 1.11, -4.15], "size": [2, 3, 1], "inflate": 0.02, "uv": [34, 34]} + ] + }, + { + "name": "eyes", + "parent": "face", + "pivot": [-3, 3, -2.75] + }, + { + "name": "eye_right", + "parent": "eyes", + "pivot": [-3, 3, -2.75], + "cubes": [ + {"origin": [-3.5, 2, -3.75], "size": [1, 2, 2], "inflate": 0.01, "uv": [22, 34], "mirror": true} + ] + }, + { + "name": "iris_right", + "parent": "eye_right", + "pivot": [-3.235, 3.5, -2.75], + "cubes": [ + {"origin": [-3.32, 2.5, -3.25], "size": [1, 2, 1], "inflate": 0.2, "uv": [38, 38], "mirror": true} + ] + }, + { + "name": "pupil_right", + "parent": "iris_right", + "pivot": [-3.14, 3.5, -2.75], + "cubes": [ + {"origin": [-3.63, 2.5, -3.25], "size": [1, 2, 1], "inflate": -0.1, "uv": [0, 40], "mirror": true} + ] + }, + { + "name": "locator_eye_right", + "parent": "pupil_right", + "pivot": [-3.53, 3.25, -2.75], + "locators": { + "eye1": [-3.53, 3.25, -2.75] + } + }, + { + "name": "eyelid_sad_right", + "parent": "eye_right", + "pivot": [-2.9, 3, -2.75], + "cubes": [ + {"origin": [-3.4, 3, -2.75], "size": [1, 1, 1], "inflate": 0.05, "uv": [38, 29]} + ] + }, + { + "name": "eyelid_angry_right", + "parent": "eye_right", + "pivot": [-2.9, 3, -2.75], + "cubes": [ + {"origin": [-3.4, 3, -3.75], "size": [1, 1, 1], "inflate": 0.04, "uv": [40, 4]} + ] + }, + { + "name": "eye_left", + "parent": "eyes", + "pivot": [3, 3, -2.75], + "cubes": [ + {"origin": [2.5, 2, -3.75], "size": [1, 2, 2], "inflate": 0.01, "uv": [22, 34]} + ] + }, + { + "name": "iris_left", + "parent": "eye_left", + "pivot": [3.235, 3.5, -2.75], + "cubes": [ + {"origin": [2.32, 2.5, -3.25], "size": [1, 2, 1], "inflate": 0.2, "uv": [38, 38]} + ] + }, + { + "name": "pupil_left", + "parent": "iris_left", + "pivot": [3.14, 3.5, -2.75], + "cubes": [ + {"origin": [2.63, 2.5, -3.25], "size": [1, 2, 1], "inflate": -0.1, "uv": [0, 40]} + ] + }, + { + "name": "locator_eye_left", + "parent": "pupil_left", + "pivot": [3.53, 3.25, -2.75], + "locators": { + "eye2": [3.53, 3.25, -2.75] + } + }, + { + "name": "eyelid_sad_left", + "parent": "eye_left", + "pivot": [2.9, 3, -2.75], + "cubes": [ + {"origin": [2.4, 3, -2.75], "size": [1, 1, 1], "inflate": 0.05, "uv": [36, 4]} + ] + }, + { + "name": "eyelid_angry_left", + "parent": "eye_left", + "pivot": [2.9, 3, -2.75], + "cubes": [ + {"origin": [2.4, 3, -3.75], "size": [1, 1, 1], "inflate": 0.04, "uv": [38, 23]} + ] + }, + { + "name": "eyelids_left", + "parent": "eyes", + "pivot": [0.5, 0.5, 0] + }, + { + "name": "eyelid_left", + "parent": "eyelids_left", + "pivot": [2.9, 3, -2.75], + "cubes": [ + {"origin": [2.4, 2, -3.75], "size": [1, 2, 2], "inflate": 0.01, "uv": [0, 36]} + ] + }, + { + "name": "eyelid_recoil_left", + "parent": "eyelids_left", + "pivot": [2.9, 3, -2.75], + "cubes": [ + {"origin": [2.4, 2, -3.75], "size": [1, 2, 2], "inflate": 0.01, "uv": [36, 0]} + ] + }, + { + "name": "eyelid_happy_left", + "parent": "eyelids_left", + "pivot": [2.9, 3, -2.75], + "cubes": [ + {"origin": [2.4, 2, -4.23], "size": [1, 2, 4], "inflate": 0.01, "uv": [22, 25]} + ] + }, + { + "name": "eyelids_right", + "parent": "eyes", + "pivot": [-0.5, 0.5, 0] + }, + { + "name": "eyelid_right", + "parent": "eyelids_right", + "pivot": [-2.9, 3, -2.75], + "cubes": [ + {"origin": [-3.4, 2, -3.75], "size": [1, 2, 2], "inflate": 0.01, "uv": [6, 38]} + ] + }, + { + "name": "eyelid_recoil_right", + "parent": "eyelids_right", + "pivot": [-2.9, 3, -2.75], + "cubes": [ + {"origin": [-3.4, 2, -3.75], "size": [1, 2, 2], "inflate": 0.01, "uv": [12, 38]} + ] + }, + { + "name": "eyelid_happy_right", + "parent": "eyelids_right", + "pivot": [-2.9, 3, -2.75], + "cubes": [ + {"origin": [-3.4, 2, -4.23], "size": [1, 2, 4], "inflate": 0.01, "uv": [0, 26]} + ] + }, + { + "name": "ditto_face", + "parent": "head", + "pivot": [-3, 2.75, -3.25] + }, + { + "name": "ditto_eye_right", + "parent": "ditto_face", + "pivot": [-2.9, 2.75, -3.25], + "cubes": [ + {"origin": [-3.4, 2, -3.75], "size": [1, 1, 1], "inflate": 0.01, "uv": [40, 21]} + ] + }, + { + "name": "ditto_eyelid_right", + "parent": "ditto_eye_right", + "pivot": [-2.8, 2.75, -3.25], + "cubes": [ + {"origin": [-3.3, 2, -4.23], "size": [1, 1, 2], "inflate": 0.01, "uv": [24, 38]}, + {"origin": [-3.3, 2.5, -3.74], "size": [1, 1, 1], "inflate": 0.02, "uv": [40, 25]} + ] + }, + { + "name": "ditto_eye_left", + "parent": "ditto_face", + "pivot": [2.9, 2.75, -3.25], + "cubes": [ + {"origin": [2.4, 2, -3.75], "size": [1, 1, 1], "inflate": 0.01, "uv": [40, 13]} + ] + }, + { + "name": "ditto_eyelid_left", + "parent": "ditto_eye_left", + "pivot": [2.8, 2.75, -3.25], + "cubes": [ + {"origin": [2.3, 2, -4.23], "size": [1, 1, 2], "inflate": 0.01, "uv": [18, 38]}, + {"origin": [2.3, 2.5, -3.74], "size": [1, 1, 1], "inflate": 0.02, "uv": [40, 19]} + ] + }, + { + "name": "ditto_mouth", + "parent": "ditto_face", + "pivot": [0, 2.09333, -3.65], + "cubes": [ + {"origin": [-1, 1.26, -4.15], "size": [2, 1, 1], "inflate": 0.01, "uv": [32, 29]}, + {"origin": [1, 1.76, -4.15], "size": [1, 1, 1], "inflate": 0.01, "uv": [40, 15]}, + {"origin": [-2, 1.76, -4.15], "size": [1, 1, 1], "inflate": 0.01, "uv": [40, 17]} + ] + }, + { + "name": "ditto_mouth_open", + "parent": "ditto_face", + "pivot": [0, 2.03, -3.55], + "cubes": [ + {"origin": [-2, 1.03, -4.05], "size": [4, 2, 1], "inflate": 0.01, "uv": [30, 31]} + ] + }, + { + "name": "mandible_left", + "parent": "head", + "pivot": [2, 2.5, -4.25], + "cubes": [ + {"origin": [0.99, 2.5, -10.25], "size": [2, 0, 3], "uv": [10, 31]}, + {"origin": [0.99, 1.5, -7.25], "size": [2, 2, 3], "uv": [23, 20]} + ] + }, + { + "name": "locator_jaw_left", + "parent": "mandible_left", + "pivot": [1, 2.5, -8.25], + "locators": { + "jaw2": [1, 2.5, -8.25], + "physical2": [1, 2.5, -8.25] + } + }, + { + "name": "mandible_right", + "parent": "head", + "pivot": [-2, 2.5, -4.25], + "cubes": [ + {"origin": [-2.99, 2.5, -10.25], "size": [2, 0, 3], "uv": [20, 31]}, + {"origin": [-2.99, 1.5, -7.25], "size": [2, 2, 3], "uv": [25, 1]} + ] + }, + { + "name": "locator_jaw_right", + "parent": "mandible_right", + "pivot": [-1, 2.5, -8.25], + "locators": { + "jaw1": [-1, 2.5, -8.25], + "physical1": [-1, 2.5, -8.25] + } + }, + { + "name": "arm_left", + "parent": "midsection", + "pivot": [2.25, 1, 0], + "cubes": [ + {"origin": [1.25, 0, -2], "size": [2, 2, 3], "uv": [24, 6]} + ] + }, + { + "name": "locator_hand_secondary", + "parent": "arm_left", + "pivot": [2.25, 1, -1], + "locators": { + "hand_secondary": [2.25, 1, -1] + } + }, + { + "name": "arm_right", + "parent": "midsection", + "pivot": [-2.25, 1, 0], + "cubes": [ + {"origin": [-3.25, 0, -2], "size": [2, 2, 3], "uv": [10, 26]} + ] + }, + { + "name": "locator_hand_primary", + "parent": "arm_right", + "pivot": [-2.25, 1, -1], + "locators": { + "hand_primary": [-2.25, 1, -1] + } + }, + { + "name": "leg_front_left", + "parent": "midsection", + "pivot": [2.25, 1.5, 2.5], + "cubes": [ + {"origin": [1.25, 0, 1.5], "size": [2, 2, 2], "uv": [0, 32]} + ] + }, + { + "name": "locator_foot_secondary1", + "parent": "leg_front_left", + "pivot": [2.25, 1, 2.5], + "locators": { + "foot_secondary1": [2.25, 1, 2.5] + } + }, + { + "name": "leg_front_right", + "parent": "midsection", + "pivot": [-2.25, 1.5, 2.5], + "cubes": [ + {"origin": [-3.25, 0, 1.5], "size": [2, 2, 2], "uv": [32, 25]} + ] + }, + { + "name": "locator_foot_primary1", + "parent": "leg_front_right", + "pivot": [-2.25, 1, 2.5], + "locators": { + "foot_primary1": [-2.25, 1, 2.5] + } + }, + { + "name": "tail", + "parent": "body", + "pivot": [0, 3, 4], + "cubes": [ + {"origin": [-3, 1, 4], "size": [6, 5, 3], "uv": [22, 11]}, + {"origin": [2, 2, 4.5], "size": [1, 2, 2], "inflate": 0.02, "uv": [34, 19]}, + {"origin": [-3, 2, 4.5], "size": [1, 2, 2], "inflate": 0.02, "uv": [28, 34]} + ] + }, + { + "name": "leg_back_left", + "parent": "tail", + "pivot": [1.5, 1.5, 5], + "cubes": [ + {"origin": [0.5, 0, 4], "size": [2, 2, 2], "inflate": -0.02, "uv": [34, 6]} + ] + }, + { + "name": "locator_foot_secondary2", + "parent": "leg_back_left", + "pivot": [1.5, 1, 5], + "locators": { + "foot_secondary2": [1.5, 1, 5] + } + }, + { + "name": "leg_back_right", + "parent": "tail", + "pivot": [-1.5, 1.5, 5], + "cubes": [ + {"origin": [-2.5, 0, 4], "size": [2, 2, 2], "inflate": -0.02, "uv": [8, 34]} + ] + }, + { + "name": "locator_foot_primary2", + "parent": "leg_back_right", + "pivot": [-1.5, 1, 5], + "locators": { + "foot_primary2": [-1.5, 1, 5] + } + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0736_grubbin/grubbin.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0736_grubbin/grubbin.json new file mode 100644 index 0000000000..2be1c32d04 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0736_grubbin/grubbin.json @@ -0,0 +1,23 @@ +{ + "portraitScale": 2.08, + "portraitTranslation": [-0.12, -1.5, 0], + "profileScale": 0.79, + "profileTranslation": [0.06, 0.59, 0], + "rootBone": "grubbin", + "animations": { + "cry": "q.bedrock_stateful('grubbin', 'cry')", + "physical": "q.bedrock_primary('grubbin', 'physical', q.curve('symmetrical_wide'))" + }, + "poses": { + "standing": { + "poseTypes": ["STAND", "FLOAT", "NONE", "PORTRAIT", "PROFILE"], + "animations": ["q.look('head')", "q.bedrock('grubbin', 'ground_idle')"], + "quirks": ["q.bedrock_quirk('grubbin', 'blink')"] + }, + "walking": { + "poseTypes": ["WALK", "SWIM"], + "animations": ["q.look('head')", "q.bedrock('grubbin', 'ground_walk')"], + "quirks": ["q.bedrock_quirk('grubbin', 'blink')"] + } + } +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0736_grubbin/0_grubbin_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0736_grubbin/0_grubbin_base.json new file mode 100644 index 0000000000..1e99c15c99 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0736_grubbin/0_grubbin_base.json @@ -0,0 +1,31 @@ +{ + "species": "cobblemon:grubbin", + "order": 0, + "variations": [ + { + "aspects": [], + "poser": "cobblemon:grubbin", + "model": "cobblemon:grubbin.geo", + "texture": "cobblemon:textures/pokemon/0736_grubbin/grubbin.png", + "layers": [] + }, + { + "aspects": [ + "shiny" + ], + "texture": "cobblemon:textures/pokemon/0736_grubbin/grubbin_shiny.png" + }, + { + "aspects": [ + "alpha_eyes" + ], + "layers": [ + { + "name": "alpha_eyes", + "texture": "cobblemon:textures/pokemon/0736_grubbin/grubbin_alpha.png", + "emissive": true + } + ] + } + ] +} diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0736_grubbin/grubbin.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0736_grubbin/grubbin.png new file mode 100644 index 0000000000..be9ca9a3ea Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0736_grubbin/grubbin.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0736_grubbin/grubbin_alpha.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0736_grubbin/grubbin_alpha.png new file mode 100644 index 0000000000..59720e54a6 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0736_grubbin/grubbin_alpha.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0736_grubbin/grubbin_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0736_grubbin/grubbin_shiny.png new file mode 100644 index 0000000000..e2c064455c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0736_grubbin/grubbin_shiny.png differ diff --git a/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json b/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json index 0ac08c8df6..6793147f1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json +++ b/common/src/main/resources/data/cobblemon/species/generation7/grubbin.json @@ -42,10 +42,11 @@ "baseFriendship": 50, "baseScale": 1, "hitbox": { - "width": 1, - "height": 1, + "width": 0.7, + "height": 0.45, "fixed": false }, + "standingEyeHeight": 0.6, "drops": { "amount": 3, "entries": [