diff --git a/CHANGELOG.md b/CHANGELOG.md index c4dcf9015..fe1772147 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ -**Update v2.9.2** +**Update v2.9.4** -- Added new Poke dollars glyph -- The top UI bar now displays how much poke dollars you have -- New custom door model -- fixed apricorn doors \ No newline at end of file +- Added Beldum, Metang, and Metagross +- Added Max revive and revive +- Pokémon animation controllers have been updated to just look if the Pokémon is swimming to play animation +- Pokémon animation controllers have been updated to not trigger fly animation if jumping \ No newline at end of file diff --git a/animation_controllers/pokemon.json b/animation_controllers/pokemon.json index e7c3a4ccd..4a99579a1 100644 --- a/animation_controllers/pokemon.json +++ b/animation_controllers/pokemon.json @@ -21,10 +21,10 @@ "walking": "query.modified_move_speed >= 0.01 && query.is_on_ground && !query.is_in_water" }, { - "swimming": "query.modified_move_speed >= 0.01 && q.is_in_water" + "swimming": "query.is_swimming" }, { - "flying": "query.modified_move_speed >= 0.01 && q.can_fly && !query.is_on_ground && !query.is_in_water" + "flying": "query.modified_move_speed >= 0.01 && q.can_fly && !query.is_on_ground && !query.is_in_water && !query.is_jumping" }, { "sleeping": "q.is_sleeping" diff --git a/animations/pokemon/beldum.animation.json b/animations/pokemon/beldum.animation.json new file mode 100644 index 000000000..1d63c7914 --- /dev/null +++ b/animations/pokemon/beldum.animation.json @@ -0,0 +1,576 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.beldum.flying": { + "loop": true, + "animation_length": 2.1, + "bones": { + "bone3": { + "rotation": { + "0.0": { + "post": [85, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [85.01893, 0.43523, 4.98107], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [85, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [85.02, -0.45975, -5.26175], + "lerp_mode": "catmullrom" + }, + "2.1": { + "post": [85, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 1, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.1": { + "post": [0, 1, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone7": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": { + "pre": [0, 0, -5], + "post": [0, 0, -5], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0, 0, 7.5], + "lerp_mode": "catmullrom" + }, + "2.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [-67.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-77.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.1": { + "post": [-67.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.beldum.air_idle": { + "loop": true, + "animation_length": 3.3, + "bones": { + "bone3": { + "rotation": { + "0.0": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 2, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.3": { + "post": [0, 2, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone7": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, 0, -10.58], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [0, 0, 10], + "lerp_mode": "catmullrom" + }, + "3.3": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-17.25002, 2.99318, 9.54589], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [-17.25002, -2.99318, -9.54589], + "lerp_mode": "catmullrom" + }, + "3.3": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, 1, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [0, -1.06, 0], + "lerp_mode": "catmullrom" + }, + "3.3": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.beldum.ground_idle": { + "loop": true, + "animation_length": 2.7, + "bones": { + "bone3": { + "rotation": { + "0.0": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.7": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone7": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [0, 0, -7.5], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9": { + "post": [0, 0, 8], + "lerp_mode": "catmullrom" + }, + "2.7": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [0, 0, 7.5], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [0, 0, -7.97], + "lerp_mode": "catmullrom" + }, + "2.7": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, -1, 0], + "lerp_mode": "catmullrom" + }, + "2.7": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.beldum.attack": { + "animation_length": 1.1, + "bones": { + "bone3": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1": { + "post": [-41.15088, 11.72145, 13.0867], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [39.56869, 6.40865, -7.69263], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [-70, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [0, 11, 10], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [0, 14, 12], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, 7, -7], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [0, 3, -14], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [-15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-29.37, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [57.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone2": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone7": { + "position": [0, 0, 0] + }, + "bone8": { + "position": [0, 0, 0] + } + } + }, + "animation.beldum.sleeping": { + "loop": true, + "animation_length": 3, + "bones": { + "head": { + "rotation": { + "0.0": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone7": { + "position": [0, 0, 1] + }, + "bone8": { + "position": [0, 0, -1] + } + } + }, + "animation.beldum.fainted": { + "loop": true, + "animation_length": 0.4, + "bones": { + "bone3": { + "rotation": [78.18381, -4.03563, 18.57489], + "position": [0, -3, 0] + }, + "head": { + "rotation": [-81.5064, 21.93857, 5.123] + }, + "bone7": { + "position": [0, 0, 1] + }, + "bone9": { + "rotation": { + "0.0": [0, 0, 0], + "0.4": [0, 0, 360] + }, + "position": [0, 0, -2] + } + } + }, + "animation.beldum.swimming": { + "loop": true, + "animation_length": 0.6, + "bones": { + "bone3": { + "rotation": { + "0.0": { + "post": [92.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [90.29332, -10.30055, 12.25481], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [92.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [89.75234, 12.74128, -12.25381], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [92.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [-2, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [3, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-2, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [-87.5095, -0.21782, 4.99527], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [-87.5795, -0.61069, 14.15377], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [-87.50238, 0.10901, -2.49762], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [-87.54809, 0.49869, -11.5017], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-87.5095, -0.21782, 4.99527], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.beldum.water_idle": { + "loop": true, + "animation_length": 1.6, + "bones": { + "bone3": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [10.63, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 3, 0], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0, 3, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-8.44, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone2": { + "rotation": [0, 0, 0] + } + } + } + } +} \ No newline at end of file diff --git a/animations/pokemon/metagross.animation.json b/animations/pokemon/metagross.animation.json new file mode 100644 index 000000000..2f61baa83 --- /dev/null +++ b/animations/pokemon/metagross.animation.json @@ -0,0 +1,1415 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.metagross.walking": { + "loop": true, + "animation_length": 1.6, + "bones": { + "wholebody": { + "rotation": { + "0.0": { + "post": [0, 10, 0], + "lerp_mode": "catmullrom" + }, + "0.1": { + "post": [0, 12.5, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [-9.96271, 0.86717, 4.92442], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-9.99067, 0.43399, 2.46207], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, -15, 0], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [0, -15, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-12.45392, -1.08089, -4.88206], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-12.48848, -0.54094, -2.44081], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0, 10, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [0, 2, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 2, 0], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, 2, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 2, 0], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg4": { + "rotation": { + "0.0": [-2.5, 0, 0], + "0.1": [-2.5, 0, 0], + "0.4": [27.39716, 1.95831, -15.7952], + "0.5": [27.39716, 1.95831, -15.7952], + "0.9": [1.9397, 1.2723, -11.98406], + "1.0": [16.19896, 1.2723, -11.98406], + "1.3": { + "pre": [6.9397, 1.2723, -11.98406], + "post": [6.9397, 1.2723, -11.98406], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [-10.5603, 1.2723, -11.98406], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone12": { + "rotation": { + "0.0": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [-20, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-20, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [-15, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [12.02669, -0.60455, 24.57127], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": [0, 0, 0] + }, + "leg6": { + "rotation": { + "0.0": { + "post": [0, 15, 0], + "lerp_mode": "catmullrom" + }, + "0.1": { + "post": [0, 15, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [-0.67382, -7.65577, 5.04509], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [-0.78795, -17.48281, 2.62116], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-3.61644, -19.6835, 10.62758], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, -47.5, 0], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [0, -50, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [-9.3498, -14.30627, 33.67595], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, -2.5, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 2.5, 0], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0, 15, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg5": { + "rotation": { + "0.0": { + "post": [0, 37.5, 0], + "lerp_mode": "catmullrom" + }, + "0.1": { + "post": [0, 42.5, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [-12.30072, 22.2569, -29.92862], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [0, 17.5, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 15, 0], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [0, -2.5, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [-2.3059, 12.85379, -10.25978], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-4.50432, 19.50645, -13.27463], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-6.1191, 21.69365, -16.17354], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0, 37.5, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg7": { + "rotation": { + "0.0": { + "post": [2.3273, -24.89837, -5.51385], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [0, -30, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [-9.61799, 12.28389, -38.5374], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 37.5, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [2.3273, -24.89837, -5.51385], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [2.3273, -24.89837, -5.51385], + "lerp_mode": "catmullrom" + } + } + }, + "leg8": { + "rotation": { + "0.0": { + "post": [0, -40, 0], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [0, 47.5, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [8.33298, -59.5598, 24.34063], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, -50, 0], + "lerp_mode": "catmullrom" + }, + "1.6": { + "post": [0, -40, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.metagross.ground_idle": { + "loop": true, + "animation_length": 3, + "bones": { + "wholebody": { + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 1, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-6.93, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2": { + "post": [2.72, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 1, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 1, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone30": { + "rotation": [0, 0, 0] + }, + "leg6": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, 7.5], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg5": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, -5], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg7": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, 5], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg8": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, -5], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.metagross.flying": { + "loop": true, + "animation_length": 3, + "bones": { + "wholebody": { + "rotation": { + "0.0": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, -1, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg4": { + "rotation": { + "0.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": [-6, 1, 5] + }, + "leg3": { + "rotation": { + "0.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": [10, 0, -6] + }, + "leg2": { + "rotation": { + "0.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": [-8, 1, -3] + }, + "leg": { + "rotation": { + "0.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": [7, 2, 6] + }, + "bone31": { + "rotation": [-12.5, 20, 0] + }, + "bone32": { + "rotation": [0, -22.5, 0] + } + } + }, + "animation.metagross.air_idle": { + "loop": true, + "animation_length": 3, + "bones": { + "wholebody": { + "rotation": { + "0.0": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2": { + "post": [-0.83, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, -1, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg4": { + "rotation": { + "0.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-50, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2": { + "post": [-42.35, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": [-6, 1, 5] + }, + "leg3": { + "rotation": { + "0.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-50, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2": { + "post": [-42.35, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": [10, 0, -6] + }, + "leg2": { + "rotation": { + "0.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-50, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2": { + "post": [-42.35, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": [-8, 1, -3] + }, + "leg": { + "rotation": { + "0.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-50, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2": { + "post": [-42.35, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [7, 2, 6], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [7, 2, 6], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [7, 2, 6], + "lerp_mode": "catmullrom" + } + } + }, + "bone31": { + "rotation": [-12.5, 20, 0] + }, + "bone32": { + "rotation": [0, -22.5, 0] + } + } + }, + "animation.metagross.swimming": { + "loop": true, + "animation_length": 2.4, + "bones": { + "wholebody": { + "rotation": { + "0.0": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [2.49167, -0.32793, 7.49287], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.8": { + "post": [5.5082, 0.50003, -5.40658], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg4": { + "rotation": { + "0.0": { + "post": [-64.96182, 23.62091, 45.95539], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [-46.3017, 10.50179, 35.00057], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [-37.2161, 9.4118, 27.26356], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-43.48302, 9.10184, 33.08878], + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": [-64.96182, 23.62091, 45.95539], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [-64.96182, 23.62091, 45.95539], + "lerp_mode": "catmullrom" + } + } + }, + "leg3": { + "rotation": { + "0.0": { + "post": [180, -85, 180], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [128.83883, -98.11248, 144.95112], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [214.61432, -90.57169, 204.75948], + "lerp_mode": "catmullrom" + }, + "1.8": { + "post": [226.02509, -95.34724, 212.04446], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [180, -85, 180], + "lerp_mode": "catmullrom" + } + } + }, + "leg": { + "rotation": { + "0.0": { + "post": [-58.66856, -18.37602, -42.66117], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-50.82763, -13.23712, -37.88024], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [-66.91342, -25.43193, -46.871], + "lerp_mode": "catmullrom" + }, + "1.7": { + "post": [-91.52251, -54.48315, -52.47365], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [-58.66856, -18.37602, -42.66117], + "lerp_mode": "catmullrom" + } + } + }, + "leg6": { + "rotation": { + "0.0": { + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.8": { + "post": [6.875, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg5": { + "rotation": { + "0.0": { + "post": [82.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [82.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg7": { + "rotation": { + "0.0": { + "post": [40, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [40, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.metagross.water_idle": { + "loop": true, + "animation_length": 2.6, + "bones": { + "wholebody": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-2.4905, 0.21782, 4.99527], + "lerp_mode": "catmullrom" + }, + "1.9": { + "post": [0, 0, -2.5], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, -1, 0], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg4": { + "rotation": { + "0.0": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9": { + "post": [-27.34, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg3": { + "rotation": { + "0.0": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9": { + "post": [-27.34, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg2": { + "rotation": { + "0.0": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9": { + "post": [-27.34, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg": { + "rotation": { + "0.0": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9": { + "post": [-27.34, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.metagross.fainted": { + "loop": true, + "animation_length": 1, + "bones": { + "wholebody": { + "position": [0, -9, 0] + }, + "leg4": { + "rotation": [-32.5, 0, 0] + }, + "bone12": { + "rotation": [0, 0, 17.5] + }, + "leg3": { + "rotation": [203.99331, -127.24067, 232.82085] + }, + "bone24": { + "rotation": [-16.10211, -25.65891, 76.19007] + }, + "leg2": { + "rotation": [-270.70522, 103.89178, 252.09359] + }, + "bone18": { + "rotation": [35, 0, 0] + }, + "leg": { + "rotation": [-42.64893, -27.7573, 14.47791], + "position": [2, -2, 2] + }, + "bone": { + "rotation": [-41.03345, 50.33155, 57.60231] + }, + "bone2": { + "position": [0, 0, 0] + }, + "bone5": { + "position": [0, 0, 1] + }, + "bone30": { + "position": [3, -1, 5] + }, + "bone31": { + "rotation": [0, 0, 0] + }, + "leg6": { + "rotation": [0, 0, -22.5], + "position": [-2, -3, 3] + }, + "leg5": { + "rotation": [0, 0, -40] + }, + "leg8": { + "rotation": [0, 0, 22.5] + }, + "bone23": { + "rotation": { + "0.0": [0, 0, 2.5], + "1.0": [0, 0, 362.5] + }, + "position": [0, 0, -1], + "scale": [1.3, 1.3, 1] + }, + "bone33": { + "rotation": { + "0.0": [0, 0, 2.5], + "1.0": [0, 0, 362.5] + }, + "position": [0, 0, -1], + "scale": [1.3, 1.3, 1] + } + } + }, + "animation.metagross.attack": { + "animation_length": 1.1, + "bones": { + "wholebody": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0, 15, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 20, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [0, 25, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, -15, 0], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [0, -17.5, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0, 0, 8], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 0, 10], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, -3, -14], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg4": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [-30.42439, 3.22133, 18.61166], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-4.72913, -0.15032, 4.53802], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [49.69854, 16.22304, -46.95052], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone12": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-6.28835, 0.44593, 4.04063], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-22.76556, 8.78356, 49.39521], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg2": { + "rotation": [0, 0, 0] + }, + "leg": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [-35.48731, -11.15008, -49.55237], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [-51.47067, -41.39136, -83.6496], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-7.36606, -44.46683, -86.5002], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-54.24807, -43.35097, -85.22665], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [-72.78736, -35.56913, -78.77412], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [-1.99847, -32.16999, 8.76253], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [4.47007, -29.77192, 20.173], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [12.65896, -28.47062, 10.42736], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-14.59009, -8.66914, 5.04585], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [0.60459, -12.12497, -9.79814], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [3.76614, -4.87585, -32.50209], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0, -15, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [0, -25, 0], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 17.5, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg5": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0, 52.5, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [0, 65, 0], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg7": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [-20, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [21.26765, 7.52076, -18.58597], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [13.70646, 17.54502, -12.38446], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg8": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [-22.30998, -25.71543, 10.09541], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-28.93803, -29.14089, 15.06885], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [2.28714, -45.53475, 16.88727], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [29.32794, 38.62085, 19.32397], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/animations/pokemon/metang.animation.json b/animations/pokemon/metang.animation.json new file mode 100644 index 000000000..316d0e5c0 --- /dev/null +++ b/animations/pokemon/metang.animation.json @@ -0,0 +1,1012 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.metang.flying": { + "loop": true, + "animation_length": 2.8, + "bones": { + "bone24": { + "rotation": { + "0.0": { + "post": [20, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 4, 4], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 2, 4], + "lerp_mode": "catmullrom" + }, + "2.8": { + "post": [0, 4, 4], + "lerp_mode": "catmullrom" + } + } + }, + "leg2": { + "rotation": { + "0.0": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.8": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone14": { + "rotation": { + "0.0": { + "post": [0, 0, 22.5], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [5, 0, 22.5], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, 0, 22.5], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [-5.3125, 0, 22.5], + "lerp_mode": "catmullrom" + }, + "2.8": { + "post": [0, 0, 22.5], + "lerp_mode": "catmullrom" + } + } + }, + "leg": { + "rotation": { + "0.0": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.8": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone10": { + "rotation": { + "0.0": { + "post": [0, 0, -20], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [5, 0, -20], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 0, -20], + "lerp_mode": "catmullrom" + }, + "2.1": { + "post": [-5.29037, 0, -20], + "lerp_mode": "catmullrom" + }, + "2.8": { + "post": [0, 0, -20], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": [-10, 0, 0] + } + } + }, + "animation.metang.air_idle": { + "loop": true, + "animation_length": 3, + "bones": { + "bone24": { + "rotation": { + "0.0": { + "post": [0, 0, -2.5], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 0, 2.5], + "lerp_mode": "catmullrom" + }, + "2.2": { + "post": [-5.29, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 0, -2.5], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 1, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 2, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 1, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone14": { + "rotation": { + "0.0": { + "post": [-22.9228, 10.27074, 11.17549], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-15.78291, 6.4284, 8.09554], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [-22.9228, 10.27074, 11.17549], + "lerp_mode": "catmullrom" + }, + "2.2": { + "post": [-27.87285, 13.26082, 13.05449], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-22.9228, 10.27074, 11.17549], + "lerp_mode": "catmullrom" + } + } + }, + "bone10": { + "rotation": { + "0.0": { + "post": [-22.31707, -10.97038, -10.58628], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-15.37819, -6.92549, -7.71384], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [-22.31707, -10.97038, -10.58628], + "lerp_mode": "catmullrom" + }, + "2.3": { + "post": [-29.20381, -15.52649, -12.9725], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [-22.31707, -10.97038, -10.58628], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-4.99527, 0.21782, 2.4905], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2": { + "post": [5.28499, 0.23042, -2.48937], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.metang.ground_idle": { + "loop": true, + "animation_length": 2.7, + "bones": { + "leg2": { + "rotation": [14.68086, 2.98837, 1.24669] + }, + "leg": { + "rotation": [12.25329, -2.46641, 0.07762] + }, + "head": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-2.49762, -0.10901, -2.49762], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [2.64748, -0.11555, 2.49733], + "lerp_mode": "catmullrom" + }, + "2.7": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, -1, 0], + "lerp_mode": "catmullrom" + }, + "2.7": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.metang.walking": { + "loop": true, + "animation_length": 1.5, + "bones": { + "bone24": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [0, 0, 5], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, -7.81], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, -3, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [0, 2, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, -3, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 1.81, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [0, -3, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg2": { + "rotation": { + "0.0": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [70, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [25.33909, 1.13737, -34.97964], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone14": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [-15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-15, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg": { + "rotation": { + "0.0": { + "post": [65, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [13.97107, -1.65698, 39.96655], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [65, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone10": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0, 0, -30], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [0, 0, 25], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, 0, 10], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4": { + "post": [0, 0, -5], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-5, 0, -3.14125], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, 5.26], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-5, 0, 2.95875], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.metang.attack": { + "animation_length": 1.4, + "bones": { + "bone24": { + "rotation": { + "0.0": { + "post": [0, -2.5, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0, 70, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [0, 80, 0], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, -52.5, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [0, -60, 0], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, -2.5, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0, 0, 8], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [0, 0, 15], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 0, -3], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [0, -3, -8], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "wholebody": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0, 0, -11.88], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [0, 0, 5], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 0, 20], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 0, -7.5], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg2": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [-57.85815, -60.3277, 12.66689], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-80.35815, -60.3277, 12.66689], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [-108.03351, -67.00396, 17.88634], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [-175.14008, -80.5211, 90.45504], + "lerp_mode": "catmullrom" + }, + "1.3": { + "post": [-24.79311, -10.84121, 22.64677], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [2, 0, 4], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [1, 0, 2], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [4, 2, 4], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [3, 2, 3], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone14": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [50, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [25.27306, -0.50866, -39.50439], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [-65.25628, 30.1489, -0.31266], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-66.7099, 72.63995, -1.11938], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-243.01418, 79.84807, -177.02301], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [-74.22966, 18.15404, -49.15875], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-44.49464, -5.96906, -50.60949], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [0, 0, 3], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [0, 0, 7], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [0, 0, -2], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [0, 0, -4], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone10": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8": { + "post": [-37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-50, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0, -47.5, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, -35, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [0, -12.5, 0], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [0, 32.5, 0], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [0, 37.5, 0], + "lerp_mode": "catmullrom" + }, + "1.4": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone": { + "rotation": [0, 0, 0] + } + } + }, + "animation.metang.fainted": { + "loop": true, + "animation_length": 0.6, + "bones": { + "bone24": { + "rotation": [0, 0, 5], + "position": [0, -12, 0] + }, + "leg2": { + "rotation": [-58.02681, -37.97982, -27.22418] + }, + "leg": { + "rotation": [32.5, 0, 77.5] + }, + "bone6": { + "position": [0, 0, 1] + }, + "bone25": { + "position": [0, 0, -1] + }, + "bone26": { + "rotation": { + "0.0": [0, 0, 0], + "0.6": [0, 0, 360] + } + }, + "bone27": { + "rotation": { + "0.0": [0, 0, 0], + "0.6": [0, 0, 360] + } + } + } + }, + "animation.metang.sleeping": { + "loop": true, + "animation_length": 2.1, + "bones": { + "bone24": { + "position": [0, -12, 0] + }, + "leg2": { + "rotation": [-72.80788, -28.87909, -8.49878] + }, + "leg": { + "rotation": [-74.85629, 34.05444, 8.61775] + }, + "head": { + "rotation": { + "0.0": { + "post": [5, 0, -10], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [0, 1, 0], + "lerp_mode": "catmullrom" + }, + "2.1": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone": { + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone6": { + "rotation": [72.5, 0, 0], + "position": [0, 1, 0], + "scale": [1, 0, 1] + }, + "bone9": { + "scale": [0.8, 1, 1] + }, + "bone8": { + "scale": [0.8, 1, 1] + } + } + }, + "animation.metang.swimming": { + "loop": true, + "animation_length": 2.4, + "bones": { + "bone24": { + "rotation": { + "0.0": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [2.49167, -0.32793, 7.49287], + "lerp_mode": "catmullrom" + }, + "1.1": { + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.8": { + "post": [5.5082, 0.50003, -5.40658], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg2": { + "rotation": { + "0.0": { + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.8": { + "post": [6.875, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg": { + "rotation": { + "0.0": { + "post": [82.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4": { + "post": [82.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.metang.water_idle": { + "loop": true, + "animation_length": 2.6, + "bones": { + "bone24": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7": { + "post": [-2.4905, 0.21782, 4.99527], + "lerp_mode": "catmullrom" + }, + "1.9": { + "post": [0, 0, -2.5], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [0, -1, 0], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone14": { + "rotation": { + "0.0": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9": { + "post": [-27.34, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone10": { + "rotation": { + "0.0": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6": { + "post": [-32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9": { + "post": [-27.34, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.6": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/entity/pokemon/beldum.json b/entity/pokemon/beldum.json index 963e05282..4a2135d8e 100644 --- a/entity/pokemon/beldum.json +++ b/entity/pokemon/beldum.json @@ -4,21 +4,49 @@ "description": { "identifier": "pokemon:beldum", "materials": { - "default": "zombie" + "default": "entity_emissive_alpha", + "aura": "charged_creeper" }, "textures": { - "default": "textures/sprites/beldum", - "shiny": "textures/sprites/beldum", - "default_male": "textures/sprites/beldum", - "default_female": "textures/sprites/beldum", - "shiny_male": "textures/sprites/beldum", - "shiny_female": "textures/sprites/beldum" + "default": "textures/entity/pokemon/beldum/beldum", + "default_male": "textures/entity/pokemon/beldum/beldum", + "default_female": "textures/entity/pokemon/beldum/beldum", + "shiny": "textures/entity/pokemon/beldum/shiny_beldum", + "shiny_male": "textures/entity/pokemon/beldum/shiny_beldum", + "shiny_female": "textures/entity/pokemon/beldum/shiny_beldum", + "evo_aura": "textures/entity/evolving" }, "geometry": { - "default": "geometry.substitute" + "default": "geometry.beldum" + }, + "scripts": { + "animate": [ + "controller" + ] + }, + "animations": { + "ground_idle": "animation.beldum.ground_idle", + "air_idle": "animation.beldum.air_idle", + "water_idle": "animation.beldum.water_idle", + "walking": "animation.beldum.swimming", + "flying": "animation.beldum.flying", + "swimming": "animation.beldum.swimming", + "sleeping": "animation.beldum.sleeping", + "attack": "animation.beldum.attack", + "look_at_target": "animation.pokemon.look_at_target", + "controller": "controller.animation.pokemon" + }, + "particle_effects": { + "poison_smoke": "pokeb:posion_smoke", + "tail_flame": "pokeb:tail_flame" }, "render_controllers": [ - "controller.render.pokemon" + { + "controller.render.pokemon": "query.variant==0" + }, + { + "controller.render.evolve": "query.variant==1" + } ], "spawn_egg": { "texture": "beldum", diff --git a/entity/pokemon/metagross.json b/entity/pokemon/metagross.json index dfe2d24f3..9421c314c 100644 --- a/entity/pokemon/metagross.json +++ b/entity/pokemon/metagross.json @@ -4,21 +4,49 @@ "description": { "identifier": "pokemon:metagross", "materials": { - "default": "zombie" + "default": "entity_emissive_alpha", + "aura": "charged_creeper" }, "textures": { - "default": "textures/sprites/metagross", - "shiny": "textures/sprites/metagross", - "default_male": "textures/sprites/metagross", - "default_female": "textures/sprites/metagross", - "shiny_male": "textures/sprites/metagross", - "shiny_female": "textures/sprites/metagross" + "default": "textures/entity/pokemon/metagross/metagross", + "default_male": "textures/entity/pokemon/metagross/metagross", + "default_female": "textures/entity/pokemon/metagross/metagross", + "shiny": "textures/entity/pokemon/metagross/shiny_metagross", + "shiny_male": "textures/entity/pokemon/metagross/shiny_metagross", + "shiny_female": "textures/entity/pokemon/metagross/shiny_metagross", + "evo_aura": "textures/entity/evolving" }, "geometry": { - "default": "geometry.substitute" + "default": "geometry.metagross" + }, + "scripts": { + "animate": [ + "controller" + ] + }, + "animations": { + "ground_idle": "animation.metagross.ground_idle", + "air_idle": "animation.metagross.air_idle", + "water_idle": "animation.metagross.water_idle", + "walking": "animation.metagross.walking", + "flying": "animation.metagross.flying", + "swimming": "animation.metagross.swimming", + "sleeping": "animation.metagross.ground_idle", + "attack": "animation.metagross.attack", + "look_at_target": "animation.pokemon.look_at_target", + "controller": "controller.animation.pokemon" + }, + "particle_effects": { + "poison_smoke": "pokeb:posion_smoke", + "tail_flame": "pokeb:tail_flame" }, "render_controllers": [ - "controller.render.pokemon" + { + "controller.render.pokemon": "query.variant==0" + }, + { + "controller.render.evolve": "query.variant==1" + } ], "spawn_egg": { "texture": "metagross", diff --git a/entity/pokemon/metang.json b/entity/pokemon/metang.json index 1646db5a8..f3c817b02 100644 --- a/entity/pokemon/metang.json +++ b/entity/pokemon/metang.json @@ -4,21 +4,49 @@ "description": { "identifier": "pokemon:metang", "materials": { - "default": "zombie" + "default": "entity_emissive_alpha", + "aura": "charged_creeper" }, "textures": { - "default": "textures/sprites/metang", - "shiny": "textures/sprites/metang", - "default_male": "textures/sprites/metang", - "default_female": "textures/sprites/metang", - "shiny_male": "textures/sprites/metang", - "shiny_female": "textures/sprites/metang" + "default": "textures/entity/pokemon/metang/metang", + "default_male": "textures/entity/pokemon/metang/metang", + "default_female": "textures/entity/pokemon/metang/metang", + "shiny": "textures/entity/pokemon/metang/shiny_metang", + "shiny_male": "textures/entity/pokemon/metang/shiny_metang", + "shiny_female": "textures/entity/pokemon/metang/shiny_metang", + "evo_aura": "textures/entity/evolving" }, "geometry": { - "default": "geometry.substitute" + "default": "geometry.metang" + }, + "scripts": { + "animate": [ + "controller" + ] + }, + "animations": { + "ground_idle": "animation.metang.ground_idle", + "air_idle": "animation.metang.air_idle", + "water_idle": "animation.metang.water_idle", + "walking": "animation.metang.walking", + "flying": "animation.metang.flying", + "swimming": "animation.metang.swimming", + "sleeping": "animation.metang.sleeping", + "attack": "animation.metang.attack", + "look_at_target": "animation.pokemon.look_at_target", + "controller": "controller.animation.pokemon" + }, + "particle_effects": { + "poison_smoke": "pokeb:posion_smoke", + "tail_flame": "pokeb:tail_flame" }, "render_controllers": [ - "controller.render.pokemon" + { + "controller.render.pokemon": "query.variant==0" + }, + { + "controller.render.evolve": "query.variant==1" + } ], "spawn_egg": { "texture": "metang", diff --git a/manifest.json b/manifest.json index 71bed524f..03c87e59a 100644 --- a/manifest.json +++ b/manifest.json @@ -4,15 +4,15 @@ "name": "pack.name", "description": "pack.description", "min_engine_version": [1, 20, 60], - "uuid": "b101e392-8890-42a7-ac9f-c0978993ac2f", - "version": [2, 9, 3] + "uuid": "ac4e2aa8-1787-49b2-93d5-798aaa5068e7", + "version": [2, 9, 4] }, "modules": [ { "description": "Resources Module", "type": "resources", - "uuid": "54c8da15-5918-4699-a360-5e3392a33653", - "version": [2, 9, 3] + "uuid": "59de2aec-59a1-43a1-8017-b690335b3472", + "version": [2, 9, 4] } ], "metadata": { diff --git a/models/entity/pokemon/beldum.geo.json b/models/entity/pokemon/beldum.geo.json new file mode 100644 index 000000000..eed002ac2 --- /dev/null +++ b/models/entity/pokemon/beldum.geo.json @@ -0,0 +1,102 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.beldum", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 2, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "bone3", + "pivot": [0, 7, -1] + }, + { + "name": "bone", + "parent": "bone3", + "pivot": [0, 1, -1], + "cubes": [ + {"origin": [-3.4, 1, -4.5], "size": [7, 2, 7], "uv": [0, 0]}, + {"origin": [-3, 3, -4], "size": [6, 5, 4], "inflate": -0.2, "uv": [0, 10]}, + {"origin": [-1.5, 3, -4], "size": [3, 5, 4], "uv": [0, 20]}, + {"origin": [-2, 3, 0], "size": [4, 5, 2], "inflate": 0.01, "uv": [27, 8]}, + {"origin": [-2, 7, -1], "size": [4, 4, 3], "pivot": [0, 8, 0], "rotation": [-25, 0, 0], "uv": [15, 25]}, + {"origin": [-1.5, 9.87369, 1.08047], "size": [3, 1, 2], "inflate": 0.05, "uv": [30, 16]}, + {"origin": [-1.5, 9.45947, 2.66626], "size": [3, 5, 1], "pivot": [-1, 9.45947, 1.66626], "rotation": [45, 0, 0], "uv": [0, 30]}, + {"origin": [-1.5, 8.94786, 1.68094], "size": [3, 5, 1], "inflate": -0.05, "pivot": [-1, 8.94786, 0.68094], "rotation": [32.5, 0, 0], "uv": [22, 0]} + ] + }, + { + "name": "bone4", + "parent": "bone", + "pivot": [0, 1, -3], + "cubes": [ + {"origin": [-1, 0, -4], "size": [2, 2, 1], "pivot": [0, 1, -3], "rotation": [0, 0, 45], "uv": [45, 5]} + ] + }, + { + "name": "bone5", + "parent": "bone4", + "pivot": [-3, 1, -1], + "rotation": [0, -67.5, 0], + "cubes": [ + {"origin": [-2.09257, 0, -1.39859], "size": [2, 2, 1], "pivot": [-1.09257, 1, -4.39859], "rotation": [0, 0, 45], "uv": [45, 5]} + ] + }, + { + "name": "bone6", + "parent": "bone4", + "pivot": [3, 1, 1], + "rotation": [0, 65, 0], + "cubes": [ + {"origin": [2, 0, 0], "size": [2, 2, 1], "pivot": [3, 1, -3], "rotation": [0, 0, 45], "uv": [45, 5]} + ] + }, + { + "name": "head", + "parent": "bone3", + "pivot": [0, 11, -3.2], + "cubes": [ + {"origin": [-2.375, 8.19186, -5.62], "size": [1.1, 1.1, 1.1], "pivot": [-1.1, 8.9, -5.4], "rotation": [0, 0, 82.5], "uv": [0, 4]} + ] + }, + { + "name": "bone2", + "parent": "head", + "pivot": [0, 11, -3], + "cubes": [ + {"origin": [-2.2, 8.9, -5.4], "size": [4.4, 4.4, 4.4], "uv": [17, 16]} + ] + }, + { + "name": "bone7", + "parent": "head", + "pivot": [0, 11, -5], + "cubes": [ + {"origin": [-1.1, 10, -5.73], "size": [2.2, 2.2, 1.1], "uv": [0, 0]} + ] + }, + { + "name": "bone8", + "parent": "bone7", + "pivot": [0, 11, -5], + "cubes": [ + {"origin": [-1.1, 10, -5.73], "size": [2.2, 2.2, 1.1], "inflate": -0.01, "uv": [45, 12]} + ] + }, + { + "name": "bone9", + "parent": "bone7", + "pivot": [0, 11, -5], + "cubes": [ + {"origin": [-1.1, 10, -4.73], "size": [2.2, 2.2, 1.1], "inflate": 0.1, "uv": [43, 23]} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/models/entity/pokemon/metagross.geo.json b/models/entity/pokemon/metagross.geo.json new file mode 100644 index 000000000..6aed2fa41 --- /dev/null +++ b/models/entity/pokemon/metagross.geo.json @@ -0,0 +1,399 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.metagross", + "texture_width": 128, + "texture_height": 128, + "visible_bounds_width": 5, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] + }, + "bones": [ + { + "name": "wholebody", + "pivot": [0, 17, 0] + }, + { + "name": "head", + "parent": "wholebody", + "pivot": [0, 13.8, 2.7], + "cubes": [ + {"origin": [-12.15, 11.96931, -8.77906], "size": [24.3, 2.7, 24.3], "pivot": [0, 13.8, -5.4], "rotation": [10, 0, 0], "uv": [0, 0]}, + {"origin": [-9.45, 15.15, 0], "size": [18.9, 8.1, 9.45], "pivot": [0, 19.2, 2.7], "rotation": [7.5, 0, 0], "uv": [58, 27]}, + {"origin": [-9.4465, 16.95965, 4.42784], "size": [18.893, 8.093, 4.043], "inflate": -0.01, "pivot": [0, 25.30269, 10.45988], "rotation": [30, 0, 0], "uv": [0, 71]}, + {"origin": [4.05, 14.65602, -5.96328], "size": [2.7, 8.1, 5.4], "pivot": [6.75, 23.25, -1.35], "rotation": [7.24721, 1.93597, -14.87739], "uv": [45, 51]}, + {"origin": [-6.75, 14.65602, -5.96328], "size": [2.7, 8.1, 5.4], "pivot": [-6.75, 23.25, -1.35], "rotation": [7.24721, -1.93597, 14.87739], "uv": [0, 51]}, + {"origin": [-6.75, 16.5, -5.4], "size": [13.5, 6.75, 5.4], "pivot": [0, 19.2, 2.7], "rotation": [7.5, 0, 0], "uv": [81, 81]}, + {"origin": [-6.75, 16.5, 9.45], "size": [13.5, 6.75, 4.05], "pivot": [0, 19.2, 2.7], "rotation": [7.5, 0, 0], "uv": [0, 84]}, + {"origin": [-9.45, 15.15, -8.1], "size": [18.9, 8.1, 2.7], "pivot": [0, 19.2, 2.7], "rotation": [7.5, 0, 0], "uv": [73, 13]}, + {"origin": [-6.75, 23.25, -6.75], "size": [13.5, 1.35, 18.9], "pivot": [0, 19.2, 2.7], "rotation": [7.5, 0, 0], "uv": [45, 53]} + ] + }, + { + "name": "bone11", + "parent": "head", + "pivot": [0, 19.2, 2.7], + "cubes": [ + {"origin": [-9.45, 12.45, -8.1], "size": [18.9, 2.7, 21.6], "pivot": [0, 19.2, 2.7], "rotation": [7.5, 0, 0], "uv": [0, 27]}, + {"origin": [-9.45, 14.45, -8.1], "size": [18.9, 2.7, 21.6], "inflate": -0.01, "pivot": [0, 19.2, 2.7], "rotation": [7.5, 0, 0], "uv": [0, 27]}, + {"origin": [-6.75, 11.775, -6.75], "size": [13.5, 1.35, 18.9], "pivot": [0, 19.2, 2.7], "rotation": [7.5, 0, 0], "uv": [0, 51]} + ] + }, + { + "name": "bone2", + "parent": "head", + "pivot": [0, 15.15, -8.1], + "rotation": [7.5, 0, 0] + }, + { + "name": "bone4", + "parent": "bone2", + "pivot": [0, 16.5, -8.1], + "rotation": [0, 0, 7.5], + "cubes": [ + {"origin": [5.31142, 15.08203, -10.65679], "size": [4.05, 2.7, 2.7], "pivot": [-0.08858, 16.43203, -9.30679], "rotation": [0, -15, -42.5], "uv": [58, 86]}, + {"origin": [-9.45, 15.15, -9.45], "size": [9.45, 2.7, 2.7], "pivot": [0, 16.5, -8.1], "rotation": [0, -2.5, -37.5], "uv": [99, 76]}, + {"origin": [0, 15.15, -9.45], "size": [5.4, 2.7, 2.7], "pivot": [0, 16.5, -8.1], "rotation": [0, -2.5, -42.5], "uv": [64, 105]}, + {"origin": [-10.87781, 8.75799, -9.36691], "size": [2.7, 2.7, 2.7], "inflate": -0.01, "pivot": [-8.54982, 10.75484, -10.29065], "rotation": [0, 42.5, -37.5], "uv": [73, 5]} + ] + }, + { + "name": "bone3", + "parent": "bone2", + "pivot": [-0.08768, 16.03263, -6.51155], + "rotation": [0, 0, -7.5], + "cubes": [ + {"origin": [-1.35, 7.05, -9.45], "size": [2.7, 9.45, 2.7], "pivot": [0, 16.5, -8.1], "rotation": [-2.5, 0, -52.5], "uv": [104, 24]}, + {"origin": [-1.35, 16.5, -9.45], "size": [2.7, 5.4, 2.7], "pivot": [0, 16.5, -8.1], "rotation": [-2.5, 0, -47.5], "uv": [0, 0]}, + {"origin": [5.53486, 7.67389, -10.54167], "size": [2.7, 2.7, 2.7], "inflate": -0.01, "pivot": [6.70989, 11.13078, -10.16341], "rotation": [47.5, 0, -52.5], "uv": [45, 73]}, + {"origin": [-1.01351, 20.80895, -10.58828], "size": [2.7, 4.05, 2.7], "pivot": [-0.08768, 16.03263, -6.51155], "rotation": [-15, 0, -47.5], "uv": [14, 0]} + ] + }, + { + "name": "bone5", + "parent": "head", + "pivot": [5.4, 16.5, -9.45], + "cubes": [ + {"origin": [2.7, 16.60691, -8.38119], "size": [4.05, 2.7, 1.35], "pivot": [5.4, 19.2, -8.1], "rotation": [7.43656, 0.9762, -7.43656], "uv": [45, 65]}, + {"origin": [-6.75, 16.60691, -8.38119], "size": [4.05, 2.7, 1.35], "pivot": [-5.4, 19.2, -8.1], "rotation": [7.38733, -1.29876, 9.91615], "uv": [0, 65]} + ] + }, + { + "name": "bone6", + "parent": "head", + "pivot": [-10, 9.8, 2.7], + "rotation": [0, 0, 45], + "cubes": [ + {"origin": [-13, 9.8, 1.7], "size": [3, 3, 2], "uv": [106, 93]}, + {"origin": [-14.70711, 10.50711, 1.7], "size": [2, 4.2, 2], "inflate": 0.02, "pivot": [-13.70711, 10.50711, 2.7], "rotation": [0, 0, 45], "uv": [0, 12]}, + {"origin": [-0.70711, 24.50711, 1.7], "size": [2, 4.2, 2], "inflate": 0.02, "pivot": [0.29289, 24.50711, 2.7], "rotation": [0, 0, 45], "uv": [0, 12]}, + {"origin": [1, 23.8, 1.7], "size": [3, 3, 2], "uv": [106, 93]} + ] + }, + { + "name": "bone17", + "parent": "head", + "pivot": [0, 13.8, 6.7] + }, + { + "name": "bone23", + "parent": "bone17", + "pivot": [-6, 17.8, -6.3], + "cubes": [ + {"origin": [-7, 16.8, -7.3], "size": [2, 2, 2], "uv": [35, 122]} + ] + }, + { + "name": "bone33", + "parent": "bone17", + "pivot": [6, 17.8, -7.3], + "cubes": [ + {"origin": [5, 16.8, -7.3], "size": [2, 2, 2], "uv": [35, 122]} + ] + }, + { + "name": "leg6", + "parent": "wholebody", + "pivot": [8, 19.8, -2.3] + }, + { + "name": "bone29", + "parent": "leg6", + "pivot": [8.1, 19.2, -2.7], + "rotation": [-22.5, -47.5, 0], + "cubes": [ + {"origin": [6.75, 17.85, -4.05], "size": [2.7, 2.7, 2.97], "pivot": [8.1, 19.2, -2.7], "rotation": [-24.25045, -22.32924, -40.144], "uv": [73, 0]}, + {"origin": [6.855, 17.955, -13.395], "size": [2.49, 2.49, 11.94], "inflate": -0.3, "uv": [97, 62]} + ] + }, + { + "name": "leg4", + "parent": "leg6", + "pivot": [14.35, 23.15, -8.65], + "rotation": [0, -52.5, 0], + "cubes": [ + {"origin": [12.34463, 16.5, -16.54879], "size": [4.05, 6.75, 5.4], "inflate": 0.01, "pivot": [14.36963, 16.5, -16.54879], "rotation": [-40, 0, 0], "uv": [34, 102]}, + {"origin": [12.41463, 17.99999, -10.50425], "size": [3.91, 7.96, 2.56], "inflate": -0.2, "uv": [0, 95]}, + {"origin": [11.73963, 24.50279, -11.10074], "size": [5.26, 3.91, 2.56], "inflate": -0.2, "pivot": [15.71963, 24.35279, -9.04528], "rotation": [-37.5, 0, 0], "uv": [79, 45]}, + {"origin": [11.74313, 18.34261, -10.34132], "size": [5.253, 7.953, 2.553], "inflate": -0.21, "pivot": [15.71963, 26.28912, -10.98937], "rotation": [-25, 0, 0], "uv": [104, 0]}, + {"origin": [12.42163, 18.34611, -8.98782], "size": [3.896, 3.896, 2.546], "inflate": -0.22, "pivot": [14.36963, 26.28912, -10.98937], "rotation": [-25, 0, 0], "uv": [11, 109]} + ] + }, + { + "name": "bone12", + "parent": "leg4", + "pivot": [14.36963, 16.65, -13.14879], + "cubes": [ + {"origin": [8.96963, 1.65, -17.89879], "size": [10.8, 2.7, 10.8], "uv": [73, 0]}, + {"origin": [12.34463, 4.35, -17.89879], "size": [4.05, 10.8, 8.1], "uv": [64, 86]}, + {"origin": [11.66963, 15.15, -16.54879], "size": [5.4, 1.35, 6.75], "uv": [16, 96]}, + {"origin": [10.31963, 4.35, -15.19879], "size": [8.1, 9.45, 6.75], "uv": [90, 45]} + ] + }, + { + "name": "bone13", + "parent": "bone12", + "pivot": [14.36963, 1.65, -11.14879] + }, + { + "name": "bone14", + "parent": "bone13", + "pivot": [14.36963, 1.65, -15.19879], + "cubes": [ + {"origin": [13.01963, 0.3, -16.54879], "size": [2.7, 2.7, 1.35], "pivot": [14.36963, 1.65, -15.19879], "rotation": [0, 0, -45], "uv": [45, 78]} + ] + }, + { + "name": "bone15", + "parent": "bone13", + "pivot": [18.66963, 1.65, -10.14879], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [17.31963, 0.3, -11.49879], "size": [2.7, 2.7, 1.35], "pivot": [18.66963, 1.65, -10.14879], "rotation": [0, 0, -45], "uv": [56, 65]} + ] + }, + { + "name": "bone16", + "parent": "bone13", + "pivot": [10.06963, 1.65, -10.14879], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [8.71963, 0.3, -11.49879], "size": [2.7, 2.7, 1.35], "pivot": [10.06963, 1.65, -10.14879], "rotation": [0, 0, -45], "uv": [11, 65]} + ] + }, + { + "name": "leg8", + "parent": "wholebody", + "pivot": [-8, 20.8, 11.7] + }, + { + "name": "bone31", + "parent": "leg8", + "pivot": [-8.1, 21.9, 12.15], + "rotation": [-151.09515, -77.25635, -11.13101], + "cubes": [ + {"origin": [-9.45, 20.55, 10.8], "size": [2.7, 2.7, 2.97], "pivot": [-8.1, 21.9, 12.15], "rotation": [-24.25045, -22.32924, -40.144], "uv": [58, 27]}, + {"origin": [-9.345, 20.655, 2.155], "size": [2.49, 2.49, 11.24], "inflate": -0.3, "uv": [0, 95]} + ] + }, + { + "name": "leg3", + "parent": "leg8", + "pivot": [-14.7, 25.15, 13.7], + "rotation": [0, 132.5, 0], + "cubes": [ + {"origin": [-16.72203, 16.5, 5.67882], "size": [4.05, 6.75, 5.4], "inflate": 0.01, "pivot": [-14.69703, 16.5, 5.67882], "rotation": [-40, 0, 0], "uv": [0, 27]}, + {"origin": [-16.65203, 17.99999, 11.72336], "size": [3.91, 7.96, 2.56], "inflate": -0.2, "uv": [0, 95]}, + {"origin": [-17.32703, 24.61787, 11.24473], "size": [5.26, 3.91, 2.56], "inflate": -0.2, "pivot": [-14.69703, 24.46788, 13.30019], "rotation": [-32.5, 0, 0], "uv": [0, 39]}, + {"origin": [-17.32353, 18.34261, 11.88629], "size": [5.253, 7.953, 2.553], "inflate": -0.21, "pivot": [-14.69703, 26.28912, 11.23825], "rotation": [-25, 0, 0], "uv": [90, 61]}, + {"origin": [-16.64503, 18.34611, 13.23979], "size": [3.896, 3.896, 2.546], "inflate": -0.22, "pivot": [-14.69703, 26.28912, 11.23825], "rotation": [-25, 0, 0], "uv": [77, 108]} + ] + }, + { + "name": "bone24", + "parent": "leg3", + "pivot": [-14.69703, 16.65, 9.07882], + "cubes": [ + {"origin": [-20.09703, 1.65, 4.32882], "size": [10.8, 2.7, 10.8], "uv": [73, 0]}, + {"origin": [-16.72203, 4.35, 4.32882], "size": [4.05, 10.8, 8.1], "uv": [64, 86]}, + {"origin": [-17.39703, 15.15, 5.67882], "size": [5.4, 1.35, 6.75], "uv": [76, 73]}, + {"origin": [-18.74703, 4.35, 7.02882], "size": [8.1, 9.45, 6.75], "uv": [35, 86]} + ] + }, + { + "name": "bone25", + "parent": "bone24", + "pivot": [-14.69703, 1.65, 11.07882] + }, + { + "name": "bone26", + "parent": "bone25", + "pivot": [-14.69703, 1.65, 7.02882], + "cubes": [ + {"origin": [-16.04703, 0.3, 5.67882], "size": [2.7, 2.7, 1.35], "pivot": [-14.69703, 1.65, 7.02882], "rotation": [0, 0, -45], "uv": [14, 44]} + ] + }, + { + "name": "bone27", + "parent": "bone25", + "pivot": [-10.39703, 1.65, 12.07882], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [-11.74703, 0.3, 10.72882], "size": [2.7, 2.7, 1.35], "pivot": [-10.39703, 1.65, 12.07882], "rotation": [0, 0, -45], "uv": [14, 27]} + ] + }, + { + "name": "bone28", + "parent": "bone25", + "pivot": [-18.99703, 1.65, 12.07882], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [-20.34703, 0.3, 10.72882], "size": [2.7, 2.7, 1.35], "pivot": [-18.99703, 1.65, 12.07882], "rotation": [0, 0, -45], "uv": [14, 17]} + ] + }, + { + "name": "leg7", + "parent": "wholebody", + "pivot": [8, 20.8, 12.7] + }, + { + "name": "leg2", + "parent": "leg7", + "pivot": [13.7, 23.15, 13.7], + "rotation": [0, -132.5, 0], + "cubes": [ + {"origin": [10.99644, 16.5, 4.94154], "size": [4.05, 6.75, 5.4], "inflate": 0.01, "pivot": [13.02144, 16.5, 4.94154], "rotation": [-40, 0, 0], "uv": [0, 27]}, + {"origin": [11.06644, 17.99999, 10.98608], "size": [3.91, 7.96, 2.56], "inflate": -0.2, "uv": [0, 95]}, + {"origin": [10.39144, 25.67498, 6.88068], "size": [5.26, 3.91, 2.56], "inflate": -0.2, "pivot": [14.37144, 18.77498, 8.93614], "rotation": [-32.5, 0, 0], "uv": [0, 39]}, + {"origin": [10.39494, 18.34261, 11.14901], "size": [5.253, 7.953, 2.553], "inflate": -0.21, "pivot": [14.37144, 26.28912, 10.50097], "rotation": [-25, 0, 0], "uv": [90, 61]}, + {"origin": [11.07344, 18.34611, 12.50251], "size": [3.896, 3.896, 2.546], "inflate": -0.22, "pivot": [13.02144, 26.28912, 10.50097], "rotation": [-25, 0, 0], "uv": [0, 109]} + ] + }, + { + "name": "bone18", + "parent": "leg2", + "pivot": [13.02144, 16.65, 8.34154], + "cubes": [ + {"origin": [7.62144, 1.65, 3.59154], "size": [10.8, 2.7, 10.8], "uv": [73, 0]}, + {"origin": [10.99644, 4.35, 3.59154], "size": [4.05, 10.8, 8.1], "uv": [64, 86]}, + {"origin": [10.32144, 15.15, 4.94154], "size": [5.4, 1.35, 6.75], "uv": [76, 73]}, + {"origin": [8.97144, 4.35, 6.29154], "size": [8.1, 9.45, 6.75], "uv": [35, 86]} + ] + }, + { + "name": "bone19", + "parent": "bone18", + "pivot": [13.02144, 1.65, 10.34154] + }, + { + "name": "bone20", + "parent": "bone19", + "pivot": [13.02144, 1.65, 6.29154], + "cubes": [ + {"origin": [11.67144, 0.3, 4.94154], "size": [2.7, 2.7, 1.35], "pivot": [13.02144, 1.65, 6.29154], "rotation": [0, 0, -45], "uv": [58, 32]} + ] + }, + { + "name": "bone21", + "parent": "bone19", + "pivot": [17.32144, 1.65, 11.34154], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [15.97144, 0.3, 9.99154], "size": [2.7, 2.7, 1.35], "pivot": [17.32144, 1.65, 11.34154], "rotation": [0, 0, -45], "uv": [55, 51]} + ] + }, + { + "name": "bone22", + "parent": "bone19", + "pivot": [8.72144, 1.65, 11.34154], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [7.37144, 0.3, 9.99154], "size": [2.7, 2.7, 1.35], "pivot": [8.72144, 1.65, 11.34154], "rotation": [0, 0, -45], "uv": [10, 51]} + ] + }, + { + "name": "bone32", + "parent": "leg7", + "pivot": [8.1, 21.9, 12.15], + "rotation": [-152.92476, 74.79781, 9.24606], + "cubes": [ + {"origin": [6.75, 20.55, 10.8], "size": [2.7, 2.7, 2.97], "pivot": [8.1, 21.9, 12.15], "rotation": [-24.25045, -22.32924, -40.144], "uv": [14, 12]}, + {"origin": [6.855, 20.655, 4.155], "size": [2.49, 2.49, 9.24], "inflate": -0.3, "uv": [0, 0]} + ] + }, + { + "name": "leg5", + "parent": "wholebody", + "pivot": [-8, 19.8, -2.3] + }, + { + "name": "bone30", + "parent": "leg5", + "pivot": [-8.1, 19.2, -2.7], + "rotation": [-22.5, 47.5, 0], + "cubes": [ + {"origin": [-9.45, 17.85, -4.05], "size": [2.7, 2.7, 2.97], "pivot": [-8.1, 19.2, -2.7], "rotation": [-24.25045, -22.32924, -40.144], "uv": [58, 27]}, + {"origin": [-9.345, 17.955, -13.395], "size": [2.49, 2.49, 11.94], "inflate": -0.3, "uv": [0, 95]} + ] + }, + { + "name": "leg", + "parent": "leg5", + "pivot": [-15.35, 23.15, -8.65], + "rotation": [0, 52.5, 0], + "cubes": [ + {"origin": [-16.78587, 16.5, -15.75544], "size": [4.05, 6.75, 5.4], "inflate": 0.01, "pivot": [-14.76087, 16.5, -15.75544], "rotation": [-40, 0, 0], "uv": [0, 27]}, + {"origin": [-16.71587, 17.99999, -9.7109], "size": [3.91, 7.96, 2.56], "inflate": -0.2, "uv": [53, 102]}, + {"origin": [-17.39087, 25.89765, -14.41652], "size": [5.26, 3.91, 2.56], "inflate": -0.2, "pivot": [-13.41087, 18.99766, -12.36107], "rotation": [-37.5, 0, 0], "uv": [0, 39]}, + {"origin": [-17.38737, 18.34261, -9.54797], "size": [5.253, 7.953, 2.553], "inflate": -0.21, "pivot": [-13.41087, 26.28912, -10.19601], "rotation": [-25, 0, 0], "uv": [90, 61]}, + {"origin": [-16.70887, 18.34611, -8.19447], "size": [3.896, 3.896, 2.546], "inflate": -0.22, "pivot": [-14.76087, 26.28912, -10.19601], "rotation": [-25, 0, 0], "uv": [22, 109]} + ] + }, + { + "name": "bone", + "parent": "leg", + "pivot": [-14.76087, 16.65, -12.35544], + "cubes": [ + {"origin": [-20.16087, 1.65, -17.10544], "size": [10.8, 2.7, 10.8], "uv": [45, 73]}, + {"origin": [-16.78587, 4.35, -17.10544], "size": [4.05, 10.8, 8.1], "uv": [89, 93]}, + {"origin": [-17.46087, 15.15, -15.75544], "size": [5.4, 1.35, 6.75], "uv": [76, 73]}, + {"origin": [-18.81087, 4.35, -14.40544], "size": [8.1, 9.45, 6.75], "uv": [35, 86]} + ] + }, + { + "name": "bone7", + "parent": "bone", + "pivot": [-14.76087, 1.65, -10.35544] + }, + { + "name": "bone8", + "parent": "bone7", + "pivot": [-14.76087, 1.65, -14.40544], + "cubes": [ + {"origin": [-16.11087, 0.3, -15.75544], "size": [2.7, 2.7, 1.35], "pivot": [-14.76087, 1.65, -14.40544], "rotation": [0, 0, -45], "uv": [89, 97]} + ] + }, + { + "name": "bone9", + "parent": "bone7", + "pivot": [-10.46087, 1.65, -9.35544], + "rotation": [0, 45, 0], + "cubes": [ + {"origin": [-11.81087, 0.3, -10.70544], "size": [2.7, 2.7, 1.35], "pivot": [-10.46087, 1.65, -9.35544], "rotation": [0, 0, -45], "uv": [89, 93]} + ] + }, + { + "name": "bone10", + "parent": "bone7", + "pivot": [-19.06087, 1.65, -9.35544], + "rotation": [0, -45, 0], + "cubes": [ + {"origin": [-20.41087, 0.3, -10.70544], "size": [2.7, 2.7, 1.35], "pivot": [-19.06087, 1.65, -9.35544], "rotation": [0, 0, -45], "uv": [31, 84]} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/models/entity/pokemon/metang.geo.json b/models/entity/pokemon/metang.geo.json new file mode 100644 index 000000000..831b90629 --- /dev/null +++ b/models/entity/pokemon/metang.geo.json @@ -0,0 +1,277 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.metang", + "texture_width": 128, + "texture_height": 128, + "visible_bounds_width": 4, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "bone24", + "pivot": [0, 0, 0] + }, + { + "name": "wholebody", + "parent": "bone24", + "pivot": [0, 14.82, 0] + }, + { + "name": "leg2", + "parent": "wholebody", + "pivot": [6.84, 13.68, -1.14] + }, + { + "name": "bone14", + "parent": "leg2", + "pivot": [12.54, 13.68, -3.42], + "rotation": [-14.74196, -33.86002, 21.1341], + "cubes": [ + {"origin": [9.30805, 1.14, -6.84103], "size": [6.84, 2.28, 6.84], "uv": [40, 18]}, + {"origin": [11.58805, 3.42, -6.84103], "size": [2.28, 7.98, 2.28], "uv": [0, 18]}, + {"origin": [11.58945, 11.4014, -6.83963], "size": [2.2772, 4.5572, 2.2772], "inflate": -0.01, "pivot": [12.72805, 11.4, -6.84103], "rotation": [-30, 0, 0], "uv": [30, 48]}, + {"origin": [11.58665, 9.44541, -5.7796], "size": [2.2828, 3.4228, 2.2828], "inflate": 0.01, "uv": [53, 27]}, + {"origin": [9.87805, 3.42, -5.70103], "size": [5.7, 6.84, 5.7], "uv": [46, 0]} + ] + }, + { + "name": "bone15", + "parent": "bone14", + "pivot": [12.72805, 1.14, -4.56103], + "rotation": [0, 0, 45], + "cubes": [ + {"origin": [11.58805, 0, -5.70103], "size": [2.28, 2.28, 1.14], "uv": [61, 12]} + ] + }, + { + "name": "bone16", + "parent": "bone14", + "pivot": [10.44805, 1.14, -1.14103], + "rotation": [-32.94099, -28.53622, 53.59953], + "cubes": [ + {"origin": [9.30805, 0, -2.28103], "size": [2.28, 2.28, 1.14], "uv": [36, 60]} + ] + }, + { + "name": "bone17", + "parent": "bone14", + "pivot": [15.00805, 1.14, -1.14103], + "rotation": [32.94097, 28.53624, 53.59945], + "cubes": [ + {"origin": [13.86805, 0, -2.28103], "size": [2.28, 2.28, 1.14], "uv": [40, 27]} + ] + }, + { + "name": "bone21", + "parent": "leg2", + "pivot": [5.7, 13.68, -1.14], + "rotation": [-15, 0, -55], + "cubes": [ + {"origin": [4.588, 6.868, -2.252], "size": [2.224, 5.644, 2.224], "inflate": -0.2, "uv": [34, 33]} + ] + }, + { + "name": "bone22", + "parent": "bone21", + "pivot": [5.7, 12.54, -1.14], + "cubes": [ + {"origin": [4.56, 11.4, -2.28], "size": [2.28, 2.28, 2.28], "pivot": [5.7, 12.54, -1.14], "rotation": [-37.65635, 31.42176, 34.04258], "uv": [58, 44]} + ] + }, + { + "name": "bone23", + "parent": "bone21", + "pivot": [5.7, 6.84, -1.14], + "cubes": [ + {"origin": [4.56, 5.7, -2.28], "size": [2.28, 2.28, 2.28], "pivot": [5.7, 6.84, -1.14], "rotation": [-37.65635, 31.42176, 34.04258], "uv": [19, 58]} + ] + }, + { + "name": "leg", + "parent": "wholebody", + "pivot": [-6.84, 13.68, -1.14] + }, + { + "name": "bone18", + "parent": "leg", + "pivot": [-5.7, 13.68, -1.14], + "rotation": [-15, 0, 55], + "cubes": [ + {"origin": [-6.812, 6.868, -2.252], "size": [2.224, 5.644, 2.224], "inflate": -0.2, "uv": [21, 48]} + ] + }, + { + "name": "bone19", + "parent": "bone18", + "pivot": [-5.7, 12.54, -1.14], + "cubes": [ + {"origin": [-6.84, 11.4, -2.28], "size": [2.28, 2.28, 2.28], "pivot": [-5.7, 12.54, -1.14], "rotation": [-37.65635, 31.42176, 34.04258], "uv": [19, 58]} + ] + }, + { + "name": "bone20", + "parent": "bone18", + "pivot": [-5.7, 6.84, -1.14], + "cubes": [ + {"origin": [-6.84, 5.7, -2.28], "size": [2.28, 2.28, 2.28], "pivot": [-5.7, 6.84, -1.14], "rotation": [-37.65635, 31.42176, 34.04258], "uv": [59, 16]} + ] + }, + { + "name": "bone10", + "parent": "leg", + "pivot": [-12.54, 13.68, -3.42], + "rotation": [-14.49559, 33.35938, -23.43849], + "cubes": [ + {"origin": [-16.14805, 1.14, -6.84103], "size": [6.84, 2.28, 6.84], "uv": [39, 44]}, + {"origin": [-13.86805, 3.42, -6.84103], "size": [2.28, 7.98, 2.28], "uv": [0, 33]}, + {"origin": [-13.86665, 11.4014, -6.83963], "size": [2.2772, 4.5572, 2.2772], "inflate": -0.01, "pivot": [-12.72805, 11.4, -6.84103], "rotation": [-30, 0, 0], "uv": [37, 53]}, + {"origin": [-13.86945, 9.44541, -5.7796], "size": [2.2828, 3.4228, 2.2828], "inflate": 0.01, "uv": [46, 53]}, + {"origin": [-15.57805, 3.42, -5.70103], "size": [5.7, 6.84, 5.7], "uv": [0, 48]} + ] + }, + { + "name": "bone11", + "parent": "bone10", + "pivot": [-12.72805, 1.14, -4.56103], + "rotation": [0, 0, 45], + "cubes": [ + {"origin": [-13.86805, 0, -5.70103], "size": [2.28, 2.28, 1.14], "uv": [62, 27]} + ] + }, + { + "name": "bone12", + "parent": "bone10", + "pivot": [-15.00805, 1.14, -1.14103], + "rotation": [-32.94099, -28.53622, 53.59953], + "cubes": [ + {"origin": [-16.14805, 0, -2.28103], "size": [2.28, 2.28, 1.14], "uv": [62, 0]} + ] + }, + { + "name": "bone13", + "parent": "bone10", + "pivot": [-10.44805, 1.14, -1.14103], + "rotation": [32.94097, 28.53624, 53.59945], + "cubes": [ + {"origin": [-11.58805, 0, -2.28103], "size": [2.28, 2.28, 1.14], "uv": [28, 61]} + ] + }, + { + "name": "head", + "parent": "wholebody", + "pivot": [0, 15.96, 0] + }, + { + "name": "bone", + "parent": "head", + "pivot": [0, 14.82, 0], + "cubes": [ + {"origin": [-7.98, 14.82, -7.98], "size": [15.96, 2.28, 15.96], "uv": [0, 0]}, + {"origin": [-5.686, 17.114, -5.686], "size": [11.372, 3.392, 11.372], "inflate": -0.1, "uv": [0, 33]}, + {"origin": [-6.84, 13.68, -6.84], "size": [13.68, 1.14, 13.68], "uv": [0, 18]}, + {"origin": [-4.56, 12.768, -4.56], "size": [9.12, 1.14, 9.12], "uv": [34, 33]} + ] + }, + { + "name": "bone2", + "parent": "head", + "pivot": [0, 17.1, -6.84], + "cubes": [ + {"origin": [-1.098, 17.142, -11.358], "size": [2.196, 2.196, 5.616], "inflate": -0.3, "uv": [0, 0]}, + {"origin": [-1.126, 17.114, -9.106], "size": [2.252, 2.252, 3.392], "inflate": -0.1, "uv": [0, 8]}, + {"origin": [-1.154, 17.086, -6.854], "size": [2.308, 2.308, 1.168], "inflate": 0.1, "uv": [62, 31]} + ] + }, + { + "name": "bone3", + "parent": "head", + "pivot": [0, 14.82, 0] + }, + { + "name": "bone4", + "parent": "bone3", + "pivot": [6.84, 18.24, -0.57], + "cubes": [ + {"origin": [9.40786, 18.9032, -3.42], "size": [1.14, 3.42, 1.14], "pivot": [5.7, 21.66, -2.28], "rotation": [0, 0, 47.5], "uv": [34, 64]}, + {"origin": [9.3753, 17.39869, -3.4214], "size": [1.1428, 3.4228, 1.1428], "inflate": 0.01, "pivot": [5.7, 21.66, -2.28], "rotation": [0, 0, 27.5], "uv": [24, 64]}, + {"origin": [9.49002, 18.24826, -3.4228], "size": [1.1, 3.4256, 1.1456], "inflate": 0.02, "pivot": [5.7, 21.66, -2.28], "rotation": [0, 0, 37.5], "uv": [19, 63]}, + {"origin": [9.3753, 17.39869, 1.1386], "size": [1.1428, 3.4228, 1.1428], "inflate": 0.01, "pivot": [5.7, 21.66, 2.28], "rotation": [0, 0, 27.5], "uv": [14, 60]}, + {"origin": [9.40786, 18.9032, 1.14], "size": [1.14, 3.42, 1.14], "pivot": [5.7, 21.66, 2.28], "rotation": [0, 0, 47.5], "uv": [62, 35]}, + {"origin": [9.49002, 18.24826, 1.1372], "size": [1.1, 3.4256, 1.1456], "inflate": 0.02, "pivot": [5.7, 21.66, 2.28], "rotation": [0, 0, 37.5], "uv": [62, 59]} + ] + }, + { + "name": "bone5", + "parent": "bone3", + "pivot": [-6.84, 18.24, -0.57], + "rotation": [179.99989, 0.00006, -179.99994], + "cubes": [ + {"origin": [-4.27214, 18.9032, -3.42], "size": [1.14, 3.42, 1.14], "pivot": [-7.98, 21.66, -2.28], "rotation": [0, 0, 47.5], "uv": [16, 48]}, + {"origin": [-4.3047, 17.39869, -3.4214], "size": [1.1428, 3.4228, 1.1428], "inflate": 0.01, "pivot": [-7.98, 21.66, -2.28], "rotation": [0, 0, 27.5], "uv": [0, 48]}, + {"origin": [-4.18998, 18.24826, -3.4228], "size": [1.1, 3.4256, 1.1456], "inflate": 0.02, "pivot": [-7.98, 21.66, -2.28], "rotation": [0, 0, 37.5], "uv": [46, 0]}, + {"origin": [-4.3047, 17.39869, 1.1386], "size": [1.1428, 3.4228, 1.1428], "inflate": 0.01, "pivot": [-7.98, 21.66, 2.28], "rotation": [0, 0, 27.5], "uv": [40, 18]}, + {"origin": [-4.27214, 18.9032, 1.14], "size": [1.14, 3.42, 1.14], "pivot": [-7.98, 21.66, 2.28], "rotation": [0, 0, 47.5], "uv": [10, 0]}, + {"origin": [-4.18998, 18.24826, 1.1372], "size": [1.1, 3.4256, 1.1456], "inflate": 0.02, "pivot": [-7.98, 21.66, 2.28], "rotation": [0, 0, 37.5], "uv": [0, 0]} + ] + }, + { + "name": "bone6", + "parent": "head", + "pivot": [0.42, 17.1, -5.7] + }, + { + "name": "bone7", + "parent": "bone6", + "pivot": [-4.56, 19.38, -5.7] + }, + { + "name": "bone9", + "parent": "bone7", + "pivot": [-4.56, 21.66, -5.7], + "rotation": [0, 0, 5], + "cubes": [ + {"origin": [-4.56, 15.96, -5.7], "size": [2.28, 3.42, 2.28], "pivot": [-2.28, 19.38, -5.7], "rotation": [0, 0, -37.5], "uv": [28, 55]}, + {"origin": [-4.5614, 17.0986, -5.7014], "size": [2.2828, 2.2828, 2.2828], "inflate": 0.01, "uv": [44, 59]}, + {"origin": [-4.56, 17.1, -5.7], "size": [1.14, 2.28, 2.28], "pivot": [-4.56, 19.38, -5.7], "rotation": [0, 0, 15], "uv": [0, 60]} + ] + }, + { + "name": "bone8", + "parent": "bone6", + "pivot": [4.56, 21.66, -5.7], + "rotation": [0, 0, -5], + "cubes": [ + {"origin": [2.2786, 17.0986, -5.7014], "size": [2.2828, 2.2828, 2.2828], "inflate": 0.01, "uv": [53, 59]}, + {"origin": [3.42, 17.1, -5.7], "size": [1.14, 2.28, 2.28], "pivot": [4.56, 19.38, -5.7], "rotation": [0, 0, -12.5], "uv": [7, 60]}, + {"origin": [2.28, 15.96, -5.7], "size": [2.28, 3.42, 2.28], "pivot": [2.28, 19.38, -5.7], "rotation": [0, 0, 32.5], "uv": [55, 53]} + ] + }, + { + "name": "bone25", + "parent": "head", + "pivot": [-3, 17, -4] + }, + { + "name": "bone27", + "parent": "bone25", + "pivot": [-3.5, 18.5, -4], + "cubes": [ + {"origin": [-4.5, 17.5, -5], "size": [2, 2, 2], "uv": [73, 0]} + ] + }, + { + "name": "bone26", + "parent": "bone25", + "pivot": [3.5, 18.5, -4], + "cubes": [ + {"origin": [2.5, 17.5, -5], "size": [2, 2, 2], "uv": [73, 0]} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/pokemon.json b/pokemon.json index 1f2816889..1b1b8a0da 100644 --- a/pokemon.json +++ b/pokemon.json @@ -248,6 +248,9 @@ "flygon", "lileep", "cradily", + "beldum", + "metang", + "metagross", "regirock", "regice", "registeel", diff --git a/texts/en_US.lang b/texts/en_US.lang index bf06aeeb1..a20e17aa4 100644 --- a/texts/en_US.lang +++ b/texts/en_US.lang @@ -1,4 +1,4 @@ -pack.name=§lPokeBedrock v2.9.3 RES +pack.name=§lPokeBedrock v2.9.4 RES pack.description=§aA High Level Pokemon Addon Created by Smell of curry for Minecraft Bedrock ## Orbs @@ -504,6 +504,8 @@ item.pokeb:pp_max=PP Max item.pokeb:pp_up=PP Up item.pokeb:protein=Protein item.pokeb:zinc=Zinc +item.pokeb:revive=Revive +item.pokeb:max_revive=Max Revive ## Miscellaneous item.pokeb:gui=§cPoke§fBedrock §aGUI diff --git a/textures/entity/pokemon/beldum/beldum.png b/textures/entity/pokemon/beldum/beldum.png new file mode 100644 index 000000000..ddeb14149 Binary files /dev/null and b/textures/entity/pokemon/beldum/beldum.png differ diff --git a/textures/entity/pokemon/beldum/shiny_beldum.png b/textures/entity/pokemon/beldum/shiny_beldum.png new file mode 100644 index 000000000..ab6ab61fa Binary files /dev/null and b/textures/entity/pokemon/beldum/shiny_beldum.png differ diff --git a/textures/entity/pokemon/metagross/metagross.png b/textures/entity/pokemon/metagross/metagross.png new file mode 100644 index 000000000..010b8b2a9 Binary files /dev/null and b/textures/entity/pokemon/metagross/metagross.png differ diff --git a/textures/entity/pokemon/metagross/shiny_metagross.png b/textures/entity/pokemon/metagross/shiny_metagross.png new file mode 100644 index 000000000..70d4febd4 Binary files /dev/null and b/textures/entity/pokemon/metagross/shiny_metagross.png differ diff --git a/textures/entity/pokemon/metang/metang.png b/textures/entity/pokemon/metang/metang.png new file mode 100644 index 000000000..27c5d83dd Binary files /dev/null and b/textures/entity/pokemon/metang/metang.png differ diff --git a/textures/entity/pokemon/metang/shiny_metang.png b/textures/entity/pokemon/metang/shiny_metang.png new file mode 100644 index 000000000..4f938512b Binary files /dev/null and b/textures/entity/pokemon/metang/shiny_metang.png differ diff --git a/textures/item_texture.json b/textures/item_texture.json index c34e2e2e2..fe2455a4e 100644 --- a/textures/item_texture.json +++ b/textures/item_texture.json @@ -528,6 +528,9 @@ "max_repel": { "textures": "textures/items/healing_items/max_repel" }, + "revive": { + "textures": "textures/items/healing_items/revive" + }, "max_revive": { "textures": "textures/items/healing_items/maxrevive" },