diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0451_skorupi/skorupi.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0451_skorupi/skorupi.animation.json new file mode 100644 index 0000000000..11c26b5aa7 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0451_skorupi/skorupi.animation.json @@ -0,0 +1,186 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.skorupi.ground_idle": { + "loop": true, + "bones": { + "torso": { + "rotation": [2.5, 0, 0] + }, + "tail": { + "rotation": [22.5193, 2.30959, 0.95723] + }, + "tail2": { + "rotation": [35.02564, -2.04767, -1.43455] + }, + "tail3": { + "rotation": [32.5, 0, 0] + }, + "tail4": { + "rotation": [30.02363, 2.16489, 1.2506] + }, + "tail_end": { + "rotation": [32.10382, -5.35355, 8.45862] + }, + "leg_front_left": { + "rotation": [7.92945, 18.42031, 23.78773] + }, + "leg_front_left2": { + "rotation": [0, 0, -12.5] + }, + "leg_back_left": { + "rotation": [-10.11783, -22.9824, 24.56202] + }, + "leg_back_left2": { + "rotation": [0, 0, -5] + }, + "leg_front_right": { + "rotation": [7.92945, -18.42031, -23.78773] + }, + "leg_front_right2": { + "rotation": [0, 0, 12.5] + }, + "leg_back_right": { + "rotation": [-10.11783, 22.9824, -24.56202] + }, + "leg_back_right2": { + "rotation": [0, 0, 5] + }, + "head": { + "rotation": [-5, 0, 0] + }, + "arm_left": { + "rotation": [0, 0, -7.5] + }, + "arm_right": { + "rotation": [0, 0, 7.5] + }, + "mouth_open": { + "position": [0, 0, 0] + } + } + }, + "animation.skorupi.blink": { + "animation_length": 0.1667, + "bones": { + "pupil_left": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": [0, 0, 0] + } + }, + "pupil_closed_left": { + "position": { + "0.0": [0, 0, -0.1], + "0.125": [0, 0, -0.1], + "0.1667": [0, 0, 0] + } + }, + "pupil_right": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": [0, 0, 0] + } + }, + "pupil_closed_right": { + "position": { + "0.0": [0, 0, -0.1], + "0.125": [0, 0, -0.1], + "0.1667": [0, 0, 0] + } + } + } + }, + "animation.skorupi.shock": { + "loop": true, + "bones": { + "mouth_closed": { + "position": [0, 0, 0.1] + }, + "mouth_open": { + "position": [0, 0, -0.1] + }, + "pupil_left": { + "rotation": [0, 0, -25], + "scale": [0.5, 0.5, 1] + }, + "pupil_right": { + "rotation": [0, 0, 25], + "scale": [0.5, 0.5, 1] + } + } + }, + "animation.skorupi.angry": { + "loop": true, + "bones": { + "pupil_left": { + "rotation": [0, 0, -15] + }, + "eye_expression_left": { + "position": [-0.5, 0, -0.1] + }, + "pupil_right": { + "rotation": [0, 0, 15] + }, + "eye_expression_right": { + "position": [0.5, 0, -0.1] + } + } + }, + "animation.skorupi.sad": { + "loop": true, + "bones": { + "eye_expression_left": { + "position": [0.5, 0.25, -0.1] + }, + "eye_expression_right": { + "position": [-0.5, 0.25, -0.1] + } + } + }, + "animation.skorupi.happy": { + "loop": true, + "bones": { + "mouth_closed": { + "position": [0, 0, 0.1] + }, + "mouth_open": { + "position": [0, 0, -0.1] + }, + "pupil_left": { + "position": [0, 0, 0.1] + }, + "pupil_happy_left": { + "position": [0, 0, -0.1] + }, + "pupil_right": { + "position": [0, 0, 0.1] + }, + "pupil_happy_right": { + "position": [0, 0, -0.1] + } + } + }, + "animation.skorupi.hurt": { + "loop": true, + "bones": { + "pupil_left": { + "position": [0, 0, 0.1] + }, + "pupil_closed_left": { + "rotation": [0, 0, -45], + "position": [0, 0, -0.1] + }, + "pupil_right": { + "position": [0, 0, 0.1] + }, + "pupil_closed_right": { + "rotation": [0, 0, 45], + "position": [0, 0, -0.1] + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0452_drapion/drapion.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0452_drapion/drapion.animation.json new file mode 100644 index 0000000000..33d15be57a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0452_drapion/drapion.animation.json @@ -0,0 +1,223 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.drapion.ground_idle": { + "loop": true, + "bones": { + "torso": { + "rotation": [-5, 0, 0] + }, + "neck": { + "rotation": [-27.51313, 0.23318, 0.28749] + }, + "neck2": { + "rotation": [-17.5, 0, 0] + }, + "neck3": { + "rotation": [-12.5, 0, 0] + }, + "neck4": { + "rotation": [27.5, 0, 0] + }, + "head": { + "rotation": [37.48636, -0.24814, 0.36242] + }, + "tail": { + "rotation": [17.5193, 2.30959, 0.95723] + }, + "tail2": { + "rotation": [24.49937, 2.93303, -1.90673] + }, + "tail3": { + "rotation": [14.8369, -5.47408, 1.12804] + }, + "tail4": { + "rotation": [17.43464, 0.4137, 3.27244] + }, + "tail5": { + "rotation": [12.60443, -7.32123, -1.63219] + }, + "arm_left": { + "rotation": [0, 0, -5] + }, + "arm_left2": { + "rotation": [0, 7.5, 2.5] + }, + "arm_left3": { + "rotation": [-0.32652, 2.4786, 27.49294] + }, + "arm_left4": { + "rotation": [-0.88045, 9.96156, 29.92327] + }, + "hand_left": { + "rotation": [14.33408, 7.08823, 22.2945] + }, + "arm_right": { + "rotation": [0, 0, 5] + }, + "arm_right2": { + "rotation": [0, -7.5, -2.5] + }, + "arm_right3": { + "rotation": [-0.32652, -2.4786, -27.49294] + }, + "arm_right4": { + "rotation": [-0.88045, -9.96156, -29.92327] + }, + "leg_front_left": { + "rotation": [0, 22.5, 0] + }, + "leg_back_left": { + "rotation": [0, -30, 0] + }, + "leg_back_right": { + "rotation": [0, 30, 0] + }, + "leg_front_right": { + "rotation": [0, -22.5, 0] + }, + "hand_right": { + "rotation": [14.33408, -7.08823, -22.2945] + } + } + }, + "animation.drapion.blink": { + "animation_length": 0.1667, + "bones": { + "pupil_left": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": [0, 0, 0] + } + }, + "pupil_closed_left": { + "position": { + "0.0": [0, 0, -0.1], + "0.125": [0, 0, -0.1], + "0.1667": [0, 0, 0] + } + }, + "pupil_right": { + "position": { + "0.0": [0, 0, 0.1], + "0.125": [0, 0, 0.1], + "0.1667": [0, 0, 0] + } + }, + "pupil_closed_right": { + "position": { + "0.0": [0, 0, -0.1], + "0.125": [0, 0, -0.1], + "0.1667": [0, 0, 0] + } + } + } + }, + "animation.drapion.mouth_open": { + "loop": true, + "bones": { + "head_top": { + "rotation": [-15.5, 0, 0] + }, + "head_bottom": { + "rotation": [37.5, 0, 0] + }, + "teeth": { + "rotation": [12.5, 0, 0] + } + } + }, + "animation.drapion.shock": { + "loop": true, + "bones": { + "head_top": { + "rotation": [-15.5, 0, 0] + }, + "head_bottom": { + "rotation": [37.5, 0, 0] + }, + "pupil_left": { + "rotation": [0, 0, 10], + "position": [0.4, 0.25, 0], + "scale": [0.6, 0.6, 1] + }, + "teeth": { + "rotation": [12.5, 0, 0] + }, + "pupil_right": { + "rotation": [0, 0, -10], + "position": [-0.4, 0.25, 0], + "scale": [0.6, 0.6, 1] + } + } + }, + "animation.drapion.angry": { + "loop": true, + "bones": { + "eye_expression_left": { + "position": [-0.4, 0, -0.1] + }, + "eye_expression_right": { + "position": [0.4, 0, -0.1] + } + } + }, + "animation.drapion.sad": { + "loop": true, + "bones": { + "eye_expression_left": { + "position": [0.4, 0.15, -0.1] + }, + "eye_expression_right": { + "position": [-0.4, 0.15, -0.1] + } + } + }, + "animation.drapion.happy": { + "loop": true, + "bones": { + "head_top": { + "rotation": [-15.5, 0, 0] + }, + "head_bottom": { + "rotation": [37.5, 0, 0] + }, + "pupil_left": { + "position": [0, 0, 0.1] + }, + "teeth": { + "rotation": [12.5, 0, 0] + }, + "pupil_happy_left": { + "position": [0, 0, -0.1] + }, + "pupil_right": { + "position": [0, 0, 0.1] + }, + "pupil_happy_right": { + "position": [0, 0, -0.1] + } + } + }, + "animation.drapion.hurt": { + "loop": true, + "bones": { + "pupil_left": { + "position": [0, 0, 0.1] + }, + "pupil_closed_left": { + "rotation": [0, 0, -30], + "position": [0, 0, -0.1] + }, + "pupil_right": { + "position": [0, 0, 0.1] + }, + "pupil_closed_right": { + "rotation": [0, 0, 30], + "position": [0, 0, -0.1] + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0602_tynamo/tynamo.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0602_tynamo/tynamo.animation.json new file mode 100644 index 0000000000..a719d2e6fc --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0602_tynamo/tynamo.animation.json @@ -0,0 +1,141 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.tynamo.ground_idle": { + "loop": true, + "bones": { + "body": { + "rotation": [0, 0, 0] + }, + "head": { + "rotation": [2.5, 0, 0] + }, + "body2": { + "rotation": [-2.5, 0, 0] + }, + "body3": { + "rotation": [-2.5, 0, 0] + }, + "body_fin3": { + "rotation": [0, 0, 0] + }, + "body_fin4": { + "rotation": [-5.07435, -0.61884, -0.62342] + } + } + }, + "animation.tynamo.blink": { + "animation_length": 0.1667, + "bones": { + "eyelid_left": { + "position": { + "0.0": [0.1, 0, 0], + "0.125": [0.1, 0, 0], + "0.1667": [0, 0, 0] + } + }, + "eyelid_right": { + "position": { + "0.0": [-0.1, 0, 0], + "0.125": [-0.1, 0, 0], + "0.1667": [0, 0, 0] + } + } + } + }, + "animation.tynamo.shock": { + "loop": true, + "bones": { + "eye_left": { + "rotation": [0, 0, -0.5], + "position": [-0.01, 0.5, 0], + "scale": [1, 0.8, 0.73] + }, + "eye_right": { + "rotation": [0, 0, 0.5], + "position": [0.01, 0.5, 0], + "scale": [1, 0.8, 0.73] + } + } + }, + "animation.tynamo.angry": { + "loop": true, + "bones": { + "eye_expression_left": { + "position": [0.1, 0, -0.65] + }, + "eye_expression_right": { + "position": [-0.1, 0, -0.65] + } + } + }, + "animation.tynamo.sad": { + "loop": true, + "bones": { + "eye_expression_left": { + "position": [0.1, 0.15, 0.75] + }, + "mouth_open": { + "position": [0, 0, 0.1] + }, + "eye_expression_right": { + "position": [-0.1, 0.15, 0.75] + }, + "mouth_closed": { + "position": [0, 0, -0.2] + } + } + }, + "animation.tynamo.happy": { + "loop": true, + "bones": { + "eyelid_happy_left": { + "position": [0.1, 0, 0] + }, + "eyelid_happy_right": { + "position": [-0.1, 0, 0] + } + } + }, + "animation.tynamo.hurt": { + "loop": true, + "bones": { + "eyelid_recoil_left": { + "position": [0.1, 0, 0] + }, + "mouth_open": { + "position": [0, 0, 0.1] + }, + "eyelid_recoil_right": { + "position": [-0.1, 0, 0] + }, + "mouth_closed": { + "position": [0, 0, -0.2] + } + } + }, + "animation.tynamo.render": { + "loop": true, + "bones": { + "body": { + "rotation": [0, 45, 0] + }, + "head": { + "rotation": [-5, 0, 0] + }, + "body2": { + "rotation": [-2.5, 0, 0] + }, + "body3": { + "rotation": [-2.5, 0, 0] + }, + "body_fin3": { + "rotation": [0, 0, 0] + }, + "body_fin4": { + "rotation": [-5.07435, -0.61884, -0.62342] + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0603_eelektrik/eelektrik.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0603_eelektrik/eelektrik.animation.json new file mode 100644 index 0000000000..b1a715ed8b --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0603_eelektrik/eelektrik.animation.json @@ -0,0 +1,163 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.eelektrik.ground_idle": { + "loop": true, + "bones": { + "body": { + "position": [0, 10.5, 12] + }, + "neck": { + "rotation": [-7.5, 0, 0] + }, + "head": { + "rotation": [20, 0, 0] + }, + "segment1": { + "rotation": [-57.52472, -1.34295, 2.10886] + }, + "segment8": { + "rotation": [22.57734, 4.61854, 1.91757] + }, + "segment2": { + "rotation": [-52.5, 0, 0] + }, + "segment3": { + "rotation": [-47.47282, 1.84293, 1.68956] + }, + "segment4": { + "rotation": [27.5, 0, 0] + }, + "segment5": { + "rotation": [67.5, 0, 0] + }, + "segment6": { + "rotation": [52.5, 0, 0] + }, + "segment7": { + "rotation": [12.5, 0, 0] + }, + "teeth_closed": { + "position": [0, 0, 1], + "scale": 1 + } + } + }, + "animation.eelektrik.blink": { + "animation_length": 0.1667, + "bones": { + "eyelid_left": { + "position": { + "0.0": [0.1, 0, 0], + "0.125": [0.1, 0, 0], + "0.1667": [0, 0, 0] + } + }, + "eyelid_right": { + "position": { + "0.0": [-0.1, 0, 0], + "0.125": [-0.1, 0, 0], + "0.1667": [0, 0, 0] + } + } + } + }, + "animation.eelektrik.shock": { + "loop": true, + "bones": { + "pupil_left": { + "scale": [1, 0.6, 0.6] + }, + "teeth_open_left": { + "scale": [0.6, 0.6, 1] + }, + "teeth_open_right": { + "scale": [0.6, 0.6, 1] + }, + "teeth_open_top": { + "scale": [0.6, 0.6, 1] + }, + "teeth_open_bottom": { + "scale": [0.6, 0.6, 1] + }, + "teeth_closed": { + "position": [0, 0, 1] + }, + "pupil_right": { + "scale": [1, 0.6, 0.6] + } + } + }, + "animation.eelektrik.angry": { + "loop": true, + "bones": { + "teeth_closed": { + "position": [0, 0, 1] + }, + "eye_expression_left": { + "position": [0.1, 0, -0.6] + }, + "eye_expression_right": { + "position": [-0.1, 0, -0.6] + } + } + }, + "animation.eelektrik.sad": { + "loop": true, + "bones": { + "teeth_open": { + "position": [0, 0, 1] + }, + "teeth_closed": { + "position": [0, 0, 0] + }, + "eye_expression_left": { + "position": [0.1, 0.5, 0.6] + }, + "eye_expression_right": { + "position": [-0.1, 0.5, 0.6] + } + } + }, + "animation.eelektrik.happy": { + "loop": true, + "bones": { + "teeth_open_left": { + "scale": [0.6, 0.6, 1] + }, + "teeth_open_right": { + "scale": [0.6, 0.6, 1] + }, + "teeth_open_top": { + "scale": [0.6, 0.6, 1] + }, + "teeth_open_bottom": { + "scale": [0.6, 0.6, 1] + }, + "teeth_closed": { + "position": [0, 0, 1] + }, + "eyelid_happy_left": { + "position": [0.1, 0, 0] + }, + "eyelid_happy_right": { + "position": [-0.1, 0, 0] + } + } + }, + "animation.eelektrik.hurt": { + "loop": true, + "bones": { + "eyelid_recoil_left": { + "position": [0.1, 0, 0] + }, + "teeth_open": { + "position": [0, 0, 1] + }, + "eyelid_recoil_right": { + "position": [-0.1, 0, 0] + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0604_eelektross/eelektross.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0604_eelektross/eelektross.animation.json new file mode 100644 index 0000000000..f42e3c5833 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0604_eelektross/eelektross.animation.json @@ -0,0 +1,376 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.eelektross.ground_idle": { + "loop": true, + "bones": { + "body": { + "rotation": [-100, 0, 0], + "position": [0, 4.7, 0] + }, + "neck": { + "rotation": [15, 0, 0] + }, + "neck2": { + "rotation": [45, 0, 0] + }, + "head": { + "rotation": [47.5, 0, 0] + }, + "segment1": { + "rotation": [-12.5, 0, 0] + }, + "segment3": { + "rotation": [52.5, 0, 0] + }, + "segment4": { + "rotation": [20, 0, 0] + }, + "segment5": { + "rotation": [10, 0, 0] + }, + "segment2": { + "rotation": [45, 0, 0] + }, + "segment6": { + "rotation": [12.5, 0, 0] + }, + "segment7": { + "rotation": [7.5, 0, 0] + }, + "segment8": { + "rotation": [10, 0, 0] + }, + "arms": { + "rotation": [77.5, 0, 0] + }, + "arm_left": { + "rotation": [0, 0, 50] + }, + "arm_left2": { + "rotation": [0, 30, -12.5] + }, + "arm_left3": { + "rotation": [0, 17.5, 20] + }, + "hand_left": { + "rotation": [0, 20, 25] + }, + "legs": { + "rotation": [15, 0, 0] + }, + "arm_right": { + "rotation": [0, 0, -50] + }, + "arm_right2": { + "rotation": [0, -30, 12.5] + }, + "arm_right3": { + "rotation": [0, -17.5, -20] + }, + "hand_right": { + "rotation": [0, -20, -25] + }, + "leg_left": { + "rotation": [0, 0, -35] + }, + "leg_left2": { + "rotation": [0, 0, -54] + }, + "leg_left3": { + "rotation": [0, 0, -25] + }, + "leg_right": { + "rotation": [0, 0, 35] + }, + "leg_right2": { + "rotation": [0, 0, 54] + }, + "leg_right3": { + "rotation": [0, 0, 25] + }, + "head_fin": { + "rotation": [-5, 0, 0] + }, + "head_fin2": { + "rotation": [-35, 0, 0] + }, + "head_fin3": { + "rotation": [20, 0, 0] + }, + "head_fin5": { + "rotation": [-20, 0, 0] + }, + "head_fin4": { + "rotation": [30, 0, 0] + }, + "head_fin_bottom2": { + "rotation": [15, 0, 0] + }, + "head_fin_bottom3": { + "rotation": [30, 0, 0] + }, + "head_fin_bottom1": { + "rotation": [2.5, 0, 0] + }, + "back_fin1": { + "rotation": [0, 0, 0], + "position": [0, 0, -0.5] + }, + "head_detail_left1": { + "position": [0, -0.5, 0] + }, + "head_detail_right1": { + "position": [0, -0.5, 0] + }, + "head_detail_left2": { + "position": [0, 0, 1] + }, + "head_detail_right2": { + "position": [0, 0, 1] + } + } + }, + "animation.eelektross.water_idle": { + "loop": true, + "bones": { + "body": { + "rotation": [-15, 0, 0], + "position": [0, 4.7, 0] + }, + "neck": { + "rotation": [-5, 0, 0] + }, + "neck2": { + "rotation": [15, 0, 0] + }, + "head": { + "rotation": [20, 0, 0] + }, + "segment1": { + "rotation": [-12.51153, -2.4407, 0.54143] + }, + "segment3": { + "rotation": [27.58957, 4.43385, 2.31336] + }, + "segment4": { + "rotation": [0.22588, 3.50244, -2.34348] + }, + "segment5": { + "rotation": [-10.23772, -12.3071, 2.20462] + }, + "segment2": { + "rotation": [30.02363, 2.16489, 1.2506] + }, + "segment6": { + "rotation": [-25.34721, -12.06754, 3.28396] + }, + "segment7": { + "rotation": [-36.4568, -32.61461, 13.46783] + }, + "segment8": { + "rotation": [-32.00206, -19.3546, 11.70092] + }, + "arms": { + "rotation": [77.5, 0, 0] + }, + "arm_left": { + "rotation": [10.11252, 3.77941, 51.75758] + }, + "arm_left2": { + "rotation": [5.41207, -8.42145, -10.39875] + }, + "arm_left3": { + "rotation": [0.14655, -15.79256, 25.63835] + }, + "hand_left": { + "rotation": [0, 0, 20] + }, + "legs": { + "rotation": [15, 0, 0] + }, + "arm_right": { + "rotation": [10.11252, -3.77941, -51.75758] + }, + "arm_right2": { + "rotation": [5.41207, 8.42145, 10.39875] + }, + "arm_right3": { + "rotation": [0.14655, 15.79256, -25.63835] + }, + "hand_right": { + "rotation": [0, 0, -20] + }, + "leg_left": { + "rotation": [0, 0, -47.5] + }, + "leg_left2": { + "rotation": [0, 0, 13.5] + }, + "leg_left3": { + "rotation": [0, 0, 30] + }, + "leg_right": { + "rotation": [0, 0, 47.5] + }, + "leg_right2": { + "rotation": [0, 0, -13.5] + }, + "leg_right3": { + "rotation": [0, 0, -30] + }, + "head_fin": { + "rotation": [-5, 0, 0] + }, + "head_fin2": { + "rotation": [12.59468, -4.32875, -2.50477] + }, + "head_fin3": { + "rotation": [-25.18908, 6.79382, -3.18458] + }, + "head_fin5": { + "rotation": [-20, 0, 0] + }, + "head_fin4": { + "rotation": [15.0547, -4.82922, -1.29717] + }, + "head_fin_bottom2": { + "rotation": [-30.21362, 6.49053, -3.76613] + }, + "head_fin_bottom3": { + "rotation": [20.07031, -4.69776, -1.71394], + "position": [0, 0, -1] + }, + "finger_side_left": { + "rotation": [0, 0, -25] + }, + "finger_front_left": { + "rotation": [-27.5, 0, 0] + }, + "finger_back_left": { + "rotation": [30, 0, 0] + }, + "finger_side_right": { + "rotation": [0, 0, 25] + }, + "finger_front_right": { + "rotation": [-27.5, 0, 0] + }, + "finger_back_right": { + "rotation": [30, 0, 0] + }, + "head_fin_bottom1": { + "rotation": [2.5, 0, 0] + }, + "head2": { + "rotation": [-15, 0, 0] + }, + "eye_base_left": { + "rotation": [5, 0, 0] + }, + "eye_base_left2": { + "rotation": [10, 0, 0] + }, + "back_fin1": { + "rotation": [0, 0, 0] + }, + "back_fin6": { + "rotation": [0, 12.5, 0] + }, + "head_detail_left1": { + "position": [0, 0, -0.5] + }, + "head_detail_right1": { + "position": [0, 0, -0.5] + }, + "head_detail_left2": { + "position": [0, 0, -1] + }, + "head_detail_right2": { + "position": [0, 0, -1] + }, + "eye_base_right": { + "rotation": [5, 0, 0] + }, + "eye_base_right2": { + "rotation": [10, 0, 0] + } + } + }, + "animation.eelektross.blink": { + "animation_length": 0.1667, + "bones": { + "eyelid_left": { + "position": { + "0.0": [0.1, 0, 0], + "0.125": [0.1, 0, 0], + "0.1667": [0, 0, 0] + } + } + } + }, + "animation.eelektross.shock": { + "loop": true, + "bones": { + "pupil_left": { + "position": [0, -0.25, 0.25], + "scale": [1, 0.7, 0.7] + }, + "pupil_right": { + "position": [0, -0.25, 0.25], + "scale": [1, 0.7, 0.7] + } + } + }, + "animation.eelektross.angry": { + "loop": true, + "bones": { + "pupil_left": { + "position": [0, -0.25, 0] + }, + "eye_expression_left": { + "position": [0.1, 0.5, -0.5] + }, + "eye_expression_right": { + "position": [-0.1, 0.5, -0.5] + }, + "pupil_right": { + "position": [0, -0.25, 0] + } + } + }, + "animation.eelektross.sad": { + "loop": true, + "bones": { + "eye_expression_left": { + "position": [0.1, 0.5, 0.5] + }, + "eye_expression_right": { + "position": [-0.1, 0.5, 0.5] + } + } + }, + "animation.eelektross.happy": { + "loop": true, + "bones": { + "eyelid_happy_left": { + "position": [0.1, 0, 0] + }, + "eyelid_happy_right": { + "position": [-0.1, 0, 0] + } + } + }, + "animation.eelektross.hurt": { + "loop": true, + "bones": { + "eyelid_hurt_left": { + "position": [0.1, 0, 0] + }, + "eyelid_hurt_right": { + "position": [-0.1, 0, 0] + } + } + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0451_skorupi/skorupi.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0451_skorupi/skorupi.geo.json new file mode 100644 index 0000000000..cd235dee8f --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0451_skorupi/skorupi.geo.json @@ -0,0 +1,371 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.skorupi", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 3, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "skorupi", + "pivot": [0, 0, 0] + }, + { + "name": "body", + "parent": "skorupi", + "pivot": [0, 3.5, 0] + }, + { + "name": "torso", + "parent": "body", + "pivot": [3.5, 4, 0], + "cubes": [ + {"origin": [-4, 1, -4.5], "size": [8, 6, 9], "inflate": 0.1, "uv": [0, 16]} + ] + }, + { + "name": "head", + "parent": "torso", + "pivot": [0, 5.5, -5], + "cubes": [ + {"origin": [-5, 3, -11], "size": [10, 8, 8], "inflate": 0.1, "uv": [0, 0]} + ] + }, + { + "name": "mouth", + "parent": "head", + "pivot": [0, 5.5, -11.11] + }, + { + "name": "mouth_closed", + "parent": "mouth", + "pivot": [0, 4.5, -11.11], + "cubes": [ + {"origin": [-3.5, 4.5, -11.11], "size": [7, 1, 0], "uv": [24, 55]}, + {"origin": [-2, 3.5, -11.11], "size": [4, 2, 0], "uv": [24, 56]} + ] + }, + { + "name": "mouth_open", + "parent": "mouth", + "pivot": [0, 4.65, -11.01], + "cubes": [ + {"origin": [-3.5, 3.65, -11.01], "size": [7, 2, 0], "uv": [18, 58]}, + {"origin": [-2, 3.65, -11.02], "size": [4, 2, 0], "uv": [32, 56]}, + {"origin": [-2.5, 3.15, -11.02], "size": [5, 1, 0], "inflate": 0.01, "uv": [8, 60]} + ] + }, + { + "name": "fangs", + "parent": "mouth", + "pivot": [0, 5.5, -11.11] + }, + { + "name": "fang_left", + "parent": "fangs", + "pivot": [4.75, 5, -11.11], + "rotation": [0, 0, -25], + "cubes": [ + {"origin": [2.25, 3.5, -11.15], "size": [4, 3, 0], "pivot": [5.75, 5, -11.11], "rotation": [0, -5, 0], "uv": [39, 16]} + ] + }, + { + "name": "fang_right", + "parent": "fangs", + "pivot": [-4.75, 5, -11.11], + "rotation": [0, 0, 25], + "cubes": [ + {"origin": [-6.25, 3.5, -11.15], "size": [4, 3, 0], "pivot": [-5.75, 5, -11.11], "rotation": [0, 5, 0], "uv": [34, 34], "mirror": true} + ] + }, + { + "name": "eyes", + "parent": "head", + "pivot": [0, 7.75, -11.11] + }, + { + "name": "eye_left", + "parent": "eyes", + "pivot": [2.5, 7.75, -11.11], + "rotation": [0, 0, 25], + "cubes": [ + {"origin": [1.1, 5.75, -11.11], "size": [3, 7, 0], "uv": [2, 1]} + ] + }, + { + "name": "pupil_left", + "parent": "eye_left", + "pivot": [2.6, 8.25, -11.12], + "cubes": [ + {"origin": [2.1, 7.75, -11.12], "size": [1, 1, 0], "uv": [4, 0]} + ] + }, + { + "name": "eye_expression_left", + "parent": "pupil_left", + "pivot": [2.6, 8.75, -11.02], + "cubes": [ + {"origin": [2.1, 8.25, -11.02], "size": [1, 1, 0], "inflate": 0.01, "uv": [0, 0]} + ] + }, + { + "name": "pupil_closed_left", + "parent": "eye_left", + "pivot": [2.6, 8.25, -11.02], + "cubes": [ + {"origin": [1.6, 7.75, -11.02], "size": [2, 1, 0], "uv": [28, 0]} + ] + }, + { + "name": "pupil_happy_left", + "parent": "eye_left", + "pivot": [2.6, 8.25, -11.02], + "cubes": [ + {"origin": [1.6, 7.25, -11.02], "size": [2, 2, 0], "pivot": [2.6, 8.25, -11.02], "rotation": [0, 0, 45], "uv": [0, 16]} + ] + }, + { + "name": "eye_right", + "parent": "eyes", + "pivot": [-2.5, 7.75, -11.11], + "rotation": [0, 0, -25], + "cubes": [ + {"origin": [-4.1, 5.75, -11.11], "size": [3, 7, 0], "uv": [3, 18], "mirror": true} + ] + }, + { + "name": "pupil_right", + "parent": "eye_right", + "pivot": [-2.6, 8.25, -11.12], + "cubes": [ + {"origin": [-3.1, 7.75, -11.12], "size": [1, 1, 0], "uv": [6, 0], "mirror": true} + ] + }, + { + "name": "eye_expression_right", + "parent": "pupil_right", + "pivot": [-2.6, 8.75, -11.02], + "cubes": [ + {"origin": [-3.1, 8.25, -11.02], "size": [1, 1, 0], "inflate": 0.01, "uv": [2, 0], "mirror": true} + ] + }, + { + "name": "pupil_closed_right", + "parent": "eye_right", + "pivot": [-2.6, 8.25, -11.02], + "cubes": [ + {"origin": [-3.6, 7.75, -11.02], "size": [2, 1, 0], "uv": [28, 1], "mirror": true} + ] + }, + { + "name": "pupil_happy_right", + "parent": "eye_right", + "pivot": [-2.6, 8.25, -11.02], + "cubes": [ + {"origin": [-3.6, 7.25, -11.02], "size": [2, 2, 0], "pivot": [-2.6, 8.25, -11.02], "rotation": [0, 0, -45], "uv": [4, 16], "mirror": true} + ] + }, + { + "name": "arm_left", + "parent": "head", + "pivot": [6.1, 9.1, -7.5], + "cubes": [ + {"origin": [4.73, 7.75, -10.5], "size": [6, 6, 6], "inflate": 0.2, "uv": [16, 31]}, + {"origin": [6.73, 9.75, -13], "size": [2, 2, 3], "inflate": 0.15, "pivot": [7.73, 10.75, -10.25], "rotation": [5, 0, 0], "uv": [50, 6]}, + {"origin": [7.23, 9.51, -15.25], "size": [1, 2, 3], "pivot": [7.73, 9.95, -12.75], "rotation": [22.5, 0, 0], "uv": [16, 53]} + ] + }, + { + "name": "arm_right", + "parent": "head", + "pivot": [-6.1, 9.1, -7.5], + "cubes": [ + {"origin": [-10.73, 7.75, -10.5], "size": [6, 6, 6], "inflate": 0.2, "uv": [21, 43], "mirror": true}, + {"origin": [-8.73, 9.75, -13], "size": [2, 2, 3], "inflate": 0.15, "pivot": [-7.73, 10.75, -10.25], "rotation": [5, 0, 0], "uv": [54, 11], "mirror": true}, + {"origin": [-8.23, 9.51, -15.25], "size": [1, 2, 3], "pivot": [-7.73, 9.95, -12.75], "rotation": [22.5, 0, 0], "uv": [3, 58], "mirror": true} + ] + }, + { + "name": "tail", + "parent": "torso", + "pivot": [0, 3.75, 4.5], + "cubes": [ + {"origin": [-2.5, 1.75, 4.45], "size": [5, 5, 4], "inflate": 0.01, "uv": [25, 16]}, + {"origin": [-2.5, 1.75, 5.95], "size": [5, 5, 1], "inflate": 0.02, "uv": [40, 55]}, + {"origin": [-1.5, 0.25, 4.95], "size": [3, 3, 3], "pivot": [0, 1.75, 12.375], "rotation": [0, 0, 45], "uv": [28, 2]} + ] + }, + { + "name": "tail2", + "parent": "tail", + "pivot": [0, 3.75, 8.5], + "cubes": [ + {"origin": [-2.5, 1.75, 8.4], "size": [5, 5, 4], "uv": [36, 7]}, + {"origin": [-2.5, 1.75, 9.9], "size": [5, 5, 1], "inflate": 0.03, "uv": [52, 46]}, + {"origin": [-1.5, 0.25, 8.9], "size": [3, 3, 3], "pivot": [0, 1.75, 12.375], "rotation": [0, 0, 45], "uv": [40, 1]} + ] + }, + { + "name": "tail3", + "parent": "tail2", + "pivot": [0, 3.75, 12.4], + "cubes": [ + {"origin": [-2.5, 1.75, 12.35], "size": [5, 5, 4], "inflate": 0.01, "uv": [43, 16]}, + {"origin": [-2.5, 1.75, 13.85], "size": [5, 5, 1], "inflate": 0.02, "uv": [52, 58]}, + {"origin": [-1.5, 0.25, 12.85], "size": [3, 3, 3], "pivot": [0, 1.75, 12.375], "rotation": [0, 0, 45], "uv": [52, 0]} + ] + }, + { + "name": "tail4", + "parent": "tail3", + "pivot": [0, 3.75, 16.4], + "cubes": [ + {"origin": [-2.5, 1.75, 16.3], "size": [5, 5, 4], "uv": [34, 25]}, + {"origin": [-2.5, 1.75, 17.8], "size": [5, 5, 1], "inflate": 0.03, "uv": [52, 52]}, + {"origin": [-1.5, 0.25, 16.8], "size": [3, 3, 3], "pivot": [0, 1.75, 12.375], "rotation": [0, 0, 45], "uv": [52, 25]} + ] + }, + { + "name": "tail_end", + "parent": "tail4", + "pivot": [0, 4, 20.3], + "cubes": [ + {"origin": [-3, 1, 20.3], "size": [6, 6, 6], "inflate": 0.1, "pivot": [0, 4, 23.3], "rotation": [180, 0, 0], "uv": [40, 34]} + ] + }, + { + "name": "tail_spike_left", + "parent": "tail_end", + "pivot": [3, 4, 24.3], + "rotation": [0, -27.5, 0], + "cubes": [ + {"origin": [1.75, 2.5, 22.8], "size": [4, 3, 3], "inflate": -0.1, "pivot": [3.75, 4, 24.3], "rotation": [180, 0, 0], "uv": [8, 31]} + ] + }, + { + "name": "tail_spike_left2", + "parent": "tail_spike_left", + "pivot": [5.85, 4, 23.8], + "rotation": [0, 30, 0], + "cubes": [ + {"origin": [4, 3, 23.05], "size": [2, 2, 4], "pivot": [5, 4, 25.05], "rotation": [180, 0, 0], "uv": [0, 33]} + ] + }, + { + "name": "tail_spike_left3", + "parent": "tail_spike_left2", + "pivot": [5.5, 4, 26.95], + "rotation": [0, -55, 0], + "cubes": [ + {"origin": [4.6, 3, 26.85], "size": [1, 2, 3], "inflate": -0.1, "pivot": [5.1, 4, 28.35], "rotation": [180, 0, 0], "uv": [3, 45]} + ] + }, + { + "name": "tail_spike_right", + "parent": "tail_end", + "pivot": [-3, 4, 24.3], + "rotation": [0, 27.5, 0], + "cubes": [ + {"origin": [-5.75, 2.5, 22.8], "size": [4, 3, 3], "inflate": -0.1, "pivot": [-3.75, 4, 24.3], "rotation": [180, 0, 0], "uv": [13, 43], "mirror": true} + ] + }, + { + "name": "tail_spike_right2", + "parent": "tail_spike_right", + "pivot": [-5.85, 4, 23.8], + "rotation": [0, -30, 0], + "cubes": [ + {"origin": [-6, 3, 23.05], "size": [2, 2, 4], "pivot": [-5, 4, 25.05], "rotation": [180, 0, 0], "uv": [4, 39], "mirror": true} + ] + }, + { + "name": "tail_spike_right3", + "parent": "tail_spike_right2", + "pivot": [-5.5, 4, 26.95], + "rotation": [0, 55, 0], + "cubes": [ + {"origin": [-5.6, 3, 26.85], "size": [1, 2, 3], "inflate": -0.1, "pivot": [-5.1, 4, 28.35], "rotation": [180, 0, 0], "uv": [8, 47], "mirror": true} + ] + }, + { + "name": "legs", + "parent": "body", + "pivot": [0, 3.5, 0] + }, + { + "name": "leg_front_left", + "parent": "legs", + "pivot": [4, 3.5, -2.25], + "cubes": [ + {"origin": [3.75, 2.5, -3.25], "size": [3, 2, 2], "uv": [0, 50]} + ] + }, + { + "name": "leg_front_left2", + "parent": "leg_front_left", + "pivot": [6.75, 3.5, -2.25], + "rotation": [0, 0, -27.5], + "cubes": [ + {"origin": [6, 1.25, -2.75], "size": [1, 3, 1], "inflate": 0.1, "uv": [0, 33]} + ] + }, + { + "name": "leg_back_left", + "parent": "legs", + "pivot": [4, 3.5, 2.25], + "cubes": [ + {"origin": [3.75, 2.5, 1.25], "size": [3, 2, 2], "uv": [0, 54]} + ] + }, + { + "name": "leg_back_left2", + "parent": "leg_back_left", + "pivot": [6.75, 3.5, 2.25], + "rotation": [0, 0, -27.5], + "cubes": [ + {"origin": [6, 1.25, 1.75], "size": [1, 3, 1], "inflate": 0.1, "uv": [4, 39]} + ] + }, + { + "name": "leg_front_right", + "parent": "legs", + "pivot": [-4, 3.5, -2.25], + "cubes": [ + {"origin": [-6.75, 2.5, -3.25], "size": [3, 2, 2], "uv": [9, 52], "mirror": true} + ] + }, + { + "name": "leg_front_right2", + "parent": "leg_front_right", + "pivot": [-6.75, 3.5, -2.25], + "rotation": [0, 0, 27.5], + "cubes": [ + {"origin": [-7, 1.25, -2.75], "size": [1, 3, 1], "inflate": 0.1, "uv": [0, 43], "mirror": true} + ] + }, + { + "name": "leg_back_right", + "parent": "legs", + "pivot": [-4, 3.5, 2.25], + "cubes": [ + {"origin": [-6.75, 2.5, 1.25], "size": [3, 2, 2], "uv": [8, 56], "mirror": true} + ] + }, + { + "name": "leg_back_right2", + "parent": "leg_back_right", + "pivot": [-6.75, 3.5, 2.25], + "rotation": [0, 0, 27.5], + "cubes": [ + {"origin": [-7, 1.25, 1.75], "size": [1, 3, 1], "inflate": 0.1, "uv": [0, 39], "mirror": true} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0452_drapion/drapion.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0452_drapion/drapion.geo.json new file mode 100644 index 0000000000..285494bccb --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0452_drapion/drapion.geo.json @@ -0,0 +1,708 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.drapion", + "texture_width": 128, + "texture_height": 128, + "visible_bounds_width": 7, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "drapion", + "pivot": [0, 0, 0] + }, + { + "name": "body", + "parent": "drapion", + "pivot": [0, 10.25, -0.25] + }, + { + "name": "torso", + "parent": "body", + "pivot": [0, 10.75, -0.5], + "cubes": [ + {"origin": [-7, 4.25, 2.25], "size": [14, 12, 7], "uv": [86, 43]}, + {"origin": [-8, 3.75, -9.5], "size": [16, 14, 12], "uv": [0, 50]} + ] + }, + { + "name": "neck", + "parent": "torso", + "pivot": [0, 11, -7.5], + "cubes": [ + {"origin": [-5.5, 5.5, -14.35], "size": [11, 11, 5], "uv": [29, 76]} + ] + }, + { + "name": "neck2", + "parent": "neck", + "pivot": [0, 11, -14.35], + "cubes": [ + {"origin": [-5, 6, -19.35], "size": [10, 10, 5], "inflate": 0.01, "uv": [61, 72]} + ] + }, + { + "name": "neck3", + "parent": "neck2", + "pivot": [0, 11, -19.35], + "cubes": [ + {"origin": [-5, 6, -24.35], "size": [10, 10, 5], "uv": [86, 62]} + ] + }, + { + "name": "neck4", + "parent": "neck3", + "pivot": [0, 11, -24.35], + "cubes": [ + {"origin": [-5, 6, -29.35], "size": [10, 10, 5], "inflate": 0.01, "uv": [56, 56]} + ] + }, + { + "name": "head", + "parent": "neck4", + "pivot": [0, 11, -33.4], + "cubes": [ + {"origin": [-6.5, 6.75, -34.35], "size": [13, 10, 5], "inflate": 0.01, "uv": [0, 0]}, + {"origin": [-1.5, 16.75, -33.85], "size": [3, 2, 0], "pivot": [0, 17.75, -33.85], "rotation": [0, -45, 0], "uv": [31, 1]}, + {"origin": [-1.5, 16.75, -33.85], "size": [3, 2, 0], "pivot": [0, 17.75, -33.85], "rotation": [0, 45, 0], "uv": [31, 3], "mirror": true} + ] + }, + { + "name": "head_top", + "parent": "head", + "pivot": [0.5, 11.25, -34.35], + "cubes": [ + {"origin": [-6.5, 11.75, -39.35], "size": [13, 5, 5], "uv": [36, 0]}, + {"origin": [2, 12.5, -41.1], "size": [0, 2, 2], "pivot": [2, 13.5, -39.1], "rotation": [-15, 2.5, 45], "uv": [37, -1]}, + {"origin": [1, 13.5, -41.1], "size": [2, 0, 2], "pivot": [2, 13.5, -39.1], "rotation": [-15, 2.5, 45], "uv": [35, 3]}, + {"origin": [-2, 12.5, -41.1], "size": [0, 2, 2], "pivot": [-2, 13.5, -39.1], "rotation": [-15, -5, -45], "uv": [26, 13], "mirror": true}, + {"origin": [-3, 13.5, -41.1], "size": [2, 0, 2], "pivot": [-2, 13.5, -39.1], "rotation": [-15, -5, -45], "uv": [24, 17], "mirror": true}, + {"origin": [6.5, 10.75, -39.35], "size": [0, 1, 5], "uv": [0, 14]}, + {"origin": [-6.5, 10.75, -39.35], "size": [0, 1, 5], "uv": [10, 14], "mirror": true}, + {"origin": [-6.5, 8.75, -39.35], "size": [13, 3, 0], "pivot": [0, 11.75, -34.325], "rotation": [-1, 0, 0], "uv": [0, 15]} + ] + }, + { + "name": "eyes", + "parent": "head_top", + "pivot": [0, 12.75, -39.36] + }, + { + "name": "eye_left", + "parent": "eyes", + "pivot": [5.25, 13, -39.36], + "rotation": [0, 0, 7.5], + "cubes": [ + {"origin": [3.25, 11.5, -39.36], "size": [3, 6, 0], "uv": [72, 23]}, + {"origin": [4.25, 14, -39.37], "size": [1, 1, 0], "uv": [93, 20]} + ] + }, + { + "name": "pupil_left", + "parent": "eye_left", + "pivot": [4.3, 12.5, -39.37], + "rotation": [0, 0, -10], + "cubes": [ + {"origin": [3.8, 12, -39.37], "size": [1, 1, 0], "uv": [66, 20]} + ] + }, + { + "name": "eye_expression_left", + "parent": "pupil_left", + "pivot": [4.3, 12.9, -38.87], + "cubes": [ + {"origin": [3.8, 12.4, -39.37], "size": [1, 1, 1], "inflate": -0.09, "uv": [68, 20]} + ] + }, + { + "name": "pupil_closed_left", + "parent": "eye_left", + "pivot": [4.25, 12.5, -39.27], + "rotation": [0, 0, -7.5], + "cubes": [ + {"origin": [3.25, 12, -39.37], "size": [2, 1, 1], "inflate": -0.1, "uv": [72, 20]} + ] + }, + { + "name": "pupil_happy_left", + "parent": "eye_left", + "pivot": [4.3, 12.5, -39.37], + "rotation": [0, 0, -10], + "cubes": [ + {"origin": [3.3, 11.5, -39.37], "size": [2, 2, 1], "inflate": -0.1, "pivot": [4.3, 12.5, -39.37], "rotation": [0, 0, 45], "uv": [78, 36]} + ] + }, + { + "name": "eye_right", + "parent": "eyes", + "pivot": [-5.25, 13, -39.36], + "rotation": [0, 0, -7.5], + "cubes": [ + {"origin": [-6.25, 11.5, -39.36], "size": [3, 6, 0], "uv": [104, 30], "mirror": true}, + {"origin": [-5.25, 14, -39.37], "size": [1, 1, 0], "uv": [95, 20], "mirror": true} + ] + }, + { + "name": "pupil_right", + "parent": "eye_right", + "pivot": [-4.3, 12.5, -39.37], + "rotation": [0, 0, 10], + "cubes": [ + {"origin": [-4.8, 12, -39.37], "size": [1, 1, 0], "uv": [66, 21], "mirror": true} + ] + }, + { + "name": "eye_expression_right", + "parent": "pupil_right", + "pivot": [-4.3, 12.9, -38.87], + "cubes": [ + {"origin": [-4.8, 12.4, -39.37], "size": [1, 1, 1], "inflate": -0.09, "uv": [66, 22], "mirror": true} + ] + }, + { + "name": "pupil_closed_right", + "parent": "eye_right", + "pivot": [-4.25, 12.5, -39.27], + "rotation": [0, 0, 7.5], + "cubes": [ + {"origin": [-5.25, 12, -39.37], "size": [2, 1, 1], "inflate": -0.1, "uv": [78, 20], "mirror": true} + ] + }, + { + "name": "pupil_happy_right", + "parent": "eye_right", + "pivot": [-4.3, 12.5, -39.37], + "rotation": [0, 0, 10], + "cubes": [ + {"origin": [-5.3, 11.5, -39.37], "size": [2, 2, 1], "inflate": -0.1, "pivot": [-4.3, 12.5, -39.37], "rotation": [0, 0, -45], "uv": [82, 47], "mirror": true} + ] + }, + { + "name": "head_bottom", + "parent": "head", + "pivot": [0.5, 11.25, -34.35], + "cubes": [ + {"origin": [-6.5, 6.75, -39.35], "size": [13, 3, 5], "uv": [31, 10]}, + {"origin": [6.5, 9.75, -39.35], "size": [0, 1, 5], "uv": [0, 15]}, + {"origin": [-6.5, 9.75, -39.35], "size": [0, 1, 5], "uv": [10, 15], "mirror": true}, + {"origin": [-6.5, 9.75, -39.35], "size": [13, 3, 0], "pivot": [0, 9.75, -34.325], "rotation": [1, 0, 0], "uv": [0, 125]}, + {"origin": [-6.5, 9.95, -39.35], "size": [13, 1, 0], "pivot": [0, 10, -34.325], "rotation": [1, 0, 0], "uv": [26, 127]} + ] + }, + { + "name": "teeth", + "parent": "head", + "pivot": [0, 10.75, -34.9] + }, + { + "name": "teeth_left", + "parent": "teeth", + "pivot": [6.25, 10.75, -34.9], + "rotation": [0, 25, 0], + "cubes": [ + {"origin": [6.25, 9.75, -36.9], "size": [0, 2, 2], "uv": [8, 56]} + ] + }, + { + "name": "teeth_left2", + "parent": "teeth_left", + "pivot": [6.25, 10.75, -36.9], + "rotation": [0, -25, 0], + "cubes": [ + {"origin": [6.25, 8.75, -39.9], "size": [0, 4, 3], "uv": [0, 73]} + ] + }, + { + "name": "teeth_left3", + "parent": "teeth_left2", + "pivot": [6.25, 10.75, -39.9], + "rotation": [0, -67.5, 0], + "cubes": [ + {"origin": [6.25, 8.75, -41.9], "size": [0, 4, 2], "uv": [24, 74]} + ] + }, + { + "name": "teeth_left4", + "parent": "teeth_left3", + "pivot": [6.25, 10.75, -41.9], + "rotation": [0, -25, 0], + "cubes": [ + {"origin": [6.25, 8.75, -43.9], "size": [0, 4, 2], "uv": [0, 78]} + ] + }, + { + "name": "teeth_right", + "parent": "teeth", + "pivot": [-6.25, 10.75, -34.9], + "rotation": [0, -25, 0], + "cubes": [ + {"origin": [-6.25, 9.75, -36.9], "size": [0, 2, 2], "uv": [8, 58], "mirror": true} + ] + }, + { + "name": "teeth_right2", + "parent": "teeth_right", + "pivot": [-6.25, 10.75, -36.9], + "rotation": [0, 25, 0], + "cubes": [ + {"origin": [-6.25, 8.75, -39.9], "size": [0, 4, 3], "uv": [6, 73], "mirror": true} + ] + }, + { + "name": "teeth_right3", + "parent": "teeth_right2", + "pivot": [-6.25, 10.75, -39.9], + "rotation": [0, 67.5, 0], + "cubes": [ + {"origin": [-6.25, 8.75, -41.9], "size": [0, 4, 2], "uv": [28, 74], "mirror": true} + ] + }, + { + "name": "teeth_right4", + "parent": "teeth_right3", + "pivot": [-6.25, 10.75, -41.9], + "rotation": [0, 25, 0], + "cubes": [ + {"origin": [-6.25, 8.75, -43.9], "size": [0, 4, 2], "uv": [0, 82], "mirror": true} + ] + }, + { + "name": "arms", + "parent": "head", + "pivot": [0, 13, -34.15] + }, + { + "name": "arm_left", + "parent": "arms", + "pivot": [6.5, 12.5, -34.15], + "cubes": [ + {"origin": [6.6, 8.5, -38.85], "size": [6, 8, 9], "inflate": 0.15, "uv": [67, 3]}, + {"origin": [7.6, 13.65, -37.35], "size": [4, 6, 6], "pivot": [9.6, 16.65, -34.35], "rotation": [45, 0, 0], "uv": [88, 0]} + ] + }, + { + "name": "arm_left2", + "parent": "arm_left", + "pivot": [12.7, 12.25, -34.4], + "cubes": [ + {"origin": [12.6, 8.75, -37.35], "size": [5, 7, 6], "inflate": -0.1, "uv": [72, 23]}, + {"origin": [13.6, 13.15, -35.35], "size": [3, 4, 4], "pivot": [15.6, 14.15, -34.35], "rotation": [45, 0, 0], "uv": [109, 13]} + ] + }, + { + "name": "arm_left3", + "parent": "arm_left2", + "pivot": [17.5, 12.25, -34.4], + "cubes": [ + {"origin": [17.4, 8.75, -37.35], "size": [5, 7, 6], "inflate": -0.09, "uv": [50, 18]}, + {"origin": [18.4, 13.15, -35.35], "size": [3, 4, 4], "inflate": 0.01, "pivot": [20.4, 14.15, -34.35], "rotation": [45, 0, 0], "uv": [78, 39]} + ] + }, + { + "name": "arm_left4", + "parent": "arm_left3", + "pivot": [22.3, 12.25, -34.4], + "cubes": [ + {"origin": [22.2, 8.75, -37.35], "size": [5, 7, 6], "inflate": -0.1, "uv": [28, 18]}, + {"origin": [23.2, 13.15, -35.35], "size": [3, 4, 4], "pivot": [25.2, 14.15, -34.35], "rotation": [45, 0, 0], "uv": [58, 48]} + ] + }, + { + "name": "hand_left", + "parent": "arm_left4", + "pivot": [27.1, 12.25, -34.4], + "cubes": [ + {"origin": [27.1, 9.5, -37.85], "size": [7, 6, 7], "inflate": 0.1, "uv": [7, 24]} + ] + }, + { + "name": "finger_front_left", + "parent": "hand_left", + "pivot": [31.6, 12.5, -37.9], + "rotation": [0, -35, 0], + "cubes": [ + {"origin": [30.1, 11, -40.9], "size": [3, 3, 4], "inflate": 0.1, "uv": [0, 21]} + ] + }, + { + "name": "finger_front_left2", + "parent": "finger_front_left", + "pivot": [31.6, 12.5, -40.9], + "rotation": [0, -47.5, 0], + "cubes": [ + {"origin": [30.6, 11.5, -43.9], "size": [2, 2, 4], "inflate": 0.1, "uv": [44, 18]} + ] + }, + { + "name": "finger_front_left3", + "parent": "finger_front_left2", + "pivot": [31.6, 12.5, -43.9], + "rotation": [0, -35, 0], + "cubes": [ + {"origin": [31.1, 11.5, -46.4], "size": [1, 2, 3], "uv": [17, 19]} + ] + }, + { + "name": "finger_back_left", + "parent": "hand_left", + "pivot": [31.6, 12.5, -30.9], + "rotation": [0, 35, 0], + "cubes": [ + {"origin": [30.1, 11, -31.9], "size": [3, 3, 4], "inflate": 0.1, "uv": [6, 37]} + ] + }, + { + "name": "finger_back_left2", + "parent": "finger_back_left", + "pivot": [31.6, 12.5, -27.9], + "rotation": [0, 47.5, 0], + "cubes": [ + {"origin": [30.6, 11.5, -28.9], "size": [2, 2, 4], "inflate": 0.1, "uv": [50, 31]} + ] + }, + { + "name": "finger_back_left3", + "parent": "finger_back_left2", + "pivot": [31.6, 12.5, -24.9], + "rotation": [0, 35, 0], + "cubes": [ + {"origin": [31.1, 11.5, -25.4], "size": [1, 2, 3], "uv": [25, 19]} + ] + }, + { + "name": "arm_right", + "parent": "arms", + "pivot": [-6.5, 12.5, -34.15], + "cubes": [ + {"origin": [-12.6, 8.5, -38.85], "size": [6, 8, 9], "inflate": 0.15, "uv": [88, 12], "mirror": true}, + {"origin": [-11.6, 13.65, -37.35], "size": [4, 6, 6], "pivot": [-9.6, 16.65, -34.35], "rotation": [45, 0, 0], "uv": [108, 0], "mirror": true} + ] + }, + { + "name": "arm_right2", + "parent": "arm_right", + "pivot": [-12.7, 12.25, -34.4], + "cubes": [ + {"origin": [-17.6, 8.75, -37.35], "size": [5, 7, 6], "inflate": -0.1, "uv": [88, 30], "mirror": true}, + {"origin": [-16.6, 13.15, -35.35], "size": [3, 4, 4], "pivot": [-15.6, 14.15, -34.35], "rotation": [45, 0, 0], "uv": [114, 25], "mirror": true} + ] + }, + { + "name": "arm_right3", + "parent": "arm_right2", + "pivot": [-17.5, 12.25, -34.4], + "cubes": [ + {"origin": [-22.4, 8.75, -37.35], "size": [5, 7, 6], "inflate": -0.09, "uv": [56, 31], "mirror": true}, + {"origin": [-21.4, 13.15, -35.35], "size": [3, 4, 4], "inflate": 0.01, "pivot": [-20.4, 14.15, -34.35], "rotation": [45, 0, 0], "uv": [110, 33], "mirror": true} + ] + }, + { + "name": "arm_right4", + "parent": "arm_right3", + "pivot": [-22.3, 12.25, -34.4], + "cubes": [ + {"origin": [-27.2, 8.75, -37.35], "size": [5, 7, 6], "inflate": -0.1, "uv": [34, 31], "mirror": true}, + {"origin": [-26.2, 13.15, -35.35], "size": [3, 4, 4], "pivot": [-25.2, 14.15, -34.35], "rotation": [45, 0, 0], "uv": [68, 44], "mirror": true} + ] + }, + { + "name": "hand_right", + "parent": "arm_right4", + "pivot": [-27.1, 12.25, -34.4], + "cubes": [ + {"origin": [-34.1, 9.5, -37.85], "size": [7, 6, 7], "inflate": 0.1, "uv": [13, 37], "mirror": true} + ] + }, + { + "name": "finger_front_right", + "parent": "hand_right", + "pivot": [-31.6, 12.5, -37.9], + "rotation": [0, 35, 0], + "cubes": [ + {"origin": [-33.1, 11, -40.9], "size": [3, 3, 4], "inflate": 0.1, "uv": [44, 51], "mirror": true} + ] + }, + { + "name": "finger_front_right2", + "parent": "finger_front_right", + "pivot": [-31.6, 12.5, -40.9], + "rotation": [0, 47.5, 0], + "cubes": [ + {"origin": [-32.6, 11.5, -43.9], "size": [2, 2, 4], "inflate": 0.1, "uv": [0, 46], "mirror": true} + ] + }, + { + "name": "finger_front_right3", + "parent": "finger_front_right2", + "pivot": [-31.6, 12.5, -43.9], + "rotation": [0, 35, 0], + "cubes": [ + {"origin": [-32.1, 11.5, -46.4], "size": [1, 2, 3], "uv": [2, 36], "mirror": true} + ] + }, + { + "name": "finger_back_right", + "parent": "hand_right", + "pivot": [-31.6, 12.5, -30.9], + "rotation": [0, -35, 0], + "cubes": [ + {"origin": [-33.1, 11, -31.9], "size": [3, 3, 4], "inflate": 0.1, "uv": [48, 44], "mirror": true} + ] + }, + { + "name": "finger_back_right2", + "parent": "finger_back_right", + "pivot": [-31.6, 12.5, -27.9], + "rotation": [0, -47.5, 0], + "cubes": [ + {"origin": [-32.6, 11.5, -28.9], "size": [2, 2, 4], "inflate": 0.1, "uv": [0, 52], "mirror": true} + ] + }, + { + "name": "finger_back_right3", + "parent": "finger_back_right2", + "pivot": [-31.6, 12.5, -24.9], + "rotation": [0, -35, 0], + "cubes": [ + {"origin": [-32.1, 11.5, -25.4], "size": [1, 2, 3], "uv": [1, 41], "mirror": true} + ] + }, + { + "name": "tail", + "parent": "torso", + "pivot": [0, 11.25, 9.25], + "cubes": [ + {"origin": [-3, 7.75, 9.2], "size": [6, 7, 5], "inflate": -0.05, "uv": [7, 76]}, + {"origin": [-2, 12.7, 10.2], "size": [4, 4, 3], "pivot": [0, 14.7, 11.7], "rotation": [0, 0, 45], "uv": [4, 88]} + ] + }, + { + "name": "tail2", + "parent": "tail", + "pivot": [0, 11.25, 14], + "cubes": [ + {"origin": [-3, 7.75, 13.95], "size": [6, 7, 5], "inflate": -0.04, "uv": [1, 95]}, + {"origin": [-2, 12.7, 14.95], "size": [4, 4, 3], "inflate": 0.01, "pivot": [0, 14.7, 16.45], "rotation": [0, 0, 45], "uv": [18, 89]} + ] + }, + { + "name": "tail3", + "parent": "tail2", + "pivot": [0, 11.25, 18.75], + "cubes": [ + {"origin": [-3, 7.75, 18.7], "size": [6, 7, 5], "inflate": -0.05, "uv": [27, 92]}, + {"origin": [-2, 12.7, 19.7], "size": [4, 4, 3], "pivot": [0, 14.7, 21.2], "rotation": [0, 0, 45], "uv": [20, 104]} + ] + }, + { + "name": "tail4", + "parent": "tail3", + "pivot": [0, 11.25, 23.6], + "cubes": [ + {"origin": [-3, 7.75, 23.55], "size": [6, 7, 5], "inflate": -0.04, "uv": [3, 107]}, + {"origin": [-2, 12.7, 24.55], "size": [4, 4, 3], "inflate": 0.01, "pivot": [0, 14.7, 26.05], "rotation": [0, 0, 45], "uv": [34, 104]} + ] + }, + { + "name": "tail5", + "parent": "tail4", + "pivot": [0, 11.35, 29], + "cubes": [ + {"origin": [-4, 8.35, 28.5], "size": [8, 6, 8], "uv": [17, 111]} + ] + }, + { + "name": "tail_spike_left", + "parent": "tail5", + "pivot": [4, 11.35, 34], + "rotation": [0, -35, 0], + "cubes": [ + {"origin": [3, 9.85, 32.5], "size": [4, 3, 3], "inflate": 0.1, "uv": [49, 92]} + ] + }, + { + "name": "tail_spike_left2", + "parent": "tail_spike_left", + "pivot": [7, 11.35, 34], + "rotation": [0, -50, 0], + "cubes": [ + {"origin": [6, 10.35, 33], "size": [4, 2, 2], "inflate": 0.05, "uv": [49, 98]} + ] + }, + { + "name": "tail_spike_left3", + "parent": "tail_spike_left2", + "pivot": [10, 11.35, 34], + "rotation": [0, -37.5, 0], + "cubes": [ + {"origin": [9.5, 10.85, 33.5], "size": [3, 1, 1], "inflate": 0.1, "uv": [0, 108]} + ] + }, + { + "name": "tail_spike_right", + "parent": "tail5", + "pivot": [-4, 11.35, 34], + "rotation": [0, 35, 0], + "cubes": [ + {"origin": [-7, 9.85, 32.5], "size": [4, 3, 3], "inflate": 0.1, "uv": [61, 87], "mirror": true} + ] + }, + { + "name": "tail_spike_right2", + "parent": "tail_spike_right", + "pivot": [-7, 11.35, 34], + "rotation": [0, 50, 0], + "cubes": [ + {"origin": [-10, 10.35, 33], "size": [4, 2, 2], "inflate": 0.05, "uv": [47, 102], "mirror": true} + ] + }, + { + "name": "tail_spike_right3", + "parent": "tail_spike_right2", + "pivot": [-10, 11.35, 34], + "rotation": [0, 37.5, 0], + "cubes": [ + {"origin": [-12.5, 10.85, 33.5], "size": [3, 1, 1], "inflate": 0.1, "uv": [0, 110], "mirror": true} + ] + }, + { + "name": "legs", + "parent": "body", + "pivot": [0, 8, -0.25] + }, + { + "name": "leg_front_left", + "parent": "legs", + "pivot": [8, 7, -5.5] + }, + { + "name": "leg_front_left_rotation", + "parent": "leg_front_left", + "pivot": [8, 7, -5.5], + "rotation": [0, 0, 30], + "cubes": [ + {"origin": [5, 4.5, -7.5], "size": [6, 5, 4], "uv": [91, 77]} + ] + }, + { + "name": "leg_front_left2", + "parent": "leg_front_left_rotation", + "pivot": [11, 7, -5.5], + "rotation": [0, 0, -47.5], + "cubes": [ + {"origin": [9.5, 4, -7], "size": [3, 5, 3], "uv": [116, 62]} + ] + }, + { + "name": "leg_front_left3", + "parent": "leg_front_left2", + "pivot": [11, 4, -5], + "rotation": [0, 0, 10], + "cubes": [ + {"origin": [10, 1.35, -6.5], "size": [2, 3, 2], "uv": [111, 78]} + ] + }, + { + "name": "leg_back_left", + "parent": "legs", + "pivot": [7, 7, 5.25] + }, + { + "name": "leg_back_left_rotation", + "parent": "leg_back_left", + "pivot": [7, 7, 5.25], + "rotation": [0, 0, 32.5], + "cubes": [ + {"origin": [4.25, 4.5, 3.25], "size": [6, 5, 4], "uv": [80, 87]} + ] + }, + { + "name": "leg_back_left2", + "parent": "leg_back_left_rotation", + "pivot": [10.5, 6.5, 5.25], + "rotation": [0, 0, -47.5], + "cubes": [ + {"origin": [9, 4.5, 3.75], "size": [3, 4, 3], "uv": [116, 83]} + ] + }, + { + "name": "leg_back_left3", + "parent": "leg_back_left2", + "pivot": [10.5, 4.5, 5.75], + "rotation": [0, 0, 10], + "cubes": [ + {"origin": [9.5, 1.75, 4.25], "size": [2, 3, 2], "uv": [96, 96]} + ] + }, + { + "name": "leg_front_right", + "parent": "legs", + "pivot": [-8, 7, -5.5] + }, + { + "name": "leg_front_right_rotation", + "parent": "leg_front_right", + "pivot": [-8, 7, -5.5], + "rotation": [0, 0, -30], + "cubes": [ + {"origin": [-11, 4.5, -7.5], "size": [6, 5, 4], "uv": [64, 93], "mirror": true} + ] + }, + { + "name": "leg_front_right2", + "parent": "leg_front_right_rotation", + "pivot": [-11, 7, -5.5], + "rotation": [0, 0, 47.5], + "cubes": [ + {"origin": [-12.5, 4, -7], "size": [3, 5, 3], "uv": [116, 70], "mirror": true} + ] + }, + { + "name": "leg_front_right3", + "parent": "leg_front_right2", + "pivot": [-11, 4, -5], + "rotation": [0, 0, -10], + "cubes": [ + {"origin": [-12, 1.35, -6.5], "size": [2, 3, 2], "uv": [119, 78], "mirror": true} + ] + }, + { + "name": "leg_back_right", + "parent": "legs", + "pivot": [-7, 7, 5.25] + }, + { + "name": "leg_back_right_rotation", + "parent": "leg_back_right", + "pivot": [-7, 7, 5.25], + "rotation": [0, 0, -32.5], + "cubes": [ + {"origin": [-10.25, 4.5, 3.25], "size": [6, 5, 4], "uv": [100, 86], "mirror": true} + ] + }, + { + "name": "leg_back_right2", + "parent": "leg_back_right_rotation", + "pivot": [-10.5, 6.5, 5.25], + "rotation": [0, 0, 47.5], + "cubes": [ + {"origin": [-12, 4.5, 3.75], "size": [3, 4, 3], "uv": [84, 96], "mirror": true} + ] + }, + { + "name": "leg_back_right3", + "parent": "leg_back_right2", + "pivot": [-10.5, 4.5, 5.75], + "rotation": [0, 0, -10], + "cubes": [ + {"origin": [-11.5, 1.75, 4.25], "size": [2, 3, 2], "uv": [120, 90], "mirror": true} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0602_tynamo/tynamo.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0602_tynamo/tynamo.geo.json new file mode 100644 index 0000000000..7cacac0194 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0602_tynamo/tynamo.geo.json @@ -0,0 +1,195 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.tynamo", + "texture_width": 32, + "texture_height": 32, + "visible_bounds_width": 3, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "tynamo", + "pivot": [0, 0, 0] + }, + { + "name": "body", + "parent": "tynamo", + "pivot": [-1, 8, -1.25], + "cubes": [ + {"origin": [-2, 5.5, -4], "size": [4, 5, 5], "inflate": -0.03, "uv": [0, 10]} + ] + }, + { + "name": "head", + "parent": "body", + "pivot": [0, 8, -3.5], + "cubes": [ + {"origin": [-2, 5.5, -8.5], "size": [4, 5, 5], "uv": [0, 0]} + ] + }, + { + "name": "eyes", + "parent": "head", + "pivot": [-1, 8, -7.5] + }, + { + "name": "eye_left", + "parent": "eyes", + "pivot": [1.86, 8, -6.75], + "cubes": [ + {"origin": [1.86, 7, -7.25], "size": [0, 2, 1], "inflate": 0.15, "uv": [1, 2]} + ] + }, + { + "name": "eye_expression_left", + "parent": "eye_left", + "pivot": [1.77, 9.15, -6.75], + "cubes": [ + {"origin": [0.77, 8.65, -7.25], "size": [1, 1, 1], "inflate": 0.15, "uv": [1, 10]} + ] + }, + { + "name": "eyelid_left", + "parent": "eye_left", + "pivot": [1.76, 8, -6.75], + "cubes": [ + {"origin": [1.76, 7, -7.75], "size": [0, 2, 2], "inflate": 0.16, "uv": [0, 28]} + ] + }, + { + "name": "eyelid_happy_left", + "parent": "eye_left", + "pivot": [1.76, 8, -6.75], + "cubes": [ + {"origin": [1.76, 7, -7.75], "size": [0, 2, 2], "inflate": 0.16, "uv": [20, 28]}, + {"origin": [1.92, 7.5, -7.25], "size": [0, 1, 1], "inflate": 0.01, "uv": [30, 29]} + ] + }, + { + "name": "eyelid_recoil_left", + "parent": "eye_left", + "pivot": [1.76, 8, -6.75], + "cubes": [ + {"origin": [1.76, 7, -7.75], "size": [0, 2, 2], "inflate": 0.16, "uv": [10, 28]} + ] + }, + { + "name": "eye_right", + "parent": "eyes", + "pivot": [-1.86, 8, -6.75], + "cubes": [ + {"origin": [-1.86, 7, -7.25], "size": [0, 2, 1], "inflate": 0.15, "uv": [3, 2], "mirror": true} + ] + }, + { + "name": "eye_expression_right", + "parent": "eye_right", + "pivot": [-1.77, 9.15, -6.75], + "cubes": [ + {"origin": [-1.77, 8.65, -7.25], "size": [1, 1, 1], "inflate": 0.15, "uv": [1, 12], "mirror": true} + ] + }, + { + "name": "eyelid_right", + "parent": "eye_right", + "pivot": [-1.76, 8, -6.75], + "cubes": [ + {"origin": [-1.76, 7, -7.75], "size": [0, 2, 2], "inflate": 0.16, "uv": [5, 28], "mirror": true} + ] + }, + { + "name": "eyelid_happy_right", + "parent": "eye_right", + "pivot": [-1.76, 8, -6.75], + "cubes": [ + {"origin": [-1.76, 7, -7.75], "size": [0, 2, 2], "inflate": 0.16, "uv": [25, 28], "mirror": true}, + {"origin": [-1.92, 7.5, -7.25], "size": [0, 1, 1], "inflate": 0.01, "uv": [30, 30], "mirror": true} + ] + }, + { + "name": "eyelid_recoil_right", + "parent": "eye_right", + "pivot": [-1.76, 8, -6.75], + "cubes": [ + {"origin": [-1.76, 7, -7.75], "size": [0, 2, 2], "inflate": 0.16, "uv": [15, 28], "mirror": true} + ] + }, + { + "name": "mouth", + "parent": "head", + "pivot": [0, 8, -8.51] + }, + { + "name": "mouth_open", + "parent": "mouth", + "pivot": [0, 8, -8.51], + "cubes": [ + {"origin": [-1.5, 6.5, -8.51], "size": [3, 3, 0], "pivot": [0, 8, -8.51], "rotation": [0, 0, 45], "uv": [22, 8]} + ] + }, + { + "name": "mouth_closed", + "parent": "mouth", + "pivot": [0, 8, -8.41], + "cubes": [ + {"origin": [-0.5, 7.2, -8.41], "size": [2, 2, 0], "pivot": [0, 8.7, -8.41], "rotation": [0, 0, 45], "uv": [13, 13]} + ] + }, + { + "name": "body_fin", + "parent": "body", + "pivot": [-1, 8, -2.5], + "cubes": [ + {"origin": [0, 4, -3.5], "size": [0, 8, 4], "inflate": 0.005, "uv": [23, 17]} + ] + }, + { + "name": "body2", + "parent": "body", + "pivot": [0, 8, 0.75], + "cubes": [ + {"origin": [-1.5, 6, 0.5], "size": [3, 4, 4], "uv": [18, 0]}, + {"origin": [-1.5, 7.5, 2.5], "size": [3, 1, 2], "inflate": 0.01, "uv": [0, 24]} + ] + }, + { + "name": "body_fin2", + "parent": "body2", + "pivot": [-1, 8, 0.5], + "cubes": [ + {"origin": [0, 4, -0.5], "size": [0, 8, 6], "uv": [10, 15]} + ] + }, + { + "name": "body3", + "parent": "body2", + "pivot": [0, 8, 4.5], + "cubes": [ + {"origin": [-1, 7, 4], "size": [2, 2, 3], "uv": [15, 8]}, + {"origin": [-1, 7.5, 4], "size": [2, 1, 3], "inflate": 0.01, "uv": [0, 20]} + ] + }, + { + "name": "body_fin3", + "parent": "body3", + "pivot": [0, 8, 5], + "cubes": [ + {"origin": [0, 5, 5], "size": [0, 6, 6], "inflate": 0.005, "uv": [19, 8]} + ] + }, + { + "name": "body_fin4", + "parent": "body_fin3", + "pivot": [0, 8, 11], + "cubes": [ + {"origin": [0, 7, 11], "size": [0, 2, 3], "uv": [25, 8]} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0603_eelektrik/eelektrik.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0603_eelektrik/eelektrik.geo.json new file mode 100644 index 0000000000..e800ab4f63 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0603_eelektrik/eelektrik.geo.json @@ -0,0 +1,299 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.eelektrik", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 3, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] + }, + "bones": [ + { + "name": "eelektrik", + "pivot": [0, 0, 0] + }, + { + "name": "body", + "parent": "eelektrik", + "pivot": [0, 8, -8] + }, + { + "name": "neck", + "parent": "body", + "pivot": [0, 8, -9], + "cubes": [ + {"origin": [-3, 5, -17], "size": [6, 6, 8], "uv": [0, 0]} + ] + }, + { + "name": "head", + "parent": "neck", + "pivot": [0, 8, -15], + "cubes": [ + {"origin": [-3, 4.5, -23], "size": [6, 7, 8], "inflate": 0.1, "uv": [0, 14]}, + {"origin": [-3, 5, -23.02], "size": [6, 6, 0], "inflate": 0.09, "uv": [28, 28]}, + {"origin": [1.86, 6.5, -20.85], "size": [1, 3, 5], "inflate": 0.25, "uv": [5, 29]}, + {"origin": [-2.86, 6.5, -20.85], "size": [1, 3, 5], "inflate": 0.25, "uv": [17, 29], "mirror": true} + ] + }, + { + "name": "eyes", + "parent": "head", + "pivot": [0, 8, -18.5] + }, + { + "name": "eye_left", + "parent": "eyes", + "pivot": [3.02, 8, -18.35], + "cubes": [ + {"origin": [3.02, 7, -19.35], "size": [0, 2, 2], "inflate": 0.1, "uv": [0, -2]} + ] + }, + { + "name": "eye_expression_left", + "parent": "eye_left", + "pivot": [2.93, 8.6, -18.35], + "cubes": [ + {"origin": [2.93, 8.1, -18.85], "size": [0, 1, 1], "inflate": 0.11, "uv": [2, 17]} + ] + }, + { + "name": "pupil_left", + "parent": "eye_left", + "pivot": [3.13, 8, -18.35], + "cubes": [ + {"origin": [3.13, 7.5, -18.85], "size": [0, 1, 1], "uv": [0, 3]} + ] + }, + { + "name": "eyelid_left", + "parent": "eye_left", + "pivot": [2.43, 8, -18.35], + "cubes": [ + {"origin": [1.93, 7, -19.35], "size": [1, 2, 2], "inflate": 0.11, "uv": [2, 14]} + ] + }, + { + "name": "eyelid_happy_left", + "parent": "eye_left", + "pivot": [2.43, 8, -18.35], + "cubes": [ + {"origin": [1.93, 7, -19.85], "size": [1, 2, 3], "inflate": 0.11, "uv": [0, 34]} + ] + }, + { + "name": "eyelid_recoil_left", + "parent": "eye_left", + "pivot": [2.43, 8, -18.35], + "cubes": [ + {"origin": [1.93, 7, -19.35], "size": [1, 2, 2], "inflate": 0.11, "uv": [44, 1]} + ] + }, + { + "name": "eye_right", + "parent": "eyes", + "pivot": [-3.02, 8, -18.35], + "cubes": [ + {"origin": [-3.02, 7, -19.35], "size": [0, 2, 2], "inflate": 0.1, "uv": [0, 0], "mirror": true} + ] + }, + { + "name": "eye_expression_right", + "parent": "eye_right", + "pivot": [-2.93, 8.6, -18.35], + "cubes": [ + {"origin": [-2.93, 8.1, -18.85], "size": [0, 1, 1], "inflate": 0.11, "uv": [2, 18], "mirror": true} + ] + }, + { + "name": "pupil_right", + "parent": "eye_right", + "pivot": [-3.13, 8, -18.35], + "cubes": [ + {"origin": [-3.13, 7.5, -18.85], "size": [0, 1, 1], "uv": [2, 3], "mirror": true} + ] + }, + { + "name": "eyelid_right", + "parent": "eye_right", + "pivot": [-2.43, 8, -18.35], + "cubes": [ + {"origin": [-2.93, 7, -19.35], "size": [1, 2, 2], "inflate": 0.11, "uv": [2, 18], "mirror": true} + ] + }, + { + "name": "eyelid_happy_right", + "parent": "eye_right", + "pivot": [-2.43, 8, -18.35], + "cubes": [ + {"origin": [-2.93, 7, -19.85], "size": [1, 2, 3], "inflate": 0.11, "uv": [5, 37], "mirror": true} + ] + }, + { + "name": "eyelid_recoil_right", + "parent": "eye_right", + "pivot": [-2.43, 8, -18.35], + "cubes": [ + {"origin": [-2.93, 7, -19.35], "size": [1, 2, 2], "inflate": 0.11, "uv": [58, 11], "mirror": true} + ] + }, + { + "name": "mouth", + "parent": "head", + "pivot": [0, 8, -23] + }, + { + "name": "teeth_open", + "parent": "mouth", + "pivot": [2.1, 8, -23.02] + }, + { + "name": "teeth_open_top", + "parent": "teeth_open", + "pivot": [0, 10.1, -23.02], + "cubes": [ + {"origin": [-1, 9.1, -23.02], "size": [2, 2, 0], "pivot": [0, 10.1, -23.02], "rotation": [0, 0, -45], "uv": [4, 4]} + ] + }, + { + "name": "teeth_open_bottom", + "parent": "teeth_open", + "pivot": [0, 5.9, -23.02], + "cubes": [ + {"origin": [-1, 4.9, -23.02], "size": [2, 2, 0], "pivot": [0, 5.9, -23.02], "rotation": [0, 0, -45], "uv": [4, 6]} + ] + }, + { + "name": "teeth_open_left", + "parent": "teeth_open", + "pivot": [2.1, 8, -23.02], + "cubes": [ + {"origin": [1.1, 7, -23.02], "size": [2, 2, 0], "pivot": [2.1, 8, -23.02], "rotation": [0, 0, -45], "uv": [4, 0]} + ] + }, + { + "name": "teeth_open_right", + "parent": "teeth_open", + "pivot": [-2.1, 8, -23.02], + "cubes": [ + {"origin": [-3.1, 7, -23.02], "size": [2, 2, 0], "pivot": [-2.1, 8, -23.02], "rotation": [0, 0, 45], "uv": [4, 2], "mirror": true} + ] + }, + { + "name": "teeth_closed", + "parent": "mouth", + "pivot": [0, 8, -23.02], + "cubes": [ + {"origin": [-3.5, 4.5, -23.02], "size": [7, 7, 0], "pivot": [0, 8, -23.02], "rotation": [0, 0, -45], "uv": [48, 37]} + ] + }, + { + "name": "mouth_inside", + "parent": "mouth", + "pivot": [0, 8, -22.02], + "cubes": [ + {"origin": [-2, 6, -22.02], "size": [4, 4, 0], "inflate": 0.1, "uv": [54, 33]}, + {"origin": [-3, 10.1, -23.11], "size": [6, 0, 1], "uv": [49, 31]}, + {"origin": [-3, 5.92, -23.11], "size": [6, 0, 1], "uv": [49, 32]}, + {"origin": [2.08, 5, -23.1], "size": [0, 6, 1], "uv": [62, 30]}, + {"origin": [-2.08, 5, -23.1], "size": [0, 6, 1], "uv": [62, 36], "mirror": true} + ] + }, + { + "name": "fin_top", + "parent": "head", + "pivot": [0, 11.5, -17], + "cubes": [ + {"origin": [0, 11, -19.5], "size": [0, 6, 5], "uv": [34, -4]} + ] + }, + { + "name": "fin_bottom", + "parent": "head", + "pivot": [0, 4.5, -17], + "cubes": [ + {"origin": [0, -1, -19.5], "size": [0, 6, 5], "uv": [53, 12]} + ] + }, + { + "name": "segment1", + "parent": "body", + "pivot": [0, 8, -9], + "cubes": [ + {"origin": [-2.5, 5.5, -10.5], "size": [5, 5, 7], "uv": [21, 7]}, + {"origin": [2.51, 7, -8.5], "size": [0, 2, 5], "uv": [0, 24]}, + {"origin": [-2.51, 7, -8.5], "size": [0, 2, 5], "uv": [0, 26], "mirror": true} + ] + }, + { + "name": "segment2", + "parent": "segment1", + "pivot": [0, 8, -3.5], + "cubes": [ + {"origin": [-2, 6, -4.5], "size": [4, 4, 5], "uv": [28, 19]} + ] + }, + { + "name": "segment3", + "parent": "segment2", + "pivot": [0, 8, 0.5], + "cubes": [ + {"origin": [-1.5, 6.5, -0.5], "size": [3, 3, 6], "uv": [38, 5]}, + {"origin": [-1, 6.5, -0.5], "size": [2, 1, 6], "inflate": 0.01, "uv": [34, 28]} + ] + }, + { + "name": "segment4", + "parent": "segment3", + "pivot": [0, 8, 5.5], + "cubes": [ + {"origin": [-1, 7, 4.5], "size": [2, 2, 5], "inflate": 0.05, "uv": [20, 0]} + ] + }, + { + "name": "segment5", + "parent": "segment4", + "pivot": [0, 8, 9.5], + "cubes": [ + {"origin": [-1, 7, 9], "size": [2, 2, 5], "uv": [50, 4]} + ] + }, + { + "name": "segment6", + "parent": "segment5", + "pivot": [0, 8, 14], + "cubes": [ + {"origin": [-0.5, 7.5, 13.5], "size": [1, 1, 5], "uv": [41, 14]} + ] + }, + { + "name": "segment7", + "parent": "segment6", + "pivot": [0, 8, 18.5], + "cubes": [ + {"origin": [-0.5, 7.5, 18], "size": [1, 1, 5], "inflate": -0.05, "uv": [51, 11]} + ] + }, + { + "name": "segment8", + "parent": "segment7", + "pivot": [0, 8, 23], + "cubes": [ + {"origin": [-1.5, 7.5, 22.5], "size": [3, 1, 3], "inflate": -0.05, "uv": [52, 0]} + ] + }, + { + "name": "tail_fin", + "parent": "segment8", + "pivot": [0, 8, 23.5], + "cubes": [ + {"origin": [-4.5, 8, 21.75], "size": [9, 0, 8], "uv": [38, 23]} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0604_eelektross/eelektross.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0604_eelektross/eelektross.geo.json new file mode 100644 index 0000000000..9e2ffde711 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0604_eelektross/eelektross.geo.json @@ -0,0 +1,731 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.eelektross", + "texture_width": 128, + "texture_height": 64, + "visible_bounds_width": 8, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] + }, + "bones": [ + { + "name": "eelektross", + "pivot": [0, 0, 0] + }, + { + "name": "body", + "parent": "eelektross", + "pivot": [0, 7.75, 0] + }, + { + "name": "neck", + "parent": "body", + "pivot": [0, 7.75, -5], + "cubes": [ + {"origin": [-3.5, 4.25, -13], "size": [7, 7, 8], "inflate": 0.01, "uv": [4, 29]} + ] + }, + { + "name": "arms", + "parent": "neck", + "pivot": [0, 7.5, -9] + }, + { + "name": "arm_left", + "parent": "arms", + "pivot": [3.5, 7.5, -9], + "cubes": [ + {"origin": [2.5, 6.5, -10.5], "size": [8, 2, 3], "inflate": -0.1, "uv": [0, 44]} + ] + }, + { + "name": "arm_left2", + "parent": "arm_left", + "pivot": [10.5, 7.5, -9], + "cubes": [ + {"origin": [10, 6.5, -10.5], "size": [8, 2, 3], "uv": [0, 49]} + ] + }, + { + "name": "arm_left3", + "parent": "arm_left2", + "pivot": [18, 7.5, -9], + "cubes": [ + {"origin": [17.5, 6.6, -11.5], "size": [8, 2, 5], "inflate": 0.15, "uv": [44, 46]} + ] + }, + { + "name": "hand_left", + "parent": "arm_left3", + "pivot": [25, 7.6, -9], + "cubes": [ + {"origin": [25, 6.5, -12.5], "size": [9, 3, 7], "inflate": 0.1, "uv": [0, 54]}, + {"origin": [24.9, 9.61, -10], "size": [2, 0, 2], "uv": [-2, 37]} + ] + }, + { + "name": "fingers_left", + "parent": "hand_left", + "pivot": [30, 7.1, -9] + }, + { + "name": "finger_side_left", + "parent": "fingers_left", + "pivot": [34, 7.75, -9], + "rotation": [0, 0, -15], + "cubes": [ + {"origin": [33.75, 5.75, -10], "size": [1, 3, 2], "inflate": 0.1, "uv": [51, 22]} + ] + }, + { + "name": "finger_side_left2", + "parent": "finger_side_left", + "pivot": [34.25, 5.65, -9], + "rotation": [0, 0, 22.5], + "cubes": [ + {"origin": [34.25, 3.9, -10], "size": [0, 2, 2], "uv": [57, 21]} + ] + }, + { + "name": "finger_front_left", + "parent": "fingers_left", + "pivot": [30.5, 7.75, -12.5], + "rotation": [-15, 0, 0], + "cubes": [ + {"origin": [29.5, 5.75, -13.25], "size": [2, 3, 1], "inflate": 0.1, "uv": [26, 20]} + ] + }, + { + "name": "finger_front_left2", + "parent": "finger_front_left", + "pivot": [30.5, 5.65, -12.75], + "rotation": [22.5, 0, 0], + "cubes": [ + {"origin": [29.5, 3.9, -12.75], "size": [2, 2, 0], "uv": [26, 24]} + ] + }, + { + "name": "finger_back_left", + "parent": "fingers_left", + "pivot": [30.5, 7.75, -5], + "rotation": [15, 0, 0], + "cubes": [ + {"origin": [29.5, 5.75, -5.75], "size": [2, 3, 1], "inflate": 0.1, "uv": [0, 29]} + ] + }, + { + "name": "finger_back_left2", + "parent": "finger_back_left", + "pivot": [30.5, 5.65, -5.25], + "rotation": [-22.5, 0, 0], + "cubes": [ + {"origin": [29.5, 3.9, -5.25], "size": [2, 2, 0], "uv": [2, 33]} + ] + }, + { + "name": "arm_right", + "parent": "arms", + "pivot": [-3.5, 7.5, -9], + "cubes": [ + {"origin": [-10.5, 6.5, -10.5], "size": [8, 2, 3], "inflate": -0.1, "uv": [22, 44], "mirror": true} + ] + }, + { + "name": "arm_right2", + "parent": "arm_right", + "pivot": [-10.5, 7.5, -9], + "cubes": [ + {"origin": [-18, 6.5, -10.5], "size": [8, 2, 3], "uv": [22, 49], "mirror": true} + ] + }, + { + "name": "arm_right3", + "parent": "arm_right2", + "pivot": [-18, 7.5, -9], + "cubes": [ + {"origin": [-25.5, 6.6, -11.5], "size": [8, 2, 5], "inflate": 0.15, "uv": [70, 46], "mirror": true} + ] + }, + { + "name": "hand_right", + "parent": "arm_right3", + "pivot": [-25, 7.6, -9], + "cubes": [ + {"origin": [-34, 6.5, -12.5], "size": [9, 3, 7], "inflate": 0.1, "uv": [32, 54], "mirror": true}, + {"origin": [-26.9, 9.61, -10], "size": [2, 0, 2], "uv": [-2, 39], "mirror": true} + ] + }, + { + "name": "fingers_right", + "parent": "hand_right", + "pivot": [-30, 7.1, -9] + }, + { + "name": "finger_side_right", + "parent": "fingers_right", + "pivot": [-34, 7.75, -9], + "rotation": [0, 0, 15], + "cubes": [ + {"origin": [-34.75, 5.75, -10], "size": [1, 3, 2], "inflate": 0.1, "uv": [61, 5], "mirror": true} + ] + }, + { + "name": "finger_side_right2", + "parent": "finger_side_right", + "pivot": [-34.25, 5.65, -9], + "rotation": [0, 0, -22.5], + "cubes": [ + {"origin": [-34.25, 3.9, -10], "size": [0, 2, 2], "uv": [57, 23], "mirror": true} + ] + }, + { + "name": "finger_front_right", + "parent": "fingers_right", + "pivot": [-30.5, 7.75, -12.5], + "rotation": [-15, 0, 0], + "cubes": [ + {"origin": [-31.5, 5.75, -13.25], "size": [2, 3, 1], "inflate": 0.1, "uv": [6, 29], "mirror": true} + ] + }, + { + "name": "finger_front_right2", + "parent": "finger_front_right", + "pivot": [-30.5, 5.65, -12.75], + "rotation": [22.5, 0, 0], + "cubes": [ + {"origin": [-31.5, 3.9, -12.75], "size": [2, 2, 0], "uv": [30, 24], "mirror": true} + ] + }, + { + "name": "finger_back_right", + "parent": "fingers_right", + "pivot": [-30.5, 7.75, -5], + "rotation": [15, 0, 0], + "cubes": [ + {"origin": [-31.5, 5.75, -5.75], "size": [2, 3, 1], "inflate": 0.1, "uv": [6, 33], "mirror": true} + ] + }, + { + "name": "finger_back_right2", + "parent": "finger_back_right", + "pivot": [-30.5, 5.65, -5.25], + "rotation": [-22.5, 0, 0], + "cubes": [ + {"origin": [-31.5, 3.9, -5.25], "size": [2, 2, 0], "uv": [2, 35], "mirror": true} + ] + }, + { + "name": "neck2", + "parent": "neck", + "pivot": [0, 11.25, -13], + "cubes": [ + {"origin": [-4, 3.75, -22], "size": [8, 8, 9], "inflate": 0.01, "uv": [26, 18]} + ] + }, + { + "name": "head_detail_left2", + "parent": "neck2", + "pivot": [4.02, 8.75, -18.5], + "cubes": [ + {"origin": [4.02, 8.25, -19], "size": [0, 1, 1], "uv": [67, 19]} + ] + }, + { + "name": "head_detail_right2", + "parent": "neck2", + "pivot": [-4.02, 8.75, -18.5], + "cubes": [ + {"origin": [-4.02, 8.25, -19], "size": [0, 1, 1], "uv": [67, 20], "mirror": true} + ] + }, + { + "name": "head", + "parent": "neck2", + "pivot": [0, 11.75, -22], + "cubes": [ + {"origin": [-4.5, 3.75, -32], "size": [9, 8, 10], "uv": [32, 0]} + ] + }, + { + "name": "head_detail_left1", + "parent": "head", + "pivot": [4.51, 8.75, -24], + "cubes": [ + {"origin": [4.51, 7.75, -25], "size": [0, 2, 2], "uv": [61, 20]} + ] + }, + { + "name": "head_detail_right1", + "parent": "head", + "pivot": [-4.51, 8.75, -24], + "cubes": [ + {"origin": [-4.51, 7.75, -25], "size": [0, 2, 2], "uv": [65, 20], "mirror": true} + ] + }, + { + "name": "head_fin", + "parent": "head", + "pivot": [0, 11.75, -31.5], + "rotation": [12, 0, 0], + "cubes": [ + {"origin": [-1, 9.75, -31.5], "size": [2, 2, 11], "inflate": 0.1, "uv": [86, 47]} + ] + }, + { + "name": "head_fin2", + "parent": "head_fin", + "pivot": [0, 10.75, -20.5], + "cubes": [ + {"origin": [-1, 9.75, -21], "size": [2, 2, 10], "inflate": -0.1, "uv": [101, 46]} + ] + }, + { + "name": "head_fin_bottom1", + "parent": "head_fin2", + "pivot": [0, 9.75, -15.5], + "cubes": [ + {"origin": [0, 6.25, -22], "size": [0, 4, 12], "uv": [102, 48]} + ] + }, + { + "name": "head_fin_bottom2", + "parent": "head_fin_bottom1", + "pivot": [0, 8.25, -11], + "cubes": [ + {"origin": [-0.01, 6.25, -11], "size": [0, 4, 11], "uv": [76, 20]} + ] + }, + { + "name": "head_fin_bottom3", + "parent": "head_fin_bottom2", + "pivot": [0, 8.25, -1], + "cubes": [ + {"origin": [0, 6.25, -1], "size": [0, 4, 8], "uv": [57, 45]} + ] + }, + { + "name": "head_fin3", + "parent": "head_fin2", + "pivot": [0, 10.75, -11], + "cubes": [ + {"origin": [-0.5, 10.25, -11.5], "size": [1, 1, 10], "inflate": 0.1, "uv": [74, 53]} + ] + }, + { + "name": "head_fin4", + "parent": "head_fin3", + "pivot": [0, 10.75, -1.5], + "cubes": [ + {"origin": [-0.5, 10.25, -2], "size": [1, 1, 9], "uv": [64, 53]} + ] + }, + { + "name": "head_fin5", + "parent": "head_fin4", + "pivot": [0, 10.75, 6.5], + "cubes": [ + {"origin": [-1.5, 9.75, 6.5], "size": [3, 2, 6], "inflate": 0.05, "uv": [34, 36]} + ] + }, + { + "name": "head2", + "parent": "head", + "pivot": [0, 11.75, -32], + "rotation": [35, 0, 0], + "cubes": [ + {"origin": [-4.5, 3, -39], "size": [9, 9, 7], "inflate": 0.01, "uv": [0, 0]} + ] + }, + { + "name": "eyes", + "parent": "head2", + "pivot": [0, 8.85, -34.9] + }, + { + "name": "eye_base_left", + "parent": "eyes", + "pivot": [4.52, 10, -36], + "rotation": [-11.5, 0, 0], + "cubes": [ + {"origin": [4.32, 6.8, -35.8], "size": [0, 3, 4], "inflate": 0.21, "uv": [75, 49]} + ] + }, + { + "name": "eye_left", + "parent": "eye_base_left", + "pivot": [4.44, 8.3, -34.3], + "cubes": [ + {"origin": [4.44, 7.3, -35.3], "size": [0, 2, 2], "inflate": 0.1, "uv": [25, -2]} + ] + }, + { + "name": "eye_expression_left", + "parent": "eye_left", + "pivot": [4.35, 8.9, -34.3], + "cubes": [ + {"origin": [4.36, 8.4, -34.8], "size": [0, 1, 1], "inflate": 0.1, "uv": [39, 0]} + ] + }, + { + "name": "pupil_left", + "parent": "eye_left", + "pivot": [4.55, 8.55, -34.55], + "cubes": [ + {"origin": [4.55, 8.05, -35.05], "size": [0, 1, 1], "uv": [26, 1]} + ] + }, + { + "name": "eyelid_left", + "parent": "eye_left", + "pivot": [3.85, 8.3, -34.3], + "cubes": [ + {"origin": [3.35, 7.3, -35.3], "size": [1, 2, 2], "inflate": 0.11, "uv": [84, 16]} + ] + }, + { + "name": "eyelid_happy_left", + "parent": "eye_left", + "pivot": [3.85, 8.3, -34.3], + "cubes": [ + {"origin": [3.35, 7.3, -35.8], "size": [1, 2, 3], "inflate": 0.11, "uv": [115, 45]} + ] + }, + { + "name": "eyelid_hurt_left", + "parent": "eye_left", + "pivot": [3.85, 8.3, -34.3], + "cubes": [ + {"origin": [3.35, 7.3, -35.3], "size": [1, 2, 2], "inflate": 0.11, "uv": [92, 22]} + ] + }, + { + "name": "eye_base_left2", + "parent": "eye_base_left", + "pivot": [4.52, 10, -31.6], + "rotation": [-23.5, 0, 0], + "cubes": [ + {"origin": [4.52, 8, -31.6], "size": [0, 2, 3], "uv": [91, 44]} + ] + }, + { + "name": "eye_base_right", + "parent": "eyes", + "pivot": [-4.52, 10, -36], + "rotation": [-11.5, 0, 0], + "cubes": [ + {"origin": [-4.32, 6.8, -35.8], "size": [0, 3, 4], "inflate": 0.21, "uv": [75, 52], "mirror": true} + ] + }, + { + "name": "eye_right", + "parent": "eye_base_right", + "pivot": [-4.44, 8.3, -34.3], + "cubes": [ + {"origin": [-4.44, 7.3, -35.3], "size": [0, 2, 2], "inflate": 0.1, "uv": [29, -2], "mirror": true} + ] + }, + { + "name": "eye_expression_right", + "parent": "eye_right", + "pivot": [-4.35, 8.9, -34.3], + "cubes": [ + {"origin": [-4.36, 8.4, -34.8], "size": [0, 1, 1], "inflate": 0.1, "uv": [39, 1], "mirror": true} + ] + }, + { + "name": "pupil_right", + "parent": "eye_right", + "pivot": [-4.55, 8.55, -34.55], + "cubes": [ + {"origin": [-4.55, 8.05, -35.05], "size": [0, 1, 1], "uv": [26, 2], "mirror": true} + ] + }, + { + "name": "eyelid_right", + "parent": "eye_right", + "pivot": [-3.85, 8.3, -34.3], + "cubes": [ + {"origin": [-4.35, 7.3, -35.3], "size": [1, 2, 2], "inflate": 0.11, "uv": [84, 20], "mirror": true} + ] + }, + { + "name": "eyelid_happy_right", + "parent": "eye_right", + "pivot": [-3.85, 8.3, -34.3], + "cubes": [ + {"origin": [-4.35, 7.3, -35.8], "size": [1, 2, 3], "inflate": 0.11, "uv": [115, 50], "mirror": true} + ] + }, + { + "name": "eyelid_hurt_right", + "parent": "eye_right", + "pivot": [-3.85, 8.3, -34.3], + "cubes": [ + {"origin": [-4.35, 7.3, -35.3], "size": [1, 2, 2], "inflate": 0.11, "uv": [92, 26], "mirror": true} + ] + }, + { + "name": "eye_base_right2", + "parent": "eye_base_right", + "pivot": [-4.52, 10, -31.6], + "rotation": [-23.5, 0, 0], + "cubes": [ + {"origin": [-4.52, 8, -31.6], "size": [0, 2, 3], "uv": [91, 46], "mirror": true} + ] + }, + { + "name": "mouth", + "parent": "head2", + "pivot": [0, 7.5, -39], + "cubes": [ + {"origin": [-5, 2.5, -41], "size": [10, 10, 3], "inflate": 0.1, "uv": [0, 16]}, + {"origin": [-3.5, 10.57, -41.099], "size": [7, 0, 3], "uv": [96, 22]}, + {"origin": [-3.5, 4.43, -41.099], "size": [7, 0, 3], "uv": [96, 25]}, + {"origin": [3.07, 4, -41.099], "size": [0, 7, 3], "uv": [25, 51]}, + {"origin": [-3.07, 4, -41.099], "size": [0, 7, 3], "uv": [31, 51], "mirror": true} + ] + }, + { + "name": "teeth_top_left", + "parent": "mouth", + "pivot": [4.5, 12, -39.6], + "rotation": [5, 5, 0], + "cubes": [ + {"origin": [3.5, 11, -41.6], "size": [2, 2, 3], "uv": [25, 2]} + ] + }, + { + "name": "teeth_top_left2", + "parent": "teeth_top_left", + "pivot": [4.75, 12.25, -41.6], + "rotation": [7.5, 7.5, 0], + "cubes": [ + {"origin": [3.75, 11.25, -43.6], "size": [1, 1, 2], "inflate": 0.1, "uv": [1, 1]} + ] + }, + { + "name": "teeth_top_right", + "parent": "mouth", + "pivot": [-4.5, 12, -39.6], + "rotation": [5, -5, 0], + "cubes": [ + {"origin": [-5.5, 11, -41.6], "size": [2, 2, 3], "uv": [32, 0], "mirror": true} + ] + }, + { + "name": "teeth_top_right2", + "parent": "teeth_top_right", + "pivot": [-4.75, 12.25, -41.6], + "rotation": [7.5, -7.5, 0], + "cubes": [ + {"origin": [-4.75, 11.25, -43.6], "size": [1, 1, 2], "inflate": 0.1, "uv": [1, 4], "mirror": true} + ] + }, + { + "name": "teeth_bottom_left", + "parent": "mouth", + "pivot": [4.5, 3, -39.6], + "rotation": [-5, 5, 0], + "cubes": [ + {"origin": [3.5, 2, -41.6], "size": [2, 2, 3], "uv": [32, 5]} + ] + }, + { + "name": "teeth_bottom_left2", + "parent": "teeth_bottom_left", + "pivot": [4.75, 2.75, -41.6], + "rotation": [-7.5, 7.5, 0], + "cubes": [ + {"origin": [3.75, 2.75, -43.6], "size": [1, 1, 2], "inflate": 0.1, "uv": [23, 16]} + ] + }, + { + "name": "teeth_bottom_right", + "parent": "mouth", + "pivot": [-4.5, 3, -39.6], + "rotation": [-5, -5, 0], + "cubes": [ + {"origin": [-5.5, 2, -41.6], "size": [2, 2, 3], "uv": [60, 0], "mirror": true} + ] + }, + { + "name": "teeth_bottom_right2", + "parent": "teeth_bottom_right", + "pivot": [-4.75, 2.75, -41.6], + "rotation": [-7.5, -7.5, 0], + "cubes": [ + {"origin": [-4.75, 2.75, -43.6], "size": [1, 1, 2], "inflate": 0.1, "uv": [27, 17], "mirror": true} + ] + }, + { + "name": "segment1", + "parent": "body", + "pivot": [0, 7.75, -5], + "cubes": [ + {"origin": [-3.5, 4.25, -6], "size": [7, 7, 9], "uv": [70, 0]} + ] + }, + { + "name": "segment2", + "parent": "segment1", + "pivot": [0, 4.25, 3], + "cubes": [ + {"origin": [-3.5, 4.25, 3], "size": [7, 7, 8], "inflate": 0.1, "uv": [62, 16]} + ] + }, + { + "name": "segment3", + "parent": "segment2", + "pivot": [0, 4.25, 11], + "cubes": [ + {"origin": [-3.5, 4.25, 11], "size": [7, 7, 8], "inflate": 0.11, "uv": [52, 31]} + ] + }, + { + "name": "back_fin1", + "parent": "segment3", + "pivot": [0, 11.25, 15.25], + "cubes": [ + {"origin": [0, 10.25, 12.25], "size": [0, 4, 6], "uv": [67, -1]} + ] + }, + { + "name": "legs", + "parent": "segment3", + "pivot": [0, 4.75, 15] + }, + { + "name": "leg_left", + "parent": "legs", + "pivot": [2.25, 4.75, 15], + "cubes": [ + {"origin": [2.25, 0.75, 11], "size": [0, 4, 8], "uv": [51, 10]} + ] + }, + { + "name": "leg_left2", + "parent": "leg_left", + "pivot": [2.25, 0.75, 15], + "cubes": [ + {"origin": [2.25, -2.25, 11], "size": [0, 3, 8], "uv": [57, 49]} + ] + }, + { + "name": "leg_left3", + "parent": "leg_left2", + "pivot": [2.25, -2.25, 15], + "cubes": [ + {"origin": [2.25, -5.25, 11], "size": [0, 3, 8], "uv": [82, 34]} + ] + }, + { + "name": "leg_right", + "parent": "legs", + "pivot": [-2.25, 4.75, 15], + "cubes": [ + {"origin": [-2.25, 0.75, 11], "size": [0, 4, 8], "uv": [82, 30], "mirror": true} + ] + }, + { + "name": "leg_right2", + "parent": "leg_right", + "pivot": [-2.25, 0.75, 15], + "cubes": [ + {"origin": [-2.25, -2.25, 11], "size": [0, 3, 8], "uv": [86, 52], "mirror": true} + ] + }, + { + "name": "leg_right3", + "parent": "leg_right2", + "pivot": [-2.25, -2.25, 15], + "cubes": [ + {"origin": [-2.25, -5.25, 11], "size": [0, 3, 8], "uv": [75, 27], "mirror": true} + ] + }, + { + "name": "segment4", + "parent": "segment3", + "pivot": [0, 7.75, 19], + "cubes": [ + {"origin": [-3, 4.75, 18], "size": [6, 6, 8], "inflate": 0.1, "uv": [94, 8]} + ] + }, + { + "name": "back_fin2", + "parent": "segment4", + "pivot": [0, 10.75, 22.5], + "cubes": [ + {"origin": [-0.01, 10.25, 18], "size": [0, 5, 9], "uv": [93, -6]} + ] + }, + { + "name": "segment5", + "parent": "segment4", + "pivot": [0, 7.75, 26], + "cubes": [ + {"origin": [-2.5, 5.25, 25], "size": [5, 5, 7], "uv": [104, 33]} + ] + }, + { + "name": "back_fin3", + "parent": "segment5", + "pivot": [0, 10.25, 29], + "cubes": [ + {"origin": [0, 9.25, 26], "size": [0, 5, 8], "uv": [111, -8]} + ] + }, + { + "name": "segment6", + "parent": "segment5", + "pivot": [0, 7.75, 32], + "cubes": [ + {"origin": [-2, 5.75, 31], "size": [4, 4, 7], "inflate": -0.1, "uv": [106, 22]} + ] + }, + { + "name": "back_fin4", + "parent": "segment6", + "pivot": [0, 9.75, 35], + "cubes": [ + {"origin": [-0.01, 9.25, 32], "size": [0, 4, 7], "uv": [114, 3]} + ] + }, + { + "name": "segment7", + "parent": "segment6", + "pivot": [0, 7.75, 38], + "cubes": [ + {"origin": [-1.5, 6.25, 37], "size": [3, 3, 7], "uv": [91, 28]} + ] + }, + { + "name": "back_fin5", + "parent": "segment7", + "pivot": [0, 9.25, 40], + "cubes": [ + {"origin": [0, 8.25, 37], "size": [0, 5, 6], "uv": [114, -1]} + ] + }, + { + "name": "segment8", + "parent": "segment7", + "pivot": [0, 7.75, 44], + "cubes": [ + {"origin": [-1, 6.75, 43], "size": [2, 2, 7], "uv": [91, 38]} + ] + }, + { + "name": "back_fin6", + "parent": "segment8", + "pivot": [0, 8.75, 44.5], + "cubes": [ + {"origin": [-0.01, 8.25, 42], "size": [0, 3, 5], "uv": [93, -5]} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0451_skorupi/skorupi.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0451_skorupi/skorupi.json new file mode 100644 index 0000000000..c979a054f9 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0451_skorupi/skorupi.json @@ -0,0 +1,43 @@ +{ + "portraitScale": 2.09, + "portraitTranslation": [-0.71, -1.34, 0], + "profileScale": 0.66, + "profileTranslation": [-0.1, 0.74, 0], + "rootBone": "skorupi", + "poses": { + "standing": { + "poseTypes": [ + "STAND", + "NONE", + "PORTRAIT", + "PROFILE", + "FLOAT" + ], + "isBattle": false, + "animations": [ + "q.look('head')", + "q.bedrock('skorupi', 'ground_idle')" + ], + "quirks": [ + "q.bedrock_quirk('skorupi', 'blink')" + ] + }, + "walking": { + "poseTypes": [ + "WALK", + "SWIM" + ], + "animations": [ + "q.look('head')", + "q.bedrock('skorupi', 'ground_idle')", + "q.quadruped_walk(1, 1, 'leg_front_left', 'leg_front_right', 'leg_back_left', 'leg_back_right')" + ], + "quirks": [ + "q.bedrock_quirk('skorupi', 'blink')" + ] + } + } +} + + + \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0452_drapion/drapion.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0452_drapion/drapion.json new file mode 100644 index 0000000000..9a412c5452 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0452_drapion/drapion.json @@ -0,0 +1,43 @@ +{ + "portraitScale": 1.63, + "portraitTranslation": [-1.76, 1.25, 0], + "profileScale": 0.53, + "profileTranslation": [-0.09, 0.92, 0], + "rootBone": "drapion", + "poses": { + "standing": { + "poseTypes": [ + "STAND", + "NONE", + "PORTRAIT", + "PROFILE", + "FLOAT" + ], + "isBattle": false, + "animations": [ + "q.look('head')", + "q.bedrock('drapion', 'ground_idle')" + ], + "quirks": [ + "q.bedrock_quirk('drapion', 'blink')" + ] + }, + "walking": { + "poseTypes": [ + "WALK", + "SWIM" + ], + "animations": [ + "q.look('head')", + "q.bedrock('drapion', 'ground_idle')", + "q.quadruped_walk(1, 1, 'leg_front_left', 'leg_front_right', 'leg_back_left', 'leg_back_right')" + ], + "quirks": [ + "q.bedrock_quirk('drapion', 'blink')" + ] + } + } +} + + + \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0602_tynamo/tynamo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0602_tynamo/tynamo.json new file mode 100644 index 0000000000..ed66187bc7 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0602_tynamo/tynamo.json @@ -0,0 +1,34 @@ +{ + "portraitScale": 3.05, + "portraitTranslation": [-0.59, -2.13, 0], + "profileScale": 0.66, + "profileTranslation": [0, 0.75, 0], + "rootBone": "tynamo", + "animations": {}, + "poses": { + "standing": { + "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"], + "isBattle": true, + "animations": ["q.look('head')", "q.bedrock('tynamo', 'ground_idle')"], + "quirks": ["q.bedrock_quirk('tynamo', 'blink')"] + }, + "walking": { + "poseTypes": ["WALK"], + "animations": [ + "q.look('head')", + "q.bedrock('tynamo', 'ground_idle')" + ], + "quirks": ["q.bedrock_quirk('tynamo', 'blink')"] + }, + "float": { + "poseTypes": ["FLOAT"], + "animations": ["q.bedrock('tynamo', 'ground_idle')"], + "quirks": ["q.bedrock_quirk('tynamo', 'blink')"] + }, + "swim": { + "poseTypes": ["SWIM"], + "animations": ["q.bedrock('tynamo', 'ground_idle')"], + "quirks": ["q.bedrock_quirk('tynamo', 'blink')"] + } + } +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0603_eelektrik/eelektrik.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0603_eelektrik/eelektrik.json new file mode 100644 index 0000000000..879bb2919a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0603_eelektrik/eelektrik.json @@ -0,0 +1,34 @@ +{ + "portraitScale": 2.36, + "portraitTranslation": [-0.63, -0.02, 0], + "profileScale": 0.67, + "profileTranslation": [0, 0.8, 0], + "rootBone": "eelektrik", + "animations": {}, + "poses": { + "standing": { + "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"], + "isBattle": true, + "animations": ["q.look('head')", "q.bedrock('eelektrik', 'ground_idle')"], + "quirks": ["q.bedrock_quirk('eelektrik', 'blink')"] + }, + "walking": { + "poseTypes": ["WALK"], + "animations": [ + "q.look('head')", + "q.bedrock('eelektrik', 'ground_idle')" + ], + "quirks": ["q.bedrock_quirk('eelektrik', 'blink')"] + }, + "float": { + "poseTypes": ["FLOAT"], + "animations": ["q.bedrock('eelektrik', 'ground_idle')"], + "quirks": ["q.bedrock_quirk('eelektrik', 'blink')"] + }, + "swim": { + "poseTypes": ["SWIM"], + "animations": ["q.bedrock('eelektrik', 'ground_idle')"], + "quirks": ["q.bedrock_quirk('eelektrik', 'blink')"] + } + } +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0604_eelektross/eelektross.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0604_eelektross/eelektross.json new file mode 100644 index 0000000000..07ddc8f5ba --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0604_eelektross/eelektross.json @@ -0,0 +1,35 @@ +{ + "portraitScale": 1.63, + "portraitTranslation": [-0.87, 0.72, 0], + "profileScale": 0.64, + "profileTranslation": [0, 0.76, 0], + "rootBone": "eelektross", + "animations": {}, + "poses": { + "standing": { + "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"], + "isBattle": true, + "animations": ["q.look('head')", "q.bedrock('eelektross', 'ground_idle')"], + "quirks": ["q.bedrock_quirk('eelektross', 'blink')"] + }, + "walking": { + "poseTypes": ["WALK"], + "animations": [ + "q.look('head')", + "q.bedrock('eelektross', 'ground_idle')", + "q.biped_walk(1, 1, 'leg_left', 'leg_right')" + ], + "quirks": ["q.bedrock_quirk('eelektross', 'blink')"] + }, + "float": { + "poseTypes": ["FLOAT"], + "animations": ["q.bedrock('eelektross', 'ground_idle')"], + "quirks": ["q.bedrock_quirk('eelektross', 'blink')"] + }, + "swim": { + "poseTypes": ["SWIM"], + "animations": ["q.bedrock('eelektross', 'ground_idle')"], + "quirks": ["q.bedrock_quirk('eelektross', 'blink')"] + } + } +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0451_skorupi/0_skorupi_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0451_skorupi/0_skorupi_base.json new file mode 100644 index 0000000000..c4d3bc10c5 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0451_skorupi/0_skorupi_base.json @@ -0,0 +1,17 @@ +{ + "species": "cobblemon:skorupi", + "order": 0, + "variations": [ + { + "aspects": [], + "poser": "cobblemon:skorupi", + "model": "cobblemon:skorupi.geo", + "texture": "cobblemon:textures/pokemon/0451_skorupi/skorupi.png", + "layers": [] + }, + { + "aspects": ["shiny"], + "texture": "cobblemon:textures/pokemon/0451_skorupi/skorupi_shiny.png" + } + ] +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0452_drapion/0_drapion_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0452_drapion/0_drapion_base.json new file mode 100644 index 0000000000..7662c97383 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0452_drapion/0_drapion_base.json @@ -0,0 +1,17 @@ +{ + "species": "cobblemon:drapion", + "order": 0, + "variations": [ + { + "aspects": [], + "poser": "cobblemon:drapion", + "model": "cobblemon:drapion.geo", + "texture": "cobblemon:textures/pokemon/0452_drapion/drapion.png", + "layers": [] + }, + { + "aspects": ["shiny"], + "texture": "cobblemon:textures/pokemon/0452_drapion/drapion_shiny.png" + } + ] +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0602_tynamo/0_tynamo_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0602_tynamo/0_tynamo_base.json new file mode 100644 index 0000000000..526d9c16b1 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0602_tynamo/0_tynamo_base.json @@ -0,0 +1,17 @@ +{ + "species": "cobblemon:tynamo", + "order": 0, + "variations": [ + { + "aspects": [], + "poser": "cobblemon:tynamo", + "model": "cobblemon:tynamo.geo", + "texture": "cobblemon:textures/pokemon/0602_tynamo/tynamo.png", + "layers": [] + }, + { + "aspects": ["shiny"], + "texture": "cobblemon:textures/pokemon/0602_tynamo/tynamo_shiny.png" + } + ] +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0603_eelektrik/0_eelektrik_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0603_eelektrik/0_eelektrik_base.json new file mode 100644 index 0000000000..5c94b9e656 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0603_eelektrik/0_eelektrik_base.json @@ -0,0 +1,17 @@ +{ + "species": "cobblemon:eelektrik", + "order": 0, + "variations": [ + { + "aspects": [], + "poser": "cobblemon:eelektrik", + "model": "cobblemon:eelektrik.geo", + "texture": "cobblemon:textures/pokemon/0603_eelektrik/eelektrik.png", + "layers": [] + }, + { + "aspects": ["shiny"], + "texture": "cobblemon:textures/pokemon/0603_eelektrik/eelektrik_shiny.png" + } + ] +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0604_eelektross/0_eelektross_base.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0604_eelektross/0_eelektross_base.json new file mode 100644 index 0000000000..9b3fa1baed --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0604_eelektross/0_eelektross_base.json @@ -0,0 +1,17 @@ +{ + "species": "cobblemon:eelektross", + "order": 0, + "variations": [ + { + "aspects": [], + "poser": "cobblemon:eelektross", + "model": "cobblemon:eelektross.geo", + "texture": "cobblemon:textures/pokemon/0604_eelektross/eelektross.png", + "layers": [] + }, + { + "aspects": ["shiny"], + "texture": "cobblemon:textures/pokemon/0604_eelektross/eelektross_shiny.png" + } + ] +} diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0451_skorupi/skorupi.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0451_skorupi/skorupi.png new file mode 100644 index 0000000000..90c4cd9392 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0451_skorupi/skorupi.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0451_skorupi/skorupi_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0451_skorupi/skorupi_shiny.png new file mode 100644 index 0000000000..bb10b2aacb Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0451_skorupi/skorupi_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0452_drapion/drapion.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0452_drapion/drapion.png new file mode 100644 index 0000000000..016370b051 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0452_drapion/drapion.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0452_drapion/drapion_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0452_drapion/drapion_shiny.png new file mode 100644 index 0000000000..f0bf6be2c5 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0452_drapion/drapion_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0602_tynamo/tynamo.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0602_tynamo/tynamo.png new file mode 100644 index 0000000000..25ebb940e7 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0602_tynamo/tynamo.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0602_tynamo/tynamo_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0602_tynamo/tynamo_shiny.png new file mode 100644 index 0000000000..e8124fcb4a Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0602_tynamo/tynamo_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0603_eelektrik/eelektrik.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0603_eelektrik/eelektrik.png new file mode 100644 index 0000000000..1a7a97f166 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0603_eelektrik/eelektrik.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0603_eelektrik/eelektrik_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0603_eelektrik/eelektrik_shiny.png new file mode 100644 index 0000000000..4cebd0d257 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0603_eelektrik/eelektrik_shiny.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0604_eelektross/eelektross.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0604_eelektross/eelektross.png new file mode 100644 index 0000000000..3a60031e4c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0604_eelektross/eelektross.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0604_eelektross/eelektross_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0604_eelektross/eelektross_shiny.png new file mode 100644 index 0000000000..5ded1c8c28 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0604_eelektross/eelektross_shiny.png differ diff --git a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json b/common/src/main/resources/data/cobblemon/species/generation4/drapion.json index 82d7d43085..cc66564bac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/drapion.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/drapion.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 452, "name": "Drapion", "primaryType": "poison", @@ -43,10 +44,10 @@ "catchRate": 45, "eggCycles": 20, "baseFriendship": 50, - "baseScale": 1, + "baseScale": 0.9, "hitbox": { - "width": 1, - "height": 1, + "width": 2.25, + "height": 2.5, "fixed": false }, "behaviour": { diff --git a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json b/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json index 8c96b20ad0..f76f336db7 100644 --- a/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json +++ b/common/src/main/resources/data/cobblemon/species/generation4/skorupi.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 451, "name": "Skorupi", "primaryType": "poison", @@ -43,10 +44,10 @@ "catchRate": 120, "eggCycles": 20, "baseFriendship": 50, - "baseScale": 1, + "baseScale": 0.65, "hitbox": { - "width": 1, - "height": 1, + "width": 1.1, + "height": 1.2, "fixed": false }, "behaviour": { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json b/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json index 08ad8345ea..e93954bcd4 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/eelektrik.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 603, "name": "Eelektrik", "primaryType": "electric", @@ -40,15 +41,16 @@ "catchRate": 60, "eggCycles": 20, "baseFriendship": 50, - "baseScale": 1, + "baseScale": 0.7, "hitbox": { - "width": 1, - "height": 1, + "width": 0.7, + "height": 1.5, "fixed": false }, "behaviour": { "moving": { "swim": { + "canBreatheUnderwater": true, "canSwimInWater": true }, "fly": { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json b/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json index a747812a53..ed4350c848 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/eelektross.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 604, "name": "Eelektross", "primaryType": "electric", @@ -42,13 +43,14 @@ "baseFriendship": 50, "baseScale": 1, "hitbox": { - "width": 1, - "height": 1, + "width": 1.25, + "height": 2, "fixed": false }, "behaviour": { "moving": { "swim": { + "canBreatheUnderwater": true, "canSwimInWater": true }, "fly": { diff --git a/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json b/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json index 2abbdb5fb3..de354d22ac 100644 --- a/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json +++ b/common/src/main/resources/data/cobblemon/species/generation5/tynamo.json @@ -1,4 +1,5 @@ { + "implemented": true, "nationalPokedexNumber": 602, "name": "Tynamo", "primaryType": "electric", @@ -40,10 +41,10 @@ "catchRate": 190, "eggCycles": 20, "baseFriendship": 50, - "baseScale": 1, + "baseScale": 0.55, "hitbox": { - "width": 1, - "height": 1, + "width": 0.6, + "height": 0.75, "fixed": false }, "behaviour": {