From ea33d86dbdfca218a2e052d00ddac01662665657 Mon Sep 17 00:00:00 2001 From: GenotypeXD-Dev Date: Sat, 9 Aug 2025 13:45:05 -0500 Subject: [PATCH] Implemented Tynamo line and Skorupi Line --- .../0451_skorupi/skorupi.animation.json | 186 +++++ .../0452_drapion/drapion.animation.json | 223 ++++++ .../0602_tynamo/tynamo.animation.json | 141 ++++ .../0603_eelektrik/eelektrik.animation.json | 163 ++++ .../0604_eelektross/eelektross.animation.json | 376 +++++++++ .../models/0451_skorupi/skorupi.geo.json | 371 +++++++++ .../models/0452_drapion/drapion.geo.json | 708 +++++++++++++++++ .../models/0602_tynamo/tynamo.geo.json | 195 +++++ .../models/0603_eelektrik/eelektrik.geo.json | 299 +++++++ .../0604_eelektross/eelektross.geo.json | 731 ++++++++++++++++++ .../pokemon/posers/0451_skorupi/skorupi.json | 43 ++ .../pokemon/posers/0452_drapion/drapion.json | 43 ++ .../pokemon/posers/0602_tynamo/tynamo.json | 34 + .../posers/0603_eelektrik/eelektrik.json | 34 + .../posers/0604_eelektross/eelektross.json | 35 + .../0451_skorupi/0_skorupi_base.json | 17 + .../0452_drapion/0_drapion_base.json | 17 + .../resolvers/0602_tynamo/0_tynamo_base.json | 17 + .../0603_eelektrik/0_eelektrik_base.json | 17 + .../0604_eelektross/0_eelektross_base.json | 17 + .../textures/pokemon/0451_skorupi/skorupi.png | Bin 0 -> 2907 bytes .../pokemon/0451_skorupi/skorupi_shiny.png | Bin 0 -> 2923 bytes .../textures/pokemon/0452_drapion/drapion.png | Bin 0 -> 8181 bytes .../pokemon/0452_drapion/drapion_shiny.png | Bin 0 -> 8254 bytes .../textures/pokemon/0602_tynamo/tynamo.png | Bin 0 -> 962 bytes .../pokemon/0602_tynamo/tynamo_shiny.png | Bin 0 -> 948 bytes .../pokemon/0603_eelektrik/eelektrik.png | Bin 0 -> 2399 bytes .../0603_eelektrik/eelektrik_shiny.png | Bin 0 -> 2472 bytes .../pokemon/0604_eelektross/eelektross.png | Bin 0 -> 5098 bytes .../0604_eelektross/eelektross_shiny.png | Bin 0 -> 5288 bytes .../species/generation4/drapion.json | 7 +- .../species/generation4/skorupi.json | 7 +- .../species/generation5/eelektrik.json | 8 +- .../species/generation5/eelektross.json | 6 +- .../cobblemon/species/generation5/tynamo.json | 7 +- 35 files changed, 3688 insertions(+), 14 deletions(-) create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0451_skorupi/skorupi.animation.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0452_drapion/drapion.animation.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0602_tynamo/tynamo.animation.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0603_eelektrik/eelektrik.animation.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0604_eelektross/eelektross.animation.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0451_skorupi/skorupi.geo.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0452_drapion/drapion.geo.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0602_tynamo/tynamo.geo.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0603_eelektrik/eelektrik.geo.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0604_eelektross/eelektross.geo.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0451_skorupi/skorupi.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0452_drapion/drapion.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0602_tynamo/tynamo.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0603_eelektrik/eelektrik.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0604_eelektross/eelektross.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0451_skorupi/0_skorupi_base.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0452_drapion/0_drapion_base.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0602_tynamo/0_tynamo_base.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0603_eelektrik/0_eelektrik_base.json create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/resolvers/0604_eelektross/0_eelektross_base.json create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0451_skorupi/skorupi.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0451_skorupi/skorupi_shiny.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0452_drapion/drapion.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0452_drapion/drapion_shiny.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0602_tynamo/tynamo.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0602_tynamo/tynamo_shiny.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0603_eelektrik/eelektrik.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0603_eelektrik/eelektrik_shiny.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0604_eelektross/eelektross.png create mode 100644 common/src/main/resources/assets/cobblemon/textures/pokemon/0604_eelektross/eelektross_shiny.png 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 0000000000000000000000000000000000000000..90c4cd93921e963d522e1c35c4d62806ed69871f GIT binary patch literal 2907 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 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e8124fcb4ac7b49488d6d394521146172a44c6b3 GIT binary patch literal 948 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 Rq3i$v002ovPDHLkV1jx1kl_FT literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4cebd0d257f23ca118c0fbd33e48023b7f6d483c GIT binary patch literal 2472 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 M07*qoM6N<$f`75#R{#J2 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5ded1c8c2847ccfca7287fb34a64919d5acefbd4 GIT binary patch literal 5288 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 literal 0 HcmV?d00001 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": {