diff --git a/CHANGELOG.md b/CHANGELOG.md index fe1772147..b3aa2bb0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,4 @@ -**Update v2.9.4** +**Update v2.9.5** -- 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 +- Removed extra Bike Animation +- Added Meowstic, Meowstic-Female, and Shroomish diff --git a/animations/pokemon/bike.animation.json b/animations/pokemon/bike.animation.json deleted file mode 100644 index 3d081f229..000000000 --- a/animations/pokemon/bike.animation.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "format_version": "1.8.0", - "animations": { - "animation.bike.walking": { - "loop": true, - "animation_length": 1, - "bones": { - "Wheel1": { - "rotation": { - "0.0": [0, 0, 0], - "0.24": [90, 0, 0], - "0.52": [180, 0, 0], - "0.76": [270, 0, 0], - "1.0": [360, 0, 0] - } - }, - "Wheel2": { - "rotation": { - "0.0": [0, 0, 0], - "0.24": [90, 0, 0], - "0.52": [180, 0, 0], - "0.76": [270, 0, 0], - "1.0": [360, 0, 0] - } - } - } - } - } -} \ No newline at end of file diff --git a/animations/pokemon/meowstic.animation.json b/animations/pokemon/meowstic.animation.json new file mode 100644 index 000000000..67a0276a5 --- /dev/null +++ b/animations/pokemon/meowstic.animation.json @@ -0,0 +1,945 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.meowstic.ground_idle": { + "loop": true, + "animation_length": 2, + "bones": { + "body": { + "position": { + "0.0": [0, 0.1, 0], + "0.25": [0, 0, 0], + "0.75": [0, -0.4, 0], + "1.0": [0, -0.5, 0], + "1.25": [0, -0.4, 0], + "1.75": [0, 0, 0], + "2.0": [0, 0.1, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-0.89, 0, 0], + "0.375": [-1, 0, 0], + "0.75": [-0.5, 0, 0], + "1.0": [0.95, 0, 0], + "1.25": [2.5, 0, 0], + "1.375": [2.8, 0, 0], + "1.5": [2.5, 0, 0], + "1.75": [1.53, 0, 0], + "2.0": [0, 0, 0] + } + }, + "ear1": { + "rotation": { + "0.0": [25.08377, -4.53051, 35.38249], + "0.5": [22.98, -4.53, 35.38], + "1.0": [25.08, -4.53, 35.38], + "1.25": [27.58, -4.53, 35.38], + "1.375": [28.58, -4.53, 35.38], + "1.625": [27.58, -4.53, 35.38], + "2.0": [25.08, -4.53, 35.38] + } + }, + "bone": { + "rotation": [35, 0, 0] + }, + "ear2": { + "rotation": { + "0.0": [18.17779, 6.44361, -29.575], + "0.5": [15.98, 6.44, -29.57], + "1.0": [18.18, 6.44, -29.57], + "1.25": [20.68, 6.44, -29.57], + "1.375": [22.08, 6.44, -29.57], + "1.625": [21.68, 6.44, -29.57], + "2.0": [18.18, 6.44, -29.57] + } + }, + "bone2": { + "rotation": [37.5, 0, 0] + }, + "hair": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [-2.5, 0, 0], + "1.0": [0, 0, 0], + "1.5": [2.5, 0, 0], + "2.0": [0, 0, 0] + } + }, + "arm2": { + "rotation": { + "0.0": [0, 0, 60], + "0.5": [0, 0, 57.5], + "1.0": [0, 0, 60], + "1.5": [0, 0, 62.5], + "2.0": [0, 0, 60] + } + }, + "arm1": { + "rotation": { + "0.0": [0, 0, -60], + "0.5": [0, 0, -57.5], + "1.0": [0, 0, -60], + "1.5": [0, 0, -62.5], + "2.0": [0, 0, -60] + } + }, + "tail2": { + "rotation": { + "0.0": [20, -17.5, 0], + "0.5": [24.16667, -17.5, 0], + "0.75": [24.33, -17.5, 0], + "1.0": [22.5, -17.5, 0], + "1.5": [17.5, -17.5, 0], + "1.75": [16.75, -17.5, 0], + "2.0": [20, -17.5, 0] + } + }, + "tail2_part2": { + "rotation": { + "0.0": [11.5, 0, 0], + "0.25": [21.75, 0, 0], + "0.5": [28, 0, 0], + "0.75": [31.75, 0, 0], + "1.0": [32.5, 0, 0], + "1.25": [26.75, 0, 0], + "1.4583": [18, 0, 0], + "1.75": [11.25, 0, 0], + "2.0": [11.5, 0, 0] + } + }, + "tail1": { + "rotation": { + "0.0": [22.5, 17.5, 0], + "0.5": [31.25, 17.5, 0], + "0.75": [30.13, 17.5, 0], + "1.0": [25, 17.5, 0], + "1.5": [17.5, 17.5, 0], + "1.75": [19, 17.5, 0], + "2.0": [22.5, 17.5, 0] + } + }, + "tail1_part2": { + "rotation": { + "0.0": [11, 0, 0], + "0.25": [8, 0, 0], + "0.5": [13, 0, 0], + "1.0": [29, 0, 0], + "1.25": [32.25, 0, 0], + "1.5": [29.5, 0, 0], + "1.75": [20.75, 0, 0], + "2.0": [11, 0, 0] + } + } + } + }, + "animation.meowstic.walking": { + "loop": true, + "animation_length": 1, + "bones": { + "ear1": { + "rotation": { + "0.0": [25.08377, -4.53051, 35.38249], + "0.125": [22.58377, -4.53051, 35.38249], + "0.25": [21.58, -4.53, 35.38], + "0.375": [22.58377, -4.53051, 35.38249], + "0.5": [25.08377, -4.53051, 35.38249], + "0.625": [22.58377, -4.53051, 35.38249], + "0.75": [21.58, -4.53, 35.38], + "0.875": [22.58377, -4.53051, 35.38249], + "1.0": [25.08377, -4.53051, 35.38249] + } + }, + "bone": { + "rotation": [35, 0, 0] + }, + "ear2": { + "rotation": { + "0.0": [16.48, 6.44, -29.57], + "0.125": [15.18, 6.44, -29.57], + "0.25": [14.78, 6.44, -29.57], + "0.375": [16.18, 6.44, -29.57], + "0.5": [17.58, 6.44, -29.57], + "0.625": [15.18, 6.44, -29.57], + "0.75": [12.68, 6.44, -29.57], + "0.875": [14.18, 6.44, -29.57], + "1.0": [16.48, 6.44, -29.57] + } + }, + "bone2": { + "rotation": [37.5, 0, 0] + }, + "arm2": { + "rotation": { + "0.0": [0, -20, 60], + "0.25": [0, -10, 60], + "0.5": [0, 20, 60], + "0.75": [0, 5, 60], + "1.0": [0, -20, 60] + } + }, + "arm1": { + "rotation": { + "0.0": [0, -20, -60], + "0.25": [0, -5, -60], + "0.5": [12.73247, 26.34266, -54.07299], + "0.75": [11.54287, 9.22711, -57.92296], + "1.0": [0, -20, -60] + } + }, + "tail2": { + "rotation": { + "0.0": [20, -17.5, 0], + "0.125": [23.5, -17.5, 0], + "0.25": [25, -17.5, 0], + "0.375": [23.5, -17.5, 0], + "0.5": [20, -17.5, 0], + "0.625": [16.5, -17.5, 0], + "0.75": [15, -17.5, 0], + "0.875": [16.5, -17.5, 0], + "1.0": [20, -17.5, 0] + } + }, + "tail2_part2": { + "rotation": { + "0.0": [7.5, 0, 0], + "0.25": [12.5, 0, 0], + "0.5": [15, 0, 0], + "0.75": [12.5, 0, 0], + "1.0": [7.5, 0, 0] + } + }, + "tail1": { + "rotation": { + "0.0": [24.5, 17.5, 0], + "0.125": [21.5, 17.5, 0], + "0.25": [20.5, 17.5, 0], + "0.375": [22.5, 17.5, 0], + "0.5": [24.5, 17.5, 0], + "0.625": [26.1, 17.5, 0], + "0.75": [27, 17.5, 0], + "0.875": [26.1, 17.5, 0], + "1.0": [24.5, 17.5, 0] + } + }, + "tail1_part2": { + "rotation": { + "0.0": [22.5, 0, 0], + "0.25": [16.5, 0, 0], + "0.5": [13, 0, 0], + "0.75": [17.5, 0, 0], + "1.0": [22.5, 0, 0] + } + }, + "body": { + "rotation": { + "0.0": [-2.5, 0, -0.5], + "0.25": [0, 0, 0], + "0.5": [-2.5, 0, -0.5], + "0.75": [0, 0, 0], + "1.0": [-2.5, 0, -0.5] + } + }, + "head": { + "rotation": { + "0.0": [5, 0, 0], + "0.125": [3.75, 0, 0], + "0.25": [5, 0, 0], + "0.375": [6.5, 0, 0], + "0.5": [5, 0, 0], + "0.625": [3.75, 0, 0], + "0.75": [5, 0, 0], + "0.875": [6.5, 0, 0], + "1.0": [5, 0, 0] + } + }, + "hair": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-5, 0, 0], + "0.5": [0, 0, 0], + "0.75": [-5, 0, 0], + "1.0": [0, 0, 0] + } + }, + "leg1": { + "rotation": { + "0.0": [-25, 0, 0], + "0.25": [0, 0, 0], + "0.5": [27.5, 0, 0], + "0.75": [0, 0, 0], + "1.0": [-25, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "0.5": [0, 0, 0], + "0.75": [0, 1, 0], + "1.0": [0, 0, 0] + } + }, + "leg_2": { + "rotation": { + "0.0": [35, 0, 0], + "0.25": [-2.5, 0, 0], + "0.5": [-27.5, 0, 0], + "0.75": [4.66178, -4.80755, -0.25861], + "1.0": [35, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 1, 0], + "0.5": [0, 0, 0], + "0.75": [0, 0, 0], + "1.0": [0, 0, 0] + } + } + } + }, + "animation.meowstic.blink": { + "animation_length": 2, + "bones": { + "eye1": { + "position": { + "0.0": [0, 0, 0], + "0.0417": [0, -1.5, 0], + "0.0833": [0, -1.5, 0], + "0.125": [0, 0, 0] + }, + "scale": { + "0.0": [1, 1, 1], + "0.0417": [1, 0.04, 1], + "0.0833": [1, 0.04, 1], + "0.125": [1, 1, 1] + } + }, + "eye2": { + "position": { + "0.0": [0, 0, 0], + "0.0417": [0, -1.6, 0], + "0.0833": [0, -1.6, 0], + "0.125": [0, 0, 0] + }, + "scale": { + "0.0": [1, 1, 1], + "0.0417": [1, 0.04, 1], + "0.0833": [1, 0.04, 1], + "0.125": [1, 1, 1] + } + } + } + }, + "animation.meowstic.attack": { + "animation_length": 2, + "bones": { + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 12.5, 0], + "0.5": [0, 12.5, 0], + "0.75": [0, 0, 0], + "1.0": [0, -5, 0], + "1.25": [0, -5, 0], + "1.75": [0, 0, 0] + }, + "position": [0, 0.1, 0] + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, -27.5, 0], + "0.5": [5, -27.5, 0], + "0.75": [-0.45382, -7.62667, 3.44689], + "0.875": [-0.46364, 9.87277, 3.30687], + "1.0": [-0.4605, 12.3727, 3.28799], + "1.25": [-0.4605, 12.3727, 3.28799], + "1.5": [-0.4605, 12.3727, 3.28799], + "1.75": [0, 0, 0] + } + }, + "ear1": { + "rotation": { + "0.0": [25.08377, -4.53051, 35.38249], + "0.25": [30.08377, -4.53051, 35.38249], + "0.375": [37.58377, -4.53051, 35.38249], + "0.5": [37.58, -4.53, 35.38], + "0.75": [37.58, -4.53, 35.38], + "1.0": [15.08, -4.53, 35.38], + "1.25": [15.08, -4.53, 35.38], + "1.5": [22.58, -4.53, 35.38], + "1.625": [30.08, -4.53, 35.38], + "1.75": [25.08377, -4.53051, 35.38249] + } + }, + "bone": { + "rotation": { + "0.0": [35, 0, 0], + "0.25": [32.5, 0, 0], + "0.375": [22.5, 0, 0], + "0.5": [22.5, 0, 0], + "0.75": [35, 0, 0], + "1.0": [52.5, 0, 0], + "1.125": [40, 0, 0], + "1.25": [32.5, 0, 0], + "1.375": [22.5, 0, 0], + "1.5": [22.5, 0, 0], + "1.75": [35, 0, 0] + } + }, + "ear2": { + "rotation": { + "0.0": [18.17779, 6.44361, -29.575], + "0.25": [10.67779, 6.44361, -29.575], + "0.5": [28.17779, 6.44361, -29.575], + "0.625": [25.67779, 6.44361, -29.575], + "0.75": [25.68, 6.44, -29.57], + "0.875": [20.68, 6.44, -29.57], + "1.0": [23.18, 6.44, -29.57], + "1.25": [30.68, 6.44, -29.57], + "1.5": [18.17779, 6.44361, -29.575] + } + }, + "bone2": { + "rotation": { + "0.0": [37.5, 0, 0], + "0.25": [45, 0, 0], + "0.5": [42.5, 0, 0], + "0.75": [32.5, 0, 0], + "0.875": [25, 0, 0], + "1.0": [22.5, 0, 0], + "1.25": [32.5, 0, 0], + "1.5": [37.5, 0, 0] + } + }, + "hair": { + "rotation": [0, 0, 0] + }, + "arm2": { + "rotation": { + "0.0": [0, 0, 60], + "0.125": [-15.38137, 42.30224, -4.59138], + "0.375": [-106.25523, 78.20893, -100.68835], + "0.5": [-182.7045, 74.45385, -180.09548], + "0.75": [-357.10253, 75.51192, -354.68431], + "0.875": [-354.32427, -4.90908, -382.52393], + "1.0": [-354.14885, -14.85879, -383.54199], + "1.25": [-354.15, -14.86, -383.54], + "1.5": [-352.41503, -0.10159, -339.29127], + "1.75": [-359.00865, 0.4795, -299.42677] + } + }, + "arm1": { + "rotation": { + "0.0": [0, 0, -60], + "0.25": [2.20462, 12.3071, -49.76228], + "0.5": [2.25608, 17.30331, -49.56108], + "0.75": [7.48151, 15.80489, -31.36448], + "1.0": [8.1719, 28.18957, -29.53218], + "1.25": [8.17, 28.19, -29.53], + "1.75": [0, 0, -60] + } + }, + "tail2": { + "rotation": { + "0.0": [20, -17.5, 0], + "0.125": [22.49121, -31.49427, -5.95883], + "0.375": [19.57299, 13.17439, 10.87895], + "0.5": [20.34211, 20.22531, 13.54993], + "0.75": [20.34, 20.23, 13.55], + "0.875": [20.34, 20.23, 13.55], + "1.0": [19.99683, -17.4959, 0.00175], + "1.375": [21.44251, -26.85284, -3.81464], + "1.5": [21.44, -26.85, -3.81], + "1.75": [20, -17.5, 0], + "1.875": [19.54187, -12.79436, 1.75169], + "2.0": [20, -17.5, 0] + } + }, + "tail2_part2": { + "rotation": { + "0.0": [11.5, 0, 0], + "0.125": [11.5, 0, 0], + "0.25": [11.77151, -12.24513, -2.53076], + "0.375": [11.77, -12.25, -2.53], + "0.625": [11.67069, 9.7925, 2.01346], + "1.0": [11.67, 9.79, 2.01], + "1.25": [11.67052, -9.80465, -2.0159], + "1.5": [11.67, -9.8, -2.02], + "1.75": [11.5, 0, 0] + } + }, + "tail1": { + "rotation": { + "0.0": [22.5, 17.5, 0], + "0.125": [21.40981, -1.07663, -7.5221], + "0.375": [29.59059, 42.34437, 13.83202], + "0.5": [32.11131, 46.63864, 17.4258], + "0.75": [32.11, 46.64, 17.43], + "0.875": [32.11, 46.64, 17.43], + "1.0": [21.40982, 1.25177, -6.60442], + "1.375": [21.62838, -8.05438, -10.27497], + "1.5": [21.63, -8.05, -10.27], + "1.75": [22.5, 17.5, 0], + "1.875": [23.62659, 24.40239, 3.14426], + "2.0": [22.5, 17.5, 0] + } + }, + "tail1_part2": { + "rotation": { + "0.0": [11, 0, 0], + "0.125": [11, 0, 0], + "0.25": [11.26033, -12.26673, -2.42224], + "0.375": [11.26, -12.27, -2.42], + "0.625": [11.09203, 7.35819, 1.4411], + "1.0": [11.09, 7.36, 1.44], + "1.25": [11.03849, -4.90945, -0.95484], + "1.5": [11.04, -4.91, -0.95], + "1.75": [11, 0, 0] + } + }, + "root": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 17.9, 0], + "0.5": [0, 25, 0], + "0.625": [0, 23.9, 0], + "0.75": [0, 7.5, 0], + "0.875": [0, -7.5, 0], + "1.125": [0, -10, 0], + "1.375": [0, -10, 0], + "1.5": [0, -7.5, 0], + "1.75": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 1], + "0.5": [0, 0, 1], + "0.625": [0, 0, 1], + "0.75": [0, 0, 0], + "0.875": [0, 0, -1], + "1.375": [0, 0, -1], + "1.75": [0, 0, 0] + } + }, + "leg1": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-2.5, -10, 0], + "0.5": [-2.66474, -22.48742, 0.58545], + "0.625": [-2.66, -22.49, 0.59], + "0.75": [4.58032, -12.52358, 1.44995], + "0.875": [10, 0, 0], + "1.125": [10, 0, 0], + "1.375": [10, 0, 0], + "1.75": [0, 0, 0] + } + }, + "leg_2": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [17.75313, 9.53274, 3.03513], + "0.5": [-2.00307, 14.8687, 2.2386], + "0.625": [0.49693, 14.8687, 2.2386], + "0.75": [25.49693, 14.8687, 2.2386], + "1.0": [-7.00307, 14.8687, 2.2386], + "1.125": [0.49693, 14.8687, 2.2386], + "1.375": [0.5, 14.87, 2.24], + "1.5": [12.57135, 2.67749, -0.55379], + "1.75": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 1, 0], + "0.5": [0, 0, 0], + "0.625": [0, 0, 0], + "0.875": [0, 0.2, 0], + "1.125": [0, 0, 0], + "1.375": [0, 0, 0], + "1.875": [0, 0, 0] + } + } + } + }, + "animation.meowstic.water_idle": { + "loop": true, + "animation_length": 2, + "bones": { + "root": { + "rotation": [0, 0, 0], + "position": { + "0.0": [0, -4, 0], + "0.25": [0, -3.92, 0], + "0.75": [0, -3.15, 0], + "1.0": [0, -3, 0], + "1.25": [0, -3.05, 0], + "1.75": [0, -3.82, 0], + "2.0": [0, -4, 0] + } + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [-2.5, 0, 0], + "1.0": [0, 0, 0], + "1.5": [2.5, 0, 0], + "2.0": [0.00046, -0.00703, -0.04728] + } + }, + "arm2": { + "rotation": { + "0.0": [0, 27.5, 0], + "0.25": [0, 32.5, 0], + "0.5": [0, -2.5, 0], + "1.0": [0, -20, 0], + "1.25": [0, -22.5, 0], + "1.5": [0, 0, 0], + "2.0": [0, 27.5, 0] + } + }, + "arm1": { + "rotation": { + "0.0": [0, -27.5, 0], + "0.25": [0, -20, 0], + "0.5": [0, -2.5, 0], + "1.0": [0, 22.5, 0], + "1.25": [0, 25, 0], + "1.5": [0, 0, 0], + "2.0": [0, -27.5, 0] + } + }, + "leg1": { + "rotation": { + "0.0": [15, 0, 0], + "0.25": [8, 0, 0], + "0.5": [-15, 0, 0], + "0.75": [-7, 0, 0], + "1.0": [15, 0, 0], + "1.25": [6, 0, 0], + "1.5": [-15, 0, 0], + "1.75": [-6, 0, 0], + "2.0": [15, 0, 0] + } + }, + "leg_2": { + "rotation": { + "0.0": [-17.5, 0, 0], + "0.25": [-6.75, 0, 0], + "0.5": [20, 0, 0], + "0.75": [7, 0, 0], + "1.0": [-20, 0, 0], + "1.25": [-9, 0, 0], + "1.5": [20, 0, 0], + "1.75": [7.25, 0, 0], + "2.0": [-17.5, 0, 0] + } + }, + "ear1": { + "rotation": { + "0.0": [22.5, 0, 20], + "0.5": [18, 0, 20], + "1.0": [22.5, 0, 20], + "1.5": [28, 0, 20], + "2.0": [22.5, 0, 20] + } + }, + "bone": { + "rotation": { + "0.0": [42.24682, -17.04679, -14.9092], + "0.5": [46.26754, -15.97867, -16.05248], + "0.75": [48.26129, -15.41653, -16.59197], + "1.0": [45.26653, -16.25286, -15.77461], + "1.5": [39.2021, -17.79574, -13.99741], + "1.75": [36.13254, -18.49724, -13.04118], + "2.0": [42.24682, -17.04679, -14.9092] + } + }, + "ear2": { + "rotation": { + "0.0": [20, 0, -22.5], + "0.5": [10.5, 0, -22.5], + "1.0": [20, 0, -22.5], + "1.5": [26.5, 0, -22.5], + "2.0": [20, 0, -22.5] + } + }, + "bone2": { + "rotation": { + "0.0": [43.35299, 12.9128, 11.91333], + "0.5": [47.49071, 10.26256, 10.99907], + "0.75": [48.98575, 9.97298, 11.26172], + "1.0": [46.49252, 10.45182, 10.81961], + "1.5": [37.66275, 9.95394, 7.59948], + "1.75": [37.9591, 11.92916, 9.16042], + "2.0": [43.35299, 12.9128, 11.91333] + } + }, + "tail2": { + "rotation": [0, -27.5, 0] + }, + "tail2_part2": { + "rotation": [12.5, 0, 0] + }, + "tail1": { + "rotation": [0, 17.5, 0] + }, + "tail1_part2": { + "rotation": [12.5, 0, 0] + } + } + }, + "animation.meowstic.swimming": { + "loop": true, + "animation_length": 1, + "bones": { + "root": { + "rotation": { + "0.0": [60, 0, 0], + "0.25": [58.5, 0, 0], + "0.5": [60, 0, 0], + "0.75": [61.5, 0, 0], + "1.0": [60, 0, 0] + }, + "position": { + "0.0": [0, -6, 4], + "0.25": [0, -5.95, 4], + "0.5": [0, -5, 4], + "0.75": [0, -5.5, 4], + "1.0": [0, -6, 4] + } + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-2.5, 0, 0], + "0.5": [0, 0, 0], + "0.75": [2.5, 0, 0], + "1.0": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [-35, 0, 0], + "0.25": [-32.5, 0, 0], + "0.5": [-35, 0, 0], + "0.75": [-37.5, 0, 0], + "1.0": [-35, 0, 0] + } + }, + "ear1": { + "rotation": { + "0.0": [31.38636, 15.58394, 24.03705], + "0.5": [26.38636, 15.58394, 24.03705], + "1.0": [31.38636, 15.58394, 24.03705] + } + }, + "bone": { + "rotation": { + "0.0": [42.81, -17.39, -18.25], + "0.25": [47.81, -17.39, -18.25], + "0.5": [45.4127, -17.37529, -18.54161], + "0.75": [40.31, -17.39, -18.25], + "1.0": [42.81, -17.39, -18.25] + } + }, + "ear2": { + "rotation": { + "0.0": [31.97028, -14.36495, -31.29652], + "0.5": [26.97028, -14.36495, -31.29652], + "1.0": [31.97028, -14.36495, -31.29652] + } + }, + "bone2": { + "rotation": { + "0.0": [43.43, 19.9, 19.38], + "0.25": [45.93, 19.9, 19.38], + "0.5": [43.43, 19.9, 19.38], + "0.75": [40.93, 19.9, 19.38], + "1.0": [43.43, 19.9, 19.38] + } + }, + "hair": { + "rotation": { + "0.0": [14.5, 0, 0], + "0.125": [16.5, 0, 0], + "0.25": [14.5, 0, 0], + "0.5": [7.5, 0, 0], + "0.625": [5.75, 0, 0], + "0.75": [7, 0, 0], + "1.0": [14.5, 0, 0] + } + }, + "arm2": { + "rotation": { + "0.0": [17.23442, 24.94169, -53.66086], + "0.25": [29.62165, 4.98093, -8.6822], + "0.5": [22.20765, -20.70481, 40.89339], + "0.625": [22.20765, -20.70481, 40.89339], + "0.875": [20.47173, 5.50094, -10.27069], + "1.0": [17.23442, 24.94169, -53.66086] + } + }, + "arm1": { + "rotation": { + "0.0": [18.32252, -24.1782, 51.04342], + "0.25": [28.83844, -8.64738, 15.27269], + "0.5": [22.20765, 20.70481, -40.89339], + "0.625": [22.20765, 20.70481, -40.89339], + "0.875": [21.24966, -3.95343, 6.25278], + "1.0": [18.32252, -24.1782, 51.04342] + } + }, + "tail2": { + "rotation": { + "0.0": [-57.70113, -3.45533, 6.66067], + "0.125": [-57.70113, -3.45533, 6.66067], + "0.375": [-65.20113, -3.45533, 6.66067], + "0.5": [-67.70113, -3.45533, 6.66067], + "0.75": [-65.20113, -3.45533, 6.66067], + "1.0": [-57.70113, -3.45533, 6.66067] + } + }, + "tail2_part2": { + "rotation": { + "0.0": [4.96674, -0.21719, -0.3483], + "0.25": [4.97, -0.22, -0.35], + "0.5": [2.47, -0.22, -0.35], + "0.75": [4.97, -0.22, -0.35], + "1.0": [4.96674, -0.21719, -0.3483] + } + }, + "tail1": { + "rotation": { + "0.0": [-55.35767, 4.59902, -8.88927], + "0.125": [-55.35767, 4.59902, -8.88927], + "0.375": [-62.85767, 4.59902, -8.88927], + "0.5": [-65.35767, 4.59902, -8.88927], + "0.75": [-62.85767, 4.59902, -8.88927], + "1.0": [-55.35767, 4.59902, -8.88927] + } + }, + "tail1_part2": { + "rotation": { + "0.0": [5, 0, 0], + "0.25": [5, 0, 0], + "0.5": [-5, 0, 0], + "0.75": [-2.5, 0, 0], + "1.0": [5, 0, 0] + } + }, + "leg1": { + "rotation": { + "0.0": [29.99985, 0.08805, 0.07109], + "0.25": [-27.50015, 0.08805, 0.07109], + "0.5": [29.99985, 0.08805, 0.07109], + "0.75": [-27.50015, 0.08805, 0.07109], + "1.0": [29.99985, 0.08805, 0.07109] + } + }, + "leg_2": { + "rotation": { + "0.0": [-25, 0, 0], + "0.25": [40, 0, 0], + "0.5": [-25, 0, 0], + "0.75": [40, 0, 0], + "1.0": [-25, 0, 0] + } + } + } + }, + "animation.meowstic.sleeping": { + "loop": true, + "animation_length": 2, + "bones": { + "root": { + "rotation": [-17.5, 0, 0], + "position": [0, -4, 0] + }, + "body": { + "rotation": [22.5, 0, 0], + "position": { + "0.0": [0, 0, 0], + "1.0": [0, 0.1, 0], + "2.0": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [32.5, 0, 0], + "0.25": [31.4, 0, 0], + "0.5": [31, 0, 0], + "1.0": [32.5, 0, 0], + "1.25": [33.41, 0, 0], + "1.5": [33.5, 0, 0], + "2.0": [32.5, 0, 0] + } + }, + "ear1": { + "rotation": [68.49762, -21.07593, 8.0634] + }, + "bone": { + "rotation": { + "0.0": [-12.5, 0, 0], + "0.25": [-13.95, 0, 0], + "0.5": [-15, 0, 0], + "0.75": [-14.48, 0, 0], + "1.0": [-12.5, 0, 0], + "1.25": [-10.27, 0, 0], + "1.5": [-10, 0, 0], + "1.75": [-10.67, 0, 0], + "2.0": [-12.5, 0, 0] + } + }, + "ear2": { + "rotation": [66.52397, 16.1299, -6.88003] + }, + "bone2": { + "rotation": { + "0.0": [-10, 0, 0], + "0.25": [-12.05, 0, 0], + "0.5": [-12.5, 0, 0], + "0.75": [-12.15, 0, 0], + "1.0": [-10, 0, 0], + "1.25": [-7.95, 0, 0], + "1.5": [-7.5, 0, 0], + "1.75": [-8, 0, 0], + "2.0": [-10, 0, 0] + } + }, + "eye1": { + "position": [0, -1.4, 0], + "scale": [1, 0.03, 1] + }, + "eye2": { + "position": [0, -1.4, 0], + "scale": [1, 0.03, 1] + }, + "arm2": { + "rotation": [67.93369, 38.44796, 79.69097] + }, + "arm1": { + "rotation": [46.02509, -37.15276, -79.54446] + }, + "tail2": { + "rotation": [-18.07779, -14.2906, 4.60659] + }, + "tail2_part2": { + "rotation": [9.99403, 0.34723, -1.96964] + }, + "tail1": { + "rotation": [-20.88852, 16.41371, -6.15491] + }, + "tail1_part2": { + "rotation": [13.48848, -0.54094, 2.44081], + "position": [0, 0, 0] + }, + "leg1": { + "rotation": [-80, 0, -17.5] + }, + "leg_2": { + "rotation": [-77.5, 0, 20] + } + } + } + } +} \ No newline at end of file diff --git a/animations/pokemon/meowsticf.animation.json b/animations/pokemon/meowsticf.animation.json new file mode 100644 index 000000000..e66ef64a6 --- /dev/null +++ b/animations/pokemon/meowsticf.animation.json @@ -0,0 +1,951 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.meowsticf.ground_idle": { + "loop": true, + "animation_length": 2, + "bones": { + "body": { + "position": { + "0.0": [0, 0.1, 0], + "0.25": [0, 0, 0], + "0.75": [0, -0.4, 0], + "1.0": [0, -0.5, 0], + "1.25": [0, -0.4, 0], + "1.75": [0, 0, 0], + "2.0": [0, 0.1, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-0.89, 0, 0], + "0.375": [-1, 0, 0], + "0.75": [-0.5, 0, 0], + "1.0": [0.95, 0, 0], + "1.25": [2.5, 0, 0], + "1.375": [2.8, 0, 0], + "1.5": [2.5, 0, 0], + "1.75": [1.53, 0, 0], + "2.0": [0, 0, 0] + } + }, + "ear1": { + "rotation": { + "0.0": [25.08377, -4.53051, 35.38249], + "0.5": [22.98, -4.53, 35.38], + "1.0": [25.08, -4.53, 35.38], + "1.25": [27.58, -4.53, 35.38], + "1.375": [28.58, -4.53, 35.38], + "1.625": [27.58, -4.53, 35.38], + "2.0": [25.08, -4.53, 35.38] + } + }, + "bone": { + "rotation": [35, 0, 0] + }, + "ear2": { + "rotation": { + "0.0": [18.17779, 6.44361, -29.575], + "0.5": [15.98, 6.44, -29.57], + "1.0": [18.18, 6.44, -29.57], + "1.25": [20.68, 6.44, -29.57], + "1.375": [22.08, 6.44, -29.57], + "1.625": [21.68, 6.44, -29.57], + "2.0": [18.18, 6.44, -29.57] + } + }, + "bone2": { + "rotation": [40.00233, 0.0719, -0.08198], + "position": [0, 2, 5] + }, + "hair": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [-2.5, 0, 0], + "1.0": [0, 0, 0], + "1.5": [2.5, 0, 0], + "2.0": [0, 0, 0] + } + }, + "arm2": { + "rotation": { + "0.0": [0, 0, 60], + "0.5": [0, 0, 57.5], + "1.0": [0, 0, 60], + "1.5": [0, 0, 62.5], + "2.0": [0, 0, 60] + } + }, + "arm1": { + "rotation": { + "0.0": [0, 0, -60], + "0.5": [0, 0, -57.5], + "1.0": [0, 0, -60], + "1.5": [0, 0, -62.5], + "2.0": [0, 0, -60] + } + }, + "tail2": { + "rotation": { + "0.0": [20, -17.5, 0], + "0.5": [24.16667, -17.5, 0], + "0.75": [24.33, -17.5, 0], + "1.0": [22.5, -17.5, 0], + "1.5": [17.5, -17.5, 0], + "1.75": [16.75, -17.5, 0], + "2.0": [20, -17.5, 0] + } + }, + "tail2_part2": { + "rotation": { + "0.0": [11.5, 0, 0], + "0.25": [21.75, 0, 0], + "0.5": [28, 0, 0], + "0.75": [31.75, 0, 0], + "1.0": [32.5, 0, 0], + "1.25": [26.75, 0, 0], + "1.4583": [18, 0, 0], + "1.75": [11.25, 0, 0], + "2.0": [11.5, 0, 0] + } + }, + "tail1": { + "rotation": { + "0.0": [22.5, 17.5, 0], + "0.5": [31.25, 17.5, 0], + "0.75": [30.13, 17.5, 0], + "1.0": [25, 17.5, 0], + "1.5": [17.5, 17.5, 0], + "1.75": [19, 17.5, 0], + "2.0": [22.5, 17.5, 0] + } + }, + "tail1_part2": { + "rotation": { + "0.0": [11, 0, 0], + "0.25": [8, 0, 0], + "0.5": [13, 0, 0], + "1.0": [29, 0, 0], + "1.25": [32.25, 0, 0], + "1.5": [29.5, 0, 0], + "1.75": [20.75, 0, 0], + "2.0": [11, 0, 0] + } + } + } + }, + "animation.meowsticf.walking": { + "loop": true, + "animation_length": 1, + "bones": { + "ear1": { + "rotation": { + "0.0": [25.08377, -4.53051, 35.38249], + "0.125": [22.58377, -4.53051, 35.38249], + "0.25": [21.58, -4.53, 35.38], + "0.375": [22.58377, -4.53051, 35.38249], + "0.5": [25.08377, -4.53051, 35.38249], + "0.625": [22.58377, -4.53051, 35.38249], + "0.75": [21.58, -4.53, 35.38], + "0.875": [22.58377, -4.53051, 35.38249], + "1.0": [25.08377, -4.53051, 35.38249] + } + }, + "bone": { + "rotation": [35, 0, 0] + }, + "ear2": { + "rotation": { + "0.0": [16.48, 6.44, -29.57], + "0.125": [15.18, 6.44, -29.57], + "0.25": [14.78, 6.44, -29.57], + "0.375": [16.18, 6.44, -29.57], + "0.5": [17.58, 6.44, -29.57], + "0.625": [15.18, 6.44, -29.57], + "0.75": [12.68, 6.44, -29.57], + "0.875": [14.18, 6.44, -29.57], + "1.0": [16.48, 6.44, -29.57] + } + }, + "bone2": { + "rotation": [42.5, 0, 0], + "position": [0, 2, 6] + }, + "arm2": { + "rotation": { + "0.0": [0, -20, 60], + "0.25": [0, -10, 60], + "0.5": [0, 20, 60], + "0.75": [0, 5, 60], + "1.0": [0, -20, 60] + } + }, + "arm1": { + "rotation": { + "0.0": [0, -20, -60], + "0.25": [0, -5, -60], + "0.5": [12.73247, 26.34266, -54.07299], + "0.75": [11.54287, 9.22711, -57.92296], + "1.0": [0, -20, -60] + } + }, + "tail2": { + "rotation": { + "0.0": [20, -17.5, 0], + "0.125": [23.5, -17.5, 0], + "0.25": [25, -17.5, 0], + "0.375": [23.5, -17.5, 0], + "0.5": [20, -17.5, 0], + "0.625": [16.5, -17.5, 0], + "0.75": [15, -17.5, 0], + "0.875": [16.5, -17.5, 0], + "1.0": [20, -17.5, 0] + } + }, + "tail2_part2": { + "rotation": { + "0.0": [7.5, 0, 0], + "0.25": [12.5, 0, 0], + "0.5": [15, 0, 0], + "0.75": [12.5, 0, 0], + "1.0": [7.5, 0, 0] + } + }, + "tail1": { + "rotation": { + "0.0": [24.5, 17.5, 0], + "0.125": [21.5, 17.5, 0], + "0.25": [20.5, 17.5, 0], + "0.375": [22.5, 17.5, 0], + "0.5": [24.5, 17.5, 0], + "0.625": [26.1, 17.5, 0], + "0.75": [27, 17.5, 0], + "0.875": [26.1, 17.5, 0], + "1.0": [24.5, 17.5, 0] + } + }, + "tail1_part2": { + "rotation": { + "0.0": [22.5, 0, 0], + "0.25": [16.5, 0, 0], + "0.5": [13, 0, 0], + "0.75": [17.5, 0, 0], + "1.0": [22.5, 0, 0] + } + }, + "body": { + "rotation": { + "0.0": [-2.5, 0, -0.5], + "0.25": [0, 0, 0], + "0.5": [-2.5, 0, -0.5], + "0.75": [0, 0, 0], + "1.0": [-2.5, 0, -0.5] + } + }, + "head": { + "rotation": { + "0.0": [5, 0, 0], + "0.125": [3.75, 0, 0], + "0.25": [5, 0, 0], + "0.375": [6.5, 0, 0], + "0.5": [5, 0, 0], + "0.625": [3.75, 0, 0], + "0.75": [5, 0, 0], + "0.875": [6.5, 0, 0], + "1.0": [5, 0, 0] + } + }, + "hair": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-5, 0, 0], + "0.5": [0, 0, 0], + "0.75": [-5, 0, 0], + "1.0": [0, 0, 0] + } + }, + "leg1": { + "rotation": { + "0.0": [-25, 0, 0], + "0.25": [0, 0, 0], + "0.5": [27.5, 0, 0], + "0.75": [0, 0, 0], + "1.0": [-25, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "0.5": [0, 0, 0], + "0.75": [0, 1, 0], + "1.0": [0, 0, 0] + } + }, + "leg_2": { + "rotation": { + "0.0": [35, 0, 0], + "0.25": [-2.5, 0, 0], + "0.5": [-27.5, 0, 0], + "0.75": [4.66178, -4.80755, -0.25861], + "1.0": [35, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 1, 0], + "0.5": [0, 0, 0], + "0.75": [0, 0, 0], + "1.0": [0, 0, 0] + } + } + } + }, + "animation.meowsticf.blink": { + "animation_length": 2, + "bones": { + "eye1": { + "position": { + "0.0": [0, 0, 0], + "0.0417": [0, -1.5, 0], + "0.0833": [0, -1.5, 0], + "0.125": [0, 0, 0] + }, + "scale": { + "0.0": [1, 1, 1], + "0.0417": [1, 0.04, 1], + "0.0833": [1, 0.04, 1], + "0.125": [1, 1, 1] + } + }, + "eye2": { + "position": { + "0.0": [0, 0, 0], + "0.0417": [0, -1.6, 0], + "0.0833": [0, -1.6, 0], + "0.125": [0, 0, 0] + }, + "scale": { + "0.0": [1, 1, 1], + "0.0417": [1, 0.04, 1], + "0.0833": [1, 0.04, 1], + "0.125": [1, 1, 1] + } + } + } + }, + "animation.meowsticf.attack": { + "animation_length": 2, + "bones": { + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 12.5, 0], + "0.5": [0, 12.5, 0], + "0.75": [0, 0, 0], + "1.0": [0, -5, 0], + "1.25": [0, -5, 0], + "1.75": [0, 0, 0] + }, + "position": [0, 0.1, 0] + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, -27.5, 0], + "0.5": [5, -27.5, 0], + "0.75": [-0.45382, -7.62667, 3.44689], + "0.875": [-0.46364, 9.87277, 3.30687], + "1.0": [-0.4605, 12.3727, 3.28799], + "1.25": [-0.4605, 12.3727, 3.28799], + "1.5": [-0.4605, 12.3727, 3.28799], + "1.75": [0, 0, 0] + } + }, + "ear1": { + "rotation": { + "0.0": [25.08377, -4.53051, 35.38249], + "0.25": [30.08377, -4.53051, 35.38249], + "0.375": [37.58377, -4.53051, 35.38249], + "0.5": [37.58, -4.53, 35.38], + "0.75": [37.58, -4.53, 35.38], + "1.0": [15.08, -4.53, 35.38], + "1.25": [15.08, -4.53, 35.38], + "1.5": [22.58, -4.53, 35.38], + "1.625": [30.08, -4.53, 35.38], + "1.75": [25.08377, -4.53051, 35.38249] + } + }, + "bone": { + "rotation": { + "0.0": [35, 0, 0], + "0.25": [32.5, 0, 0], + "0.375": [22.5, 0, 0], + "0.5": [22.5, 0, 0], + "0.75": [35, 0, 0], + "1.0": [52.5, 0, 0], + "1.125": [40, 0, 0], + "1.25": [32.5, 0, 0], + "1.375": [22.5, 0, 0], + "1.5": [22.5, 0, 0], + "1.75": [35, 0, 0] + } + }, + "ear2": { + "rotation": { + "0.0": [18.17779, 6.44361, -29.575], + "0.25": [10.67779, 6.44361, -29.575], + "0.5": [28.17779, 6.44361, -29.575], + "0.625": [25.67779, 6.44361, -29.575], + "0.75": [25.68, 6.44, -29.57], + "0.875": [20.68, 6.44, -29.57], + "1.0": [23.18, 6.44, -29.57], + "1.25": [30.68, 6.44, -29.57], + "1.5": [18.17779, 6.44361, -29.575] + } + }, + "bone2": { + "rotation": { + "0.0": [37.5, 0, 0], + "0.25": [45, 0, 0], + "0.5": [42.5, 0, 0], + "0.75": [32.5, 0, 0], + "0.875": [25, 0, 0], + "1.0": [22.5, 0, 0], + "1.25": [32.5, 0, 0], + "1.5": [37.5, 0, 0] + }, + "position": [0, 2, 5] + }, + "hair": { + "rotation": [0, 0, 0] + }, + "arm2": { + "rotation": { + "0.0": [0, 0, 60], + "0.125": [-15.38137, 42.30224, -4.59138], + "0.375": [-106.25523, 78.20893, -100.68835], + "0.5": [-182.7045, 74.45385, -180.09548], + "0.75": [-357.10253, 75.51192, -354.68431], + "0.875": [-354.32427, -4.90908, -382.52393], + "1.0": [-354.14885, -14.85879, -383.54199], + "1.25": [-354.15, -14.86, -383.54], + "1.5": [-352.41503, -0.10159, -339.29127], + "1.75": [-359.00865, 0.4795, -299.42677] + } + }, + "arm1": { + "rotation": { + "0.0": [0, 0, -60], + "0.25": [2.20462, 12.3071, -49.76228], + "0.5": [2.25608, 17.30331, -49.56108], + "0.75": [7.48151, 15.80489, -31.36448], + "1.0": [8.1719, 28.18957, -29.53218], + "1.25": [8.17, 28.19, -29.53], + "1.75": [0, 0, -60] + } + }, + "tail2": { + "rotation": { + "0.0": [20, -17.5, 0], + "0.125": [22.49121, -31.49427, -5.95883], + "0.375": [19.57299, 13.17439, 10.87895], + "0.5": [20.34211, 20.22531, 13.54993], + "0.75": [20.34, 20.23, 13.55], + "0.875": [20.34, 20.23, 13.55], + "1.0": [19.99683, -17.4959, 0.00175], + "1.375": [21.44251, -26.85284, -3.81464], + "1.5": [21.44, -26.85, -3.81], + "1.75": [20, -17.5, 0], + "1.875": [19.54187, -12.79436, 1.75169], + "2.0": [20, -17.5, 0] + } + }, + "tail2_part2": { + "rotation": { + "0.0": [11.5, 0, 0], + "0.125": [11.5, 0, 0], + "0.25": [11.77151, -12.24513, -2.53076], + "0.375": [11.77, -12.25, -2.53], + "0.625": [11.67069, 9.7925, 2.01346], + "1.0": [11.67, 9.79, 2.01], + "1.25": [11.67052, -9.80465, -2.0159], + "1.5": [11.67, -9.8, -2.02], + "1.75": [11.5, 0, 0] + } + }, + "tail1": { + "rotation": { + "0.0": [22.5, 17.5, 0], + "0.125": [21.40981, -1.07663, -7.5221], + "0.375": [29.59059, 42.34437, 13.83202], + "0.5": [32.11131, 46.63864, 17.4258], + "0.75": [32.11, 46.64, 17.43], + "0.875": [32.11, 46.64, 17.43], + "1.0": [21.40982, 1.25177, -6.60442], + "1.375": [21.62838, -8.05438, -10.27497], + "1.5": [21.63, -8.05, -10.27], + "1.75": [22.5, 17.5, 0], + "1.875": [23.62659, 24.40239, 3.14426], + "2.0": [22.5, 17.5, 0] + } + }, + "tail1_part2": { + "rotation": { + "0.0": [11, 0, 0], + "0.125": [11, 0, 0], + "0.25": [11.26033, -12.26673, -2.42224], + "0.375": [11.26, -12.27, -2.42], + "0.625": [11.09203, 7.35819, 1.4411], + "1.0": [11.09, 7.36, 1.44], + "1.25": [11.03849, -4.90945, -0.95484], + "1.5": [11.04, -4.91, -0.95], + "1.75": [11, 0, 0] + } + }, + "root": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 17.9, 0], + "0.5": [0, 25, 0], + "0.625": [0, 23.9, 0], + "0.75": [0, 7.5, 0], + "0.875": [0, -7.5, 0], + "1.125": [0, -10, 0], + "1.375": [0, -10, 0], + "1.5": [0, -7.5, 0], + "1.75": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 1], + "0.5": [0, 0, 1], + "0.625": [0, 0, 1], + "0.75": [0, 0, 0], + "0.875": [0, 0, -1], + "1.375": [0, 0, -1], + "1.75": [0, 0, 0] + } + }, + "leg1": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-2.5, -10, 0], + "0.5": [-2.66474, -22.48742, 0.58545], + "0.625": [-2.66, -22.49, 0.59], + "0.75": [4.58032, -12.52358, 1.44995], + "0.875": [10, 0, 0], + "1.125": [10, 0, 0], + "1.375": [10, 0, 0], + "1.75": [0, 0, 0] + } + }, + "leg_2": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [17.75313, 9.53274, 3.03513], + "0.5": [-2.00307, 14.8687, 2.2386], + "0.625": [0.49693, 14.8687, 2.2386], + "0.75": [25.49693, 14.8687, 2.2386], + "1.0": [-7.00307, 14.8687, 2.2386], + "1.125": [0.49693, 14.8687, 2.2386], + "1.375": [0.5, 14.87, 2.24], + "1.5": [12.57135, 2.67749, -0.55379], + "1.75": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": [0, 1, 0], + "0.5": [0, 0, 0], + "0.625": [0, 0, 0], + "0.875": [0, 0.2, 0], + "1.125": [0, 0, 0], + "1.375": [0, 0, 0], + "1.875": [0, 0, 0] + } + } + } + }, + "animation.meowsticf.swimming": { + "loop": true, + "animation_length": 1, + "bones": { + "root": { + "rotation": { + "0.0": [60, 0, 0], + "0.25": [58.5, 0, 0], + "0.5": [60, 0, 0], + "0.75": [61.5, 0, 0], + "1.0": [60, 0, 0] + }, + "position": { + "0.0": [0, -6, 4], + "0.25": [0, -5.95, 4], + "0.5": [0, -5, 4], + "0.75": [0, -5.5, 4], + "1.0": [0, -6, 4] + } + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-2.5, 0, 0], + "0.5": [0, 0, 0], + "0.75": [2.5, 0, 0], + "1.0": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [-35, 0, 0], + "0.25": [-32.5, 0, 0], + "0.5": [-35, 0, 0], + "0.75": [-37.5, 0, 0], + "1.0": [-35, 0, 0] + } + }, + "ear1": { + "rotation": { + "0.0": [31.38636, 15.58394, 24.03705], + "0.5": [26.38636, 15.58394, 24.03705], + "1.0": [31.38636, 15.58394, 24.03705] + } + }, + "bone": { + "rotation": { + "0.0": [42.81, -17.39, -18.25], + "0.25": [47.81, -17.39, -18.25], + "0.5": [45.4127, -17.37529, -18.54161], + "0.75": [40.31, -17.39, -18.25], + "1.0": [42.81, -17.39, -18.25] + } + }, + "ear2": { + "rotation": { + "0.0": [31.97028, -14.36495, -31.29652], + "0.5": [26.97028, -14.36495, -31.29652], + "1.0": [31.97028, -14.36495, -31.29652] + } + }, + "bone2": { + "rotation": { + "0.0": [43.43, 19.9, 19.38], + "0.25": [45.93, 19.9, 19.38], + "0.5": [43.43, 19.9, 19.38], + "0.75": [40.93, 19.9, 19.38], + "1.0": [43.43, 19.9, 19.38] + }, + "position": [0, 3, 6] + }, + "hair": { + "rotation": { + "0.0": [14.5, 0, 0], + "0.125": [16.5, 0, 0], + "0.25": [14.5, 0, 0], + "0.5": [7.5, 0, 0], + "0.625": [5.75, 0, 0], + "0.75": [7, 0, 0], + "1.0": [14.5, 0, 0] + } + }, + "arm2": { + "rotation": { + "0.0": [17.23442, 24.94169, -53.66086], + "0.25": [29.62165, 4.98093, -8.6822], + "0.5": [22.20765, -20.70481, 40.89339], + "0.625": [22.20765, -20.70481, 40.89339], + "0.875": [20.47173, 5.50094, -10.27069], + "1.0": [17.23442, 24.94169, -53.66086] + } + }, + "arm1": { + "rotation": { + "0.0": [18.32252, -24.1782, 51.04342], + "0.25": [28.83844, -8.64738, 15.27269], + "0.5": [22.20765, 20.70481, -40.89339], + "0.625": [22.20765, 20.70481, -40.89339], + "0.875": [21.24966, -3.95343, 6.25278], + "1.0": [18.32252, -24.1782, 51.04342] + } + }, + "tail2": { + "rotation": { + "0.0": [-57.70113, -3.45533, 6.66067], + "0.125": [-57.70113, -3.45533, 6.66067], + "0.375": [-65.20113, -3.45533, 6.66067], + "0.5": [-67.70113, -3.45533, 6.66067], + "0.75": [-65.20113, -3.45533, 6.66067], + "1.0": [-57.70113, -3.45533, 6.66067] + } + }, + "tail2_part2": { + "rotation": { + "0.0": [4.96674, -0.21719, -0.3483], + "0.25": [4.97, -0.22, -0.35], + "0.5": [2.47, -0.22, -0.35], + "0.75": [4.97, -0.22, -0.35], + "1.0": [4.96674, -0.21719, -0.3483] + } + }, + "tail1": { + "rotation": { + "0.0": [-55.35767, 4.59902, -8.88927], + "0.125": [-55.35767, 4.59902, -8.88927], + "0.375": [-62.85767, 4.59902, -8.88927], + "0.5": [-65.35767, 4.59902, -8.88927], + "0.75": [-62.85767, 4.59902, -8.88927], + "1.0": [-55.35767, 4.59902, -8.88927] + } + }, + "tail1_part2": { + "rotation": { + "0.0": [5, 0, 0], + "0.25": [5, 0, 0], + "0.5": [-5, 0, 0], + "0.75": [-2.5, 0, 0], + "1.0": [5, 0, 0] + } + }, + "leg1": { + "rotation": { + "0.0": [29.99985, 0.08805, 0.07109], + "0.25": [-27.50015, 0.08805, 0.07109], + "0.5": [29.99985, 0.08805, 0.07109], + "0.75": [-27.50015, 0.08805, 0.07109], + "1.0": [29.99985, 0.08805, 0.07109] + } + }, + "leg_2": { + "rotation": { + "0.0": [-25, 0, 0], + "0.25": [40, 0, 0], + "0.5": [-25, 0, 0], + "0.75": [40, 0, 0], + "1.0": [-25, 0, 0] + } + } + } + }, + "animation.meowsticf.sleeping": { + "loop": true, + "animation_length": 2, + "bones": { + "root": { + "rotation": [-17.5, 0, 0], + "position": [0, -4, 0] + }, + "body": { + "rotation": [22.5, 0, 0], + "position": { + "0.0": [0, 0, 0], + "1.0": [0, 0.1, 0], + "2.0": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [32.5, 0, 0], + "0.25": [31.4, 0, 0], + "0.5": [31, 0, 0], + "1.0": [32.5, 0, 0], + "1.25": [33.41, 0, 0], + "1.5": [33.5, 0, 0], + "2.0": [32.5, 0, 0] + } + }, + "ear1": { + "rotation": [68.49762, -21.07593, 8.0634] + }, + "bone": { + "rotation": { + "0.0": [-12.5, 0, 0], + "0.25": [-13.95, 0, 0], + "0.5": [-15, 0, 0], + "0.75": [-14.48, 0, 0], + "1.0": [-12.5, 0, 0], + "1.25": [-10.27, 0, 0], + "1.5": [-10, 0, 0], + "1.75": [-10.67, 0, 0], + "2.0": [-12.5, 0, 0] + } + }, + "ear2": { + "rotation": [66.52397, 16.1299, -6.88003] + }, + "bone2": { + "rotation": { + "0.0": [-10, 0, 0], + "0.25": [-12.05, 0, 0], + "0.5": [-12.5, 0, 0], + "0.75": [-12.15, 0, 0], + "1.0": [-10, 0, 0], + "1.25": [-7.95, 0, 0], + "1.5": [-7.5, 0, 0], + "1.75": [-8, 0, 0], + "2.0": [-10, 0, 0] + }, + "position": [0, 0, -2] + }, + "eye1": { + "position": [0, -1.4, 0], + "scale": [1, 0.03, 1] + }, + "eye2": { + "position": [0, -1.4, 0], + "scale": [1, 0.03, 1] + }, + "arm2": { + "rotation": [67.93369, 38.44796, 79.69097] + }, + "arm1": { + "rotation": [46.02509, -37.15276, -79.54446] + }, + "tail2": { + "rotation": [-18.07779, -14.2906, 4.60659] + }, + "tail2_part2": { + "rotation": [9.99403, 0.34723, -1.96964] + }, + "tail1": { + "rotation": [-20.88852, 16.41371, -6.15491] + }, + "tail1_part2": { + "rotation": [13.48848, -0.54094, 2.44081], + "position": [0, 0, 0] + }, + "leg1": { + "rotation": [-80, 0, -17.5] + }, + "leg_2": { + "rotation": [-77.5, 0, 20] + } + } + }, + "animation.meowsticf.water_idle": { + "loop": true, + "animation_length": 2, + "bones": { + "root": { + "rotation": [0, 0, 0], + "position": { + "0.0": [0, -4, 0], + "0.25": [0, -3.92, 0], + "0.75": [0, -3.15, 0], + "1.0": [0, -3, 0], + "1.25": [0, -3.05, 0], + "1.75": [0, -3.82, 0], + "2.0": [0, -4, 0] + } + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": [-2.5, 0, 0], + "1.0": [0, 0, 0], + "1.5": [2.5, 0, 0], + "2.0": [0.00046, -0.00703, -0.04728] + } + }, + "arm2": { + "rotation": { + "0.0": [0, 27.5, 0], + "0.25": [0, 32.5, 0], + "0.5": [0, -2.5, 0], + "1.0": [0, -20, 0], + "1.25": [0, -22.5, 0], + "1.5": [0, 0, 0], + "2.0": [0, 27.5, 0] + } + }, + "arm1": { + "rotation": { + "0.0": [0, -27.5, 0], + "0.25": [0, -20, 0], + "0.5": [0, -2.5, 0], + "1.0": [0, 22.5, 0], + "1.25": [0, 25, 0], + "1.5": [0, 0, 0], + "2.0": [0, -27.5, 0] + } + }, + "leg1": { + "rotation": { + "0.0": [15, 0, 0], + "0.25": [8, 0, 0], + "0.5": [-15, 0, 0], + "0.75": [-7, 0, 0], + "1.0": [15, 0, 0], + "1.25": [6, 0, 0], + "1.5": [-15, 0, 0], + "1.75": [-6, 0, 0], + "2.0": [15, 0, 0] + } + }, + "leg_2": { + "rotation": { + "0.0": [-17.5, 0, 0], + "0.25": [-6.75, 0, 0], + "0.5": [20, 0, 0], + "0.75": [7, 0, 0], + "1.0": [-20, 0, 0], + "1.25": [-9, 0, 0], + "1.5": [20, 0, 0], + "1.75": [7.25, 0, 0], + "2.0": [-17.5, 0, 0] + } + }, + "ear1": { + "rotation": { + "0.0": [22.5, 0, 20], + "0.5": [18, 0, 20], + "1.0": [22.5, 0, 20], + "1.5": [28, 0, 20], + "2.0": [22.5, 0, 20] + } + }, + "bone": { + "rotation": { + "0.0": [42.24682, -17.04679, -14.9092], + "0.5": [46.26754, -15.97867, -16.05248], + "0.75": [48.26129, -15.41653, -16.59197], + "1.0": [45.26653, -16.25286, -15.77461], + "1.5": [39.2021, -17.79574, -13.99741], + "1.75": [36.13254, -18.49724, -13.04118], + "2.0": [42.24682, -17.04679, -14.9092] + } + }, + "ear2": { + "rotation": { + "0.0": [20, 0, -22.5], + "0.5": [10.5, 0, -22.5], + "1.0": [20, 0, -22.5], + "1.5": [26.5, 0, -22.5], + "2.0": [20, 0, -22.5] + } + }, + "bone2": { + "rotation": { + "0.0": [44.26274, 16.52234, 15.4914], + "0.5": [47.49071, 10.26256, 10.99907], + "0.75": [48.98575, 9.97298, 11.26172], + "1.0": [46.49252, 10.45182, 10.81961], + "1.5": [37.66275, 9.95394, 7.59948], + "1.75": [37.9591, 11.92916, 9.16042], + "2.0": [43.35299, 12.9128, 11.91333] + }, + "position": [0, 2, 6] + }, + "tail2": { + "rotation": [0, -27.5, 0] + }, + "tail2_part2": { + "rotation": [12.5, 0, 0] + }, + "tail1": { + "rotation": [0, 17.5, 0] + }, + "tail1_part2": { + "rotation": [12.5, 0, 0] + } + } + } + } +} \ No newline at end of file diff --git a/animations/pokemon/shroomish.animation.json b/animations/pokemon/shroomish.animation.json new file mode 100644 index 000000000..8ffec7a3d --- /dev/null +++ b/animations/pokemon/shroomish.animation.json @@ -0,0 +1,604 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.shroomish.ground_idle": { + "loop": true, + "animation_length": 1.25, + "bones": { + "body": { + "rotation": { + "0.0": { + "post": [0, 0, -2.5], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [0, 7.5, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [0, 0, 2.5], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [0, -5.46875, 0.15625], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0, -2.5], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, -0.3, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [0, -0.5, 0], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [0, -0.44, 0], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, -0.3, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone2": { + "rotation": { + "0.0": { + "post": [-22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [-22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-22.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone": { + "rotation": { + "0.0": { + "post": [0, 0, -20], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, 0, -20], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0, -20], + "lerp_mode": "catmullrom" + } + } + }, + "bone4": { + "rotation": { + "0.0": { + "post": [20, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [20, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [20, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone3": { + "rotation": { + "0.0": { + "post": [0, 0, 20], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, 0, 20], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0, 20], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.shroomish.walking": { + "loop": true, + "animation_length": 0.91667, + "bones": { + "body": { + "position": { + "0.0": { + "post": [0, 0.4, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [0, 0.4, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0.4, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone": { + "rotation": { + "0.0": { + "post": [0, 0, -7.5], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, 12.5], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 0, -7.5], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, 12.5], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0, -7.5], + "lerp_mode": "catmullrom" + } + } + }, + "bone2": { + "rotation": { + "0.0": { + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone4": { + "rotation": { + "0.0": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone3": { + "rotation": { + "0.0": { + "post": [0, 0, 7.5], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, -12.5], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 0, 7.5], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, -12.5], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0, 7.5], + "lerp_mode": "catmullrom" + } + } + }, + "left_leg": { + "rotation": { + "0.0": { + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 2], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0.3, -2.8], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [0, 0, -0.7], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0, 2], + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "post": [-27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [28.21, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-27.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0.4, -2.5], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [0, 0, -1], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [0, 0.57, 1.29], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0.4, -2.5], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.shroomish.sleeping": { + "loop": true, + "animation_length": 1.29167, + "bones": { + "body": { + "rotation": { + "0.0": { + "post": [5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone": { + "rotation": { + "0.0": { + "post": [0, 0, 10], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 0, 2.5], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0, -6], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [0, 0, 10], + "lerp_mode": "catmullrom" + } + } + }, + "bone2": { + "rotation": { + "0.0": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-6.58, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone4": { + "rotation": { + "0.0": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone3": { + "rotation": { + "0.0": { + "post": [0, 0, -10], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 0, -2.5], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0, 7.5], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [0, 0, -10], + "lerp_mode": "catmullrom" + } + } + }, + "eye_left": { + "scale": [1, 0.03, 1] + }, + "eye_right": { + "scale": [1, 0.03, 1] + } + } + }, + "animation.shroomish.blank": { + "loop": true, + "animation_length": 0.91667, + "bones": { + "eye_left": { + "scale": { + "0.0": [1, 1, 1], + "0.0833": [1, 0.9, 1], + "0.2083": [1, 0, 1], + "0.3333": [1, 1, 1] + } + }, + "eye_right": { + "scale": { + "0.0": [1, 1, 1], + "0.0833": [1, 0.9, 1], + "0.2083": [1, 0, 1], + "0.3333": [1, 1, 1] + } + } + } + }, + "animation.shroomish.water_idle": { + "loop": true, + "animation_length": 1, + "bones": { + "shroomish": { + "position": [0, 3, 0] + }, + "left_leg": { + "rotation": { + "0.0": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [-25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "post": [-27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [25, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-27.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.shroomish.swimming": { + "loop": true, + "animation_length": 0.58333, + "bones": { + "shroomish": { + "rotation": [12.5, 0, 0], + "position": [0, 3, 0] + }, + "left_leg": { + "rotation": { + "0.0": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": { + "post": [-27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [-27.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/animations/pokemon/swellow.animation.json b/animations/pokemon/swellow.animation.json new file mode 100644 index 000000000..3e474af4f --- /dev/null +++ b/animations/pokemon/swellow.animation.json @@ -0,0 +1,734 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.swellow.ground_idle": { + "loop": true, + "animation_length": 0.79167, + "bones": { + "body": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [2, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": [0, 0, 0], + "0.375": [0, -0.1, 0], + "0.625": [0, 0, 0] + } + }, + "leftFakeWing": { + "rotation": { + "0.0": [108.49506, -82.09657, 71.66882], + "0.125": [142.91762, -77.51003, 36.75351], + "0.25": [136.44004, -79.73173, 37.79558], + "0.375": [108.49506, -82.09657, 71.66882] + }, + "position": [0.5, -4, -3] + }, + "rightFakeWing": { + "rotation": { + "0.0": [89.83619, 82.50715, -89.83619], + "0.0833": [106.8, 77.54438, -73.21593], + "0.2083": [113.46692, 79.82499, -64.6826], + "0.3333": [89.83619, 82.50715, -89.83619] + }, + "position": [-0.5, -3, -3] + }, + "bone": { + "rotation": { + "0.0": [10, 0, 0], + "0.25": [5.5, 0, 0], + "0.375": [5.54, 0, 0], + "0.5833": [10, 0, 0], + "0.6667": [11, 0, 0], + "0.7917": [10, 0, 0] + } + }, + "bone2": { + "rotation": [0, 22.5, 0] + }, + "bone3": { + "rotation": [0, -25, 0] + } + } + }, + "animation.swellow.air_idle": { + "loop": true, + "animation_length": 1, + "bones": { + "root": { + "position": { + "0.0": [0, 19, 0], + "0.125": [0, 15.6, 0], + "0.25": [0, 19, 0], + "0.5": [0, 24, 0], + "0.625": [0, 26.5, 0], + "0.75": [0, 26.5, 0], + "0.875": [0, 23.8, 0], + "1.0": [0, 19, 0] + } + }, + "leftFakeWing": { + "rotation": { + "0.0": [90, 0, -67.5], + "0.25": [90, 0, 4.31818], + "0.4583": [90, 0, 60], + "1.0": [90, 0, -67.5] + }, + "position": [0, 0, -2] + }, + "leftDwing": { + "rotation": { + "0.0": [0, -30, 0], + "0.25": [0, -30, 0], + "0.5": [0, 42.5, 0], + "0.6667": [0, 81.88, 0], + "1.0": [0, -30, 0] + } + }, + "rightFakeWing": { + "rotation": { + "0.0": [90, 0, 67.5], + "0.25": [90, 0, 2.5], + "0.4583": [90, 0, -52.5], + "1.0": [90, 0, 67.5] + }, + "position": [0, 0, -2] + }, + "rightDwing": { + "rotation": { + "0.0": [0, 30, 0], + "0.25": [0, 30, 0], + "0.5": [0, -37.5, 0], + "0.7083": [0, -75, 0], + "1.0": [0, 30, 0] + } + }, + "leftLeg": { + "rotation": [35, 0, 0], + "position": [0, 1, -1] + }, + "rightLeg": { + "rotation": [40, 0, 0], + "position": [0, 1, -1] + }, + "body": { + "rotation": { + "0.0": [7.5, 0, 0], + "0.25": [10, 0, 0], + "0.375": [10, 0, 0], + "0.75": [5, 0, 0], + "1.0": [7.5, 0, 0] + } + }, + "bone2": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [11.25, 0, 0], + "0.25": [-10, 0, 0], + "0.5": [-42.5, 0, 0], + "0.625": [-42.5, 0, 0], + "1.0": [0, 0, 0] + } + }, + "bone3": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [13.75, 0, 0], + "0.25": [-10, 0, 0], + "0.5": [-42.5, 0, 0], + "0.625": [-42.5, 0, 0], + "1.0": [0, 0, 0] + } + } + } + }, + "animation.swellow.flying": { + "loop": true, + "animation_length": 1, + "bones": { + "root": { + "position": { + "0.0": [0, 16, 0], + "0.5": [0, 17, 0], + "1.0": [0, 16, 0] + } + }, + "leftFakeWing": { + "rotation": { + "0.0": [90, 0, -67.5], + "0.25": [90, 0, 4.31818], + "0.4583": [90, 0, 60], + "1.0": [90, 0, -67.5] + }, + "position": [0, 0, -2] + }, + "leftDwing": { + "rotation": { + "0.0": [0, -30, 0], + "0.25": [0, -30, 0], + "0.5": [0, 42.5, 0], + "0.6667": [0, 81.88, 0], + "1.0": [0, -30, 0] + } + }, + "rightFakeWing": { + "rotation": { + "0.0": [90, 0, 67.5], + "0.25": [90, 0, 2.5], + "0.4583": [90, 0, -52.5], + "1.0": [90, 0, 67.5] + }, + "position": [0, 0, -2] + }, + "rightDwing": { + "rotation": { + "0.0": [0, 30, 0], + "0.25": [0, 30, 0], + "0.5": [0, -37.5, 0], + "0.7083": [0, -75, 0], + "1.0": [0, 30, 0] + } + }, + "leftLeg": { + "rotation": [67.5, 0, 0], + "position": [0, 1, -1] + }, + "rightLeg": { + "rotation": [75, 0, 0], + "position": [0, 1, -1] + }, + "body": { + "rotation": { + "0.0": [32.5, 0, 0], + "0.25": [35, 0, 0], + "0.5": [35, 0, 0], + "0.75": [32.5, 0, 0], + "1.0": [32.5, 0, 0] + } + }, + "bone2": { + "rotation": { + "0.0": [-47.5, 0, 0], + "0.5": [-52.5, 0, 0], + "1.0": [-47.5, 0, 0] + } + }, + "bone3": { + "rotation": { + "0.0": [-47.5, 0, 0], + "0.5": [-50, 0, 0], + "1.0": [-47.5, 0, 0] + } + }, + "bone": { + "rotation": [-12.5, 0, 0] + } + } + }, + "animation.swellow.walking": { + "loop": true, + "animation_length": 1, + "bones": { + "root": { + "position": { + "0.0": [0, -1, 2], + "0.25": [0, 2, 2], + "0.375": [0, 2.16, 2], + "0.5": [0, 1.96, 2], + "0.625": [0, 1.16, 2], + "0.75": [0, -1, 2], + "0.875": [0, -1.4, 2], + "1.0": [0, -1, 2] + } + }, + "leftFakeWing": { + "rotation": [108.49506, -82.09657, 71.66882], + "position": [0.5, -4, -3] + }, + "rightFakeWing": { + "rotation": [89.83619, 82.50715, -89.83619], + "position": [-0.5, -3, -3] + }, + "leftLeg": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [42.5, 0, 0], + "0.375": [42.5, 0, 0], + "0.5": [17.5, 0, 0], + "0.625": [-12.5, 0, 0], + "0.75": [0, 0, 0] + }, + "position": { + "0.0": [0, 1, 0], + "0.25": [0, -1, 0], + "0.375": [0, 0, 0], + "0.625": [0, 0, 0], + "0.75": [0, 1, 0], + "0.875": [0, 1.3, 0], + "1.0": [0, 1, 0] + } + }, + "rightLeg": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [45, 0, 0], + "0.375": [45, 0, 0], + "0.5": [17.5, 0, 0], + "0.625": [-20, 0, 0], + "0.75": [0, 0, 0], + "1.0": [0, 0, 0] + }, + "position": { + "0.0": [0, 1, 0], + "0.25": [0, -1, 0], + "0.375": [0, 0, 0], + "0.625": [0, 0, 0], + "0.75": [0, 1, 0], + "0.875": [0, 1.3, 0], + "1.0": [0, 1, 0] + } + }, + "bone2": { + "rotation": [0, 22.5, 0] + }, + "bone3": { + "rotation": [0, -25, 0] + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [-2.5, 0, 0], + "0.5": [-2.5, 0, 0], + "0.75": [5, 0, 0], + "1.0": [0, 0, 0] + } + }, + "bone": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [4.90895, 0.39144, 0.8827], + "0.5": [9.90895, 0.39144, 0.8827], + "0.75": [7.40895, 0.39144, 0.8827], + "1.0": [0, 0, 0] + } + } + } + }, + "animation.swellow.water_idle": { + "loop": true, + "animation_length": 1.625, + "bones": { + "root": { + "position": { + "0.0": { + "post": [0, 4, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [0, 2.7, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [0, 4, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0, 2.7, 0], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [0, 4, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leftFakeWing": { + "rotation": { + "0.0": { + "post": [156.40108, -70.9899, 22.77163], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [90.16381, -82.50715, 90.16381], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [156.40108, -70.9899, 22.77163], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [90.16381, -82.50715, 90.16381], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [156.40108, -70.9899, 22.77163], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [90.16381, -82.50715, 90.16381], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [156.40108, -70.9899, 22.77163], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0.5, -4, -3], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [0.5, -4, -3], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0.5, -4, -3], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [0.5, -4, -3], + "lerp_mode": "catmullrom" + } + } + }, + "rightFakeWing": { + "rotation": { + "0.0": { + "post": [153.02901, 73.29042, -25.65557], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [89.83619, 82.50715, -89.83619], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [153.02901, 73.29042, -25.65557], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [89.83619, 82.50715, -89.83619], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [153.02901, 73.29042, -25.65557], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [89.83619, 82.50715, -89.83619], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [153.02901, 73.29042, -25.65557], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [-0.5, -3, -3], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [-0.5, -3, -3], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-0.5, -3, -3], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [-0.5, -3, -3], + "lerp_mode": "catmullrom" + } + } + }, + "bone2": { + "rotation": [0, 20, 0] + }, + "bone3": { + "rotation": [0, -25, 0] + }, + "leftLeg": { + "rotation": { + "0.0": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "rightLeg": { + "rotation": { + "0.0": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.swellow.swimming": { + "loop": true, + "animation_length": 1.625, + "bones": { + "root": { + "rotation": [22.5, 0, 0], + "position": { + "0.0": { + "post": [0, 4, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [0, 2.7, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [0, 4, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0, 2.7, 0], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [0, 4, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leftFakeWing": { + "rotation": { + "0.0": { + "post": [156.40108, -70.9899, 22.77163], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [90.16381, -82.50715, 90.16381], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [156.40108, -70.9899, 22.77163], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [90.16381, -82.50715, 90.16381], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [156.40108, -70.9899, 22.77163], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [90.16381, -82.50715, 90.16381], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [156.40108, -70.9899, 22.77163], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0.5, -4, -3], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [0.5, -4, -3], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0.5, -4, -3], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [0.5, -4, -3], + "lerp_mode": "catmullrom" + } + } + }, + "rightFakeWing": { + "rotation": { + "0.0": { + "post": [153.02901, 73.29042, -25.65557], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [89.83619, 82.50715, -89.83619], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [153.02901, 73.29042, -25.65557], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [89.83619, 82.50715, -89.83619], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [153.02901, 73.29042, -25.65557], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [89.83619, 82.50715, -89.83619], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [153.02901, 73.29042, -25.65557], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [-0.5, -3, -3], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [-0.5, -3, -3], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-0.5, -3, -3], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [-0.5, -3, -3], + "lerp_mode": "catmullrom" + } + } + }, + "bone2": { + "rotation": [0, 20, 0] + }, + "bone3": { + "rotation": [0, -25, 0] + }, + "leftLeg": { + "rotation": { + "0.0": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "rightLeg": { + "rotation": { + "0.0": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/entity/pokemon/abra.json b/entity/pokemon/abra.json index 0ff296925..163adc2a1 100644 --- a/entity/pokemon/abra.json +++ b/entity/pokemon/abra.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.abra.blink", "ground_idle": "animation.abra.ground_idle", "air_idle": "animation.abra.ground_idle", "water_idle": "animation.abra.ground_idle", diff --git a/entity/pokemon/aerodactyl.json b/entity/pokemon/aerodactyl.json index 8c7bc39f0..7408752e4 100644 --- a/entity/pokemon/aerodactyl.json +++ b/entity/pokemon/aerodactyl.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.aerodactyl.blink", "ground_idle": "animation.aerodactyl.ground_idle", "air_idle": "animation.aerodactyl.ground_idle", "water_idle": "animation.aerodactyl.ground_idle", diff --git a/entity/pokemon/aipom.json b/entity/pokemon/aipom.json index f100922d7..6c923b1f3 100644 --- a/entity/pokemon/aipom.json +++ b/entity/pokemon/aipom.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.aipom.blink", "ground_idle": "animation.aipom.ground_idle", "air_idle": "animation.aipom.ground_idle", "water_idle": "animation.aipom.ground_idle", diff --git a/entity/pokemon/alakazam.json b/entity/pokemon/alakazam.json index 6cf13b553..ae3034a68 100644 --- a/entity/pokemon/alakazam.json +++ b/entity/pokemon/alakazam.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.alakazam.blink", "ground_idle": "animation.alakazam.ground_idle", "air_idle": "animation.alakazam.ground_idle", "water_idle": "animation.alakazam.ground_idle", diff --git a/entity/pokemon/ambipom.json b/entity/pokemon/ambipom.json index b7e1f3c3e..2171ef130 100644 --- a/entity/pokemon/ambipom.json +++ b/entity/pokemon/ambipom.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ambipom.blink", "ground_idle": "animation.ambipom.ground_idle", "air_idle": "animation.ambipom.ground_idle", "water_idle": "animation.ambipom.ground_idle", diff --git a/entity/pokemon/ampharos.json b/entity/pokemon/ampharos.json index 4c3ee5eb7..536ad8216 100644 --- a/entity/pokemon/ampharos.json +++ b/entity/pokemon/ampharos.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ampharos.blink", "ground_idle": "animation.ampharos.ground_idle", "air_idle": "animation.ampharos.ground_idle", "water_idle": "animation.ampharos.ground_idle", diff --git a/entity/pokemon/arbok.json b/entity/pokemon/arbok.json index 19765dd10..02bbd2a55 100644 --- a/entity/pokemon/arbok.json +++ b/entity/pokemon/arbok.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.arbok.blink", "ground_idle": "animation.arbok.ground_idle", "air_idle": "animation.arbok.ground_idle", "water_idle": "animation.arbok.ground_idle", diff --git a/entity/pokemon/arcanine.json b/entity/pokemon/arcanine.json index 09d805126..a32ae5fab 100644 --- a/entity/pokemon/arcanine.json +++ b/entity/pokemon/arcanine.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.arcanine.blink", "ground_idle": "animation.arcanine.ground_idle", "air_idle": "animation.arcanine.ground_idle", "water_idle": "animation.arcanine.ground_idle", diff --git a/entity/pokemon/arceus.json b/entity/pokemon/arceus.json index c4209e0b5..d09f845f4 100644 --- a/entity/pokemon/arceus.json +++ b/entity/pokemon/arceus.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.arceus.blink", "ground_idle": "animation.arceus.ground_idle", "air_idle": "animation.arceus.ground_idle", "water_idle": "animation.arceus.ground_idle", diff --git a/entity/pokemon/ariados.json b/entity/pokemon/ariados.json index 33d23ffe4..992e7ed09 100644 --- a/entity/pokemon/ariados.json +++ b/entity/pokemon/ariados.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ariados.blink", "ground_idle": "animation.ariados.ground_idle", "air_idle": "animation.ariados.ground_idle", "water_idle": "animation.ariados.ground_idle", diff --git a/entity/pokemon/articuno.json b/entity/pokemon/articuno.json index 2e2da62b2..03cdca489 100644 --- a/entity/pokemon/articuno.json +++ b/entity/pokemon/articuno.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.articuno.blink", "ground_idle": "animation.articuno.ground_idle", "air_idle": "animation.articuno.ground_idle", "water_idle": "animation.articuno.ground_idle", diff --git a/entity/pokemon/axew.json b/entity/pokemon/axew.json index 03997e395..115531ad1 100644 --- a/entity/pokemon/axew.json +++ b/entity/pokemon/axew.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.axew.blink", "ground_idle": "animation.axew.ground_idle", "air_idle": "animation.axew.ground_idle", "water_idle": "animation.axew.ground_idle", diff --git a/entity/pokemon/azelf.json b/entity/pokemon/azelf.json index 152707297..bd87d32f0 100644 --- a/entity/pokemon/azelf.json +++ b/entity/pokemon/azelf.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.azelf.blink", "ground_idle": "animation.azelf.ground_idle", "air_idle": "animation.azelf.ground_idle", "water_idle": "animation.azelf.ground_idle", diff --git a/entity/pokemon/azumarill.json b/entity/pokemon/azumarill.json index 338915689..bc3b7623d 100644 --- a/entity/pokemon/azumarill.json +++ b/entity/pokemon/azumarill.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.azumarill.blink", "ground_idle": "animation.azumarill.ground_idle", "air_idle": "animation.azumarill.ground_idle", "water_idle": "animation.azumarill.ground_idle", diff --git a/entity/pokemon/azurill.json b/entity/pokemon/azurill.json index db0ac902b..d83073129 100644 --- a/entity/pokemon/azurill.json +++ b/entity/pokemon/azurill.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.azurill.blink", "ground_idle": "animation.azurill.ground_idle", "air_idle": "animation.azurill.ground_idle", "water_idle": "animation.azurill.ground_idle", diff --git a/entity/pokemon/bayleef.json b/entity/pokemon/bayleef.json index f8ae6e648..150eec04a 100644 --- a/entity/pokemon/bayleef.json +++ b/entity/pokemon/bayleef.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.bayleef.blink", "ground_idle": "animation.bayleef.ground_idle", "air_idle": "animation.bayleef.ground_idle", "water_idle": "animation.bayleef.ground_idle", diff --git a/entity/pokemon/beedrill.json b/entity/pokemon/beedrill.json index 0e89676f3..51cc0c1c3 100644 --- a/entity/pokemon/beedrill.json +++ b/entity/pokemon/beedrill.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.beedrill.blink", "ground_idle": "animation.beedrill.ground_idle", "air_idle": "animation.beedrill.ground_idle", "water_idle": "animation.beedrill.ground_idle", diff --git a/entity/pokemon/beldum.json b/entity/pokemon/beldum.json index 4a2135d8e..0aedb00c3 100644 --- a/entity/pokemon/beldum.json +++ b/entity/pokemon/beldum.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.beldum.blink", "ground_idle": "animation.beldum.ground_idle", "air_idle": "animation.beldum.air_idle", "water_idle": "animation.beldum.water_idle", diff --git a/entity/pokemon/bellossom.json b/entity/pokemon/bellossom.json index 2be48bb7a..8d713f4b4 100644 --- a/entity/pokemon/bellossom.json +++ b/entity/pokemon/bellossom.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.bellossom.blink", "ground_idle": "animation.bellossom.ground_idle", "air_idle": "animation.bellossom.ground_idle", "water_idle": "animation.bellossom.ground_idle", diff --git a/entity/pokemon/bibarel.json b/entity/pokemon/bibarel.json index 3c3f4617f..1aebcc596 100644 --- a/entity/pokemon/bibarel.json +++ b/entity/pokemon/bibarel.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.bibarel.blink", "ground_idle": "animation.bibarel.ground_idle", "air_idle": "animation.bibarel.ground_idle", "water_idle": "animation.bibarel.ground_idle", diff --git a/entity/pokemon/bidoof.json b/entity/pokemon/bidoof.json index 648818450..25d4a1905 100644 --- a/entity/pokemon/bidoof.json +++ b/entity/pokemon/bidoof.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.bidoof.blink", "ground_idle": "animation.bidoof.ground_idle", "air_idle": "animation.bidoof.ground_idle", "water_idle": "animation.bidoof.ground_idle", diff --git a/entity/pokemon/blastoise.json b/entity/pokemon/blastoise.json index 4a096e430..96e8f83ea 100644 --- a/entity/pokemon/blastoise.json +++ b/entity/pokemon/blastoise.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.blastoise.blink", "ground_idle": "animation.blastoise.ground_idle", "air_idle": "animation.blastoise.ground_idle", "water_idle": "animation.blastoise.ground_idle", diff --git a/entity/pokemon/blaziken.json b/entity/pokemon/blaziken.json index 402dc4ff2..366c3c17d 100644 --- a/entity/pokemon/blaziken.json +++ b/entity/pokemon/blaziken.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.blaziken.blink", "ground_idle": "animation.blaziken.ground_idle", "air_idle": "animation.blaziken.ground_idle", "water_idle": "animation.blaziken.ground_idle", diff --git a/entity/pokemon/bonsly.json b/entity/pokemon/bonsly.json index 0bd8d5cb8..7560f3ab8 100644 --- a/entity/pokemon/bonsly.json +++ b/entity/pokemon/bonsly.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.bonsly.blink", "ground_idle": "animation.bonsly.ground_idle", "air_idle": "animation.bonsly.air_idle", "water_idle": "animation.bonsly.water_idle", diff --git a/entity/pokemon/braixen.json b/entity/pokemon/braixen.json index 57d8c9d6b..063e33977 100644 --- a/entity/pokemon/braixen.json +++ b/entity/pokemon/braixen.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.braixen.blink", "ground_idle": "animation.braixen.ground_idle", "air_idle": "animation.braixen.ground_idle", "water_idle": "animation.braixen.ground_idle", diff --git a/entity/pokemon/breloom.json b/entity/pokemon/breloom.json index 557b84f55..b01a71e63 100644 --- a/entity/pokemon/breloom.json +++ b/entity/pokemon/breloom.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.breloom.blink", "ground_idle": "animation.breloom.ground_idle", "air_idle": "animation.breloom.ground_idle", "water_idle": "animation.breloom.ground_idle", diff --git a/entity/pokemon/brionne.json b/entity/pokemon/brionne.json index 3e8158f23..e53905a0d 100644 --- a/entity/pokemon/brionne.json +++ b/entity/pokemon/brionne.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.brionne.blink", "ground_idle": "animation.brionne.ground_idle", "air_idle": "animation.brionne.ground_idle", "water_idle": "animation.brionne.ground_idle", diff --git a/entity/pokemon/buizel.json b/entity/pokemon/buizel.json index 4c15cf060..c7b6cc86f 100644 --- a/entity/pokemon/buizel.json +++ b/entity/pokemon/buizel.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.buizel.blink", "ground_idle": "animation.buizel.ground_idle", "air_idle": "animation.buizel.ground_idle", "water_idle": "animation.buizel.ground_idle", diff --git a/entity/pokemon/bulbasaur.json b/entity/pokemon/bulbasaur.json index a4c2c3826..9bb4d573e 100644 --- a/entity/pokemon/bulbasaur.json +++ b/entity/pokemon/bulbasaur.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.bulbasaur.blink", "ground_idle": "animation.bulbasaur.ground_idle", "air_idle": "animation.bulbasaur.ground_idle", "water_idle": "animation.bulbasaur.ground_idle", diff --git a/entity/pokemon/butterfree.json b/entity/pokemon/butterfree.json index 62f938bd1..3facd4526 100644 --- a/entity/pokemon/butterfree.json +++ b/entity/pokemon/butterfree.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.butterfree.blink", "ground_idle": "animation.butterfree.ground_idle", "air_idle": "animation.butterfree.ground_idle", "water_idle": "animation.butterfree.ground_idle", diff --git a/entity/pokemon/carvanha.json b/entity/pokemon/carvanha.json index f5d7c19c4..0d67c31da 100644 --- a/entity/pokemon/carvanha.json +++ b/entity/pokemon/carvanha.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.carvanha.blink", "ground_idle": "animation.carvanha.ground_idle", "air_idle": "animation.carvanha.ground_idle", "water_idle": "animation.carvanha.water_idle", diff --git a/entity/pokemon/caterpie.json b/entity/pokemon/caterpie.json index 35dad603f..8aecce945 100644 --- a/entity/pokemon/caterpie.json +++ b/entity/pokemon/caterpie.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.caterpie.blink", "ground_idle": "animation.caterpie.ground_idle", "air_idle": "animation.caterpie.ground_idle", "water_idle": "animation.caterpie.ground_idle", diff --git a/entity/pokemon/celebi.json b/entity/pokemon/celebi.json index 2622b2519..3242949d2 100644 --- a/entity/pokemon/celebi.json +++ b/entity/pokemon/celebi.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.celebi.blink", "ground_idle": "animation.celebi.ground_idle", "air_idle": "animation.celebi.ground_idle", "water_idle": "animation.celebi.ground_idle", diff --git a/entity/pokemon/chansey.json b/entity/pokemon/chansey.json index d04b02ca5..0619358ec 100644 --- a/entity/pokemon/chansey.json +++ b/entity/pokemon/chansey.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.chansey.blink", "ground_idle": "animation.chansey.ground_idle", "air_idle": "animation.chansey.ground_idle", "water_idle": "animation.chansey.ground_idle", diff --git a/entity/pokemon/charizard.json b/entity/pokemon/charizard.json index 5183bd68d..5b5f209bf 100644 --- a/entity/pokemon/charizard.json +++ b/entity/pokemon/charizard.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.charizard.blink", "ground_idle": "animation.charizard.ground_idle", "air_idle": "animation.charizard.ground_idle", "water_idle": "animation.charizard.ground_idle", diff --git a/entity/pokemon/charmander.json b/entity/pokemon/charmander.json index 7e95e9c92..2c32c843d 100644 --- a/entity/pokemon/charmander.json +++ b/entity/pokemon/charmander.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.charmander.blink", "ground_idle": "animation.charmander.ground_idle", "air_idle": "animation.charmander.ground_idle", "water_idle": "animation.charmander.ground_idle", diff --git a/entity/pokemon/charmeleon.json b/entity/pokemon/charmeleon.json index 413c00b01..1a76c9ae2 100644 --- a/entity/pokemon/charmeleon.json +++ b/entity/pokemon/charmeleon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.charmeleon.blink", "ground_idle": "animation.charmeleon.ground_idle", "air_idle": "animation.charmeleon.ground_idle", "water_idle": "animation.charmeleon.ground_idle", diff --git a/entity/pokemon/chesnaught.json b/entity/pokemon/chesnaught.json index 6b8d757d0..da5208f9f 100644 --- a/entity/pokemon/chesnaught.json +++ b/entity/pokemon/chesnaught.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.chesnaught.blink", "ground_idle": "animation.chesnaught.ground_idle", "air_idle": "animation.chesnaught.ground_idle", "water_idle": "animation.chesnaught.ground_idle", diff --git a/entity/pokemon/chespin.json b/entity/pokemon/chespin.json index bd7fc0dc4..96846f688 100644 --- a/entity/pokemon/chespin.json +++ b/entity/pokemon/chespin.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.chespin.blink", "ground_idle": "animation.chespin.ground_idle", "air_idle": "animation.chespin.ground_idle", "water_idle": "animation.chespin.ground_idle", diff --git a/entity/pokemon/chikorita.json b/entity/pokemon/chikorita.json index b0baa5bda..0c81f9013 100644 --- a/entity/pokemon/chikorita.json +++ b/entity/pokemon/chikorita.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.chikorita.blink", "ground_idle": "animation.chikorita.ground_idle", "air_idle": "animation.chikorita.ground_idle", "water_idle": "animation.chikorita.ground_idle", diff --git a/entity/pokemon/chimchar.json b/entity/pokemon/chimchar.json index 76096c6a5..2ae3e1209 100644 --- a/entity/pokemon/chimchar.json +++ b/entity/pokemon/chimchar.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.chimchar.blink", "ground_idle": "animation.chimchar.ground_idle", "air_idle": "animation.chimchar.ground_idle", "water_idle": "animation.chimchar.ground_idle", diff --git a/entity/pokemon/chinchou.json b/entity/pokemon/chinchou.json index f4c4aeeae..fee07cacf 100644 --- a/entity/pokemon/chinchou.json +++ b/entity/pokemon/chinchou.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.chinchou.blink", "ground_idle": "animation.chinchou.ground_idle", "air_idle": "animation.chinchou.ground_idle", "water_idle": "animation.chinchou.water_idle", diff --git a/entity/pokemon/cinccino.json b/entity/pokemon/cinccino.json index 8f468a763..78cbf93d1 100644 --- a/entity/pokemon/cinccino.json +++ b/entity/pokemon/cinccino.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.cinccino.blink", "ground_idle": "animation.cinccino.ground_idle", "air_idle": "animation.cinccino.ground_idle", "water_idle": "animation.cinccino.water_idle", diff --git a/entity/pokemon/cinderace.json b/entity/pokemon/cinderace.json index a7548bdf5..71200fd0f 100644 --- a/entity/pokemon/cinderace.json +++ b/entity/pokemon/cinderace.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.cinderace.blink", "ground_idle": "animation.cinderace.ground_idle", "air_idle": "animation.cinderace.ground_idle", "water_idle": "animation.cinderace.water_idle", diff --git a/entity/pokemon/clefable.json b/entity/pokemon/clefable.json index 27232aafd..34ab748de 100644 --- a/entity/pokemon/clefable.json +++ b/entity/pokemon/clefable.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.clefable.blink", "ground_idle": "animation.clefable.ground_idle", "air_idle": "animation.clefable.ground_idle", "water_idle": "animation.clefable.ground_idle", diff --git a/entity/pokemon/clefairy.json b/entity/pokemon/clefairy.json index b3a0371b1..fadaee878 100644 --- a/entity/pokemon/clefairy.json +++ b/entity/pokemon/clefairy.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.clefairy.blink", "ground_idle": "animation.clefairy.ground_idle", "air_idle": "animation.clefairy.ground_idle", "water_idle": "animation.clefairy.ground_idle", diff --git a/entity/pokemon/cleffa.json b/entity/pokemon/cleffa.json index 23aa87860..87377edb1 100644 --- a/entity/pokemon/cleffa.json +++ b/entity/pokemon/cleffa.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.cleffa.blink", "ground_idle": "animation.cleffa.ground_idle", "air_idle": "animation.cleffa.ground_idle", "water_idle": "animation.cleffa.ground_idle", diff --git a/entity/pokemon/cloyster.json b/entity/pokemon/cloyster.json index c3a3d41a5..90cc7e443 100644 --- a/entity/pokemon/cloyster.json +++ b/entity/pokemon/cloyster.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.cloyster.blink", "ground_idle": "animation.cloyster.ground_idle", "air_idle": "animation.cloyster.ground_idle", "water_idle": "animation.cloyster.ground_idle", diff --git a/entity/pokemon/combusken.json b/entity/pokemon/combusken.json index ddb22cd4c..43cfad632 100644 --- a/entity/pokemon/combusken.json +++ b/entity/pokemon/combusken.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.combusken.blink", "ground_idle": "animation.combusken.ground_idle", "air_idle": "animation.combusken.ground_idle", "water_idle": "animation.combusken.ground_idle", diff --git a/entity/pokemon/corsola.json b/entity/pokemon/corsola.json index 47f4066a9..2e574f66c 100644 --- a/entity/pokemon/corsola.json +++ b/entity/pokemon/corsola.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.corsola.blink", "ground_idle": "animation.corsola.ground_idle", "air_idle": "animation.corsola.ground_idle", "water_idle": "animation.corsola.ground_idle", diff --git a/entity/pokemon/cosmog.json b/entity/pokemon/cosmog.json index 2bd07e910..b742410cd 100644 --- a/entity/pokemon/cosmog.json +++ b/entity/pokemon/cosmog.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.cosmog.blink", "ground_idle": "animation.cosmog.ground_idle", "air_idle": "animation.cosmog.ground_idle", "water_idle": "animation.cosmog.ground_idle", diff --git a/entity/pokemon/cradily.json b/entity/pokemon/cradily.json index a2971119b..f9fbc1fd6 100644 --- a/entity/pokemon/cradily.json +++ b/entity/pokemon/cradily.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.cradily.blink", "ground_idle": "animation.cradily.ground_idle", "air_idle": "animation.cradily.ground_idle", "water_idle": "animation.cradily.ground_idle", diff --git a/entity/pokemon/cresselia.json b/entity/pokemon/cresselia.json index 7158a6a2b..5e6dc8d2b 100644 --- a/entity/pokemon/cresselia.json +++ b/entity/pokemon/cresselia.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.cresselia.blink", "ground_idle": "animation.cresselia.ground_idle", "air_idle": "animation.cresselia.ground_idle", "water_idle": "animation.cresselia.ground_idle", diff --git a/entity/pokemon/crobat.json b/entity/pokemon/crobat.json index 54cdf8ae9..d17f1c126 100644 --- a/entity/pokemon/crobat.json +++ b/entity/pokemon/crobat.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.crobat.blink", "ground_idle": "animation.crobat.ground_idle", "air_idle": "animation.crobat.ground_idle", "water_idle": "animation.crobat.ground_idle", diff --git a/entity/pokemon/crocalor.json b/entity/pokemon/crocalor.json index ee0a0aa86..ca8e648ff 100644 --- a/entity/pokemon/crocalor.json +++ b/entity/pokemon/crocalor.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.crocalor.blink", "ground_idle": "animation.crocalor.ground_idle", "air_idle": "animation.crocalor.air_idle", "water_idle": "animation.crocalor.water_idle", diff --git a/entity/pokemon/croconaw.json b/entity/pokemon/croconaw.json index 45f073e12..f865f6139 100644 --- a/entity/pokemon/croconaw.json +++ b/entity/pokemon/croconaw.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.croconaw.blink", "ground_idle": "animation.croconaw.ground_idle", "air_idle": "animation.croconaw.ground_idle", "water_idle": "animation.croconaw.ground_idle", diff --git a/entity/pokemon/cyndaquil.json b/entity/pokemon/cyndaquil.json index f00a1b63e..9b1d1e0f6 100644 --- a/entity/pokemon/cyndaquil.json +++ b/entity/pokemon/cyndaquil.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.cyndaquil.blink", "ground_idle": "animation.cyndaquil.ground_idle", "air_idle": "animation.cyndaquil.ground_idle", "water_idle": "animation.cyndaquil.ground_idle", diff --git a/entity/pokemon/dartrix.json b/entity/pokemon/dartrix.json index 4afae014b..0dbd21580 100644 --- a/entity/pokemon/dartrix.json +++ b/entity/pokemon/dartrix.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.dartrix.blink", "ground_idle": "animation.dartrix.ground_idle", "air_idle": "animation.dartrix.ground_idle", "water_idle": "animation.dartrix.ground_idle", diff --git a/entity/pokemon/decidueye.json b/entity/pokemon/decidueye.json index debafb5c8..0bf673bcc 100644 --- a/entity/pokemon/decidueye.json +++ b/entity/pokemon/decidueye.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.decidueye.blink", "ground_idle": "animation.decidueye.ground_idle", "air_idle": "animation.decidueye.ground_idle", "water_idle": "animation.decidueye.ground_idle", diff --git a/entity/pokemon/delibird.json b/entity/pokemon/delibird.json index d9c90418d..1dd13d5ab 100644 --- a/entity/pokemon/delibird.json +++ b/entity/pokemon/delibird.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.delibird.blink", "ground_idle": "animation.delibird.ground_idle", "air_idle": "animation.delibird.ground_idle", "water_idle": "animation.delibird.ground_idle", diff --git a/entity/pokemon/delphox.json b/entity/pokemon/delphox.json index 4d7ab7916..dd699eaf7 100644 --- a/entity/pokemon/delphox.json +++ b/entity/pokemon/delphox.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.delphox.blink", "ground_idle": "animation.delphox.ground_idle", "air_idle": "animation.delphox.ground_idle", "water_idle": "animation.delphox.ground_idle", diff --git a/entity/pokemon/dewgong.json b/entity/pokemon/dewgong.json index 72dc556d0..3e01acf2c 100644 --- a/entity/pokemon/dewgong.json +++ b/entity/pokemon/dewgong.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.dewgong.blink", "ground_idle": "animation.dewgong.ground_idle", "air_idle": "animation.dewgong.ground_idle", "water_idle": "animation.dewgong.ground_idle", diff --git a/entity/pokemon/dewott.json b/entity/pokemon/dewott.json index 15d286675..d9c3325be 100644 --- a/entity/pokemon/dewott.json +++ b/entity/pokemon/dewott.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.dewott.blink", "ground_idle": "animation.dewott.ground_idle", "air_idle": "animation.dewott.ground_idle", "water_idle": "animation.dewott.ground_idle", diff --git a/entity/pokemon/dialga.json b/entity/pokemon/dialga.json index 81b5323bc..d48eca555 100644 --- a/entity/pokemon/dialga.json +++ b/entity/pokemon/dialga.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.dialga.blink", "ground_idle": "animation.dialga.ground_idle", "air_idle": "animation.dialga.ground_idle", "water_idle": "animation.dialga.ground_idle", diff --git a/entity/pokemon/diglett.json b/entity/pokemon/diglett.json index 073d82b6a..37a94c8f1 100644 --- a/entity/pokemon/diglett.json +++ b/entity/pokemon/diglett.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.diglett.blink", "ground_idle": "animation.diglett.ground_idle", "air_idle": "animation.diglett.ground_idle", "water_idle": "animation.diglett.ground_idle", diff --git a/entity/pokemon/ditto.json b/entity/pokemon/ditto.json index f100f139e..913173d83 100644 --- a/entity/pokemon/ditto.json +++ b/entity/pokemon/ditto.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ditto.blink", "ground_idle": "animation.ditto.ground_idle", "air_idle": "animation.ditto.ground_idle", "water_idle": "animation.ditto.ground_idle", diff --git a/entity/pokemon/donphan.json b/entity/pokemon/donphan.json index 3ce3af779..94c84dcdd 100644 --- a/entity/pokemon/donphan.json +++ b/entity/pokemon/donphan.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.donphan.blink", "ground_idle": "animation.donphan.ground_idle", "air_idle": "animation.donphan.ground_idle", "water_idle": "animation.donphan.ground_idle", diff --git a/entity/pokemon/dragonair.json b/entity/pokemon/dragonair.json index 1687ff706..7853d2ecb 100644 --- a/entity/pokemon/dragonair.json +++ b/entity/pokemon/dragonair.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.dragonair.blink", "ground_idle": "animation.dragonair.ground_idle", "air_idle": "animation.dragonair.ground_idle", "water_idle": "animation.dragonair.ground_idle", diff --git a/entity/pokemon/dragonite.json b/entity/pokemon/dragonite.json index d54e3c5a8..ad6d5e241 100644 --- a/entity/pokemon/dragonite.json +++ b/entity/pokemon/dragonite.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.dragonite.blink", "ground_idle": "animation.dragonite.ground_idle", "air_idle": "animation.dragonite.ground_idle", "water_idle": "animation.dragonite.ground_idle", diff --git a/entity/pokemon/dratini.json b/entity/pokemon/dratini.json index 0b5b50ca3..c3b902dcb 100644 --- a/entity/pokemon/dratini.json +++ b/entity/pokemon/dratini.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.dratini.blink", "ground_idle": "animation.dratini.ground_idle", "air_idle": "animation.dratini.ground_idle", "water_idle": "animation.dratini.ground_idle", diff --git a/entity/pokemon/drizzile.json b/entity/pokemon/drizzile.json index 5fd8673c4..0004d50ec 100644 --- a/entity/pokemon/drizzile.json +++ b/entity/pokemon/drizzile.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.drizzile.blink", "ground_idle": "animation.drizzile.ground_idle", "air_idle": "animation.drizzile.ground_idle", "water_idle": "animation.drizzile.ground_idle", diff --git a/entity/pokemon/drowzee.json b/entity/pokemon/drowzee.json index d868dbd70..7cc46ac84 100644 --- a/entity/pokemon/drowzee.json +++ b/entity/pokemon/drowzee.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.drowzee.blink", "ground_idle": "animation.drowzee.ground_idle", "air_idle": "animation.drowzee.ground_idle", "water_idle": "animation.drowzee.ground_idle", diff --git a/entity/pokemon/dugtrio.json b/entity/pokemon/dugtrio.json index 7d294a465..5d31a21af 100644 --- a/entity/pokemon/dugtrio.json +++ b/entity/pokemon/dugtrio.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.dugtrio.blink", "ground_idle": "animation.dugtrio.ground_idle", "air_idle": "animation.dugtrio.ground_idle", "water_idle": "animation.dugtrio.ground_idle", diff --git a/entity/pokemon/eevee.json b/entity/pokemon/eevee.json index 7f395e53a..3731a71fa 100644 --- a/entity/pokemon/eevee.json +++ b/entity/pokemon/eevee.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.eevee.blink", "ground_idle": "animation.eevee.ground_idle", "air_idle": "animation.eevee.ground_idle", "water_idle": "animation.eevee.ground_idle", diff --git a/entity/pokemon/ekans.json b/entity/pokemon/ekans.json index f5f1cef58..1ecf235ee 100644 --- a/entity/pokemon/ekans.json +++ b/entity/pokemon/ekans.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ekans.blink", "ground_idle": "animation.ekans.ground_idle", "air_idle": "animation.ekans.ground_idle", "water_idle": "animation.ekans.ground_idle", diff --git a/entity/pokemon/electabuzz.json b/entity/pokemon/electabuzz.json index 49a531041..27f431dd3 100644 --- a/entity/pokemon/electabuzz.json +++ b/entity/pokemon/electabuzz.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.electabuzz.blink", "ground_idle": "animation.electabuzz.ground_idle", "air_idle": "animation.electabuzz.ground_idle", "water_idle": "animation.electabuzz.ground_idle", diff --git a/entity/pokemon/electivire.json b/entity/pokemon/electivire.json index 2e177f5ff..f279dc7fb 100644 --- a/entity/pokemon/electivire.json +++ b/entity/pokemon/electivire.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.electivire.blink", "ground_idle": "animation.electivire.ground_idle", "air_idle": "animation.electivire.air_idle", "water_idle": "animation.electivire.water_idle", diff --git a/entity/pokemon/electrode.json b/entity/pokemon/electrode.json index 3159eb3cc..1d0d519a2 100644 --- a/entity/pokemon/electrode.json +++ b/entity/pokemon/electrode.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.electrode.blink", "ground_idle": "animation.electrode.ground_idle", "air_idle": "animation.electrode.ground_idle", "water_idle": "animation.electrode.ground_idle", diff --git a/entity/pokemon/elekid.json b/entity/pokemon/elekid.json index 0c13102a8..7ab691821 100644 --- a/entity/pokemon/elekid.json +++ b/entity/pokemon/elekid.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.elekid.blink", "ground_idle": "animation.elekid.ground_idle", "air_idle": "animation.elekid.ground_idle", "water_idle": "animation.elekid.ground_idle", diff --git a/entity/pokemon/emboar.json b/entity/pokemon/emboar.json index 96c989b22..a5eb88456 100644 --- a/entity/pokemon/emboar.json +++ b/entity/pokemon/emboar.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.emboar.blink", "ground_idle": "animation.emboar.ground_idle", "air_idle": "animation.emboar.ground_idle", "water_idle": "animation.emboar.ground_idle", diff --git a/entity/pokemon/empoleon.json b/entity/pokemon/empoleon.json index bc224fc16..afd93954b 100644 --- a/entity/pokemon/empoleon.json +++ b/entity/pokemon/empoleon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.empoleon.blink", "ground_idle": "animation.empoleon.ground_idle", "air_idle": "animation.empoleon.ground_idle", "water_idle": "animation.empoleon.ground_idle", diff --git a/entity/pokemon/entei.json b/entity/pokemon/entei.json index 83379125d..ae5265aa3 100644 --- a/entity/pokemon/entei.json +++ b/entity/pokemon/entei.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.entei.blink", "ground_idle": "animation.entei.ground_idle", "air_idle": "animation.entei.ground_idle", "water_idle": "animation.entei.ground_idle", diff --git a/entity/pokemon/espeon.json b/entity/pokemon/espeon.json index 3e2e5dd62..022acab6f 100644 --- a/entity/pokemon/espeon.json +++ b/entity/pokemon/espeon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.espeon.blink", "ground_idle": "animation.espeon.ground_idle", "air_idle": "animation.espeon.ground_idle", "water_idle": "animation.espeon.water_idle", diff --git a/entity/pokemon/exeggcute.json b/entity/pokemon/exeggcute.json index 19a837809..558f07326 100644 --- a/entity/pokemon/exeggcute.json +++ b/entity/pokemon/exeggcute.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.exeggcute.blink", "ground_idle": "animation.exeggcute.ground_idle", "air_idle": "animation.exeggcute.ground_idle", "water_idle": "animation.exeggcute.ground_idle", diff --git a/entity/pokemon/exeggutor.json b/entity/pokemon/exeggutor.json index 72474fce9..8a18e46e6 100644 --- a/entity/pokemon/exeggutor.json +++ b/entity/pokemon/exeggutor.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.exeggutor.blink", "ground_idle": "animation.exeggutor.ground_idle", "air_idle": "animation.exeggutor.ground_idle", "water_idle": "animation.exeggutor.ground_idle", diff --git a/entity/pokemon/farfetchd.json b/entity/pokemon/farfetchd.json index 34c08e9f0..0c81c4c3b 100644 --- a/entity/pokemon/farfetchd.json +++ b/entity/pokemon/farfetchd.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.farfetchd.blink", "ground_idle": "animation.farfetchd.ground_idle", "air_idle": "animation.farfetchd.ground_idle", "water_idle": "animation.farfetchd.ground_idle", diff --git a/entity/pokemon/fennekin.json b/entity/pokemon/fennekin.json index 35918b182..65d1f1de6 100644 --- a/entity/pokemon/fennekin.json +++ b/entity/pokemon/fennekin.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.fennekin.blink", "ground_idle": "animation.fennekin.ground_idle", "air_idle": "animation.fennekin.air_idle", "water_idle": "animation.fennekin.water_idle", diff --git a/entity/pokemon/feraligatr.json b/entity/pokemon/feraligatr.json index afea2d46d..e9d5764f9 100644 --- a/entity/pokemon/feraligatr.json +++ b/entity/pokemon/feraligatr.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.feraligatr.blink", "ground_idle": "animation.feraligatr.ground_idle", "air_idle": "animation.feraligatr.ground_idle", "water_idle": "animation.feraligatr.ground_idle", diff --git a/entity/pokemon/flaaffy.json b/entity/pokemon/flaaffy.json index 9162d3801..0f7e8252b 100644 --- a/entity/pokemon/flaaffy.json +++ b/entity/pokemon/flaaffy.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.flaaffy.blink", "ground_idle": "animation.flaaffy.ground_idle", "air_idle": "animation.flaaffy.ground_idle", "water_idle": "animation.flaaffy.water_idle", diff --git a/entity/pokemon/flareon.json b/entity/pokemon/flareon.json index f864b8483..c54712bcd 100644 --- a/entity/pokemon/flareon.json +++ b/entity/pokemon/flareon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.flareon.blink", "ground_idle": "animation.flareon.ground_idle", "air_idle": "animation.flareon.ground_idle", "water_idle": "animation.flareon.ground_idle", diff --git a/entity/pokemon/floatzel.json b/entity/pokemon/floatzel.json index 28e05513c..41494fd26 100644 --- a/entity/pokemon/floatzel.json +++ b/entity/pokemon/floatzel.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.floatzel.blink", "ground_idle": "animation.floatzel.ground_idle", "air_idle": "animation.floatzel.ground_idle", "water_idle": "animation.floatzel.ground_idle", diff --git a/entity/pokemon/floragato.json b/entity/pokemon/floragato.json index 8fd0207dc..da930841d 100644 --- a/entity/pokemon/floragato.json +++ b/entity/pokemon/floragato.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.floragato.blink", "ground_idle": "animation.floragato.ground_idle", "air_idle": "animation.floragato.ground_idle", "water_idle": "animation.floragato.ground_idle", diff --git a/entity/pokemon/flygon.json b/entity/pokemon/flygon.json index 18cfa65ad..4cc5d0ce9 100644 --- a/entity/pokemon/flygon.json +++ b/entity/pokemon/flygon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.flygon.blink", "ground_idle": "animation.flygon.ground_idle", "air_idle": "animation.flygon.air_idle", "water_idle": "animation.flygon.ground_idle", diff --git a/entity/pokemon/forretress.json b/entity/pokemon/forretress.json index 2e93d6e3a..619e32423 100644 --- a/entity/pokemon/forretress.json +++ b/entity/pokemon/forretress.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.forretress.blink", "ground_idle": "animation.forretress.ground_idle", "air_idle": "animation.forretress.ground_idle", "water_idle": "animation.forretress.ground_idle", diff --git a/entity/pokemon/fraxure.json b/entity/pokemon/fraxure.json index eb684a6f2..fe5e8d64e 100644 --- a/entity/pokemon/fraxure.json +++ b/entity/pokemon/fraxure.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.fraxure.blink", "ground_idle": "animation.fraxure.ground_idle", "air_idle": "animation.fraxure.ground_idle", "water_idle": "animation.fraxure.ground_idle", diff --git a/entity/pokemon/froakie.json b/entity/pokemon/froakie.json index 3961317ae..e7217a85b 100644 --- a/entity/pokemon/froakie.json +++ b/entity/pokemon/froakie.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.froakie.blink", "ground_idle": "animation.froakie.ground_idle", "air_idle": "animation.froakie.ground_idle", "water_idle": "animation.froakie.ground_idle", diff --git a/entity/pokemon/frogadier.json b/entity/pokemon/frogadier.json index ea6b8c61d..a2a287357 100644 --- a/entity/pokemon/frogadier.json +++ b/entity/pokemon/frogadier.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.frogadier.blink", "ground_idle": "animation.frogadier.ground_idle", "air_idle": "animation.frogadier.ground_idle", "water_idle": "animation.frogadier.ground_idle", diff --git a/entity/pokemon/fuecoco.json b/entity/pokemon/fuecoco.json index 5e22b22f4..3b95feebd 100644 --- a/entity/pokemon/fuecoco.json +++ b/entity/pokemon/fuecoco.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.fuecoco.blink", "ground_idle": "animation.fuecoco.ground_idle", "air_idle": "animation.fuecoco.ground_idle", "water_idle": "animation.fuecoco.ground_idle", diff --git a/entity/pokemon/furret.json b/entity/pokemon/furret.json index 0e36aedce..29012bab9 100644 --- a/entity/pokemon/furret.json +++ b/entity/pokemon/furret.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.furret.blink", "ground_idle": "animation.furret.ground_idle", "air_idle": "animation.furret.ground_idle", "water_idle": "animation.furret.ground_idle", diff --git a/entity/pokemon/gabite.json b/entity/pokemon/gabite.json index 72f32ca08..ae70cd963 100644 --- a/entity/pokemon/gabite.json +++ b/entity/pokemon/gabite.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.gabite.blink", "ground_idle": "animation.gabite.ground_idle", "air_idle": "animation.gabite.ground_idle", "water_idle": "animation.gabite.ground_idle", diff --git a/entity/pokemon/garchomp.json b/entity/pokemon/garchomp.json index 254b2ad1a..96898c70c 100644 --- a/entity/pokemon/garchomp.json +++ b/entity/pokemon/garchomp.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.garchomp.blink", "ground_idle": "animation.garchomp.ground_idle", "air_idle": "animation.garchomp.ground_idle", "water_idle": "animation.garchomp.ground_idle", diff --git a/entity/pokemon/gardevoir.json b/entity/pokemon/gardevoir.json index e866a1c9a..19dd68d4b 100644 --- a/entity/pokemon/gardevoir.json +++ b/entity/pokemon/gardevoir.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.gardevoir.blink", "ground_idle": "animation.gardevoir.ground_idle", "air_idle": "animation.gardevoir.air_idle", "water_idle": "animation.gardevoir.water_idle", diff --git a/entity/pokemon/gastly.json b/entity/pokemon/gastly.json index 27235684b..ae88a969f 100644 --- a/entity/pokemon/gastly.json +++ b/entity/pokemon/gastly.json @@ -26,6 +26,7 @@ ] }, "animations": { + "blink": "animation.gastly.blink", "ground_idle": "animation.gastly.ground_idle", "air_idle": "animation.gastly.ground_idle", "water_idle": "animation.gastly.ground_idle", diff --git a/entity/pokemon/gastrodon.json b/entity/pokemon/gastrodon.json index fcea5d6ac..402d96eee 100644 --- a/entity/pokemon/gastrodon.json +++ b/entity/pokemon/gastrodon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.gastrodon.blink", "ground_idle": "animation.gastrodon.ground_idle", "air_idle": "animation.gastrodon.air_idle", "water_idle": "animation.gastrodon.water_idle", diff --git a/entity/pokemon/gengar.json b/entity/pokemon/gengar.json index 44396506d..1c7d36e1d 100644 --- a/entity/pokemon/gengar.json +++ b/entity/pokemon/gengar.json @@ -26,6 +26,7 @@ ] }, "animations": { + "blink": "animation.gengar.blink", "ground_idle": "animation.gengar.ground_idle", "air_idle": "animation.gengar.ground_idle", "water_idle": "animation.gengar.ground_idle", diff --git a/entity/pokemon/geodude.json b/entity/pokemon/geodude.json index fcf7c7af0..ff68db495 100644 --- a/entity/pokemon/geodude.json +++ b/entity/pokemon/geodude.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.geodude.blink", "ground_idle": "animation.geodude.ground_idle", "air_idle": "animation.geodude.ground_idle", "water_idle": "animation.geodude.ground_idle", diff --git a/entity/pokemon/gible.json b/entity/pokemon/gible.json index 0e2c283a2..1eb69e2a8 100644 --- a/entity/pokemon/gible.json +++ b/entity/pokemon/gible.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.gible.blink", "ground_idle": "animation.gible.ground_idle", "air_idle": "animation.gible.ground_idle", "water_idle": "animation.gible.ground_idle", diff --git a/entity/pokemon/girafarig.json b/entity/pokemon/girafarig.json index 420eeb397..e9ef5d115 100644 --- a/entity/pokemon/girafarig.json +++ b/entity/pokemon/girafarig.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.girafarig.blink", "ground_idle": "animation.girafarig.ground_idle", "air_idle": "animation.girafarig.ground_idle", "water_idle": "animation.girafarig.ground_idle", diff --git a/entity/pokemon/giratina.json b/entity/pokemon/giratina.json index fddbc0920..dbaafd79e 100644 --- a/entity/pokemon/giratina.json +++ b/entity/pokemon/giratina.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.giratina.blink", "ground_idle": "animation.giratina.ground_idle", "air_idle": "animation.giratina.ground_idle", "water_idle": "animation.giratina.ground_idle", diff --git a/entity/pokemon/glaceon.json b/entity/pokemon/glaceon.json index 0c297a9a6..5a30970d8 100644 --- a/entity/pokemon/glaceon.json +++ b/entity/pokemon/glaceon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.glaceon.blink", "ground_idle": "animation.glaceon.ground_idle", "air_idle": "animation.glaceon.ground_idle", "water_idle": "animation.glaceon.ground_idle", diff --git a/entity/pokemon/gligar.json b/entity/pokemon/gligar.json index 5076646eb..c139dbec3 100644 --- a/entity/pokemon/gligar.json +++ b/entity/pokemon/gligar.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.gligar.blink", "ground_idle": "animation.gligar.ground_idle", "air_idle": "animation.gligar.ground_idle", "water_idle": "animation.gligar.ground_idle", diff --git a/entity/pokemon/gliscor.json b/entity/pokemon/gliscor.json index 55faeedf2..6197faf71 100644 --- a/entity/pokemon/gliscor.json +++ b/entity/pokemon/gliscor.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.gliscor.blink", "ground_idle": "animation.gliscor.ground_idle", "air_idle": "animation.gliscor.air_idle", "water_idle": "animation.gliscor.water_idle", diff --git a/entity/pokemon/gloom.json b/entity/pokemon/gloom.json index f96b4a28c..322e270b6 100644 --- a/entity/pokemon/gloom.json +++ b/entity/pokemon/gloom.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.gloom.blink", "ground_idle": "animation.gloom.ground_idle", "air_idle": "animation.gloom.ground_idle", "water_idle": "animation.gloom.ground_idle", diff --git a/entity/pokemon/golbat.json b/entity/pokemon/golbat.json index 1dd207f2d..81bed8b2b 100644 --- a/entity/pokemon/golbat.json +++ b/entity/pokemon/golbat.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.golbat.blink", "ground_idle": "animation.golbat.ground_idle", "air_idle": "animation.golbat.ground_idle", "water_idle": "animation.golbat.ground_idle", diff --git a/entity/pokemon/goldeen.json b/entity/pokemon/goldeen.json index 49224fef7..6aab1afb6 100644 --- a/entity/pokemon/goldeen.json +++ b/entity/pokemon/goldeen.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.goldeen.blink", "ground_idle": "animation.goldeen.ground_idle", "air_idle": "animation.goldeen.ground_idle", "water_idle": "animation.goldeen.ground_idle", diff --git a/entity/pokemon/golduck.json b/entity/pokemon/golduck.json index c00aa071b..f781d6fc1 100644 --- a/entity/pokemon/golduck.json +++ b/entity/pokemon/golduck.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.golduck.blink", "ground_idle": "animation.golduck.ground_idle", "air_idle": "animation.golduck.ground_idle", "water_idle": "animation.golduck.ground_idle", diff --git a/entity/pokemon/golem.json b/entity/pokemon/golem.json index fe6c814cb..a26c25500 100644 --- a/entity/pokemon/golem.json +++ b/entity/pokemon/golem.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.golem.blink", "ground_idle": "animation.golem.ground_idle", "air_idle": "animation.golem.ground_idle", "water_idle": "animation.golem.ground_idle", diff --git a/entity/pokemon/graveler.json b/entity/pokemon/graveler.json index 834bc0dbe..b79b639d6 100644 --- a/entity/pokemon/graveler.json +++ b/entity/pokemon/graveler.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.graveler.blink", "ground_idle": "animation.graveler.ground_idle", "air_idle": "animation.graveler.ground_idle", "water_idle": "animation.graveler.ground_idle", diff --git a/entity/pokemon/greninja.json b/entity/pokemon/greninja.json index 9a2c89e6a..bb92af318 100644 --- a/entity/pokemon/greninja.json +++ b/entity/pokemon/greninja.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.greninja.blink", "ground_idle": "animation.greninja.ground_idle", "air_idle": "animation.greninja.ground_idle", "water_idle": "animation.greninja.ground_idle", diff --git a/entity/pokemon/grookey.json b/entity/pokemon/grookey.json index 444773762..05a5e2434 100644 --- a/entity/pokemon/grookey.json +++ b/entity/pokemon/grookey.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.grookey.blink", "ground_idle": "animation.grookey.ground_idle", "air_idle": "animation.grookey.ground_idle", "water_idle": "animation.grookey.ground_idle", diff --git a/entity/pokemon/grotle.json b/entity/pokemon/grotle.json index 0332c2668..7b40ec919 100644 --- a/entity/pokemon/grotle.json +++ b/entity/pokemon/grotle.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.grotle.blink", "ground_idle": "animation.grotle.ground_idle", "air_idle": "animation.grotle.ground_idle", "water_idle": "animation.grotle.ground_idle", diff --git a/entity/pokemon/groudon.json b/entity/pokemon/groudon.json index 9e2df5bff..a583142ac 100644 --- a/entity/pokemon/groudon.json +++ b/entity/pokemon/groudon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.groudon.blink", "ground_idle": "animation.groudon.ground_idle", "air_idle": "animation.groudon.ground_idle", "water_idle": "animation.groudon.ground_idle", diff --git a/entity/pokemon/grovyle.json b/entity/pokemon/grovyle.json index 93905e5a1..a0aa2f8bb 100644 --- a/entity/pokemon/grovyle.json +++ b/entity/pokemon/grovyle.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.grovyle.blink", "ground_idle": "animation.grovyle.ground_idle", "air_idle": "animation.grovyle.ground_idle", "water_idle": "animation.grovyle.ground_idle", diff --git a/entity/pokemon/growlithe.json b/entity/pokemon/growlithe.json index 4fdca9b87..da41b2b31 100644 --- a/entity/pokemon/growlithe.json +++ b/entity/pokemon/growlithe.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.growlithe.blink", "ground_idle": "animation.growlithe.ground_idle", "air_idle": "animation.growlithe.ground_idle", "water_idle": "animation.growlithe.ground_idle", diff --git a/entity/pokemon/gyarados.json b/entity/pokemon/gyarados.json index 4e80b2322..b104ac8b8 100644 --- a/entity/pokemon/gyarados.json +++ b/entity/pokemon/gyarados.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.gyarados.blink", "ground_idle": "animation.gyarados.ground_idle", "air_idle": "animation.gyarados.ground_idle", "water_idle": "animation.gyarados.ground_idle", diff --git a/entity/pokemon/haunter.json b/entity/pokemon/haunter.json index e47539a9c..5f7aa5478 100644 --- a/entity/pokemon/haunter.json +++ b/entity/pokemon/haunter.json @@ -26,6 +26,7 @@ ] }, "animations": { + "blink": "animation.haunter.blink", "ground_idle": "animation.haunter.ground_idle", "air_idle": "animation.haunter.ground_idle", "water_idle": "animation.haunter.ground_idle", diff --git a/entity/pokemon/haxorus.json b/entity/pokemon/haxorus.json index 3f424ed6d..fe17f19c2 100644 --- a/entity/pokemon/haxorus.json +++ b/entity/pokemon/haxorus.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.haxorus.blink", "ground_idle": "animation.haxorus.ground_idle", "air_idle": "animation.haxorus.ground_idle", "water_idle": "animation.haxorus.ground_idle", diff --git a/entity/pokemon/heracross.json b/entity/pokemon/heracross.json index b90dbf2e1..8fc7881a5 100644 --- a/entity/pokemon/heracross.json +++ b/entity/pokemon/heracross.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.heracross.blink", "ground_idle": "animation.heracross.ground_idle", "air_idle": "animation.heracross.ground_idle", "water_idle": "animation.heracross.ground_idle", diff --git a/entity/pokemon/hitmonchan.json b/entity/pokemon/hitmonchan.json index a87dc1b27..4c4c62e03 100644 --- a/entity/pokemon/hitmonchan.json +++ b/entity/pokemon/hitmonchan.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.hitmonchan.blink", "ground_idle": "animation.hitmonchan.ground_idle", "air_idle": "animation.hitmonchan.ground_idle", "water_idle": "animation.hitmonchan.ground_idle", diff --git a/entity/pokemon/hitmonlee.json b/entity/pokemon/hitmonlee.json index 517c71f8a..edc7e42d0 100644 --- a/entity/pokemon/hitmonlee.json +++ b/entity/pokemon/hitmonlee.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.hitmonlee.blink", "ground_idle": "animation.hitmonlee.ground_idle", "air_idle": "animation.hitmonlee.ground_idle", "water_idle": "animation.hitmonlee.ground_idle", diff --git a/entity/pokemon/hitmontop.json b/entity/pokemon/hitmontop.json index 9ecd23174..17f4f3ba2 100644 --- a/entity/pokemon/hitmontop.json +++ b/entity/pokemon/hitmontop.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.hitmontop.blink", "ground_idle": "animation.hitmontop.ground_idle", "air_idle": "animation.hitmontop.ground_idle", "water_idle": "animation.hitmontop.ground_idle", diff --git a/entity/pokemon/honchkrow.json b/entity/pokemon/honchkrow.json index a49b66603..91b201280 100644 --- a/entity/pokemon/honchkrow.json +++ b/entity/pokemon/honchkrow.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.honchkrow.blink", "ground_idle": "animation.honchkrow.ground_idle", "air_idle": "animation.honchkrow.ground_idle", "water_idle": "animation.honchkrow.ground_idle", diff --git a/entity/pokemon/hooh.json b/entity/pokemon/hooh.json index 2549198ab..3989e3bed 100644 --- a/entity/pokemon/hooh.json +++ b/entity/pokemon/hooh.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.hooh.blink", "ground_idle": "animation.hooh.ground_idle", "air_idle": "animation.hooh.ground_idle", "water_idle": "animation.hooh.ground_idle", diff --git a/entity/pokemon/hoothoot.json b/entity/pokemon/hoothoot.json index 4d8d31ad1..983304b10 100644 --- a/entity/pokemon/hoothoot.json +++ b/entity/pokemon/hoothoot.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.hoothoot.blink", "ground_idle": "animation.hoothoot.ground_idle", "air_idle": "animation.hoothoot.air_idle", "water_idle": "animation.hoothoot.ground_idle", diff --git a/entity/pokemon/hoppip.json b/entity/pokemon/hoppip.json index 4bf42e1a1..f2e6bcfcf 100644 --- a/entity/pokemon/hoppip.json +++ b/entity/pokemon/hoppip.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.hoppip.blink", "ground_idle": "animation.hoppip.ground_idle", "air_idle": "animation.hoppip.ground_idle", "water_idle": "animation.hoppip.ground_idle", diff --git a/entity/pokemon/horsea.json b/entity/pokemon/horsea.json index 0c0cee273..a5dbcafee 100644 --- a/entity/pokemon/horsea.json +++ b/entity/pokemon/horsea.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.horsea.blink", "ground_idle": "animation.horsea.ground_idle", "air_idle": "animation.horsea.ground_idle", "water_idle": "animation.horsea.ground_idle", diff --git a/entity/pokemon/houndoom.json b/entity/pokemon/houndoom.json index 232486572..a9f5cb3a7 100644 --- a/entity/pokemon/houndoom.json +++ b/entity/pokemon/houndoom.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.houndoom.blink", "ground_idle": "animation.houndoom.ground_idle", "air_idle": "animation.houndoom.ground_idle", "water_idle": "animation.houndoom.ground_idle", diff --git a/entity/pokemon/houndour.json b/entity/pokemon/houndour.json index bcdc8057d..ddf50d182 100644 --- a/entity/pokemon/houndour.json +++ b/entity/pokemon/houndour.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.houndour.blink", "ground_idle": "animation.houndour.ground_idle", "air_idle": "animation.houndour.ground_idle", "water_idle": "animation.houndour.ground_idle", diff --git a/entity/pokemon/hypno.json b/entity/pokemon/hypno.json index 5a5479b33..35187fd4b 100644 --- a/entity/pokemon/hypno.json +++ b/entity/pokemon/hypno.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.hypno.blink", "ground_idle": "animation.hypno.ground_idle", "air_idle": "animation.hypno.ground_idle", "water_idle": "animation.hypno.ground_idle", diff --git a/entity/pokemon/igglybuff.json b/entity/pokemon/igglybuff.json index 54985fa4e..877da5baa 100644 --- a/entity/pokemon/igglybuff.json +++ b/entity/pokemon/igglybuff.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.igglybuff.blink", "ground_idle": "animation.igglybuff.ground_idle", "air_idle": "animation.igglybuff.ground_idle", "water_idle": "animation.igglybuff.ground_idle", diff --git a/entity/pokemon/incineroar.json b/entity/pokemon/incineroar.json index c2e11d915..b8c5edc80 100644 --- a/entity/pokemon/incineroar.json +++ b/entity/pokemon/incineroar.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.incineroar.blink", "ground_idle": "animation.incineroar.ground_idle", "air_idle": "animation.incineroar.ground_idle", "water_idle": "animation.incineroar.ground_idle", diff --git a/entity/pokemon/infernape.json b/entity/pokemon/infernape.json index 7c74c3cf0..a6e9670db 100644 --- a/entity/pokemon/infernape.json +++ b/entity/pokemon/infernape.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.infernape.blink", "ground_idle": "animation.infernape.ground_idle", "air_idle": "animation.infernape.ground_idle", "water_idle": "animation.infernape.ground_idle", diff --git a/entity/pokemon/inteleon.json b/entity/pokemon/inteleon.json index 0a6b7e784..c4f66e4c6 100644 --- a/entity/pokemon/inteleon.json +++ b/entity/pokemon/inteleon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.inteleon.blink", "ground_idle": "animation.inteleon.ground_idle", "air_idle": "animation.inteleon.ground_idle", "water_idle": "animation.inteleon.ground_idle", diff --git a/entity/pokemon/ironmoth.json b/entity/pokemon/ironmoth.json index df5d1ad55..5fc3c1005 100644 --- a/entity/pokemon/ironmoth.json +++ b/entity/pokemon/ironmoth.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ironmoth.blink", "ground_idle": "animation.ironmoth.ground_idle", "air_idle": "animation.ironmoth.ground_idle", "water_idle": "animation.ironmoth.ground_idle", diff --git a/entity/pokemon/ivysaur.json b/entity/pokemon/ivysaur.json index 3283a68d4..753cb0e43 100644 --- a/entity/pokemon/ivysaur.json +++ b/entity/pokemon/ivysaur.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ivysaur.blink", "ground_idle": "animation.ivysaur.ground_idle", "air_idle": "animation.ivysaur.ground_idle", "water_idle": "animation.ivysaur.ground_idle", diff --git a/entity/pokemon/jigglypuff.json b/entity/pokemon/jigglypuff.json index af8aa7b5b..5cc11acc8 100644 --- a/entity/pokemon/jigglypuff.json +++ b/entity/pokemon/jigglypuff.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.jigglypuff.blink", "ground_idle": "animation.jigglypuff.ground_idle", "air_idle": "animation.jigglypuff.ground_idle", "water_idle": "animation.jigglypuff.ground_idle", diff --git a/entity/pokemon/jirachi.json b/entity/pokemon/jirachi.json index cb814e61f..ecca2da06 100644 --- a/entity/pokemon/jirachi.json +++ b/entity/pokemon/jirachi.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.jirachi.blink", "ground_idle": "animation.jirachi.ground_idle", "air_idle": "animation.jirachi.ground_idle", "water_idle": "animation.jirachi.ground_idle", diff --git a/entity/pokemon/jolteon.json b/entity/pokemon/jolteon.json index f106c1339..208d18fa8 100644 --- a/entity/pokemon/jolteon.json +++ b/entity/pokemon/jolteon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.jolteon.blink", "ground_idle": "animation.jolteon.ground_idle", "air_idle": "animation.jolteon.ground_idle", "water_idle": "animation.jolteon.ground_idle", diff --git a/entity/pokemon/jumpluff.json b/entity/pokemon/jumpluff.json index 205732e61..19fa73825 100644 --- a/entity/pokemon/jumpluff.json +++ b/entity/pokemon/jumpluff.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.jumpluff.blink", "ground_idle": "animation.jumpluff.ground_idle", "air_idle": "animation.jumpluff.ground_idle", "water_idle": "animation.jumpluff.ground_idle", diff --git a/entity/pokemon/jynx.json b/entity/pokemon/jynx.json index e849ac655..c324ae389 100644 --- a/entity/pokemon/jynx.json +++ b/entity/pokemon/jynx.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.jynx.blink", "ground_idle": "animation.jynx.ground_idle", "air_idle": "animation.jynx.ground_idle", "water_idle": "animation.jynx.ground_idle", diff --git a/entity/pokemon/kabuto.json b/entity/pokemon/kabuto.json index 049026524..b3c19b39a 100644 --- a/entity/pokemon/kabuto.json +++ b/entity/pokemon/kabuto.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.kabuto.blink", "ground_idle": "animation.kabuto.ground_idle", "air_idle": "animation.kabuto.ground_idle", "water_idle": "animation.kabuto.ground_idle", diff --git a/entity/pokemon/kabutops.json b/entity/pokemon/kabutops.json index abd9998c7..a5d64808e 100644 --- a/entity/pokemon/kabutops.json +++ b/entity/pokemon/kabutops.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.kabutops.blink", "ground_idle": "animation.kabutops.ground_idle", "air_idle": "animation.kabutops.ground_idle", "water_idle": "animation.kabutops.ground_idle", diff --git a/entity/pokemon/kadabra.json b/entity/pokemon/kadabra.json index 5093ab366..ec17cc95f 100644 --- a/entity/pokemon/kadabra.json +++ b/entity/pokemon/kadabra.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.kadabra.blink", "ground_idle": "animation.kadabra.ground_idle", "air_idle": "animation.kadabra.ground_idle", "water_idle": "animation.kadabra.ground_idle", diff --git a/entity/pokemon/kakuna.json b/entity/pokemon/kakuna.json index 546769f6c..b067da9b8 100644 --- a/entity/pokemon/kakuna.json +++ b/entity/pokemon/kakuna.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.kakuna.blink", "ground_idle": "animation.kakuna.ground_idle", "air_idle": "animation.kakuna.ground_idle", "water_idle": "animation.kakuna.ground_idle", diff --git a/entity/pokemon/kangaskhan.json b/entity/pokemon/kangaskhan.json index 6b822a011..5f02191db 100644 --- a/entity/pokemon/kangaskhan.json +++ b/entity/pokemon/kangaskhan.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.kangaskhan.blink", "ground_idle": "animation.kangaskhan.ground_idle", "air_idle": "animation.kangaskhan.ground_idle", "water_idle": "animation.kangaskhan.ground_idle", diff --git a/entity/pokemon/kingdra.json b/entity/pokemon/kingdra.json index b777a39ab..da5d8f693 100644 --- a/entity/pokemon/kingdra.json +++ b/entity/pokemon/kingdra.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.kingdra.blink", "ground_idle": "animation.kingdra.ground_idle", "air_idle": "animation.kingdra.ground_idle", "water_idle": "animation.kingdra.ground_idle", diff --git a/entity/pokemon/kingler.json b/entity/pokemon/kingler.json index 1fb541f32..2e8cedbfa 100644 --- a/entity/pokemon/kingler.json +++ b/entity/pokemon/kingler.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.kingler.blink", "ground_idle": "animation.kingler.ground_idle", "air_idle": "animation.kingler.ground_idle", "water_idle": "animation.kingler.ground_idle", diff --git a/entity/pokemon/kirlia.json b/entity/pokemon/kirlia.json index 4ac145b41..2e8755084 100644 --- a/entity/pokemon/kirlia.json +++ b/entity/pokemon/kirlia.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.kirlia.blink", "ground_idle": "animation.kirlia.ground_idle", "air_idle": "animation.kirlia.ground_idle", "water_idle": "animation.kirlia.water_idle", diff --git a/entity/pokemon/koffing.json b/entity/pokemon/koffing.json index da7cff0ff..8669947de 100644 --- a/entity/pokemon/koffing.json +++ b/entity/pokemon/koffing.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.koffing.blink", "ground_idle": "animation.koffing.ground_idle", "air_idle": "animation.koffing.ground_idle", "water_idle": "animation.koffing.ground_idle", diff --git a/entity/pokemon/krabby.json b/entity/pokemon/krabby.json index b1e6945c3..302341194 100644 --- a/entity/pokemon/krabby.json +++ b/entity/pokemon/krabby.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.krabby.blink", "ground_idle": "animation.krabby.ground_idle", "air_idle": "animation.krabby.ground_idle", "water_idle": "animation.krabby.ground_idle", diff --git a/entity/pokemon/kyogre.json b/entity/pokemon/kyogre.json index f8b7a4021..934f2191f 100644 --- a/entity/pokemon/kyogre.json +++ b/entity/pokemon/kyogre.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.kyogre.blink", "ground_idle": "animation.kyogre.ground_idle", "air_idle": "animation.kyogre.ground_idle", "water_idle": "animation.kyogre.ground_idle", diff --git a/entity/pokemon/lanturn.json b/entity/pokemon/lanturn.json index 87652c29f..a0c9a5329 100644 --- a/entity/pokemon/lanturn.json +++ b/entity/pokemon/lanturn.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.lanturn.blink", "ground_idle": "animation.lanturn.ground_idle", "air_idle": "animation.lanturn.ground_idle", "water_idle": "animation.lanturn.ground_idle", diff --git a/entity/pokemon/lapras.json b/entity/pokemon/lapras.json index 685a3f850..bf1f78f32 100644 --- a/entity/pokemon/lapras.json +++ b/entity/pokemon/lapras.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.lapras.blink", "ground_idle": "animation.lapras.ground_idle", "air_idle": "animation.lapras.ground_idle", "water_idle": "animation.lapras.ground_idle", diff --git a/entity/pokemon/larvesta.json b/entity/pokemon/larvesta.json index e582ceb31..2aec04771 100644 --- a/entity/pokemon/larvesta.json +++ b/entity/pokemon/larvesta.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.larvesta.blink", "ground_idle": "animation.larvesta.ground_idle", "air_idle": "animation.larvesta.ground_idle", "water_idle": "animation.larvesta.ground_idle", diff --git a/entity/pokemon/larvitar.json b/entity/pokemon/larvitar.json index a5522c522..cff73f4c1 100644 --- a/entity/pokemon/larvitar.json +++ b/entity/pokemon/larvitar.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.larvitar.blink", "ground_idle": "animation.larvitar.ground_idle", "air_idle": "animation.larvitar.ground_idle", "water_idle": "animation.larvitar.ground_idle", diff --git a/entity/pokemon/latias.json b/entity/pokemon/latias.json index fe0bfc859..b26fce7f3 100644 --- a/entity/pokemon/latias.json +++ b/entity/pokemon/latias.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.latias.blink", "ground_idle": "animation.latias.ground_idle", "air_idle": "animation.latias.ground_idle", "water_idle": "animation.latias.ground_idle", diff --git a/entity/pokemon/latios.json b/entity/pokemon/latios.json index d027589e1..335390306 100644 --- a/entity/pokemon/latios.json +++ b/entity/pokemon/latios.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.latios.blink", "ground_idle": "animation.latios.ground_idle", "air_idle": "animation.latios.ground_idle", "water_idle": "animation.latios.ground_idle", diff --git a/entity/pokemon/leafeon.json b/entity/pokemon/leafeon.json index c8a4f1a2b..5e77c21cb 100644 --- a/entity/pokemon/leafeon.json +++ b/entity/pokemon/leafeon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.leafeon.blink", "ground_idle": "animation.leafeon.ground_idle", "air_idle": "animation.leafeon.ground_idle", "water_idle": "animation.leafeon.ground_idle", diff --git a/entity/pokemon/ledian.json b/entity/pokemon/ledian.json index 11761e7fb..de86acf56 100644 --- a/entity/pokemon/ledian.json +++ b/entity/pokemon/ledian.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ledian.blink", "ground_idle": "animation.ledian.ground_idle", "air_idle": "animation.ledian.ground_idle", "water_idle": "animation.ledian.ground_idle", diff --git a/entity/pokemon/ledyba.json b/entity/pokemon/ledyba.json index 4c4f4ba8b..ffa5f14c8 100644 --- a/entity/pokemon/ledyba.json +++ b/entity/pokemon/ledyba.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ledyba.blink", "ground_idle": "animation.ledyba.ground_idle", "air_idle": "animation.ledyba.ground_idle", "water_idle": "animation.ledyba.ground_idle", diff --git a/entity/pokemon/lickitung.json b/entity/pokemon/lickitung.json index 6061d1ca7..f1d155b0c 100644 --- a/entity/pokemon/lickitung.json +++ b/entity/pokemon/lickitung.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.lickitung.blink", "ground_idle": "animation.lickitung.ground_idle", "air_idle": "animation.lickitung.ground_idle", "water_idle": "animation.lickitung.ground_idle", diff --git a/entity/pokemon/lileep.json b/entity/pokemon/lileep.json index 6be3eafad..033648eba 100644 --- a/entity/pokemon/lileep.json +++ b/entity/pokemon/lileep.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.lileep.blink", "ground_idle": "animation.lileep.ground_idle", "air_idle": "animation.lileep.ground_idle", "water_idle": "animation.lileep.ground_idle", diff --git a/entity/pokemon/litten.json b/entity/pokemon/litten.json index 1e8884f6c..3410a3d39 100644 --- a/entity/pokemon/litten.json +++ b/entity/pokemon/litten.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.litten.blink", "ground_idle": "animation.litten.ground_idle", "air_idle": "animation.litten.ground_idle", "water_idle": "animation.litten.ground_idle", diff --git a/entity/pokemon/lucario.json b/entity/pokemon/lucario.json index f41dcd0e6..013377333 100644 --- a/entity/pokemon/lucario.json +++ b/entity/pokemon/lucario.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.lucario.blink", "ground_idle": "animation.lucario.ground_idle", "air_idle": "animation.lucario.ground_idle", "water_idle": "animation.lucario.ground_idle", diff --git a/entity/pokemon/lugia.json b/entity/pokemon/lugia.json index b79df6535..d50921fcf 100644 --- a/entity/pokemon/lugia.json +++ b/entity/pokemon/lugia.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.lugia.blink", "ground_idle": "animation.lugia.ground_idle", "air_idle": "animation.lugia.air_idle", "water_idle": "animation.lugia.ground_idle", diff --git a/entity/pokemon/lunala.json b/entity/pokemon/lunala.json index 7908a1ec6..20630d46e 100644 --- a/entity/pokemon/lunala.json +++ b/entity/pokemon/lunala.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.lunala.blink", "ground_idle": "animation.lunala.ground_idle", "air_idle": "animation.lunala.ground_idle", "water_idle": "animation.lunala.ground_idle", diff --git a/entity/pokemon/luxio.json b/entity/pokemon/luxio.json index e0e633778..9b2dfbdeb 100644 --- a/entity/pokemon/luxio.json +++ b/entity/pokemon/luxio.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.luxio.blink", "ground_idle": "animation.luxio.ground_idle", "air_idle": "animation.luxio.ground_idle", "water_idle": "animation.luxio.ground_idle", diff --git a/entity/pokemon/luxray.json b/entity/pokemon/luxray.json index 8072b9d3b..93e86ed79 100644 --- a/entity/pokemon/luxray.json +++ b/entity/pokemon/luxray.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.luxray.blink", "ground_idle": "animation.luxray.ground_idle", "air_idle": "animation.luxray.ground_idle", "water_idle": "animation.luxray.ground_idle", diff --git a/entity/pokemon/machamp.json b/entity/pokemon/machamp.json index 255bf5450..b869ad7f1 100644 --- a/entity/pokemon/machamp.json +++ b/entity/pokemon/machamp.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.machamp.blink", "ground_idle": "animation.machamp.ground_idle", "air_idle": "animation.machamp.ground_idle", "water_idle": "animation.machamp.ground_idle", diff --git a/entity/pokemon/machoke.json b/entity/pokemon/machoke.json index 2b0f9a5bb..0da39bdc4 100644 --- a/entity/pokemon/machoke.json +++ b/entity/pokemon/machoke.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.machoke.blink", "ground_idle": "animation.machoke.ground_idle", "air_idle": "animation.machoke.ground_idle", "water_idle": "animation.machoke.ground_idle", diff --git a/entity/pokemon/machop.json b/entity/pokemon/machop.json index dda6760c7..268851fab 100644 --- a/entity/pokemon/machop.json +++ b/entity/pokemon/machop.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.machop.blink", "ground_idle": "animation.machop.ground_idle", "air_idle": "animation.machop.ground_idle", "water_idle": "animation.machop.ground_idle", diff --git a/entity/pokemon/magby.json b/entity/pokemon/magby.json index 2b9ee9562..c920985b7 100644 --- a/entity/pokemon/magby.json +++ b/entity/pokemon/magby.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.magby.blink", "ground_idle": "animation.magby.ground_idle", "air_idle": "animation.magby.ground_idle", "water_idle": "animation.magby.ground_idle", diff --git a/entity/pokemon/magcargo.json b/entity/pokemon/magcargo.json index b7709b435..240ca4e58 100644 --- a/entity/pokemon/magcargo.json +++ b/entity/pokemon/magcargo.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.magcargo.blink", "ground_idle": "animation.magcargo.ground_idle", "air_idle": "animation.magcargo.ground_idle", "water_idle": "animation.magcargo.ground_idle", diff --git a/entity/pokemon/magikarp.json b/entity/pokemon/magikarp.json index 5d2e210b5..60e8dd4be 100644 --- a/entity/pokemon/magikarp.json +++ b/entity/pokemon/magikarp.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.magikarp.blink", "ground_idle": "animation.magikarp.ground_idle", "air_idle": "animation.magikarp.ground_idle", "water_idle": "animation.magikarp.ground_idle", diff --git a/entity/pokemon/magmar.json b/entity/pokemon/magmar.json index 5e673577a..8aad59ac8 100644 --- a/entity/pokemon/magmar.json +++ b/entity/pokemon/magmar.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.magmar.blink", "ground_idle": "animation.magmar.ground_idle", "air_idle": "animation.magmar.ground_idle", "water_idle": "animation.magmar.ground_idle", diff --git a/entity/pokemon/magmortar.json b/entity/pokemon/magmortar.json index 3bedf485e..90bed368d 100644 --- a/entity/pokemon/magmortar.json +++ b/entity/pokemon/magmortar.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.magmortar.blink", "ground_idle": "animation.magmortar.ground_idle", "air_idle": "animation.magmortar.air_idle", "water_idle": "animation.magmortar.water_idle", diff --git a/entity/pokemon/magnemite.json b/entity/pokemon/magnemite.json index d6d8aa924..1928863b2 100644 --- a/entity/pokemon/magnemite.json +++ b/entity/pokemon/magnemite.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.magnemite.blink", "ground_idle": "animation.magnemite.ground_idle", "air_idle": "animation.magnemite.ground_idle", "water_idle": "animation.magnemite.ground_idle", diff --git a/entity/pokemon/magneton.json b/entity/pokemon/magneton.json index 964f7b97b..16ce8659a 100644 --- a/entity/pokemon/magneton.json +++ b/entity/pokemon/magneton.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.magneton.blink", "ground_idle": "animation.magneton.ground_idle", "air_idle": "animation.magneton.ground_idle", "water_idle": "animation.magneton.ground_idle", diff --git a/entity/pokemon/magnezone.json b/entity/pokemon/magnezone.json index 1e8984228..f338a75dd 100644 --- a/entity/pokemon/magnezone.json +++ b/entity/pokemon/magnezone.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.magnezone.blink", "ground_idle": "animation.magnezone.ground_idle", "air_idle": "animation.magnezone.ground_idle", "water_idle": "animation.magnezone.ground_idle", diff --git a/entity/pokemon/mamoswine.json b/entity/pokemon/mamoswine.json index 7ee38d5a3..428b08c94 100644 --- a/entity/pokemon/mamoswine.json +++ b/entity/pokemon/mamoswine.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.mamoswine.blink", "ground_idle": "animation.mamoswine.ground_idle", "air_idle": "animation.mamoswine.air_idle", "water_idle": "animation.mamoswine.water_idle", diff --git a/entity/pokemon/mankey.json b/entity/pokemon/mankey.json index f8400d263..30815b73d 100644 --- a/entity/pokemon/mankey.json +++ b/entity/pokemon/mankey.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.mankey.blink", "ground_idle": "animation.mankey.ground_idle", "air_idle": "animation.mankey.ground_idle", "water_idle": "animation.mankey.ground_idle", diff --git a/entity/pokemon/mantine.json b/entity/pokemon/mantine.json index 756f918f5..f958fbb14 100644 --- a/entity/pokemon/mantine.json +++ b/entity/pokemon/mantine.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.mantine.blink", "ground_idle": "animation.mantine.ground_idle", "air_idle": "animation.mantine.ground_idle", "water_idle": "animation.mantine.ground_idle", diff --git a/entity/pokemon/mantyke.json b/entity/pokemon/mantyke.json index 80746ce03..37105a410 100644 --- a/entity/pokemon/mantyke.json +++ b/entity/pokemon/mantyke.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.mantyke.blink", "ground_idle": "animation.mantyke.ground_idle", "air_idle": "animation.mantyke.ground_idle", "water_idle": "animation.mantyke.ground_idle", diff --git a/entity/pokemon/mareep.json b/entity/pokemon/mareep.json index 5af1cebb5..3da89d9d8 100644 --- a/entity/pokemon/mareep.json +++ b/entity/pokemon/mareep.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.mareep.blink", "ground_idle": "animation.mareep.ground_idle", "air_idle": "animation.mareep.ground_idle", "water_idle": "animation.mareep.water_idle", diff --git a/entity/pokemon/marill.json b/entity/pokemon/marill.json index 0af9e0a2b..cfe5bcadb 100644 --- a/entity/pokemon/marill.json +++ b/entity/pokemon/marill.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.marill.blink", "ground_idle": "animation.marill.ground_idle", "air_idle": "animation.marill.ground_idle", "water_idle": "animation.marill.ground_idle", diff --git a/entity/pokemon/marshtomp.json b/entity/pokemon/marshtomp.json index 62b594578..4cb49a997 100644 --- a/entity/pokemon/marshtomp.json +++ b/entity/pokemon/marshtomp.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.marshtomp.blink", "ground_idle": "animation.marshtomp.ground_idle", "air_idle": "animation.marshtomp.ground_idle", "water_idle": "animation.marshtomp.ground_idle", diff --git a/entity/pokemon/meganium.json b/entity/pokemon/meganium.json index 27638d26a..acdccb2c9 100644 --- a/entity/pokemon/meganium.json +++ b/entity/pokemon/meganium.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.meganium.blink", "ground_idle": "animation.meganium.ground_idle", "air_idle": "animation.meganium.ground_idle", "water_idle": "animation.meganium.ground_idle", diff --git a/entity/pokemon/meowscarada.json b/entity/pokemon/meowscarada.json index 9ae123166..9c836b2d1 100644 --- a/entity/pokemon/meowscarada.json +++ b/entity/pokemon/meowscarada.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.meowscarada.blink", "ground_idle": "animation.meowscarada.ground_idle", "air_idle": "animation.meowscarada.ground_idle", "water_idle": "animation.meowscarada.ground_idle", diff --git a/entity/pokemon/meowstic.json b/entity/pokemon/meowstic.json index 27932bab8..f96976200 100644 --- a/entity/pokemon/meowstic.json +++ b/entity/pokemon/meowstic.json @@ -4,21 +4,50 @@ "description": { "identifier": "pokemon:meowstic", "materials": { - "default": "zombie" + "default": "entity_emissive_alpha", + "aura": "charged_creeper" }, "textures": { - "default": "textures/sprites/meowstic", - "shiny": "textures/sprites/meowstic", - "default_male": "textures/sprites/meowstic", - "default_female": "textures/sprites/meowstic", - "shiny_male": "textures/sprites/meowstic", - "shiny_female": "textures/sprites/meowstic" + "default": "textures/entity/pokemon/meowstic/meowstic", + "default_male": "textures/entity/pokemon/meowstic/meowstic", + "default_female": "textures/entity/pokemon/meowstic/meowstic", + "shiny": "textures/entity/pokemon/meowstic/shiny_meowstic", + "shiny_male": "textures/entity/pokemon/meowstic/shiny_meowstic", + "shiny_female": "textures/entity/pokemon/meowstic/shiny_meowstic", + "evo_aura": "textures/entity/evolving" }, "geometry": { - "default": "geometry.substitute" + "default": "geometry.meowstic" + }, + "scripts": { + "animate": [ + "controller" + ] + }, + "animations": { + "blink": "animation.meowstic.blink", + "ground_idle": "animation.meowstic.ground_idle", + "air_idle": "animation.meowstic.ground_idle", + "water_idle": "animation.meowstic.water_idle", + "walking": "animation.meowstic.walking", + "flying": "animation.meowstic.walking", + "swimming": "animation.meowstic.swimming", + "sleeping": "animation.meowstic.sleeping", + "attack": "animation.meowstic.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": "meowstic", diff --git a/entity/pokemon/meowsticf.json b/entity/pokemon/meowsticf.json index 410ad923c..1edf179d1 100644 --- a/entity/pokemon/meowsticf.json +++ b/entity/pokemon/meowsticf.json @@ -4,21 +4,50 @@ "description": { "identifier": "pokemon:meowsticf", "materials": { - "default": "zombie" + "default": "entity_emissive_alpha", + "aura": "charged_creeper" }, "textures": { - "default": "textures/sprites/meowsticf", - "shiny": "textures/sprites/meowsticf", - "default_male": "textures/sprites/meowsticf", - "default_female": "textures/sprites/meowsticf", - "shiny_male": "textures/sprites/meowsticf", - "shiny_female": "textures/sprites/meowsticf" + "default": "textures/entity/pokemon/meowsticf/meowsticf", + "default_male": "textures/entity/pokemon/meowsticf/meowsticf", + "default_female": "textures/entity/pokemon/meowsticf/meowsticf", + "shiny": "textures/entity/pokemon/meowsticf/shiny_meowsticf", + "shiny_male": "textures/entity/pokemon/meowsticf/shiny_meowsticf", + "shiny_female": "textures/entity/pokemon/meowsticf/shiny_meowsticf", + "evo_aura": "textures/entity/evolving" }, "geometry": { - "default": "geometry.substitute" + "default": "geometry.meowsticf" + }, + "scripts": { + "animate": [ + "controller" + ] + }, + "animations": { + "blink": "animation.meowsticf.blink", + "ground_idle": "animation.meowsticf.ground_idle", + "air_idle": "animation.meowsticf.ground_idle", + "water_idle": "animation.meowsticf.water_idle", + "walking": "animation.meowsticf.walking", + "flying": "animation.meowsticf.walking", + "swimming": "animation.meowsticf.swimming", + "sleeping": "animation.meowsticf.sleeping", + "attack": "animation.meowsticf.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": "meowsticf", diff --git a/entity/pokemon/meowth.json b/entity/pokemon/meowth.json index 5254cff40..becd0095d 100644 --- a/entity/pokemon/meowth.json +++ b/entity/pokemon/meowth.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.meowth.blink", "ground_idle": "animation.meowth.ground_idle", "air_idle": "animation.meowth.ground_idle", "water_idle": "animation.meowth.ground_idle", diff --git a/entity/pokemon/mesprit.json b/entity/pokemon/mesprit.json index 1bf0a028d..04e10639c 100644 --- a/entity/pokemon/mesprit.json +++ b/entity/pokemon/mesprit.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.mesprit.blink", "ground_idle": "animation.mesprit.ground_idle", "air_idle": "animation.mesprit.ground_idle", "water_idle": "animation.mesprit.ground_idle", diff --git a/entity/pokemon/metagross.json b/entity/pokemon/metagross.json index 9421c314c..e458b468f 100644 --- a/entity/pokemon/metagross.json +++ b/entity/pokemon/metagross.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.metagross.blink", "ground_idle": "animation.metagross.ground_idle", "air_idle": "animation.metagross.air_idle", "water_idle": "animation.metagross.water_idle", diff --git a/entity/pokemon/metang.json b/entity/pokemon/metang.json index f3c817b02..7f1c58f1b 100644 --- a/entity/pokemon/metang.json +++ b/entity/pokemon/metang.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.metang.blink", "ground_idle": "animation.metang.ground_idle", "air_idle": "animation.metang.air_idle", "water_idle": "animation.metang.water_idle", diff --git a/entity/pokemon/metapod.json b/entity/pokemon/metapod.json index 341c002b9..d26d0b923 100644 --- a/entity/pokemon/metapod.json +++ b/entity/pokemon/metapod.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.metapod.blink", "ground_idle": "animation.metapod.ground_idle", "air_idle": "animation.metapod.ground_idle", "water_idle": "animation.metapod.ground_idle", diff --git a/entity/pokemon/mew.json b/entity/pokemon/mew.json index 5dec5a216..a1ac914aa 100644 --- a/entity/pokemon/mew.json +++ b/entity/pokemon/mew.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.mew.blink", "ground_idle": "animation.mew.ground_idle", "air_idle": "animation.mew.ground_idle", "water_idle": "animation.mew.ground_idle", diff --git a/entity/pokemon/mewtwo.json b/entity/pokemon/mewtwo.json index d78d4ab56..e32220749 100644 --- a/entity/pokemon/mewtwo.json +++ b/entity/pokemon/mewtwo.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.mewtwo.blink", "ground_idle": "animation.mewtwo.ground_idle", "air_idle": "animation.mewtwo.ground_idle", "water_idle": "animation.mewtwo.ground_idle", diff --git a/entity/pokemon/miltank.json b/entity/pokemon/miltank.json index 51468fad0..35dec5d15 100644 --- a/entity/pokemon/miltank.json +++ b/entity/pokemon/miltank.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.miltank.blink", "ground_idle": "animation.miltank.ground_idle", "air_idle": "animation.miltank.ground_idle", "water_idle": "animation.miltank.ground_idle", diff --git a/entity/pokemon/minccino.json b/entity/pokemon/minccino.json index 4b9507481..e2b4dab66 100644 --- a/entity/pokemon/minccino.json +++ b/entity/pokemon/minccino.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.minccino.blink", "ground_idle": "animation.minccino.ground_idle", "air_idle": "animation.minccino.ground_idle", "water_idle": "animation.minccino.water_idle", diff --git a/entity/pokemon/misdreavus.json b/entity/pokemon/misdreavus.json index 3d32e13de..63662cc43 100644 --- a/entity/pokemon/misdreavus.json +++ b/entity/pokemon/misdreavus.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.misdreavus.blink", "ground_idle": "animation.misdreavus.ground_idle", "air_idle": "animation.misdreavus.air_idle", "water_idle": "animation.misdreavus.ground_idle", diff --git a/entity/pokemon/moltres.json b/entity/pokemon/moltres.json index 88d70831a..dc3312618 100644 --- a/entity/pokemon/moltres.json +++ b/entity/pokemon/moltres.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.moltres.blink", "ground_idle": "animation.moltres.ground_idle", "air_idle": "animation.moltres.air_idle", "water_idle": "animation.moltres.ground_idle", diff --git a/entity/pokemon/monferno.json b/entity/pokemon/monferno.json index 1984ebb89..bd11a5ab5 100644 --- a/entity/pokemon/monferno.json +++ b/entity/pokemon/monferno.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.monferno.blink", "ground_idle": "animation.monferno.ground_idle", "air_idle": "animation.monferno.ground_idle", "water_idle": "animation.monferno.ground_idle", diff --git a/entity/pokemon/mrmime.json b/entity/pokemon/mrmime.json index 41b9aebed..c26b6ceb9 100644 --- a/entity/pokemon/mrmime.json +++ b/entity/pokemon/mrmime.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.mrmime.blink", "ground_idle": "animation.mrmime.ground_idle", "air_idle": "animation.mrmime.ground_idle", "water_idle": "animation.mrmime.ground_idle", diff --git a/entity/pokemon/mudkip.json b/entity/pokemon/mudkip.json index 37dee0912..f34fe0757 100644 --- a/entity/pokemon/mudkip.json +++ b/entity/pokemon/mudkip.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.mudkip.blink", "ground_idle": "animation.mudkip.ground_idle", "air_idle": "animation.mudkip.ground_idle", "water_idle": "animation.mudkip.ground_idle", diff --git a/entity/pokemon/munchlax.json b/entity/pokemon/munchlax.json index 002193d20..9685a4432 100644 --- a/entity/pokemon/munchlax.json +++ b/entity/pokemon/munchlax.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.munchlax.blink", "ground_idle": "animation.munchlax.ground_idle", "air_idle": "animation.munchlax.ground_idle", "water_idle": "animation.munchlax.ground_idle", diff --git a/entity/pokemon/murkrow.json b/entity/pokemon/murkrow.json index 13c9c1549..c43d118d2 100644 --- a/entity/pokemon/murkrow.json +++ b/entity/pokemon/murkrow.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.murkrow.blink", "ground_idle": "animation.murkrow.ground_idle", "air_idle": "animation.murkrow.ground_idle", "water_idle": "animation.murkrow.ground_idle", diff --git a/entity/pokemon/natu.json b/entity/pokemon/natu.json index c04243b08..f42563024 100644 --- a/entity/pokemon/natu.json +++ b/entity/pokemon/natu.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.natu.blink", "ground_idle": "animation.natu.ground_idle", "air_idle": "animation.natu.air_idle", "water_idle": "animation.natu.ground_idle", diff --git a/entity/pokemon/nidoking.json b/entity/pokemon/nidoking.json index 34133d844..59ed573e4 100644 --- a/entity/pokemon/nidoking.json +++ b/entity/pokemon/nidoking.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.nidoking.blink", "ground_idle": "animation.nidoking.ground_idle", "air_idle": "animation.nidoking.ground_idle", "water_idle": "animation.nidoking.ground_idle", diff --git a/entity/pokemon/nidoqueen.json b/entity/pokemon/nidoqueen.json index 952c8d333..7da463ee7 100644 --- a/entity/pokemon/nidoqueen.json +++ b/entity/pokemon/nidoqueen.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.nidoqueen.blink", "ground_idle": "animation.nidoqueen.ground_idle", "air_idle": "animation.nidoqueen.ground_idle", "water_idle": "animation.nidoqueen.ground_idle", diff --git a/entity/pokemon/nidoranf.json b/entity/pokemon/nidoranf.json index 4c91ef90b..92c8cf662 100644 --- a/entity/pokemon/nidoranf.json +++ b/entity/pokemon/nidoranf.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.nidoranf.blink", "ground_idle": "animation.nidoranf.ground_idle", "air_idle": "animation.nidoranf.ground_idle", "water_idle": "animation.nidoranf.ground_idle", diff --git a/entity/pokemon/nidoranm.json b/entity/pokemon/nidoranm.json index c70be45ba..3fbe0fbf2 100644 --- a/entity/pokemon/nidoranm.json +++ b/entity/pokemon/nidoranm.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.nidoranm.blink", "ground_idle": "animation.nidoranm.ground_idle", "air_idle": "animation.nidoranm.ground_idle", "water_idle": "animation.nidoranm.ground_idle", diff --git a/entity/pokemon/nidorina.json b/entity/pokemon/nidorina.json index dff08689c..7ab72c133 100644 --- a/entity/pokemon/nidorina.json +++ b/entity/pokemon/nidorina.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.nidorina.blink", "ground_idle": "animation.nidorina.ground_idle", "air_idle": "animation.nidorina.ground_idle", "water_idle": "animation.nidorina.ground_idle", diff --git a/entity/pokemon/nidorino.json b/entity/pokemon/nidorino.json index 31fcbe84e..836b47f2d 100644 --- a/entity/pokemon/nidorino.json +++ b/entity/pokemon/nidorino.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.nidorino.blink", "ground_idle": "animation.nidorino.ground_idle", "air_idle": "animation.nidorino.ground_idle", "water_idle": "animation.nidorino.ground_idle", diff --git a/entity/pokemon/ninetales.json b/entity/pokemon/ninetales.json index 888a111cf..5f2d7c3dc 100644 --- a/entity/pokemon/ninetales.json +++ b/entity/pokemon/ninetales.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ninetales.blink", "ground_idle": "animation.ninetales.ground_idle", "air_idle": "animation.ninetales.ground_idle", "water_idle": "animation.ninetales.ground_idle", diff --git a/entity/pokemon/noctowl.json b/entity/pokemon/noctowl.json index 25b9742e0..585a4c6aa 100644 --- a/entity/pokemon/noctowl.json +++ b/entity/pokemon/noctowl.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.noctowl.blink", "ground_idle": "animation.noctowl.ground_idle", "air_idle": "animation.noctowl.air_idle", "water_idle": "animation.noctowl.ground_idle", diff --git a/entity/pokemon/octillery.json b/entity/pokemon/octillery.json index 5136f75c5..1a732c1b3 100644 --- a/entity/pokemon/octillery.json +++ b/entity/pokemon/octillery.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.octillery.blink", "ground_idle": "animation.octillery.ground_idle", "air_idle": "animation.octillery.ground_idle", "water_idle": "animation.octillery.ground_idle", diff --git a/entity/pokemon/oddish.json b/entity/pokemon/oddish.json index e90063368..c80d467de 100644 --- a/entity/pokemon/oddish.json +++ b/entity/pokemon/oddish.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.oddish.blink", "ground_idle": "animation.oddish.ground_idle", "air_idle": "animation.oddish.ground_idle", "water_idle": "animation.oddish.ground_idle", diff --git a/entity/pokemon/omanyte.json b/entity/pokemon/omanyte.json index e2ec164a6..1e056218c 100644 --- a/entity/pokemon/omanyte.json +++ b/entity/pokemon/omanyte.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.omanyte.blink", "ground_idle": "animation.omanyte.ground_idle", "air_idle": "animation.omanyte.ground_idle", "water_idle": "animation.omanyte.ground_idle", diff --git a/entity/pokemon/omastar.json b/entity/pokemon/omastar.json index e50153f50..d097fccf2 100644 --- a/entity/pokemon/omastar.json +++ b/entity/pokemon/omastar.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.omastar.blink", "ground_idle": "animation.omastar.ground_idle", "air_idle": "animation.omastar.ground_idle", "water_idle": "animation.omastar.ground_idle", diff --git a/entity/pokemon/onix.json b/entity/pokemon/onix.json index 92e72b186..545baa43e 100644 --- a/entity/pokemon/onix.json +++ b/entity/pokemon/onix.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.onix.blink", "ground_idle": "animation.onix.ground_idle", "air_idle": "animation.onix.ground_idle", "water_idle": "animation.onix.ground_idle", diff --git a/entity/pokemon/oshawott.json b/entity/pokemon/oshawott.json index 86d933227..ee5453195 100644 --- a/entity/pokemon/oshawott.json +++ b/entity/pokemon/oshawott.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.oshawott.blink", "ground_idle": "animation.oshawott.ground_idle", "air_idle": "animation.oshawott.ground_idle", "water_idle": "animation.oshawott.water_idle", diff --git a/entity/pokemon/palkia.json b/entity/pokemon/palkia.json index 1082d98a4..2a8f1f8f9 100644 --- a/entity/pokemon/palkia.json +++ b/entity/pokemon/palkia.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.palkia.blink", "ground_idle": "animation.palkia.ground_idle", "air_idle": "animation.palkia.ground_idle", "water_idle": "animation.palkia.ground_idle", diff --git a/entity/pokemon/paras.json b/entity/pokemon/paras.json index 02ed0902e..9022b2338 100644 --- a/entity/pokemon/paras.json +++ b/entity/pokemon/paras.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.paras.blink", "ground_idle": "animation.paras.ground_idle", "air_idle": "animation.paras.ground_idle", "water_idle": "animation.paras.ground_idle", diff --git a/entity/pokemon/parasect.json b/entity/pokemon/parasect.json index 40996358c..d57bb4777 100644 --- a/entity/pokemon/parasect.json +++ b/entity/pokemon/parasect.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.parasect.blink", "ground_idle": "animation.parasect.ground_idle", "air_idle": "animation.parasect.ground_idle", "water_idle": "animation.parasect.ground_idle", diff --git a/entity/pokemon/pawmi.json b/entity/pokemon/pawmi.json index eb361f3f8..7f8527e97 100644 --- a/entity/pokemon/pawmi.json +++ b/entity/pokemon/pawmi.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.pawmi.blink", "ground_idle": "animation.pawmi.ground_idle", "air_idle": "animation.pawmi.ground_idle", "water_idle": "animation.pawmi.ground_idle", diff --git a/entity/pokemon/pawmot.json b/entity/pokemon/pawmot.json index dad8f7394..fd67438f9 100644 --- a/entity/pokemon/pawmot.json +++ b/entity/pokemon/pawmot.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.pawmot.blink", "ground_idle": "animation.pawmot.ground_idle", "air_idle": "animation.pawmot.ground_idle", "water_idle": "animation.pawmot.ground_idle", diff --git a/entity/pokemon/persian.json b/entity/pokemon/persian.json index f7be31d3a..576892f23 100644 --- a/entity/pokemon/persian.json +++ b/entity/pokemon/persian.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.persian.blink", "ground_idle": "animation.persian.ground_idle", "air_idle": "animation.persian.ground_idle", "water_idle": "animation.persian.ground_idle", diff --git a/entity/pokemon/petilil.json b/entity/pokemon/petilil.json index b608db7f4..366bb3547 100644 --- a/entity/pokemon/petilil.json +++ b/entity/pokemon/petilil.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.petilil.blink", "ground_idle": "animation.petilil.ground_idle", "air_idle": "animation.petilil.ground_idle", "water_idle": "animation.petilil.ground_idle", diff --git a/entity/pokemon/phanpy.json b/entity/pokemon/phanpy.json index 0a63fbfe4..73d1b27c4 100644 --- a/entity/pokemon/phanpy.json +++ b/entity/pokemon/phanpy.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.phanpy.blink", "ground_idle": "animation.phanpy.ground_idle", "air_idle": "animation.phanpy.ground_idle", "water_idle": "animation.phanpy.ground_idle", diff --git a/entity/pokemon/pichu.json b/entity/pokemon/pichu.json index bb46a24d8..ed54b6843 100644 --- a/entity/pokemon/pichu.json +++ b/entity/pokemon/pichu.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.pichu.blink", "ground_idle": "animation.pichu.ground_idle", "air_idle": "animation.pichu.ground_idle", "water_idle": "animation.pichu.water_idle", diff --git a/entity/pokemon/pichuspikyeared.json b/entity/pokemon/pichuspikyeared.json index 38e01d9fb..b51420673 100644 --- a/entity/pokemon/pichuspikyeared.json +++ b/entity/pokemon/pichuspikyeared.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.pichuspikyeared.blink", "ground_idle": "animation.pichuspikyeared.ground_idle", "air_idle": "animation.pichuspikyeared.ground_idle", "water_idle": "animation.pichuspikyeared.water_idle", diff --git a/entity/pokemon/pidgeot.json b/entity/pokemon/pidgeot.json index 8015a37a1..5da0a30f1 100644 --- a/entity/pokemon/pidgeot.json +++ b/entity/pokemon/pidgeot.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.pidgeot.blink", "ground_idle": "animation.pidgeot.ground_idle", "air_idle": "animation.pidgeot.ground_idle", "water_idle": "animation.pidgeot.ground_idle", diff --git a/entity/pokemon/pidgeotto.json b/entity/pokemon/pidgeotto.json index 53921737c..651b9da81 100644 --- a/entity/pokemon/pidgeotto.json +++ b/entity/pokemon/pidgeotto.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.pidgeotto.blink", "ground_idle": "animation.pidgeotto.ground_idle", "air_idle": "animation.pidgeotto.ground_idle", "water_idle": "animation.pidgeotto.ground_idle", diff --git a/entity/pokemon/pidgey.json b/entity/pokemon/pidgey.json index c352c1052..254927631 100644 --- a/entity/pokemon/pidgey.json +++ b/entity/pokemon/pidgey.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.pidgey.blink", "ground_idle": "animation.pidgey.ground_idle", "air_idle": "animation.pidgey.ground_idle", "water_idle": "animation.pidgey.ground_idle", diff --git a/entity/pokemon/pignite.json b/entity/pokemon/pignite.json index 60c21ae2a..0348abc9c 100644 --- a/entity/pokemon/pignite.json +++ b/entity/pokemon/pignite.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.pignite.blink", "ground_idle": "animation.pignite.ground_idle", "air_idle": "animation.pignite.ground_idle", "water_idle": "animation.pignite.ground_idle", diff --git a/entity/pokemon/pikachu.json b/entity/pokemon/pikachu.json index a01cfff03..b48aa65b2 100644 --- a/entity/pokemon/pikachu.json +++ b/entity/pokemon/pikachu.json @@ -29,6 +29,7 @@ ] }, "animations": { + "blink": "animation.pikachu.blink", "ground_idle": "animation.pikachu.ground_idle", "air_idle": "animation.pikachu.ground_idle", "water_idle": "animation.pikachu.ground_idle", diff --git a/entity/pokemon/piloswine.json b/entity/pokemon/piloswine.json index d54ef9c47..6eb756bce 100644 --- a/entity/pokemon/piloswine.json +++ b/entity/pokemon/piloswine.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.piloswine.blink", "ground_idle": "animation.piloswine.ground_idle", "air_idle": "animation.piloswine.ground_idle", "water_idle": "animation.piloswine.ground_idle", diff --git a/entity/pokemon/pineco.json b/entity/pokemon/pineco.json index ddccef7fd..f294ddba2 100644 --- a/entity/pokemon/pineco.json +++ b/entity/pokemon/pineco.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.pineco.blink", "ground_idle": "animation.pineco.ground_idle", "air_idle": "animation.pineco.ground_idle", "water_idle": "animation.pineco.ground_idle", diff --git a/entity/pokemon/pinsir.json b/entity/pokemon/pinsir.json index be90cbd33..f1efaccaf 100644 --- a/entity/pokemon/pinsir.json +++ b/entity/pokemon/pinsir.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.pinsir.blink", "ground_idle": "animation.pinsir.ground_idle", "air_idle": "animation.pinsir.ground_idle", "water_idle": "animation.pinsir.ground_idle", diff --git a/entity/pokemon/piplup.json b/entity/pokemon/piplup.json index 13fe170fa..e82e735ed 100644 --- a/entity/pokemon/piplup.json +++ b/entity/pokemon/piplup.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.piplup.blink", "ground_idle": "animation.piplup.ground_idle", "air_idle": "animation.piplup.ground_idle", "water_idle": "animation.piplup.ground_idle", diff --git a/entity/pokemon/politoed.json b/entity/pokemon/politoed.json index b3b02f186..75179e043 100644 --- a/entity/pokemon/politoed.json +++ b/entity/pokemon/politoed.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.politoed.blink", "ground_idle": "animation.politoed.ground_idle", "air_idle": "animation.politoed.ground_idle", "water_idle": "animation.politoed.ground_idle", diff --git a/entity/pokemon/poliwag.json b/entity/pokemon/poliwag.json index 8f5058150..93522bb97 100644 --- a/entity/pokemon/poliwag.json +++ b/entity/pokemon/poliwag.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.poliwag.blink", "ground_idle": "animation.poliwag.ground_idle", "air_idle": "animation.poliwag.ground_idle", "water_idle": "animation.poliwag.ground_idle", diff --git a/entity/pokemon/poliwhirl.json b/entity/pokemon/poliwhirl.json index 2f33771c6..37d50abd5 100644 --- a/entity/pokemon/poliwhirl.json +++ b/entity/pokemon/poliwhirl.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.poliwhirl.blink", "ground_idle": "animation.poliwhirl.ground_idle", "air_idle": "animation.poliwhirl.ground_idle", "water_idle": "animation.poliwhirl.ground_idle", diff --git a/entity/pokemon/poliwrath.json b/entity/pokemon/poliwrath.json index 4eb1320a0..c556a1a55 100644 --- a/entity/pokemon/poliwrath.json +++ b/entity/pokemon/poliwrath.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.poliwrath.blink", "ground_idle": "animation.poliwrath.ground_idle", "air_idle": "animation.poliwrath.ground_idle", "water_idle": "animation.poliwrath.ground_idle", diff --git a/entity/pokemon/popplio.json b/entity/pokemon/popplio.json index 403069ab8..92de12e87 100644 --- a/entity/pokemon/popplio.json +++ b/entity/pokemon/popplio.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.popplio.blink", "ground_idle": "animation.popplio.ground_idle", "air_idle": "animation.popplio.ground_idle", "water_idle": "animation.popplio.ground_idle", diff --git a/entity/pokemon/porygon.json b/entity/pokemon/porygon.json index aa5175766..5719c67fd 100644 --- a/entity/pokemon/porygon.json +++ b/entity/pokemon/porygon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.porygon.blink", "ground_idle": "animation.porygon.ground_idle", "air_idle": "animation.porygon.ground_idle", "water_idle": "animation.porygon.ground_idle", diff --git a/entity/pokemon/porygon2.json b/entity/pokemon/porygon2.json index 56bf898b2..159c06ea2 100644 --- a/entity/pokemon/porygon2.json +++ b/entity/pokemon/porygon2.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.porygon2.blink", "ground_idle": "animation.porygon2.ground_idle", "air_idle": "animation.porygon2.ground_idle", "water_idle": "animation.porygon2.ground_idle", diff --git a/entity/pokemon/porygonz.json b/entity/pokemon/porygonz.json index b3b7c3947..7317fde26 100644 --- a/entity/pokemon/porygonz.json +++ b/entity/pokemon/porygonz.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.porygonz.blink", "ground_idle": "animation.porygonz.ground_idle", "air_idle": "animation.porygonz.ground_idle", "water_idle": "animation.porygonz.ground_idle", diff --git a/entity/pokemon/primarina.json b/entity/pokemon/primarina.json index 1d9214109..5b93a67cc 100644 --- a/entity/pokemon/primarina.json +++ b/entity/pokemon/primarina.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.primarina.blink", "ground_idle": "animation.primarina.ground_idle", "air_idle": "animation.primarina.ground_idle", "water_idle": "animation.primarina.ground_idle", diff --git a/entity/pokemon/primeape.json b/entity/pokemon/primeape.json index 44aa74dd5..2cc7bc3b3 100644 --- a/entity/pokemon/primeape.json +++ b/entity/pokemon/primeape.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.primeape.blink", "ground_idle": "animation.primeape.ground_idle", "air_idle": "animation.primeape.ground_idle", "water_idle": "animation.primeape.ground_idle", diff --git a/entity/pokemon/prinplup.json b/entity/pokemon/prinplup.json index 02475b0a6..59393130d 100644 --- a/entity/pokemon/prinplup.json +++ b/entity/pokemon/prinplup.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.prinplup.blink", "ground_idle": "animation.prinplup.ground_idle", "air_idle": "animation.prinplup.ground_idle", "water_idle": "animation.prinplup.ground_idle", diff --git a/entity/pokemon/psyduck.json b/entity/pokemon/psyduck.json index f1b3a3b55..2e900b2ce 100644 --- a/entity/pokemon/psyduck.json +++ b/entity/pokemon/psyduck.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.psyduck.blink", "ground_idle": "animation.psyduck.ground_idle", "air_idle": "animation.psyduck.ground_idle", "water_idle": "animation.psyduck.ground_idle", diff --git a/entity/pokemon/pupitar.json b/entity/pokemon/pupitar.json index 9ed1978c7..3ac12fa7e 100644 --- a/entity/pokemon/pupitar.json +++ b/entity/pokemon/pupitar.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.pupitar.blink", "ground_idle": "animation.pupitar.ground_idle", "air_idle": "animation.pupitar.ground_idle", "water_idle": "animation.pupitar.ground_idle", diff --git a/entity/pokemon/quagsire.json b/entity/pokemon/quagsire.json index f14ab7af9..c9bcdf9b5 100644 --- a/entity/pokemon/quagsire.json +++ b/entity/pokemon/quagsire.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.quagsire.blink", "ground_idle": "animation.quagsire.ground_idle", "air_idle": "animation.quagsire.ground_idle", "water_idle": "animation.quagsire.ground_idle", diff --git a/entity/pokemon/quaquaval.json b/entity/pokemon/quaquaval.json index e1b2cf9e4..fa90bdcf8 100644 --- a/entity/pokemon/quaquaval.json +++ b/entity/pokemon/quaquaval.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.quaquaval.blink", "ground_idle": "animation.quaquaval.ground_idle", "air_idle": "animation.quaquaval.ground_idle", "water_idle": "animation.quaquaval.ground_idle", diff --git a/entity/pokemon/quaxly.json b/entity/pokemon/quaxly.json index 2c905eab4..9c48aad38 100644 --- a/entity/pokemon/quaxly.json +++ b/entity/pokemon/quaxly.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.quaxly.blink", "ground_idle": "animation.quaxly.ground_idle", "air_idle": "animation.quaxly.ground_idle", "water_idle": "animation.quaxly.ground_idle", diff --git a/entity/pokemon/quaxwell.json b/entity/pokemon/quaxwell.json index 22d10e143..fd35cffaa 100644 --- a/entity/pokemon/quaxwell.json +++ b/entity/pokemon/quaxwell.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.quaxwell.blink", "ground_idle": "animation.quaxwell.ground_idle", "air_idle": "animation.quaxwell.ground_idle", "water_idle": "animation.quaxwell.ground_idle", diff --git a/entity/pokemon/quilava.json b/entity/pokemon/quilava.json index 87508b5be..eb305f020 100644 --- a/entity/pokemon/quilava.json +++ b/entity/pokemon/quilava.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.quilava.blink", "ground_idle": "animation.quilava.ground_idle", "air_idle": "animation.quilava.ground_idle", "water_idle": "animation.quilava.ground_idle", diff --git a/entity/pokemon/quilladin.json b/entity/pokemon/quilladin.json index 43e784bca..a2ceb74ad 100644 --- a/entity/pokemon/quilladin.json +++ b/entity/pokemon/quilladin.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.quilladin.blink", "ground_idle": "animation.quilladin.ground_idle", "air_idle": "animation.quilladin.ground_idle", "water_idle": "animation.quilladin.ground_idle", diff --git a/entity/pokemon/qwilfish.json b/entity/pokemon/qwilfish.json index 3dbde244f..59f90c533 100644 --- a/entity/pokemon/qwilfish.json +++ b/entity/pokemon/qwilfish.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.qwilfish.blink", "ground_idle": "animation.qwilfish.ground_idle", "air_idle": "animation.qwilfish.ground_idle", "water_idle": "animation.qwilfish.ground_idle", diff --git a/entity/pokemon/raboot.json b/entity/pokemon/raboot.json index e4f2a81ca..ce865cd39 100644 --- a/entity/pokemon/raboot.json +++ b/entity/pokemon/raboot.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.raboot.blink", "ground_idle": "animation.raboot.ground_idle", "air_idle": "animation.raboot.ground_idle", "water_idle": "animation.raboot.water_idle", diff --git a/entity/pokemon/raichu.json b/entity/pokemon/raichu.json index d73cfe196..cd0a6fec0 100644 --- a/entity/pokemon/raichu.json +++ b/entity/pokemon/raichu.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.raichu.blink", "ground_idle": "animation.raichu.ground_idle", "air_idle": "animation.raichu.ground_idle", "water_idle": "animation.raichu.ground_idle", diff --git a/entity/pokemon/raikou.json b/entity/pokemon/raikou.json index d77ed7c6b..5ea86389e 100644 --- a/entity/pokemon/raikou.json +++ b/entity/pokemon/raikou.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.raikou.blink", "ground_idle": "animation.raikou.ground_idle", "air_idle": "animation.raikou.ground_idle", "water_idle": "animation.raikou.ground_idle", diff --git a/entity/pokemon/ralts.json b/entity/pokemon/ralts.json index 4819067ce..0723f72b3 100644 --- a/entity/pokemon/ralts.json +++ b/entity/pokemon/ralts.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ralts.blink", "ground_idle": "animation.ralts.ground_idle", "air_idle": "animation.ralts.ground_idle", "water_idle": "animation.ralts.ground_idle", diff --git a/entity/pokemon/rayquaza.json b/entity/pokemon/rayquaza.json index 07f3e3ef5..1fe13748a 100644 --- a/entity/pokemon/rayquaza.json +++ b/entity/pokemon/rayquaza.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.rayquaza.blink", "ground_idle": "animation.rayquaza.ground_idle", "air_idle": "animation.rayquaza.ground_idle", "water_idle": "animation.rayquaza.ground_idle", diff --git a/entity/pokemon/regice.json b/entity/pokemon/regice.json index cb109fbe8..83917b8a4 100644 --- a/entity/pokemon/regice.json +++ b/entity/pokemon/regice.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.regice.blink", "ground_idle": "animation.regice.ground_idle", "air_idle": "animation.regice.ground_idle", "water_idle": "animation.regice.ground_idle", diff --git a/entity/pokemon/regigigas.json b/entity/pokemon/regigigas.json index 4fcf7816b..783e33042 100644 --- a/entity/pokemon/regigigas.json +++ b/entity/pokemon/regigigas.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.regigigas.blink", "ground_idle": "animation.regigigas.ground_idle", "air_idle": "animation.regigigas.ground_idle", "water_idle": "animation.regigigas.ground_idle", diff --git a/entity/pokemon/regirock.json b/entity/pokemon/regirock.json index 2e000ddcf..bff33e3ac 100644 --- a/entity/pokemon/regirock.json +++ b/entity/pokemon/regirock.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.regirock.blink", "ground_idle": "animation.regirock.ground_idle", "air_idle": "animation.regirock.ground_idle", "water_idle": "animation.regirock.ground_idle", diff --git a/entity/pokemon/registeel.json b/entity/pokemon/registeel.json index 094fe8cd6..f18e7c1ad 100644 --- a/entity/pokemon/registeel.json +++ b/entity/pokemon/registeel.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.registeel.blink", "ground_idle": "animation.registeel.ground_idle", "air_idle": "animation.registeel.ground_idle", "water_idle": "animation.registeel.ground_idle", diff --git a/entity/pokemon/remoraid.json b/entity/pokemon/remoraid.json index 167bbfc8f..ffa6ae248 100644 --- a/entity/pokemon/remoraid.json +++ b/entity/pokemon/remoraid.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.remoraid.blink", "ground_idle": "animation.remoraid.ground_idle", "air_idle": "animation.remoraid.ground_idle", "water_idle": "animation.remoraid.ground_idle", diff --git a/entity/pokemon/rillaboom.json b/entity/pokemon/rillaboom.json index aca11a50a..81f0f551f 100644 --- a/entity/pokemon/rillaboom.json +++ b/entity/pokemon/rillaboom.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.rillaboom.blink", "ground_idle": "animation.rillaboom.ground_idle", "air_idle": "animation.rillaboom.ground_idle", "water_idle": "animation.rillaboom.ground_idle", diff --git a/entity/pokemon/riolu.json b/entity/pokemon/riolu.json index f70e9f0ed..750c357f0 100644 --- a/entity/pokemon/riolu.json +++ b/entity/pokemon/riolu.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.riolu.blink", "ground_idle": "animation.riolu.ground_idle", "air_idle": "animation.riolu.ground_idle", "water_idle": "animation.riolu.ground_idle", diff --git a/entity/pokemon/roaringmoon.json b/entity/pokemon/roaringmoon.json index fbb15aff0..7d277d252 100644 --- a/entity/pokemon/roaringmoon.json +++ b/entity/pokemon/roaringmoon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.roaringmoon.blink", "ground_idle": "animation.roaringmoon.ground_idle", "air_idle": "animation.roaringmoon.air_idle", "water_idle": "animation.roaringmoon.water_idle", diff --git a/entity/pokemon/rowlet.json b/entity/pokemon/rowlet.json index 077ce681f..403b3a06d 100644 --- a/entity/pokemon/rowlet.json +++ b/entity/pokemon/rowlet.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.rowlet.blink", "ground_idle": "animation.rowlet.ground_idle", "air_idle": "animation.rowlet.ground_idle", "water_idle": "animation.rowlet.ground_idle", diff --git a/entity/pokemon/sableye.json b/entity/pokemon/sableye.json index 6283d245b..70cafea72 100644 --- a/entity/pokemon/sableye.json +++ b/entity/pokemon/sableye.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sableye.blink", "ground_idle": "animation.sableye.ground_idle", "air_idle": "animation.sableye.ground_idle", "water_idle": "animation.sableye.ground_idle", diff --git a/entity/pokemon/samurott.json b/entity/pokemon/samurott.json index 6d27d20c5..744cd21d2 100644 --- a/entity/pokemon/samurott.json +++ b/entity/pokemon/samurott.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.samurott.blink", "ground_idle": "animation.samurott.ground_idle", "air_idle": "animation.samurott.ground_idle", "water_idle": "animation.samurott.ground_idle", diff --git a/entity/pokemon/sandshrew.json b/entity/pokemon/sandshrew.json index 7c9fb54ca..bb92e3cec 100644 --- a/entity/pokemon/sandshrew.json +++ b/entity/pokemon/sandshrew.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sandshrew.blink", "ground_idle": "animation.sandshrew.ground_idle", "air_idle": "animation.sandshrew.ground_idle", "water_idle": "animation.sandshrew.ground_idle", diff --git a/entity/pokemon/sandslash.json b/entity/pokemon/sandslash.json index d298d6fbc..387e5d692 100644 --- a/entity/pokemon/sandslash.json +++ b/entity/pokemon/sandslash.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sandslash.blink", "ground_idle": "animation.sandslash.ground_idle", "air_idle": "animation.sandslash.ground_idle", "water_idle": "animation.sandslash.ground_idle", diff --git a/entity/pokemon/sceptile.json b/entity/pokemon/sceptile.json index 45f1bf690..d307b8847 100644 --- a/entity/pokemon/sceptile.json +++ b/entity/pokemon/sceptile.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sceptile.blink", "ground_idle": "animation.sceptile.ground_idle", "air_idle": "animation.sceptile.ground_idle", "water_idle": "animation.sceptile.ground_idle", diff --git a/entity/pokemon/scizor.json b/entity/pokemon/scizor.json index 7b90e034c..66415ce0e 100644 --- a/entity/pokemon/scizor.json +++ b/entity/pokemon/scizor.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.scizor.blink", "ground_idle": "animation.scizor.ground_idle", "air_idle": "animation.scizor.ground_idle", "water_idle": "animation.scizor.ground_idle", diff --git a/entity/pokemon/scorbunny.json b/entity/pokemon/scorbunny.json index 9c7cb9e38..2f1a913fb 100644 --- a/entity/pokemon/scorbunny.json +++ b/entity/pokemon/scorbunny.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.scorbunny.blink", "ground_idle": "animation.scorbunny.ground_idle", "air_idle": "animation.scorbunny.ground_idle", "water_idle": "animation.scorbunny.water_idle", diff --git a/entity/pokemon/scyther.json b/entity/pokemon/scyther.json index f43d07662..f2ebfb49d 100644 --- a/entity/pokemon/scyther.json +++ b/entity/pokemon/scyther.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.scyther.blink", "ground_idle": "animation.scyther.ground_idle", "air_idle": "animation.scyther.ground_idle", "water_idle": "animation.scyther.ground_idle", diff --git a/entity/pokemon/seadra.json b/entity/pokemon/seadra.json index ef079fbb4..619e7d9d9 100644 --- a/entity/pokemon/seadra.json +++ b/entity/pokemon/seadra.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.seadra.blink", "ground_idle": "animation.seadra.ground_idle", "air_idle": "animation.seadra.ground_idle", "water_idle": "animation.seadra.ground_idle", diff --git a/entity/pokemon/seaking.json b/entity/pokemon/seaking.json index 1e5267041..650e14342 100644 --- a/entity/pokemon/seaking.json +++ b/entity/pokemon/seaking.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.seaking.blink", "ground_idle": "animation.seaking.ground_idle", "air_idle": "animation.seaking.ground_idle", "water_idle": "animation.seaking.ground_idle", diff --git a/entity/pokemon/seel.json b/entity/pokemon/seel.json index 9fe18d266..15938cbca 100644 --- a/entity/pokemon/seel.json +++ b/entity/pokemon/seel.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.seel.blink", "ground_idle": "animation.seel.ground_idle", "air_idle": "animation.seel.ground_idle", "water_idle": "animation.seel.ground_idle", diff --git a/entity/pokemon/sentret.json b/entity/pokemon/sentret.json index ceacbf087..a9f209fc0 100644 --- a/entity/pokemon/sentret.json +++ b/entity/pokemon/sentret.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sentret.blink", "ground_idle": "animation.sentret.ground_idle", "air_idle": "animation.sentret.ground_idle", "water_idle": "animation.sentret.ground_idle", diff --git a/entity/pokemon/serperior.json b/entity/pokemon/serperior.json index 7ef2e1df8..a7a7a179a 100644 --- a/entity/pokemon/serperior.json +++ b/entity/pokemon/serperior.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.serperior.blink", "ground_idle": "animation.serperior.ground_idle", "air_idle": "animation.serperior.ground_idle", "water_idle": "animation.serperior.ground_idle", diff --git a/entity/pokemon/servine.json b/entity/pokemon/servine.json index 56258d073..6eedaf963 100644 --- a/entity/pokemon/servine.json +++ b/entity/pokemon/servine.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.servine.blink", "ground_idle": "animation.servine.ground_idle", "air_idle": "animation.servine.ground_idle", "water_idle": "animation.servine.ground_idle", diff --git a/entity/pokemon/sewaddle.json b/entity/pokemon/sewaddle.json index efb2ba553..4a8e94400 100644 --- a/entity/pokemon/sewaddle.json +++ b/entity/pokemon/sewaddle.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sewaddle.blink", "ground_idle": "animation.sewaddle.ground_idle", "air_idle": "animation.sewaddle.ground_idle", "water_idle": "animation.sewaddle.ground_idle", diff --git a/entity/pokemon/sharpedo.json b/entity/pokemon/sharpedo.json index 956f46e89..fcfdab4b0 100644 --- a/entity/pokemon/sharpedo.json +++ b/entity/pokemon/sharpedo.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sharpedo.blink", "ground_idle": "animation.sharpedo.ground_idle", "air_idle": "animation.sharpedo.ground_idle", "water_idle": "animation.sharpedo.water_idle", diff --git a/entity/pokemon/shellder.json b/entity/pokemon/shellder.json index 3cd26c4ef..9cec2c27c 100644 --- a/entity/pokemon/shellder.json +++ b/entity/pokemon/shellder.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.shellder.blink", "ground_idle": "animation.shellder.ground_idle", "air_idle": "animation.shellder.ground_idle", "water_idle": "animation.shellder.ground_idle", diff --git a/entity/pokemon/shinx.json b/entity/pokemon/shinx.json index 4bb1ecbe6..27a9d6102 100644 --- a/entity/pokemon/shinx.json +++ b/entity/pokemon/shinx.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.shinx.blink", "ground_idle": "animation.shinx.ground_idle", "air_idle": "animation.shinx.ground_idle", "water_idle": "animation.shinx.ground_idle", diff --git a/entity/pokemon/shroomish.json b/entity/pokemon/shroomish.json index 26d8e21eb..0b4439ab0 100644 --- a/entity/pokemon/shroomish.json +++ b/entity/pokemon/shroomish.json @@ -4,21 +4,50 @@ "description": { "identifier": "pokemon:shroomish", "materials": { - "default": "zombie" + "default": "entity_emissive_alpha", + "aura": "charged_creeper" }, "textures": { - "default": "textures/sprites/shroomish", - "shiny": "textures/sprites/shroomish", - "default_male": "textures/sprites/shroomish", - "default_female": "textures/sprites/shroomish", - "shiny_male": "textures/sprites/shroomish", - "shiny_female": "textures/sprites/shroomish" + "default": "textures/entity/pokemon/shroomish/shroomish", + "default_male": "textures/entity/pokemon/shroomish/shroomish", + "default_female": "textures/entity/pokemon/shroomish/shroomish", + "shiny": "textures/entity/pokemon/shroomish/shiny_shroomish", + "shiny_male": "textures/entity/pokemon/shroomish/shiny_shroomish", + "shiny_female": "textures/entity/pokemon/shroomish/shiny_shroomish", + "evo_aura": "textures/entity/evolving" }, "geometry": { - "default": "geometry.substitute" + "default": "geometry.shroomish" + }, + "scripts": { + "animate": [ + "controller" + ] + }, + "animations": { + "blink": "animation.shroomish.blink", + "ground_idle": "animation.shroomish.ground_idle", + "air_idle": "animation.shroomish.ground_idle", + "water_idle": "animation.shroomish.water_idle", + "walking": "animation.shroomish.walking", + "flying": "animation.shroomish.walking", + "swimming": "animation.shroomish.swimming", + "sleeping": "animation.shroomish.sleeping", + "attack": "animation.shroomish.walking", + "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": "shroomish", diff --git a/entity/pokemon/shuckle.json b/entity/pokemon/shuckle.json index 0bb3da811..9e7382f42 100644 --- a/entity/pokemon/shuckle.json +++ b/entity/pokemon/shuckle.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.shuckle.blink", "ground_idle": "animation.shuckle.ground_idle", "air_idle": "animation.shuckle.ground_idle", "water_idle": "animation.shuckle.ground_idle", diff --git a/entity/pokemon/skarmory.json b/entity/pokemon/skarmory.json index b15c8f41f..8cb96250b 100644 --- a/entity/pokemon/skarmory.json +++ b/entity/pokemon/skarmory.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.skarmory.blink", "ground_idle": "animation.skarmory.ground_idle", "air_idle": "animation.skarmory.ground_idle", "water_idle": "animation.skarmory.ground_idle", diff --git a/entity/pokemon/skeledirge.json b/entity/pokemon/skeledirge.json index 92dbc15e6..6bd708064 100644 --- a/entity/pokemon/skeledirge.json +++ b/entity/pokemon/skeledirge.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.skeledirge.blink", "ground_idle": "animation.skeledirge.ground_idle", "air_idle": "animation.skeledirge.ground_idle", "water_idle": "animation.skeledirge.ground_idle", diff --git a/entity/pokemon/skiploom.json b/entity/pokemon/skiploom.json index a9700159c..c2e94f9f1 100644 --- a/entity/pokemon/skiploom.json +++ b/entity/pokemon/skiploom.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.skiploom.blink", "ground_idle": "animation.skiploom.ground_idle", "air_idle": "animation.skiploom.ground_idle", "water_idle": "animation.skiploom.ground_idle", diff --git a/entity/pokemon/slitherwing.json b/entity/pokemon/slitherwing.json index 44e65d254..ad3e7f41b 100644 --- a/entity/pokemon/slitherwing.json +++ b/entity/pokemon/slitherwing.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.slitherwing.blink", "ground_idle": "animation.slitherwing.ground_idle", "air_idle": "animation.slitherwing.ground_idle", "water_idle": "animation.slitherwing.ground_idle", diff --git a/entity/pokemon/slowbro.json b/entity/pokemon/slowbro.json index 99df1c0d9..012ca6955 100644 --- a/entity/pokemon/slowbro.json +++ b/entity/pokemon/slowbro.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.slowbro.blink", "ground_idle": "animation.slowbro.ground_idle", "air_idle": "animation.slowbro.ground_idle", "water_idle": "animation.slowbro.ground_idle", diff --git a/entity/pokemon/slowking.json b/entity/pokemon/slowking.json index 074bc3209..5ba661b6e 100644 --- a/entity/pokemon/slowking.json +++ b/entity/pokemon/slowking.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.slowking.blink", "ground_idle": "animation.slowking.ground_idle", "air_idle": "animation.slowking.ground_idle", "water_idle": "animation.slowking.ground_idle", diff --git a/entity/pokemon/slowpoke.json b/entity/pokemon/slowpoke.json index 06ab0dcb9..9dcae3215 100644 --- a/entity/pokemon/slowpoke.json +++ b/entity/pokemon/slowpoke.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.slowpoke.blink", "ground_idle": "animation.slowpoke.ground_idle", "air_idle": "animation.slowpoke.ground_idle", "water_idle": "animation.slowpoke.ground_idle", diff --git a/entity/pokemon/slugma.json b/entity/pokemon/slugma.json index b7a7ab2ad..9676ab45a 100644 --- a/entity/pokemon/slugma.json +++ b/entity/pokemon/slugma.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.slugma.blink", "ground_idle": "animation.slugma.ground_idle", "air_idle": "animation.slugma.ground_idle", "water_idle": "animation.slugma.ground_idle", diff --git a/entity/pokemon/smeargle.json b/entity/pokemon/smeargle.json index 48af8c259..1cac3bc4f 100644 --- a/entity/pokemon/smeargle.json +++ b/entity/pokemon/smeargle.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.smeargle.blink", "ground_idle": "animation.smeargle.ground_idle", "air_idle": "animation.smeargle.ground_idle", "water_idle": "animation.smeargle.ground_idle", diff --git a/entity/pokemon/smoochum.json b/entity/pokemon/smoochum.json index a52109280..1093e0cd4 100644 --- a/entity/pokemon/smoochum.json +++ b/entity/pokemon/smoochum.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.smoochum.blink", "ground_idle": "animation.smoochum.ground_idle", "air_idle": "animation.smoochum.ground_idle", "water_idle": "animation.smoochum.ground_idle", diff --git a/entity/pokemon/sneasel.json b/entity/pokemon/sneasel.json index c06f84f19..b5666fa15 100644 --- a/entity/pokemon/sneasel.json +++ b/entity/pokemon/sneasel.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sneasel.blink", "ground_idle": "animation.sneasel.ground_idle", "air_idle": "animation.sneasel.ground_idle", "water_idle": "animation.sneasel.ground_idle", diff --git a/entity/pokemon/snivy.json b/entity/pokemon/snivy.json index 220d6a86a..bfcb55e56 100644 --- a/entity/pokemon/snivy.json +++ b/entity/pokemon/snivy.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.snivy.blink", "ground_idle": "animation.snivy.ground_idle", "air_idle": "animation.snivy.ground_idle", "water_idle": "animation.snivy.ground_idle", diff --git a/entity/pokemon/snorlax.json b/entity/pokemon/snorlax.json index e7dcc8064..2ed29bfd4 100644 --- a/entity/pokemon/snorlax.json +++ b/entity/pokemon/snorlax.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.snorlax.blink", "ground_idle": "animation.snorlax.ground_idle", "air_idle": "animation.snorlax.ground_idle", "water_idle": "animation.snorlax.ground_idle", diff --git a/entity/pokemon/sobble.json b/entity/pokemon/sobble.json index 06e8ab620..aa3c5fd2f 100644 --- a/entity/pokemon/sobble.json +++ b/entity/pokemon/sobble.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sobble.blink", "ground_idle": "animation.sobble.ground_idle", "air_idle": "animation.sobble.ground_idle", "water_idle": "animation.sobble.ground_idle", diff --git a/entity/pokemon/spinarak.json b/entity/pokemon/spinarak.json index 17df2ba6e..217e2a206 100644 --- a/entity/pokemon/spinarak.json +++ b/entity/pokemon/spinarak.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.spinarak.blink", "ground_idle": "animation.spinarak.ground_idle", "air_idle": "animation.spinarak.ground_idle", "water_idle": "animation.spinarak.ground_idle", diff --git a/entity/pokemon/sprigatito.json b/entity/pokemon/sprigatito.json index 13ff2de9d..7f2c62234 100644 --- a/entity/pokemon/sprigatito.json +++ b/entity/pokemon/sprigatito.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sprigatito.blink", "ground_idle": "animation.sprigatito.ground_idle", "air_idle": "animation.sprigatito.ground_idle", "water_idle": "animation.sprigatito.ground_idle", diff --git a/entity/pokemon/squirtle.json b/entity/pokemon/squirtle.json index 2cae9b40d..63bb995b2 100644 --- a/entity/pokemon/squirtle.json +++ b/entity/pokemon/squirtle.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.squirtle.blink", "ground_idle": "animation.squirtle.ground_idle", "air_idle": "animation.squirtle.ground_idle", "water_idle": "animation.squirtle.ground_idle", diff --git a/entity/pokemon/stantler.json b/entity/pokemon/stantler.json index c6c5dac3b..705931be0 100644 --- a/entity/pokemon/stantler.json +++ b/entity/pokemon/stantler.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.stantler.blink", "ground_idle": "animation.stantler.ground_idle", "air_idle": "animation.stantler.ground_idle", "water_idle": "animation.stantler.ground_idle", diff --git a/entity/pokemon/starmie.json b/entity/pokemon/starmie.json index 60f1de502..34b809144 100644 --- a/entity/pokemon/starmie.json +++ b/entity/pokemon/starmie.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.starmie.blink", "ground_idle": "animation.starmie.ground_idle", "air_idle": "animation.starmie.ground_idle", "water_idle": "animation.starmie.ground_idle", diff --git a/entity/pokemon/staryu.json b/entity/pokemon/staryu.json index 21696fa2f..eb2a303c8 100644 --- a/entity/pokemon/staryu.json +++ b/entity/pokemon/staryu.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.staryu.blink", "ground_idle": "animation.staryu.ground_idle", "air_idle": "animation.staryu.ground_idle", "water_idle": "animation.staryu.ground_idle", diff --git a/entity/pokemon/steelix.json b/entity/pokemon/steelix.json index bc4f1ea18..5a42375d4 100644 --- a/entity/pokemon/steelix.json +++ b/entity/pokemon/steelix.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.steelix.blink", "ground_idle": "animation.steelix.ground_idle", "air_idle": "animation.steelix.ground_idle", "water_idle": "animation.steelix.ground_idle", diff --git a/entity/pokemon/sudowoodo.json b/entity/pokemon/sudowoodo.json index 32a03a07e..ce07b29c7 100644 --- a/entity/pokemon/sudowoodo.json +++ b/entity/pokemon/sudowoodo.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sudowoodo.blink", "ground_idle": "animation.sudowoodo.ground_idle", "air_idle": "animation.sudowoodo.ground_idle", "water_idle": "animation.sudowoodo.ground_idle", diff --git a/entity/pokemon/suicune.json b/entity/pokemon/suicune.json index 55cdfd4b8..ac00ef18b 100644 --- a/entity/pokemon/suicune.json +++ b/entity/pokemon/suicune.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.suicune.blink", "ground_idle": "animation.suicune.ground_idle", "air_idle": "animation.suicune.ground_idle", "water_idle": "animation.suicune.ground_idle", diff --git a/entity/pokemon/swadloon.json b/entity/pokemon/swadloon.json index ac6bd69c0..c7dd6c232 100644 --- a/entity/pokemon/swadloon.json +++ b/entity/pokemon/swadloon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.swadloon.blink", "ground_idle": "animation.swadloon.ground_idle", "air_idle": "animation.swadloon.ground_idle", "water_idle": "animation.swadloon.ground_idle", diff --git a/entity/pokemon/swampert.json b/entity/pokemon/swampert.json index d42ecdf2d..942f67465 100644 --- a/entity/pokemon/swampert.json +++ b/entity/pokemon/swampert.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.swampert.blink", "ground_idle": "animation.swampert.ground_idle", "air_idle": "animation.swampert.ground_idle", "water_idle": "animation.swampert.water_idle", diff --git a/entity/pokemon/swinub.json b/entity/pokemon/swinub.json index 3f2affc1a..e4697848e 100644 --- a/entity/pokemon/swinub.json +++ b/entity/pokemon/swinub.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.swinub.blink", "ground_idle": "animation.swinub.ground_idle", "air_idle": "animation.swinub.ground_idle", "water_idle": "animation.swinub.ground_idle", diff --git a/entity/pokemon/sylveon.json b/entity/pokemon/sylveon.json index 3927204dc..548000de5 100644 --- a/entity/pokemon/sylveon.json +++ b/entity/pokemon/sylveon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.sylveon.blink", "ground_idle": "animation.sylveon.ground_idle", "air_idle": "animation.sylveon.ground_idle", "water_idle": "animation.sylveon.ground_idle", diff --git a/entity/pokemon/tangela.json b/entity/pokemon/tangela.json index 30bc54472..0fd4806cf 100644 --- a/entity/pokemon/tangela.json +++ b/entity/pokemon/tangela.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.tangela.blink", "ground_idle": "animation.tangela.ground_idle", "air_idle": "animation.tangela.ground_idle", "water_idle": "animation.tangela.ground_idle", diff --git a/entity/pokemon/tapukoko.json b/entity/pokemon/tapukoko.json index 6984ddbe5..324c6cf92 100644 --- a/entity/pokemon/tapukoko.json +++ b/entity/pokemon/tapukoko.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.tapukoko.blink", "ground_idle": "animation.tapukoko.ground_idle", "air_idle": "animation.tapukoko.ground_idle", "water_idle": "animation.tapukoko.ground_idle", diff --git a/entity/pokemon/tauros.json b/entity/pokemon/tauros.json index da0a37a5c..ad164818d 100644 --- a/entity/pokemon/tauros.json +++ b/entity/pokemon/tauros.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.tauros.blink", "ground_idle": "animation.tauros.ground_idle", "air_idle": "animation.tauros.ground_idle", "water_idle": "animation.tauros.ground_idle", diff --git a/entity/pokemon/teddiursa.json b/entity/pokemon/teddiursa.json index 63ac3f6d1..3e720a013 100644 --- a/entity/pokemon/teddiursa.json +++ b/entity/pokemon/teddiursa.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.teddiursa.blink", "ground_idle": "animation.teddiursa.ground_idle", "air_idle": "animation.teddiursa.ground_idle", "water_idle": "animation.teddiursa.ground_idle", diff --git a/entity/pokemon/tentacool.json b/entity/pokemon/tentacool.json index 7abf2ebbc..e5483324b 100644 --- a/entity/pokemon/tentacool.json +++ b/entity/pokemon/tentacool.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.tentacool.blink", "ground_idle": "animation.tentacool.ground_idle", "air_idle": "animation.tentacool.ground_idle", "water_idle": "animation.tentacool.ground_idle", diff --git a/entity/pokemon/tentacruel.json b/entity/pokemon/tentacruel.json index 4042476a6..655b61652 100644 --- a/entity/pokemon/tentacruel.json +++ b/entity/pokemon/tentacruel.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.tentacruel.blink", "ground_idle": "animation.tentacruel.ground_idle", "air_idle": "animation.tentacruel.ground_idle", "water_idle": "animation.tentacruel.ground_idle", diff --git a/entity/pokemon/tepig.json b/entity/pokemon/tepig.json index 9233ccddf..0f9509fa8 100644 --- a/entity/pokemon/tepig.json +++ b/entity/pokemon/tepig.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.tepig.blink", "ground_idle": "animation.tepig.ground_idle", "air_idle": "animation.tepig.ground_idle", "water_idle": "animation.tepig.ground_idle", diff --git a/entity/pokemon/thwackey.json b/entity/pokemon/thwackey.json index 5aad19415..2fe23cd5b 100644 --- a/entity/pokemon/thwackey.json +++ b/entity/pokemon/thwackey.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.thwackey.blink", "ground_idle": "animation.thwackey.ground_idle", "air_idle": "animation.thwackey.ground_idle", "water_idle": "animation.thwackey.ground_idle", diff --git a/entity/pokemon/toedscool.json b/entity/pokemon/toedscool.json index 99ee340db..4a29b8ce6 100644 --- a/entity/pokemon/toedscool.json +++ b/entity/pokemon/toedscool.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.toedscool.blink", "ground_idle": "animation.toedscool.ground_idle", "air_idle": "animation.toedscool.ground_idle", "water_idle": "animation.toedscool.ground_idle", diff --git a/entity/pokemon/toedscruel.json b/entity/pokemon/toedscruel.json index 11e873fed..24155b078 100644 --- a/entity/pokemon/toedscruel.json +++ b/entity/pokemon/toedscruel.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.toedscruel.blink", "ground_idle": "animation.toedscruel.ground_idle", "air_idle": "animation.toedscruel.ground_idle", "water_idle": "animation.toedscruel.ground_idle", diff --git a/entity/pokemon/togekiss.json b/entity/pokemon/togekiss.json index 63617f6c5..037409606 100644 --- a/entity/pokemon/togekiss.json +++ b/entity/pokemon/togekiss.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.togekiss.blink", "ground_idle": "animation.togekiss.ground_idle", "air_idle": "animation.togekiss.air_idle", "water_idle": "animation.togekiss.water_idle", diff --git a/entity/pokemon/togepi.json b/entity/pokemon/togepi.json index d8e18cc5d..07ddf993c 100644 --- a/entity/pokemon/togepi.json +++ b/entity/pokemon/togepi.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.togepi.blink", "ground_idle": "animation.togepi.ground_idle", "air_idle": "animation.togepi.ground_idle", "water_idle": "animation.togepi.ground_idle", diff --git a/entity/pokemon/togetic.json b/entity/pokemon/togetic.json index 3ffd68aa7..77ad0d558 100644 --- a/entity/pokemon/togetic.json +++ b/entity/pokemon/togetic.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.togetic.blink", "ground_idle": "animation.togetic.ground_idle", "air_idle": "animation.togetic.ground_idle", "water_idle": "animation.togetic.ground_idle", diff --git a/entity/pokemon/torchic.json b/entity/pokemon/torchic.json index 2f53afe6b..a2ecaa5d4 100644 --- a/entity/pokemon/torchic.json +++ b/entity/pokemon/torchic.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.torchic.blink", "ground_idle": "animation.torchic.ground_idle", "air_idle": "animation.torchic.ground_idle", "water_idle": "animation.torchic.ground_idle", diff --git a/entity/pokemon/torracat.json b/entity/pokemon/torracat.json index dee72e857..7d4ef1ce8 100644 --- a/entity/pokemon/torracat.json +++ b/entity/pokemon/torracat.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.torracat.blink", "ground_idle": "animation.torracat.ground_idle", "air_idle": "animation.torracat.ground_idle", "water_idle": "animation.torracat.ground_idle", diff --git a/entity/pokemon/torterra.json b/entity/pokemon/torterra.json index 76cc8cef7..14958f5a3 100644 --- a/entity/pokemon/torterra.json +++ b/entity/pokemon/torterra.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.torterra.blink", "ground_idle": "animation.torterra.ground_idle", "air_idle": "animation.torterra.ground_idle", "water_idle": "animation.torterra.ground_idle", diff --git a/entity/pokemon/totodile.json b/entity/pokemon/totodile.json index 5d495acdb..90146026a 100644 --- a/entity/pokemon/totodile.json +++ b/entity/pokemon/totodile.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.totodile.blink", "ground_idle": "animation.totodile.ground_idle", "air_idle": "animation.totodile.ground_idle", "water_idle": "animation.totodile.ground_idle", diff --git a/entity/pokemon/trapinch.json b/entity/pokemon/trapinch.json index 1ad943381..e52345c65 100644 --- a/entity/pokemon/trapinch.json +++ b/entity/pokemon/trapinch.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.trapinch.blink", "ground_idle": "animation.trapinch.ground_idle", "air_idle": "animation.trapinch.ground_idle", "water_idle": "animation.trapinch.water_idle", diff --git a/entity/pokemon/treecko.json b/entity/pokemon/treecko.json index 63e4b84ce..708b1b208 100644 --- a/entity/pokemon/treecko.json +++ b/entity/pokemon/treecko.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.treecko.blink", "ground_idle": "animation.treecko.ground_idle", "air_idle": "animation.treecko.ground_idle", "water_idle": "animation.treecko.ground_idle", diff --git a/entity/pokemon/turtwig.json b/entity/pokemon/turtwig.json index f62a1e3aa..7323db855 100644 --- a/entity/pokemon/turtwig.json +++ b/entity/pokemon/turtwig.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.turtwig.blink", "ground_idle": "animation.turtwig.ground_idle", "air_idle": "animation.turtwig.ground_idle", "water_idle": "animation.turtwig.ground_idle", diff --git a/entity/pokemon/typhlosion.json b/entity/pokemon/typhlosion.json index 1fbc4e55e..adff96413 100644 --- a/entity/pokemon/typhlosion.json +++ b/entity/pokemon/typhlosion.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.typhlosion.blink", "ground_idle": "animation.typhlosion.ground_idle", "air_idle": "animation.typhlosion.ground_idle", "water_idle": "animation.typhlosion.ground_idle", diff --git a/entity/pokemon/tyranitar.json b/entity/pokemon/tyranitar.json index 1a4c14c3a..21bec6fa9 100644 --- a/entity/pokemon/tyranitar.json +++ b/entity/pokemon/tyranitar.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.tyranitar.blink", "ground_idle": "animation.tyranitar.ground_idle", "air_idle": "animation.tyranitar.ground_idle", "water_idle": "animation.tyranitar.ground_idle", diff --git a/entity/pokemon/tyrogue.json b/entity/pokemon/tyrogue.json index d7fe4967d..e591fbfe0 100644 --- a/entity/pokemon/tyrogue.json +++ b/entity/pokemon/tyrogue.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.tyrogue.blink", "ground_idle": "animation.tyrogue.ground_idle", "air_idle": "animation.tyrogue.ground_idle", "water_idle": "animation.tyrogue.ground_idle", diff --git a/entity/pokemon/tyrunt.json b/entity/pokemon/tyrunt.json index f8e71d681..f1f6f699a 100644 --- a/entity/pokemon/tyrunt.json +++ b/entity/pokemon/tyrunt.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.tyrunt.blink", "ground_idle": "animation.tyrunt.ground_idle", "air_idle": "animation.tyrunt.ground_idle", "water_idle": "animation.tyrunt.ground_idle", diff --git a/entity/pokemon/umbreon.json b/entity/pokemon/umbreon.json index e69b1426d..8cbc2b269 100644 --- a/entity/pokemon/umbreon.json +++ b/entity/pokemon/umbreon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.umbreon.blink", "ground_idle": "animation.umbreon.ground_idle", "air_idle": "animation.umbreon.ground_idle", "water_idle": "animation.umbreon.water_idle", diff --git a/entity/pokemon/ursaring.json b/entity/pokemon/ursaring.json index 0ffaf6b6e..85b859f48 100644 --- a/entity/pokemon/ursaring.json +++ b/entity/pokemon/ursaring.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.ursaring.blink", "ground_idle": "animation.ursaring.ground_idle", "air_idle": "animation.ursaring.ground_idle", "water_idle": "animation.ursaring.ground_idle", diff --git a/entity/pokemon/uxie.json b/entity/pokemon/uxie.json index 514468e9c..214ece279 100644 --- a/entity/pokemon/uxie.json +++ b/entity/pokemon/uxie.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.uxie.blink", "ground_idle": "animation.uxie.ground_idle", "air_idle": "animation.uxie.ground_idle", "water_idle": "animation.uxie.ground_idle", diff --git a/entity/pokemon/vaporeon.json b/entity/pokemon/vaporeon.json index bdfcf5dc9..1dd7a1766 100644 --- a/entity/pokemon/vaporeon.json +++ b/entity/pokemon/vaporeon.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.vaporeon.blink", "ground_idle": "animation.vaporeon.ground_idle", "air_idle": "animation.vaporeon.ground_idle", "water_idle": "animation.vaporeon.ground_idle", diff --git a/entity/pokemon/venomoth.json b/entity/pokemon/venomoth.json index 507f6fddb..a61972dff 100644 --- a/entity/pokemon/venomoth.json +++ b/entity/pokemon/venomoth.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.venomoth.blink", "ground_idle": "animation.venomoth.ground_idle", "air_idle": "animation.venomoth.ground_idle", "water_idle": "animation.venomoth.ground_idle", diff --git a/entity/pokemon/venonat.json b/entity/pokemon/venonat.json index f7f2f9576..bc5ec5b81 100644 --- a/entity/pokemon/venonat.json +++ b/entity/pokemon/venonat.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.venonat.blink", "ground_idle": "animation.venonat.ground_idle", "air_idle": "animation.venonat.ground_idle", "water_idle": "animation.venonat.ground_idle", diff --git a/entity/pokemon/venusaur.json b/entity/pokemon/venusaur.json index a2569b1bd..19086eeb0 100644 --- a/entity/pokemon/venusaur.json +++ b/entity/pokemon/venusaur.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.venusaur.blink", "ground_idle": "animation.venusaur.ground_idle", "air_idle": "animation.venusaur.ground_idle", "water_idle": "animation.venusaur.ground_idle", diff --git a/entity/pokemon/vibrava.json b/entity/pokemon/vibrava.json index f04dd3c33..d60ee5e4a 100644 --- a/entity/pokemon/vibrava.json +++ b/entity/pokemon/vibrava.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.vibrava.blink", "ground_idle": "animation.vibrava.ground_idle", "air_idle": "animation.vibrava.air_idle", "water_idle": "animation.vibrava.air_idle", diff --git a/entity/pokemon/vileplume.json b/entity/pokemon/vileplume.json index 9689cd078..722e70c46 100644 --- a/entity/pokemon/vileplume.json +++ b/entity/pokemon/vileplume.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.vileplume.blink", "ground_idle": "animation.vileplume.ground_idle", "air_idle": "animation.vileplume.ground_idle", "water_idle": "animation.vileplume.ground_idle", diff --git a/entity/pokemon/vivillon.json b/entity/pokemon/vivillon.json index 3cba6d5b5..0e61319f6 100644 --- a/entity/pokemon/vivillon.json +++ b/entity/pokemon/vivillon.json @@ -42,6 +42,7 @@ ] }, "animations": { + "blink": "animation.vivillon.blink", "ground_idle": "animation.vivillon.ground_idle", "air_idle": "animation.vivillon.ground_idle", "water_idle": "animation.vivillon.ground_idle", diff --git a/entity/pokemon/volcarona.json b/entity/pokemon/volcarona.json index 578c76d5e..d5fd3a482 100644 --- a/entity/pokemon/volcarona.json +++ b/entity/pokemon/volcarona.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.volcarona.blink", "ground_idle": "animation.volcarona.ground_idle", "air_idle": "animation.volcarona.ground_idle", "water_idle": "animation.volcarona.ground_idle", diff --git a/entity/pokemon/voltorb.json b/entity/pokemon/voltorb.json index 9d0dd494c..a326dc34a 100644 --- a/entity/pokemon/voltorb.json +++ b/entity/pokemon/voltorb.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.voltorb.blink", "ground_idle": "animation.voltorb.ground_idle", "air_idle": "animation.voltorb.ground_idle", "water_idle": "animation.voltorb.ground_idle", diff --git a/entity/pokemon/vulpix.json b/entity/pokemon/vulpix.json index 446f34cc5..b85e94052 100644 --- a/entity/pokemon/vulpix.json +++ b/entity/pokemon/vulpix.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.vulpix.blink", "ground_idle": "animation.vulpix.ground_idle", "air_idle": "animation.vulpix.ground_idle", "water_idle": "animation.vulpix.ground_idle", diff --git a/entity/pokemon/wartortle.json b/entity/pokemon/wartortle.json index 3f7b0cbcd..05fb3d8c0 100644 --- a/entity/pokemon/wartortle.json +++ b/entity/pokemon/wartortle.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.wartortle.blink", "ground_idle": "animation.wartortle.ground_idle", "air_idle": "animation.wartortle.ground_idle", "water_idle": "animation.wartortle.ground_idle", diff --git a/entity/pokemon/weavile.json b/entity/pokemon/weavile.json index c1014a85f..282e0f757 100644 --- a/entity/pokemon/weavile.json +++ b/entity/pokemon/weavile.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.weavile.blink", "ground_idle": "animation.weavile.ground_idle", "air_idle": "animation.weavile.air_idle", "water_idle": "animation.weavile.water_idle", diff --git a/entity/pokemon/weedle.json b/entity/pokemon/weedle.json index 0d4f3fb93..c3dd55fa7 100644 --- a/entity/pokemon/weedle.json +++ b/entity/pokemon/weedle.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.weedle.blink", "ground_idle": "animation.weedle.ground_idle", "air_idle": "animation.weedle.ground_idle", "water_idle": "animation.weedle.ground_idle", diff --git a/entity/pokemon/weezing.json b/entity/pokemon/weezing.json index 80e2ba908..ffc593267 100644 --- a/entity/pokemon/weezing.json +++ b/entity/pokemon/weezing.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.weezing.blink", "ground_idle": "animation.weezing.ground_idle", "air_idle": "animation.weezing.ground_idle", "water_idle": "animation.weezing.ground_idle", diff --git a/entity/pokemon/wigglytuff.json b/entity/pokemon/wigglytuff.json index 728589b7d..a08143b3b 100644 --- a/entity/pokemon/wigglytuff.json +++ b/entity/pokemon/wigglytuff.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.wigglytuff.blink", "ground_idle": "animation.wigglytuff.ground_idle", "air_idle": "animation.wigglytuff.ground_idle", "water_idle": "animation.wigglytuff.ground_idle", diff --git a/entity/pokemon/wooper.json b/entity/pokemon/wooper.json index e2fdf6d7b..7023210bd 100644 --- a/entity/pokemon/wooper.json +++ b/entity/pokemon/wooper.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.wooper.blink", "ground_idle": "animation.wooper.ground_idle", "air_idle": "animation.wooper.ground_idle", "water_idle": "animation.wooper.ground_idle", diff --git a/entity/pokemon/xatu.json b/entity/pokemon/xatu.json index ff3d93a73..dfc4a249f 100644 --- a/entity/pokemon/xatu.json +++ b/entity/pokemon/xatu.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.xatu.blink", "ground_idle": "animation.xatu.ground_idle", "air_idle": "animation.xatu.ground_idle", "water_idle": "animation.xatu.ground_idle", diff --git a/entity/pokemon/xurkitree.json b/entity/pokemon/xurkitree.json index 696467df6..32ffe531e 100644 --- a/entity/pokemon/xurkitree.json +++ b/entity/pokemon/xurkitree.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.xurkitree.blink", "ground_idle": "animation.xurkitree.ground_idle", "air_idle": "animation.xurkitree.ground_idle", "water_idle": "animation.xurkitree.ground_idle", diff --git a/entity/pokemon/zapdos.json b/entity/pokemon/zapdos.json index 332620b51..4b1b48830 100644 --- a/entity/pokemon/zapdos.json +++ b/entity/pokemon/zapdos.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.zapdos.blink", "ground_idle": "animation.zapdos.ground_idle", "air_idle": "animation.zapdos.air_idle", "water_idle": "animation.zapdos.ground_idle", diff --git a/entity/pokemon/zubat.json b/entity/pokemon/zubat.json index b02905bda..d8a4da73e 100644 --- a/entity/pokemon/zubat.json +++ b/entity/pokemon/zubat.json @@ -25,6 +25,7 @@ ] }, "animations": { + "blink": "animation.zubat.blink", "ground_idle": "animation.zubat.ground_idle", "air_idle": "animation.zubat.ground_idle", "water_idle": "animation.zubat.ground_idle", diff --git a/manifest.json b/manifest.json index 03c87e59a..a24fceac9 100644 --- a/manifest.json +++ b/manifest.json @@ -4,15 +4,15 @@ "name": "pack.name", "description": "pack.description", "min_engine_version": [1, 20, 60], - "uuid": "ac4e2aa8-1787-49b2-93d5-798aaa5068e7", - "version": [2, 9, 4] + "uuid": "cdf2bf42-3ef5-436a-b2dc-e940e85fc8d9", + "version": [2, 9, 5] }, "modules": [ { "description": "Resources Module", "type": "resources", - "uuid": "59de2aec-59a1-43a1-8017-b690335b3472", - "version": [2, 9, 4] + "uuid": "6790d3ad-e1bf-4e9b-8335-20295111e595", + "version": [2, 9, 5] } ], "metadata": { diff --git a/models/entity/pokemon/meowstic.geo.json b/models/entity/pokemon/meowstic.geo.json new file mode 100644 index 000000000..18098c233 --- /dev/null +++ b/models/entity/pokemon/meowstic.geo.json @@ -0,0 +1,466 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.meowstic", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 4, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] + }, + "bones": [ + { + "name": "root", + "pivot": [0, 5, -3] + }, + { + "name": "body", + "parent": "root", + "pivot": [0, 5, -3], + "cubes": [ + { + "origin": [-3.40256, 4.44693, -4.9392], + "size": [6.80512, 8.40652, 4.33552], + "uv": { + "north": {"uv": [33, 46], "uv_size": [6, 7]}, + "east": {"uv": [16, 33], "uv_size": [4, 7]}, + "south": {"uv": [19, 47], "uv_size": [6, 7]}, + "west": {"uv": [34, 23], "uv_size": [4, 7]}, + "up": {"uv": [48, 29], "uv_size": [6, 4]}, + "down": {"uv": [11, 57], "uv_size": [6, -4]} + } + }, + { + "origin": [-4.3904, 4.39394, -1.9988], + "size": [8.7808, 7.31002, 0], + "pivot": [0, 20.71171, 0], + "rotation": [-20, 0, 0], + "uv": { + "north": {"uv": [0, 26], "uv_size": [8, 6]}, + "east": {"uv": [32, 43], "uv_size": [1, 6]}, + "south": {"uv": [8, 26], "uv_size": [8, 6]}, + "west": {"uv": [39, 43], "uv_size": [1, 6]}, + "up": {"uv": [43, 9], "uv_size": [8, 1]}, + "down": {"uv": [43, 11], "uv_size": [8, -1]} + } + }, + { + "origin": [-8.51696, 2.49748, -4.9392], + "size": [4.60992, 0, 4.33552], + "pivot": [-8.4072, 5.4824, -2.77144], + "rotation": [0, 0, -37.5], + "uv": { + "north": {"uv": [12, 45], "uv_size": [4, 1]}, + "east": {"uv": [0, 46], "uv_size": [4, 1]}, + "south": {"uv": [48, 33], "uv_size": [4, 1]}, + "west": {"uv": [55, 27], "uv_size": [4, 1]}, + "up": {"uv": [19, 54], "uv_size": [4, 4]}, + "down": {"uv": [54, 32], "uv_size": [4, -4]} + } + }, + { + "origin": [3.90704, 2.49748, -4.9392], + "size": [4.60992, 0, 4.33552], + "pivot": [8.4072, 5.4824, -2.77144], + "rotation": [0, 0, 37.5], + "uv": { + "north": {"uv": [56, 19], "uv_size": [4, 1]}, + "east": {"uv": [58, 20], "uv_size": [4, 1]}, + "south": {"uv": [58, 21], "uv_size": [4, 1]}, + "west": {"uv": [58, 22], "uv_size": [4, 1]}, + "up": {"uv": [54, 32], "uv_size": [4, 4]}, + "down": {"uv": [54, 40], "uv_size": [4, -4]} + } + } + ] + }, + { + "name": "head", + "parent": "body", + "pivot": [0, 13, -3], + "cubes": [ + { + "origin": [-6.02582, 12.92654, -1.40493], + "size": [12.05165, 9.55175, 8.60518], + "pivot": [0, -6.09168, 0], + "rotation": [0, -180, 0], + "uv": { + "north": {"uv": [0, 18], "uv_size": [11, 8]}, + "east": {"uv": [22, 16], "uv_size": [8, 8]}, + "south": {"uv": [11, 18], "uv_size": [11, 8]}, + "west": {"uv": [22, 24], "uv_size": [8, 8]}, + "up": {"uv": [20, 0], "uv_size": [11, 8]}, + "down": {"uv": [20, 16], "uv_size": [11, -8]} + } + }, + { + "origin": [-0.5488, 15.10737, -7.2716], + "size": [1.17443, 0.60917, 1.0976], + "uv": { + "north": {"uv": [19, 8], "uv_size": [1, 1]}, + "east": {"uv": [19, 9], "uv_size": [1, 1]}, + "south": {"uv": [19, 10], "uv_size": [1, 1]}, + "west": {"uv": [19, 11], "uv_size": [1, 1]}, + "up": {"uv": [19, 12], "uv_size": [1, 1]}, + "down": {"uv": [19, 14], "uv_size": [1, -1]} + } + } + ] + }, + { + "name": "ear1", + "parent": "head", + "pivot": [4, 22, -3], + "cubes": [ + { + "origin": [1.14861, 21, -4], + "size": [4.85139, 9.2959, 2.50253], + "uv": { + "north": {"uv": [25, 47], "uv_size": [4, 8]}, + "east": {"uv": [53, 20], "uv_size": [2, 8]}, + "south": {"uv": [48, 11], "uv_size": [4, 8]}, + "west": {"uv": [33, 53], "uv_size": [2, 8]}, + "up": {"uv": [56, 55], "uv_size": [4, 2]}, + "down": {"uv": [10, 59], "uv_size": [4, -2]} + } + } + ] + }, + { + "name": "bone", + "parent": "ear1", + "pivot": [4, 30, -3], + "cubes": [ + { + "origin": [1.14861, 17, -15], + "size": [4.85139, 9.2959, 2.50253], + "pivot": [5.19405, 22.65701, -6.34612], + "rotation": [-90, 0, 0], + "uv": { + "north": {"uv": [38, 19], "uv_size": [4, 8]}, + "east": {"uv": [39, 49], "uv_size": [2, 8]}, + "south": {"uv": [7, 47], "uv_size": [4, 8]}, + "west": {"uv": [17, 53], "uv_size": [2, 8]}, + "up": {"uv": [45, 43], "uv_size": [4, 2]}, + "down": {"uv": [47, 9], "uv_size": [4, -2]} + } + } + ] + }, + { + "name": "ear2", + "parent": "head", + "pivot": [-4, 22, -3], + "cubes": [ + { + "origin": [-5.85139, 21, -4], + "size": [4.85139, 9.2959, 2.50253], + "uv": { + "north": {"uv": [29, 49], "uv_size": [4, 8]}, + "east": {"uv": [35, 53], "uv_size": [2, 8]}, + "south": {"uv": [50, 43], "uv_size": [4, 8]}, + "west": {"uv": [37, 53], "uv_size": [2, 8]}, + "up": {"uv": [28, 57], "uv_size": [4, 2]}, + "down": {"uv": [39, 59], "uv_size": [4, -2]} + } + } + ] + }, + { + "name": "bone2", + "parent": "ear2", + "pivot": [-4, 30, -3], + "cubes": [ + { + "origin": [-5.85139, 17, -15], + "size": [4.85139, 9.2959, 2.50253], + "pivot": [-5.19405, 22.65701, -6.34612], + "rotation": [-90, 0, 0], + "uv": { + "north": {"uv": [50, 51], "uv_size": [4, 8]}, + "east": {"uv": [0, 54], "uv_size": [2, 8]}, + "south": {"uv": [52, 0], "uv_size": [4, 8]}, + "west": {"uv": [2, 54], "uv_size": [2, 8]}, + "up": {"uv": [43, 57], "uv_size": [4, 2]}, + "down": {"uv": [56, 59], "uv_size": [4, -2]} + } + } + ] + }, + { + "name": "eye1", + "parent": "head", + "pivot": [3, 18, -7], + "cubes": [ + { + "origin": [1.26224, 15.53378, -7.21014], + "size": [4.77456, 4.08143, 0], + "uv": { + "north": {"uv": [48, 19], "uv_size": [4, 3]}, + "east": {"uv": [55, 24], "uv_size": [3, 3]}, + "south": {"uv": [52, 19], "uv_size": [-4, 3]}, + "west": {"uv": [56, 10], "uv_size": [3, 3]}, + "up": {"uv": [41, 54], "uv_size": [4, 3]}, + "down": {"uv": [54, 46], "uv_size": [4, -3]} + } + } + ] + }, + { + "name": "pupil1", + "parent": "eye1", + "pivot": [3, 18, -7], + "cubes": [ + { + "origin": [2.34886, 16.27088, -7.21856], + "size": [1.25126, 2.69252, 0], + "uv": { + "north": {"uv": [19, 0], "uv_size": [1, 2]}, + "east": {"uv": [0, 0], "uv_size": [0, 2]}, + "south": {"uv": [19, 0], "uv_size": [1, 2]}, + "west": {"uv": [0, 0], "uv_size": [0, 2]}, + "up": {"uv": [0, 0], "uv_size": [1, 0]}, + "down": {"uv": [0, 0], "uv_size": [1, 0]} + } + } + ] + }, + { + "name": "eye2", + "parent": "head", + "pivot": [-3, 18, -7], + "cubes": [ + { + "origin": [-6.0368, 15.53378, -7.21014], + "size": [4.77456, 4.08143, 0], + "uv": { + "north": {"uv": [45, 54], "uv_size": [4, 3]}, + "east": {"uv": [56, 13], "uv_size": [3, 3]}, + "south": {"uv": [49, 54], "uv_size": [-4, 3]}, + "west": {"uv": [56, 16], "uv_size": [3, 3]}, + "up": {"uv": [54, 49], "uv_size": [4, 3]}, + "down": {"uv": [54, 55], "uv_size": [4, -3]} + } + } + ] + }, + { + "name": "pupil2", + "parent": "eye2", + "pivot": [-3, 18, -7], + "cubes": [ + { + "origin": [-3.60013, 16.27088, -7.21856], + "size": [1.25126, 2.69252, 0], + "uv": { + "north": {"uv": [19, 4], "uv_size": [1, 2]}, + "east": {"uv": [0, 0], "uv_size": [0, 2]}, + "south": {"uv": [19, 4], "uv_size": [1, 2]}, + "west": {"uv": [0, 0], "uv_size": [0, 2]}, + "up": {"uv": [0, 0], "uv_size": [1, 0]}, + "down": {"uv": [0, 0], "uv_size": [1, 0]} + } + } + ] + }, + { + "name": "hair", + "parent": "head", + "pivot": [0, 22.5, -7.2], + "cubes": [ + { + "origin": [-6.75657, 16.66255, -9.66091], + "size": [6.40998, 8.16285, 0], + "pivot": [-1.82835, 14.24865, -5.71357], + "rotation": [-14.89149, 9.29798, 31.28223], + "uv": { + "north": {"uv": [52, 8], "uv_size": [4, 6]}, + "east": {"uv": [0, 0], "uv_size": [0, 6]}, + "south": {"uv": [52, 14], "uv_size": [4, 6]}, + "west": {"uv": [0, 0], "uv_size": [0, 6]}, + "up": {"uv": [0, 0], "uv_size": [4, 0]}, + "down": {"uv": [0, 0], "uv_size": [4, 0]} + } + } + ] + }, + { + "name": "arm2", + "parent": "body", + "pivot": [3, 11, -3], + "cubes": [ + { + "origin": [-3.20683, 3.9046, -4.3904], + "size": [2.1952, 6.09168, 2.1952], + "pivot": [0, 13, -3], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [26, 55], "uv_size": [2, 5]}, + "east": {"uv": [54, 55], "uv_size": [2, 5]}, + "south": {"uv": [56, 0], "uv_size": [2, 5]}, + "west": {"uv": [56, 5], "uv_size": [2, 5]}, + "up": {"uv": [46, 19], "uv_size": [2, 2]}, + "down": {"uv": [46, 31], "uv_size": [2, -2]} + } + } + ] + }, + { + "name": "arm1", + "parent": "body", + "pivot": [-3, 11, -3], + "cubes": [ + { + "origin": [3.00972, 5.81736, -4.3904], + "size": [2.1952, 6.09168, 2.1952], + "pivot": [0, 15, 0], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [28, 55], "uv_size": [-2, 5]}, + "east": {"uv": [58, 5], "uv_size": [-2, 5]}, + "south": {"uv": [58, 0], "uv_size": [-2, 5]}, + "west": {"uv": [56, 55], "uv_size": [-2, 5]}, + "up": {"uv": [48, 19], "uv_size": [-2, 2]}, + "down": {"uv": [48, 31], "uv_size": [-2, -2]} + } + } + ] + }, + { + "name": "tails", + "parent": "body", + "pivot": [0, 7, 0] + }, + { + "name": "tail2", + "parent": "tails", + "pivot": [-2, 6, -0.5], + "cubes": [ + { + "origin": [-5.6832, 2, 4], + "size": [7.6832, 8.52835, 0], + "pivot": [-4.91675, 5.93511, 3.86808], + "rotation": [90, 0, 0], + "uv": { + "north": {"uv": [53, 22], "uv_size": [-7, 7]}, + "east": {"uv": [0, 0], "uv_size": [0, 7]}, + "south": {"uv": [7, 47], "uv_size": [-7, 7]}, + "west": {"uv": [0, 0], "uv_size": [0, 7]}, + "up": {"uv": [7, 0], "uv_size": [-7, 0]}, + "down": {"uv": [7, 0], "uv_size": [-7, 0]} + } + } + ] + }, + { + "name": "tail2_part2", + "parent": "tail2", + "pivot": [-2, 6, 7.8], + "cubes": [ + { + "origin": [-7.8784, -0.7, 3.55], + "size": [9.8784, 10.96502, 0], + "pivot": [-8.26792, 10.28988, 7.77992], + "rotation": [90, 0, 0], + "uv": { + "north": {"uv": [54, 34], "uv_size": [-9, 9]}, + "east": {"uv": [0, 0], "uv_size": [0, 9]}, + "south": {"uv": [50, 45], "uv_size": [-9, 9]}, + "west": {"uv": [0, 0], "uv_size": [0, 9]}, + "up": {"uv": [9, 0], "uv_size": [-9, 0]}, + "down": {"uv": [9, 0], "uv_size": [-9, 0]} + } + } + ] + }, + { + "name": "tail1", + "parent": "tails", + "pivot": [2, 6, -0.5], + "cubes": [ + { + "origin": [-1.9832, 2, 4], + "size": [7.6832, 8.52835, 0], + "pivot": [4.91675, 5.93511, 3.86808], + "rotation": [90, 0, 0], + "uv": { + "north": {"uv": [46, 22], "uv_size": [7, 7]}, + "east": {"uv": [0, 0], "uv_size": [0, 7]}, + "south": {"uv": [0, 47], "uv_size": [7, 7]}, + "west": {"uv": [0, 0], "uv_size": [0, 7]}, + "up": {"uv": [0, 0], "uv_size": [7, 0]}, + "down": {"uv": [0, 0], "uv_size": [7, 0]} + } + } + ] + }, + { + "name": "tail1_part2", + "parent": "tail1", + "pivot": [2, 6.1, 7.8], + "cubes": [ + { + "origin": [-1.97008, -1.76763, 3.05492], + "size": [9.8784, 10.96502, 0], + "pivot": [2, 10, 7], + "rotation": [90, 0, 0], + "uv": { + "north": {"uv": [45, 34], "uv_size": [9, 9]}, + "east": {"uv": [0, 0], "uv_size": [0, 9]}, + "south": {"uv": [41, 45], "uv_size": [9, 9]}, + "west": {"uv": [0, 0], "uv_size": [0, 9]}, + "up": {"uv": [0, 0], "uv_size": [9, 0]}, + "down": {"uv": [0, 0], "uv_size": [9, 0]} + } + } + ] + }, + { + "name": "legs", + "parent": "root", + "pivot": [0, 3, 0] + }, + { + "name": "leg1", + "parent": "legs", + "pivot": [2, 5, -3], + "cubes": [ + { + "origin": [1.0976, 0, -4.3904], + "size": [2.1952, 4.87334, 3.2928], + "uv": { + "north": {"uv": [14, 57], "uv_size": [2, 4]}, + "east": {"uv": [4, 54], "uv_size": [3, 4]}, + "south": {"uv": [47, 57], "uv_size": [2, 4]}, + "west": {"uv": [7, 55], "uv_size": [3, 4]}, + "up": {"uv": [30, 46], "uv_size": [2, 3]}, + "down": {"uv": [58, 7], "uv_size": [2, -3]} + } + } + ] + }, + { + "name": "leg_2", + "parent": "legs", + "pivot": [-2, 5, -3], + "cubes": [ + { + "origin": [-3.2928, 0, -4.3904], + "size": [2.1952, 4.87334, 3.2928], + "uv": { + "north": {"uv": [58, 0], "uv_size": [2, 4]}, + "east": {"uv": [55, 20], "uv_size": [3, 4]}, + "south": {"uv": [4, 58], "uv_size": [2, 4]}, + "west": {"uv": [23, 55], "uv_size": [3, 4]}, + "up": {"uv": [58, 7], "uv_size": [2, 3]}, + "down": {"uv": [19, 61], "uv_size": [2, -3]} + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/models/entity/pokemon/meowsticf.geo.json b/models/entity/pokemon/meowsticf.geo.json new file mode 100644 index 000000000..76adb257f --- /dev/null +++ b/models/entity/pokemon/meowsticf.geo.json @@ -0,0 +1,495 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.meowsticf", + "texture_width": 80, + "texture_height": 80, + "visible_bounds_width": 4, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] + }, + "bones": [ + { + "name": "root", + "pivot": [0, 5, -3] + }, + { + "name": "body", + "parent": "root", + "pivot": [0, 5, -3], + "cubes": [ + { + "origin": [-3.40256, 4.44693, -4.9392], + "size": [6.80512, 8.40652, 4.33552], + "uv": { + "north": {"uv": [12, 0], "uv_size": [7, 8]}, + "east": {"uv": [30, 18], "uv_size": [4, 8]}, + "south": {"uv": [40, 11], "uv_size": [7, 8]}, + "west": {"uv": [42, 19], "uv_size": [4, 8]}, + "up": {"uv": [10, 41], "uv_size": [7, 4]}, + "down": {"uv": [17, 47], "uv_size": [7, -4]} + } + }, + { + "origin": [-6.3904, 29.39394, -0.9988], + "size": [8.7808, 7.31002, 0], + "pivot": [0, 20.71171, 0], + "rotation": [34.72669, -2.35756, 172.59755], + "uv": { + "north": {"uv": [0, 10], "uv_size": [9, 7]}, + "east": {"uv": [0, 0], "uv_size": [0, 7]}, + "south": {"uv": [9, 10], "uv_size": [9, 7]}, + "west": {"uv": [0, 0], "uv_size": [0, 7]}, + "up": {"uv": [0, 0], "uv_size": [9, 0]}, + "down": {"uv": [0, 0], "uv_size": [9, 0]} + } + }, + { + "origin": [2.66481, 4.41223, -7.29997], + "size": [4.60992, 0, 4.33552], + "pivot": [4.4072, 5.4824, -4.77144], + "rotation": [33.67132, 37.91019, 65.03038], + "uv": { + "north": {"uv": [0, 0], "uv_size": [5, 0]}, + "east": {"uv": [0, 0], "uv_size": [4, 0]}, + "south": {"uv": [0, 0], "uv_size": [5, 0]}, + "west": {"uv": [0, 0], "uv_size": [4, 0]}, + "up": {"uv": [44, 68], "uv_size": [5, 4]}, + "down": {"uv": [68, 52], "uv_size": [5, -4]} + } + }, + { + "origin": [-7.27473, 4.41223, -7.29997], + "size": [4.60992, 0, 4.33552], + "pivot": [-4.4072, 5.4824, -4.77144], + "rotation": [33.67132, -37.91019, -65.03038], + "uv": { + "north": {"uv": [5, 0], "uv_size": [-5, 0]}, + "east": {"uv": [4, 0], "uv_size": [-4, 0]}, + "south": {"uv": [5, 0], "uv_size": [-5, 0]}, + "west": {"uv": [4, 0], "uv_size": [-4, 0]}, + "up": {"uv": [49, 68], "uv_size": [-5, 4]}, + "down": {"uv": [73, 52], "uv_size": [-5, -4]} + } + }, + { + "origin": [-5.05344, 9.01888, -6.51716], + "size": [7.7808, 4.31002, 0], + "pivot": [0, 10.71171, 0], + "rotation": [8.08226, 27.31199, 17.77579], + "uv": { + "north": {"uv": [31, 11], "uv_size": [9, 7]}, + "east": {"uv": [0, 0], "uv_size": [0, 7]}, + "south": {"uv": [41, 0], "uv_size": [9, 7]}, + "west": {"uv": [0, 0], "uv_size": [0, 7]}, + "up": {"uv": [0, 0], "uv_size": [9, 0]}, + "down": {"uv": [0, 0], "uv_size": [9, 0]} + } + } + ] + }, + { + "name": "head", + "parent": "body", + "pivot": [0, 13, -3], + "cubes": [ + { + "origin": [-6.02582, 12.92654, -1.40493], + "size": [12.05165, 9.55175, 8.60518], + "pivot": [0, -6.09168, 0], + "rotation": [0, -180, 0], + "uv": { + "north": {"uv": [0, 0], "uv_size": [12, 10]}, + "east": {"uv": [56, 59], "uv_size": [9, 10]}, + "south": {"uv": [30, 30], "uv_size": [12, 10]}, + "west": {"uv": [60, 0], "uv_size": [9, 10]}, + "up": {"uv": [58, 39], "uv_size": [12, 9]}, + "down": {"uv": [59, 19], "uv_size": [12, -9]} + } + }, + { + "origin": [-0.5488, 15.10737, -7.2716], + "size": [1.17443, 0.60917, 1.0976], + "uv": { + "north": {"uv": [0, 17], "uv_size": [1, 1]}, + "east": {"uv": [1, 17], "uv_size": [1, 1]}, + "south": {"uv": [2, 17], "uv_size": [1, 1]}, + "west": {"uv": [3, 17], "uv_size": [1, 1]}, + "up": {"uv": [4, 17], "uv_size": [1, 1]}, + "down": {"uv": [5, 18], "uv_size": [1, -1]} + } + } + ] + }, + { + "name": "ear1", + "parent": "head", + "pivot": [4, 22, -3], + "cubes": [ + { + "origin": [1.14861, 21, -4], + "size": [4.85139, 9.2959, 2.50253], + "uv": { + "north": {"uv": [10, 32], "uv_size": [5, 9]}, + "east": {"uv": [42, 27], "uv_size": [3, 9]}, + "south": {"uv": [49, 59], "uv_size": [5, 9]}, + "west": {"uv": [42, 36], "uv_size": [3, 9]}, + "up": {"uv": [11, 50], "uv_size": [5, 3]}, + "down": {"uv": [49, 71], "uv_size": [5, -3]} + } + } + ] + }, + { + "name": "bone", + "parent": "ear1", + "pivot": [4, 30, -3], + "cubes": [ + { + "origin": [1, 17, -15], + "size": [4.85139, 9.2959, 2.50253], + "pivot": [-5.19405, 22.65701, -6.34612], + "rotation": [-90, 0, 0], + "uv": { + "north": {"uv": [19, 61], "uv_size": [-5, 9]}, + "east": {"uv": [70, 19], "uv_size": [-3, 9]}, + "south": {"uv": [34, 61], "uv_size": [-5, 9]}, + "west": {"uv": [68, 66], "uv_size": [-3, 9]}, + "up": {"uv": [73, 52], "uv_size": [-5, 3]}, + "down": {"uv": [73, 69], "uv_size": [-5, -3]} + } + } + ] + }, + { + "name": "ear2", + "parent": "head", + "pivot": [-4, 22, -3], + "cubes": [ + { + "origin": [-5.85139, 21, -4], + "size": [4.85139, 9.2959, 2.50253], + "uv": { + "north": {"uv": [34, 61], "uv_size": [5, 9]}, + "east": {"uv": [5, 68], "uv_size": [3, 9]}, + "south": {"uv": [0, 62], "uv_size": [5, 9]}, + "west": {"uv": [8, 68], "uv_size": [3, 9]}, + "up": {"uv": [69, 0], "uv_size": [5, 3]}, + "down": {"uv": [69, 6], "uv_size": [5, -3]} + } + } + ] + }, + { + "name": "bone2", + "parent": "ear2", + "pivot": [-5.00567, 21.31705, -2.74154], + "cubes": [ + { + "origin": [-5.85139, 17, -15], + "size": [4.85139, 9.2959, 2.50253], + "pivot": [5.19405, 22.65701, -6.34612], + "rotation": [-90, 0, 0], + "uv": { + "north": {"uv": [14, 61], "uv_size": [5, 9]}, + "east": {"uv": [65, 66], "uv_size": [3, 9]}, + "south": {"uv": [29, 61], "uv_size": [5, 9]}, + "west": {"uv": [67, 19], "uv_size": [3, 9]}, + "up": {"uv": [68, 52], "uv_size": [5, 3]}, + "down": {"uv": [68, 69], "uv_size": [5, -3]} + } + } + ] + }, + { + "name": "eye1", + "parent": "head", + "pivot": [3, 18, -7], + "cubes": [ + { + "origin": [1.26224, 15.53378, -7.21014], + "size": [4.77456, 3.5, 0], + "uv": { + "north": {"uv": [16, 26], "uv_size": [5, 4]}, + "east": {"uv": [0, 0], "uv_size": [0, 4]}, + "south": {"uv": [33, 40], "uv_size": [5, 4]}, + "west": {"uv": [0, 0], "uv_size": [0, 4]}, + "up": {"uv": [0, 0], "uv_size": [5, 0]}, + "down": {"uv": [0, 0], "uv_size": [5, 0]} + } + } + ] + }, + { + "name": "pupil1", + "parent": "eye1", + "pivot": [3, 18, -7], + "cubes": [ + { + "origin": [2.34886, 16.27088, -7.21856], + "size": [1.25126, 2.3, 0], + "uv": { + "north": {"uv": [16, 8], "uv_size": [1, 2]}, + "east": {"uv": [0, 0], "uv_size": [0, 2]}, + "south": {"uv": [17, 8], "uv_size": [1, 2]}, + "west": {"uv": [0, 0], "uv_size": [0, 2]}, + "up": {"uv": [0, 0], "uv_size": [1, 0]}, + "down": {"uv": [0, 0], "uv_size": [1, 0]} + } + } + ] + }, + { + "name": "eye2", + "parent": "head", + "pivot": [-3, 18, -7], + "cubes": [ + { + "origin": [-6.0368, 15.53378, -7.21014], + "size": [4.77456, 3.5, 0], + "uv": { + "north": {"uv": [4, 43], "uv_size": [5, 4]}, + "east": {"uv": [0, 0], "uv_size": [0, 4]}, + "south": {"uv": [24, 43], "uv_size": [5, 4]}, + "west": {"uv": [0, 0], "uv_size": [0, 4]}, + "up": {"uv": [0, 0], "uv_size": [5, 0]}, + "down": {"uv": [0, 0], "uv_size": [5, 0]} + } + } + ] + }, + { + "name": "pupil2", + "parent": "eye2", + "pivot": [-3, 18, -7], + "cubes": [ + { + "origin": [-3.60013, 16.27088, -7.21856], + "size": [1.25126, 2.3, 0], + "uv": { + "north": {"uv": [18, 8], "uv_size": [1, 2]}, + "east": {"uv": [0, 0], "uv_size": [0, 2]}, + "south": {"uv": [18, 10], "uv_size": [1, 2]}, + "west": {"uv": [0, 0], "uv_size": [0, 2]}, + "up": {"uv": [0, 0], "uv_size": [1, 0]}, + "down": {"uv": [0, 0], "uv_size": [1, 0]} + } + } + ] + }, + { + "name": "hair", + "parent": "head", + "pivot": [0, 22.5, -7.2], + "cubes": [ + { + "origin": [0.24343, 6.66255, -9.66091], + "size": [7.40998, 10.16285, 0], + "pivot": [-1.82835, 14.24865, -5.71357], + "rotation": [2.35666, -17.34551, -97.85952], + "uv": { + "north": {"uv": [52, 8], "uv_size": [4, 6]}, + "east": {"uv": [0, 0], "uv_size": [0, 6]}, + "south": {"uv": [52, 14], "uv_size": [4, 6]}, + "west": {"uv": [0, 0], "uv_size": [0, 6]}, + "up": {"uv": [0, 0], "uv_size": [4, 0]}, + "down": {"uv": [0, 0], "uv_size": [4, 0]} + } + } + ] + }, + { + "name": "arm2", + "parent": "body", + "pivot": [3, 11, -3], + "cubes": [ + { + "origin": [-3.02062, 4.11746, -4.34869], + "size": [2.12934, 5.90893, 2.12934], + "pivot": [0.09, 12.94, -3], + "rotation": [0, 0, -90], + "uv": { + "north": {"uv": [30, 40], "uv_size": [2, 6]}, + "east": {"uv": [50, 0], "uv_size": [2, 6]}, + "south": {"uv": [58, 48], "uv_size": [2, 6]}, + "west": {"uv": [54, 60], "uv_size": [2, 6]}, + "up": {"uv": [12, 8], "uv_size": [2, 2]}, + "down": {"uv": [14, 10], "uv_size": [2, -2]} + } + } + ] + }, + { + "name": "arm1", + "parent": "body", + "pivot": [-3, 11, -3], + "cubes": [ + { + "origin": [2.88953, 5.92101, -4.36259], + "size": [2.1513, 5.96985, 2.1513], + "pivot": [-0.06, 14.92, -0.06], + "rotation": [0, 0, 90], + "uv": { + "north": {"uv": [28, 55], "uv_size": [-2, 5]}, + "east": {"uv": [58, 5], "uv_size": [-2, 5]}, + "south": {"uv": [58, 0], "uv_size": [-2, 5]}, + "west": {"uv": [56, 55], "uv_size": [-2, 5]}, + "up": {"uv": [48, 19], "uv_size": [-2, 2]}, + "down": {"uv": [48, 31], "uv_size": [-2, -2]} + } + } + ] + }, + { + "name": "tails", + "parent": "body", + "pivot": [0, 7, 0] + }, + { + "name": "tail2", + "parent": "tails", + "pivot": [-2, 6, -0.5] + }, + { + "name": "tail2_part2", + "parent": "tail2", + "pivot": [-2, 6, 7.8] + }, + { + "name": "tail1", + "parent": "tails", + "pivot": [2, 6, -0.5], + "cubes": [ + { + "origin": [-1.9832, 2, 4], + "size": [7.6832, 8.52835, 0], + "pivot": [4.91675, 5.93511, 3.86808], + "rotation": [90, 0, 0], + "uv": { + "north": {"uv": [21, 60], "uv_size": [8, 9]}, + "east": {"uv": [0, 0], "uv_size": [0, 9]}, + "south": {"uv": [60, 48], "uv_size": [8, 9]}, + "west": {"uv": [0, 0], "uv_size": [0, 9]}, + "up": {"uv": [0, 0], "uv_size": [8, 0]}, + "down": {"uv": [0, 0], "uv_size": [8, 0]} + } + } + ] + }, + { + "name": "tail1_part2", + "parent": "tail1", + "pivot": [2, 6.1, 7.8], + "cubes": [ + { + "origin": [-3.97008, -1.76763, 3.05492], + "size": [11.8784, 10.96502, 0], + "pivot": [2, 10, 7], + "rotation": [90, 0, 0], + "uv": { + "north": {"uv": [20, 32], "uv_size": [10, 11]}, + "east": {"uv": [0, 0], "uv_size": [0, 11]}, + "south": {"uv": [58, 28], "uv_size": [10, 11]}, + "west": {"uv": [0, 0], "uv_size": [0, 11]}, + "up": {"uv": [0, 0], "uv_size": [10, 0]}, + "down": {"uv": [0, 0], "uv_size": [10, 0]} + } + } + ] + }, + { + "name": "tail3", + "parent": "tails", + "pivot": [-2, 6, -0.5] + }, + { + "name": "tail1_part3", + "parent": "tail3", + "pivot": [-2, 6.1, 7.8], + "cubes": [ + { + "origin": [-7.90832, -1.76763, 3.05492], + "size": [11.8784, 10.96502, 0], + "pivot": [-2, 10, 7], + "rotation": [90, 0, 0], + "uv": { + "north": {"uv": [30, 32], "uv_size": [-10, 11]}, + "east": {"uv": [0, 0], "uv_size": [0, 11]}, + "south": {"uv": [68, 28], "uv_size": [-10, 11]}, + "west": {"uv": [0, 0], "uv_size": [0, 11]}, + "up": {"uv": [10, 0], "uv_size": [-10, 0]}, + "down": {"uv": [10, 0], "uv_size": [-10, 0]} + } + } + ] + }, + { + "name": "tail4", + "parent": "tails", + "pivot": [-2, 6, -0.5], + "cubes": [ + { + "origin": [-5.7, 2, 4], + "size": [7.6832, 8.52835, 0], + "pivot": [-4.91675, 5.93511, 3.86808], + "rotation": [90, 0, 0], + "uv": { + "north": {"uv": [29, 60], "uv_size": [-8, 9]}, + "east": {"uv": [0, 0], "uv_size": [0, 9]}, + "south": {"uv": [68, 48], "uv_size": [-8, 9]}, + "west": {"uv": [0, 0], "uv_size": [0, 9]}, + "up": {"uv": [8, 0], "uv_size": [-8, 0]}, + "down": {"uv": [8, 0], "uv_size": [-8, 0]} + } + } + ] + }, + { + "name": "legs", + "parent": "root", + "pivot": [0, 3, 0] + }, + { + "name": "leg1", + "parent": "legs", + "pivot": [1.82, 4.82, -2.73], + "cubes": [ + { + "origin": [0.99882, 0.27, -3.99526], + "size": [1.99763, 4.43474, 2.99645], + "uv": { + "north": {"uv": [40, 40], "uv_size": [2, 5]}, + "east": {"uv": [34, 18], "uv_size": [3, 5]}, + "south": {"uv": [19, 61], "uv_size": [2, 5]}, + "west": {"uv": [16, 47], "uv_size": [3, 5]}, + "up": {"uv": [18, 14], "uv_size": [2, 3]}, + "down": {"uv": [16, 33], "uv_size": [2, -3]} + } + } + ] + }, + { + "name": "leg_2", + "parent": "legs", + "pivot": [-1.82, 4.82, -2.73], + "cubes": [ + { + "origin": [-2.99645, 0.27, -3.99526], + "size": [1.99763, 4.43474, 2.99645], + "uv": { + "north": {"uv": [47, 61], "uv_size": [2, 5]}, + "east": {"uv": [59, 23], "uv_size": [3, 5]}, + "south": {"uv": [54, 66], "uv_size": [2, 5]}, + "west": {"uv": [24, 69], "uv_size": [3, 5]}, + "up": {"uv": [18, 30], "uv_size": [2, 3]}, + "down": {"uv": [30, 29], "uv_size": [2, -3]} + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/models/entity/pokemon/shroomish.geo.json b/models/entity/pokemon/shroomish.geo.json new file mode 100644 index 000000000..3e631b182 --- /dev/null +++ b/models/entity/pokemon/shroomish.geo.json @@ -0,0 +1,315 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.shroomish", + "texture_width": 32, + "texture_height": 32, + "visible_bounds_width": 2, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "shroomish", + "pivot": [0, 0, 0] + }, + { + "name": "left_leg", + "parent": "shroomish", + "pivot": [0, 1.4, -0.3], + "cubes": [ + { + "origin": [-3.5, 0, -1.5], + "size": [3, 2, 3], + "uv": { + "north": {"uv": [9, 24], "uv_size": [3, 1]}, + "east": {"uv": [25, 12], "uv_size": [3, 1]}, + "south": {"uv": [25, 13], "uv_size": [3, 1]}, + "west": {"uv": [25, 14], "uv_size": [3, 1]}, + "up": {"uv": [8, 21], "uv_size": [3, 3]}, + "down": {"uv": [11, 24], "uv_size": [3, -3]} + } + } + ] + }, + { + "name": "right_leg", + "parent": "shroomish", + "pivot": [2, 1.4, -0.3], + "cubes": [ + { + "origin": [0.5, 0, -1.5], + "size": [3, 2, 3], + "uv": { + "north": {"uv": [15, 25], "uv_size": [3, 1]}, + "east": {"uv": [25, 15], "uv_size": [3, 1]}, + "south": {"uv": [25, 16], "uv_size": [3, 1]}, + "west": {"uv": [25, 17], "uv_size": [3, 1]}, + "up": {"uv": [22, 12], "uv_size": [3, 3]}, + "down": {"uv": [14, 25], "uv_size": [3, -3]} + } + } + ] + }, + { + "name": "body", + "parent": "shroomish", + "pivot": [0, 4.4, -0.3], + "cubes": [ + { + "origin": [-4, 1, -4], + "size": [8, 7, 8], + "uv": { + "north": {"uv": [8, 0], "uv_size": [8, 7]}, + "east": {"uv": [8, 7], "uv_size": [8, 7]}, + "south": {"uv": [8, 14], "uv_size": [8, 7]}, + "west": {"uv": [0, 16], "uv_size": [8, 7]}, + "up": {"uv": [0, 0], "uv_size": [8, 8]}, + "down": {"uv": [0, 16], "uv_size": [8, -8]} + } + }, + { + "origin": [-2.8, 6.2, -4.05], + "size": [5.5, 0.4, 0], + "uv": { + "north": {"uv": [0, 25], "uv_size": [6, 1]}, + "east": {"uv": [0, 0], "uv_size": [0, 1]}, + "south": {"uv": [9, 25], "uv_size": [6, 1]}, + "west": {"uv": [0, 0], "uv_size": [0, 1]}, + "up": {"uv": [0, 0], "uv_size": [6, 0]}, + "down": {"uv": [0, 0], "uv_size": [6, 0]} + } + }, + { + "origin": [-4.2, 2.8, -4.05], + "size": [0.4, 1.9, 0], + "pivot": [-0.8, 0.2, 0], + "rotation": [0, 0, 45], + "uv": { + "north": {"uv": [17, 22], "uv_size": [1, 2]}, + "east": {"uv": [0, 0], "uv_size": [0, 2]}, + "south": {"uv": [18, 22], "uv_size": [1, 2]}, + "west": {"uv": [0, 0], "uv_size": [0, 2]}, + "up": {"uv": [0, 0], "uv_size": [1, 0]}, + "down": {"uv": [0, 0], "uv_size": [1, 0]} + } + }, + { + "origin": [3.3, 1.7, -4.05], + "size": [0.4, 1.5, 0], + "pivot": [-0.8, 0.2, 0], + "rotation": [0, 0, -45], + "uv": { + "north": {"uv": [18, 24], "uv_size": [1, 2]}, + "east": {"uv": [0, 0], "uv_size": [0, 2]}, + "south": {"uv": [22, 25], "uv_size": [1, 2]}, + "west": {"uv": [0, 0], "uv_size": [0, 2]}, + "up": {"uv": [0, 0], "uv_size": [1, 0]}, + "down": {"uv": [0, 0], "uv_size": [1, 0]} + } + } + ] + }, + { + "name": "hair", + "parent": "body", + "pivot": [0, -0.6, -0.3], + "cubes": [ + { + "origin": [-1.6, 8.5, -1.35], + "size": [3, 2, 0], + "pivot": [0, -0.6, -0.3], + "rotation": [-17.5, 0, 0], + "uv": { + "north": {"uv": [24, 4], "uv_size": [3, 2]}, + "east": {"uv": [0, 0], "uv_size": [0, 2]}, + "south": {"uv": [6, 24], "uv_size": [3, 2]}, + "west": {"uv": [0, 0], "uv_size": [0, 2]}, + "up": {"uv": [0, 0], "uv_size": [3, 0]}, + "down": {"uv": [0, 0], "uv_size": [3, 0]} + } + }, + { + "origin": [-1.6, 8, -1.55], + "size": [3, 0.4, 3], + "uv": { + "north": {"uv": [25, 18], "uv_size": [3, 1]}, + "east": {"uv": [25, 19], "uv_size": [3, 1]}, + "south": {"uv": [25, 20], "uv_size": [3, 1]}, + "west": {"uv": [25, 21], "uv_size": [3, 1]}, + "up": {"uv": [22, 15], "uv_size": [3, 3]}, + "down": {"uv": [22, 21], "uv_size": [3, -3]} + } + }, + { + "origin": [1.2, 8.4, -1.55], + "size": [0, 2, 3], + "pivot": [0, -0.6, -0.3], + "rotation": [0, 0, -17.5], + "uv": { + "north": {"uv": [0, 0], "uv_size": [0, 2]}, + "east": {"uv": [22, 21], "uv_size": [3, 2]}, + "south": {"uv": [0, 0], "uv_size": [0, 2]}, + "west": {"uv": [0, 23], "uv_size": [3, 2]}, + "up": {"uv": [0, 0], "uv_size": [0, 3]}, + "down": {"uv": [0, 3], "uv_size": [0, -3]} + } + }, + { + "origin": [-1.6, 8.3, 1.25], + "size": [3, 2, 0], + "pivot": [0, -0.6, -0.3], + "rotation": [17.5, 0, 0], + "uv": { + "north": {"uv": [3, 23], "uv_size": [3, 2]}, + "east": {"uv": [0, 0], "uv_size": [0, 2]}, + "south": {"uv": [22, 23], "uv_size": [3, 2]}, + "west": {"uv": [0, 0], "uv_size": [0, 2]}, + "up": {"uv": [0, 0], "uv_size": [3, 0]}, + "down": {"uv": [0, 0], "uv_size": [3, 0]} + } + }, + { + "origin": [-1.4, 8.4, -1.55], + "size": [0, 2, 3], + "pivot": [0, -0.6, -0.3], + "rotation": [0, 0, 17.5], + "uv": { + "north": {"uv": [0, 0], "uv_size": [0, 2]}, + "east": {"uv": [24, 0], "uv_size": [3, 2]}, + "south": {"uv": [0, 0], "uv_size": [0, 2]}, + "west": {"uv": [24, 2], "uv_size": [3, 2]}, + "up": {"uv": [0, 0], "uv_size": [0, 3]}, + "down": {"uv": [0, 3], "uv_size": [0, -3]} + } + } + ] + }, + { + "name": "bone", + "parent": "body", + "pivot": [4, 3.4, -0.3], + "cubes": [ + { + "origin": [4.75, -4, -0.75], + "size": [0, 8, 3], + "pivot": [0, 0, 0], + "rotation": [90, 0, -15], + "uv": { + "north": {"uv": [0, 0], "uv_size": [0, 8]}, + "east": {"uv": [16, 6], "uv_size": [3, 8]}, + "south": {"uv": [0, 0], "uv_size": [0, 8]}, + "west": {"uv": [16, 14], "uv_size": [3, 8]}, + "up": {"uv": [0, 0], "uv_size": [0, 3]}, + "down": {"uv": [0, 3], "uv_size": [0, -3]} + } + } + ] + }, + { + "name": "bone2", + "parent": "body", + "pivot": [0, 3.4, -4.3], + "cubes": [ + { + "origin": [-4, 4.75, -0.75], + "size": [8, 0, 3], + "pivot": [0, 0, 0], + "rotation": [75, 0, 0], + "uv": { + "north": {"uv": [0, 0], "uv_size": [8, 0]}, + "east": {"uv": [0, 0], "uv_size": [3, 0]}, + "south": {"uv": [0, 0], "uv_size": [8, 0]}, + "west": {"uv": [0, 0], "uv_size": [3, 0]}, + "up": {"uv": [16, 0], "uv_size": [8, 3]}, + "down": {"uv": [16, 6], "uv_size": [8, -3]} + } + } + ] + }, + { + "name": "bone4", + "parent": "body", + "pivot": [0, 3.5, 4], + "cubes": [ + { + "origin": [-4, 4.75, -2.45], + "size": [8, 0, 3], + "pivot": [0, 0, 0], + "rotation": [-75, 0, 0], + "uv": { + "north": {"uv": [0, 0], "uv_size": [8, 0]}, + "east": {"uv": [0, 0], "uv_size": [3, 0]}, + "south": {"uv": [0, 0], "uv_size": [8, 0]}, + "west": {"uv": [0, 0], "uv_size": [3, 0]}, + "up": {"uv": [19, 6], "uv_size": [8, 3]}, + "down": {"uv": [19, 12], "uv_size": [8, -3]} + } + } + ] + }, + { + "name": "bone3", + "parent": "body", + "pivot": [-4.2, 3.4, -0.3], + "cubes": [ + { + "origin": [-4.75474, -3.95671, -0.75], + "size": [0, 8, 3], + "pivot": [-0.00474, 0.04329, 0], + "rotation": [90, 0, 15], + "uv": { + "north": {"uv": [0, 0], "uv_size": [0, 8]}, + "east": {"uv": [19, 12], "uv_size": [3, 8]}, + "south": {"uv": [0, 0], "uv_size": [0, 8]}, + "west": {"uv": [19, 20], "uv_size": [3, 8]}, + "up": {"uv": [0, 0], "uv_size": [0, 3]}, + "down": {"uv": [0, 3], "uv_size": [0, -3]} + } + } + ] + }, + { + "name": "eye_left", + "parent": "body", + "pivot": [-1.8, 5.7, -3.3], + "cubes": [ + { + "origin": [-1.9, 5.4, -4.05], + "size": [0.6, 0.8, 0], + "uv": { + "north": {"uv": [6, 23], "uv_size": [1, 1]}, + "east": {"uv": [0, 0], "uv_size": [0, 1]}, + "south": {"uv": [7, 23], "uv_size": [1, 1]}, + "west": {"uv": [0, 0], "uv_size": [0, 1]}, + "up": {"uv": [0, 0], "uv_size": [1, 0]}, + "down": {"uv": [0, 0], "uv_size": [1, 0]} + } + } + ] + }, + { + "name": "eye_right", + "parent": "body", + "pivot": [1.6, 5.6, -3.8], + "cubes": [ + { + "origin": [1.4, 5.4, -4.05], + "size": [0.6, 0.8, 0], + "uv": { + "north": {"uv": [14, 21], "uv_size": [1, 1]}, + "east": {"uv": [0, 0], "uv_size": [0, 1]}, + "south": {"uv": [15, 21], "uv_size": [1, 1]}, + "west": {"uv": [0, 0], "uv_size": [0, 1]}, + "up": {"uv": [0, 0], "uv_size": [1, 0]}, + "down": {"uv": [0, 0], "uv_size": [1, 0]} + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/models/entity/pokemon/swellow.geo.json b/models/entity/pokemon/swellow.geo.json new file mode 100644 index 000000000..548a2a0ab --- /dev/null +++ b/models/entity/pokemon/swellow.geo.json @@ -0,0 +1,571 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.swellow", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 5, + "visible_bounds_height": 2.5, + "visible_bounds_offset": [0, 0.75, 0] + }, + "bones": [ + { + "name": "root", + "pivot": [0, 0, 0] + }, + { + "name": "body", + "parent": "root", + "pivot": [0, 4, 0], + "cubes": [ + { + "origin": [-3, 2.75, -3.25], + "size": [6, 4, 9], + "pivot": [0, 4, 0], + "rotation": [-15, 0, 0], + "uv": { + "north": {"uv": [22, 16], "uv_size": [6, 4]}, + "east": {"uv": [13, 16], "uv_size": [9, 4]}, + "south": {"uv": [37, 16], "uv_size": [6, 4]}, + "west": {"uv": [28, 16], "uv_size": [9, 4]}, + "up": {"uv": [22, 7], "uv_size": [6, 9]}, + "down": {"uv": [28, 16], "uv_size": [6, -9]} + } + }, + { + "origin": [-3, 5.6, -2.95], + "size": [6, 8, 6], + "inflate": 0.1, + "pivot": [0, 4, 0], + "rotation": [45, 0, 0], + "uv": { + "north": {"uv": [28, 33], "uv_size": [6, 8]}, + "east": {"uv": [22, 33], "uv_size": [6, 8]}, + "south": {"uv": [40, 33], "uv_size": [6, 8]}, + "west": {"uv": [34, 33], "uv_size": [6, 8]}, + "up": {"uv": [28, 27], "uv_size": [6, 6]}, + "down": {"uv": [34, 33], "uv_size": [6, -6]} + } + } + ] + }, + { + "name": "leftFakeWing", + "parent": "body", + "pivot": [3, 9.75, -4.35], + "cubes": [ + { + "origin": [3, -0.15, -4.6], + "size": [10, 13, 0], + "inflate": 0.01, + "uv": { + "north": {"uv": [0, 33], "uv_size": [10, 13]}, + "east": {"uv": [0, 33], "uv_size": [0, 13]}, + "south": {"uv": [10, 33], "uv_size": [10, 13]}, + "west": {"uv": [10, 33], "uv_size": [0, 13]}, + "up": {"uv": [0, 33], "uv_size": [10, 0]}, + "down": {"uv": [10, 33], "uv_size": [10, 0]} + } + } + ] + }, + { + "name": "leftDwing", + "parent": "leftFakeWing", + "pivot": [13, 9.75, -4.35], + "cubes": [ + { + "origin": [13, -0.15, -4.6], + "size": [14, 13, 0], + "inflate": 0.01, + "uv": { + "north": {"uv": [0, 20], "uv_size": [14, 13]}, + "east": {"uv": [0, 20], "uv_size": [0, 13]}, + "south": {"uv": [14, 20], "uv_size": [14, 13]}, + "west": {"uv": [14, 20], "uv_size": [0, 13]}, + "up": {"uv": [0, 20], "uv_size": [14, 0]}, + "down": {"uv": [14, 20], "uv_size": [14, 0]} + } + } + ] + }, + { + "name": "rightFakeWing", + "parent": "body", + "pivot": [-3, 9.75, -4.35], + "cubes": [ + { + "origin": [-13, -0.15, -4.6], + "size": [10, 13, 0], + "inflate": 0.01, + "uv": { + "north": {"uv": [10, 33], "uv_size": [-10, 13]}, + "east": {"uv": [10, 33], "uv_size": [0, 13]}, + "south": {"uv": [20, 33], "uv_size": [-10, 13]}, + "west": {"uv": [0, 33], "uv_size": [0, 13]}, + "up": {"uv": [10, 33], "uv_size": [-10, 0]}, + "down": {"uv": [20, 33], "uv_size": [-10, 0]} + } + } + ] + }, + { + "name": "rightDwing", + "parent": "rightFakeWing", + "pivot": [-13, 9.75, -4.35], + "cubes": [ + { + "origin": [-27, -0.15, -4.6], + "size": [14, 13, 0], + "inflate": 0.01, + "uv": { + "north": {"uv": [14, 20], "uv_size": [-14, 13]}, + "east": {"uv": [14, 20], "uv_size": [0, 13]}, + "south": {"uv": [28, 20], "uv_size": [-14, 13]}, + "west": {"uv": [0, 20], "uv_size": [0, 13]}, + "up": {"uv": [14, 20], "uv_size": [-14, 0]}, + "down": {"uv": [28, 20], "uv_size": [-14, 0]} + } + } + ] + }, + { + "name": "rightWing", + "parent": "body", + "pivot": [-4.75, 10.25, -6.75] + }, + { + "name": "leftWing", + "parent": "body", + "pivot": [4.75, 10.25, -6.75] + }, + { + "name": "head", + "parent": "body", + "pivot": [0, 14.75, -5.4] + }, + { + "name": "bone", + "parent": "head", + "pivot": [0, 10.75, -5.4], + "cubes": [ + { + "origin": [-2.5, 8.85, -6.7], + "size": [5, 6, 5], + "pivot": [0, 4, 0], + "rotation": [12.5, 0, 0], + "uv": { + "north": {"uv": [43, 20], "uv_size": [5, 6]}, + "east": {"uv": [38, 20], "uv_size": [5, 6]}, + "south": {"uv": [53, 20], "uv_size": [5, 6]}, + "west": {"uv": [48, 20], "uv_size": [5, 6]}, + "up": {"uv": [43, 15], "uv_size": [5, 5]}, + "down": {"uv": [48, 20], "uv_size": [5, -5]} + } + }, + { + "origin": [-0.5, 16.25, -10.4], + "size": [1, 1, 2], + "pivot": [0, 14.75, -5.4], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [12, 2], "uv_size": [1, 1]}, + "east": {"uv": [10, 2], "uv_size": [2, 1]}, + "south": {"uv": [15, 2], "uv_size": [1, 1]}, + "west": {"uv": [13, 2], "uv_size": [2, 1]}, + "up": {"uv": [12, 0], "uv_size": [1, 2]}, + "down": {"uv": [13, 2], "uv_size": [1, -2]} + } + }, + { + "origin": [-1.5, 14.25, -12.4], + "size": [3, 1, 4], + "uv": { + "north": {"uv": [26, 4], "uv_size": [3, 1]}, + "east": {"uv": [22, 4], "uv_size": [4, 1]}, + "south": {"uv": [33, 4], "uv_size": [3, 1]}, + "west": {"uv": [29, 4], "uv_size": [4, 1]}, + "up": {"uv": [26, 0], "uv_size": [3, 4]}, + "down": {"uv": [29, 4], "uv_size": [3, -4]} + } + }, + { + "origin": [-1, 13.75, -11.9], + "size": [2, 1, 4], + "uv": { + "north": {"uv": [32, 26], "uv_size": [2, 1]}, + "east": {"uv": [28, 26], "uv_size": [4, 1]}, + "south": {"uv": [38, 26], "uv_size": [2, 1]}, + "west": {"uv": [34, 26], "uv_size": [4, 1]}, + "up": {"uv": [32, 22], "uv_size": [2, 4]}, + "down": {"uv": [34, 26], "uv_size": [2, -4]} + } + }, + { + "origin": [-2.5, 12.75, -9.4], + "size": [5, 5, 6], + "inflate": 0.1, + "uv": { + "north": {"uv": [40, 6], "uv_size": [5, 5]}, + "east": {"uv": [34, 6], "uv_size": [6, 5]}, + "south": {"uv": [51, 6], "uv_size": [5, 5]}, + "west": {"uv": [45, 6], "uv_size": [6, 5]}, + "up": {"uv": [40, 0], "uv_size": [5, 6]}, + "down": {"uv": [45, 6], "uv_size": [5, -6]} + } + }, + { + "origin": [1.825, 14.975, -9.45], + "size": [1, 2, 3], + "inflate": -0.2, + "pivot": [0, 14.75, -5.4], + "rotation": [7.5, 0, 0], + "uv": { + "north": {"uv": [4, 59], "uv_size": [1, 2]}, + "east": {"uv": [1, 59], "uv_size": [3, 2]}, + "south": {"uv": [8, 59], "uv_size": [1, 2]}, + "west": {"uv": [5, 59], "uv_size": [3, 2]}, + "up": {"uv": [4, 56], "uv_size": [1, 3]}, + "down": {"uv": [5, 59], "uv_size": [1, -3]} + } + }, + { + "origin": [-2.825, 14.975, -9.45], + "size": [1, 2, 3], + "inflate": -0.2, + "pivot": [0, 14.75, -5.4], + "rotation": [7.5, 0, 0], + "uv": { + "north": {"uv": [5, 59], "uv_size": [-1, 2]}, + "east": {"uv": [8, 59], "uv_size": [-3, 2]}, + "south": {"uv": [9, 59], "uv_size": [-1, 2]}, + "west": {"uv": [4, 59], "uv_size": [-3, 2]}, + "up": {"uv": [5, 56], "uv_size": [-1, 3]}, + "down": {"uv": [6, 59], "uv_size": [-1, -3]} + } + }, + { + "origin": [-0.5, 17.05, -4.1], + "size": [1, 1, 2], + "inflate": 0.1, + "pivot": [0, 14.75, -5.4], + "rotation": [-12.5, 0, 0], + "uv": { + "north": {"uv": [2, 2], "uv_size": [1, 1]}, + "east": {"uv": [0, 2], "uv_size": [2, 1]}, + "south": {"uv": [5, 2], "uv_size": [1, 1]}, + "west": {"uv": [3, 2], "uv_size": [2, 1]}, + "up": {"uv": [2, 0], "uv_size": [1, 2]}, + "down": {"uv": [3, 2], "uv_size": [1, -2]} + } + }, + { + "origin": [-0.5, 15.55, -4.7], + "size": [1, 2, 3], + "inflate": 0.2, + "pivot": [0, 14.75, -5.4], + "rotation": [-25, 0, 0], + "uv": { + "north": {"uv": [37, 14], "uv_size": [1, 2]}, + "east": {"uv": [34, 14], "uv_size": [3, 2]}, + "south": {"uv": [41, 14], "uv_size": [1, 2]}, + "west": {"uv": [38, 14], "uv_size": [3, 2]}, + "up": {"uv": [37, 11], "uv_size": [1, 3]}, + "down": {"uv": [38, 14], "uv_size": [1, -3]} + } + }, + { + "origin": [0, 16.05, -1.6], + "size": [0, 1, 2], + "inflate": 0.01, + "pivot": [0, 14.75, -5.4], + "rotation": [2.5, 0, 0], + "uv": { + "north": {"uv": [12, 3], "uv_size": [0, 1]}, + "east": {"uv": [10, 3], "uv_size": [2, 1]}, + "south": {"uv": [14, 3], "uv_size": [0, 1]}, + "west": {"uv": [12, 3], "uv_size": [2, 1]}, + "up": {"uv": [12, 1], "uv_size": [0, 2]}, + "down": {"uv": [12, 3], "uv_size": [0, -2]} + } + }, + { + "origin": [0, 15.25, -3.9], + "size": [0, 1, 3], + "inflate": 0.01, + "pivot": [0, 14.75, -5.4], + "rotation": [-42.5, 0, 0], + "uv": { + "north": {"uv": [3, 5], "uv_size": [0, 1]}, + "east": {"uv": [0, 5], "uv_size": [3, 1]}, + "south": {"uv": [6, 5], "uv_size": [0, 1]}, + "west": {"uv": [3, 5], "uv_size": [3, 1]}, + "up": {"uv": [3, 2], "uv_size": [0, 3]}, + "down": {"uv": [3, 5], "uv_size": [0, -3]} + } + }, + { + "origin": [0, 13.55, -1.6], + "size": [0, 2, 3], + "inflate": 0.01, + "pivot": [0, 14.75, -5.4], + "rotation": [2.5, 0, 0], + "uv": { + "north": {"uv": [3, 3], "uv_size": [0, 2]}, + "east": {"uv": [0, 3], "uv_size": [3, 2]}, + "south": {"uv": [6, 3], "uv_size": [0, 2]}, + "west": {"uv": [3, 3], "uv_size": [3, 2]}, + "up": {"uv": [3, 0], "uv_size": [0, 3]}, + "down": {"uv": [3, 3], "uv_size": [0, -3]} + } + } + ] + }, + { + "name": "bone2", + "parent": "body", + "pivot": [-1, 4, 6], + "cubes": [ + { + "origin": [-0.55, 2.25, 4.75], + "size": [3, 0, 16], + "pivot": [0, 4, 0], + "rotation": [18.84359, -21.40584, -7.09999], + "uv": { + "north": {"uv": [19, 16], "uv_size": [-3, 0]}, + "east": {"uv": [35, 16], "uv_size": [-16, 0]}, + "south": {"uv": [38, 16], "uv_size": [-3, 0]}, + "west": {"uv": [16, 16], "uv_size": [-16, 0]}, + "up": {"uv": [19, 0], "uv_size": [-3, 16]}, + "down": {"uv": [22, 16], "uv_size": [-3, -16]} + } + } + ] + }, + { + "name": "bone3", + "parent": "body", + "pivot": [2, 4, 7], + "cubes": [ + { + "origin": [-2.45, 2.25, 4.75], + "size": [3, 0, 16], + "pivot": [0, 4, 0], + "rotation": [18.84359, 21.40584, 7.09999], + "uv": { + "north": {"uv": [16, 16], "uv_size": [3, 0]}, + "east": {"uv": [0, 16], "uv_size": [16, 0]}, + "south": {"uv": [35, 16], "uv_size": [3, 0]}, + "west": {"uv": [19, 16], "uv_size": [16, 0]}, + "up": {"uv": [16, 0], "uv_size": [3, 16]}, + "down": {"uv": [19, 16], "uv_size": [3, -16]} + } + } + ] + }, + { + "name": "leftLeg", + "parent": "root", + "pivot": [2, 3.25, -1.75], + "cubes": [ + { + "origin": [0.5, 0, -2.5], + "size": [3, 1, 2], + "uv": { + "north": {"uv": [5, 18], "uv_size": [-3, 1]}, + "east": {"uv": [7, 18], "uv_size": [-2, 1]}, + "south": {"uv": [10, 18], "uv_size": [-3, 1]}, + "west": {"uv": [2, 18], "uv_size": [-2, 1]}, + "up": {"uv": [5, 16], "uv_size": [-3, 2]}, + "down": {"uv": [8, 18], "uv_size": [-3, -2]} + } + }, + { + "origin": [1.5, 0, -5.5], + "size": [1, 1, 3], + "uv": { + "north": {"uv": [32, 44], "uv_size": [-1, 1]}, + "east": {"uv": [35, 44], "uv_size": [-3, 1]}, + "south": {"uv": [36, 44], "uv_size": [-1, 1]}, + "west": {"uv": [31, 44], "uv_size": [-3, 1]}, + "up": {"uv": [32, 41], "uv_size": [-1, 3]}, + "down": {"uv": [33, 44], "uv_size": [-1, -3]} + } + }, + { + "origin": [1, -0.025, -5.5], + "size": [1, 1, 3], + "pivot": [0, 3.975, 1], + "rotation": [0, -20, 0], + "uv": { + "north": {"uv": [44, 29], "uv_size": [-1, 1]}, + "east": {"uv": [47, 29], "uv_size": [-3, 1]}, + "south": {"uv": [48, 29], "uv_size": [-1, 1]}, + "west": {"uv": [43, 29], "uv_size": [-3, 1]}, + "up": {"uv": [44, 26], "uv_size": [-1, 3]}, + "down": {"uv": [45, 29], "uv_size": [-1, -3]} + } + }, + { + "origin": [2, -0.025, -5.5], + "size": [1, 1, 3], + "pivot": [4, 3.975, 1], + "rotation": [0, 20, 0], + "uv": { + "north": {"uv": [36, 3], "uv_size": [-1, 1]}, + "east": {"uv": [39, 3], "uv_size": [-3, 1]}, + "south": {"uv": [40, 3], "uv_size": [-1, 1]}, + "west": {"uv": [35, 3], "uv_size": [-3, 1]}, + "up": {"uv": [36, 0], "uv_size": [-1, 3]}, + "down": {"uv": [37, 3], "uv_size": [-1, -3]} + } + }, + { + "origin": [1.5, 2.5, -2], + "size": [1, 2, 1], + "inflate": 0.1, + "pivot": [0, 4, 0], + "rotation": [17.5, 0, 0], + "uv": { + "north": {"uv": [30, 21], "uv_size": [-1, 2]}, + "east": {"uv": [31, 21], "uv_size": [-1, 2]}, + "south": {"uv": [32, 21], "uv_size": [-1, 2]}, + "west": {"uv": [29, 21], "uv_size": [-1, 2]}, + "up": {"uv": [30, 20], "uv_size": [-1, 1]}, + "down": {"uv": [31, 21], "uv_size": [-1, -1]} + } + }, + { + "origin": [1.5, -0.38813, -0.5398], + "size": [1, 2, 1], + "pivot": [0, 4.11187, 1.4602], + "rotation": [-25, 0, 0], + "uv": { + "north": {"uv": [24, 1], "uv_size": [-1, 2]}, + "east": {"uv": [25, 1], "uv_size": [-1, 2]}, + "south": {"uv": [26, 1], "uv_size": [-1, 2]}, + "west": {"uv": [23, 1], "uv_size": [-1, 2]}, + "up": {"uv": [24, 0], "uv_size": [-1, 1]}, + "down": {"uv": [25, 1], "uv_size": [-1, -1]} + } + }, + { + "origin": [2, 0, -0.5], + "size": [0, 1, 2], + "uv": { + "north": {"uv": [12, 4], "uv_size": [0, 1]}, + "east": {"uv": [14, 4], "uv_size": [-2, 1]}, + "south": {"uv": [14, 4], "uv_size": [0, 1]}, + "west": {"uv": [12, 4], "uv_size": [-2, 1]}, + "up": {"uv": [12, 2], "uv_size": [0, 2]}, + "down": {"uv": [12, 4], "uv_size": [0, -2]} + } + } + ] + }, + { + "name": "rightLeg", + "parent": "root", + "pivot": [-2, 3.25, -1.75], + "cubes": [ + { + "origin": [-3.5, 0, -2.5], + "size": [3, 1, 2], + "uv": { + "north": {"uv": [2, 18], "uv_size": [3, 1]}, + "east": {"uv": [0, 18], "uv_size": [2, 1]}, + "south": {"uv": [7, 18], "uv_size": [3, 1]}, + "west": {"uv": [5, 18], "uv_size": [2, 1]}, + "up": {"uv": [2, 16], "uv_size": [3, 2]}, + "down": {"uv": [5, 18], "uv_size": [3, -2]} + } + }, + { + "origin": [-2.5, 0, -5.5], + "size": [1, 1, 3], + "uv": { + "north": {"uv": [31, 44], "uv_size": [1, 1]}, + "east": {"uv": [28, 44], "uv_size": [3, 1]}, + "south": {"uv": [35, 44], "uv_size": [1, 1]}, + "west": {"uv": [32, 44], "uv_size": [3, 1]}, + "up": {"uv": [31, 41], "uv_size": [1, 3]}, + "down": {"uv": [32, 44], "uv_size": [1, -3]} + } + }, + { + "origin": [-2, -0.025, -5.5], + "size": [1, 1, 3], + "pivot": [0, 3.975, 1], + "rotation": [0, 20, 0], + "uv": { + "north": {"uv": [43, 29], "uv_size": [1, 1]}, + "east": {"uv": [40, 29], "uv_size": [3, 1]}, + "south": {"uv": [47, 29], "uv_size": [1, 1]}, + "west": {"uv": [44, 29], "uv_size": [3, 1]}, + "up": {"uv": [43, 26], "uv_size": [1, 3]}, + "down": {"uv": [44, 29], "uv_size": [1, -3]} + } + }, + { + "origin": [-3, -0.025, -5.5], + "size": [1, 1, 3], + "pivot": [-4, 3.975, 1], + "rotation": [0, -20, 0], + "uv": { + "north": {"uv": [35, 3], "uv_size": [1, 1]}, + "east": {"uv": [32, 3], "uv_size": [3, 1]}, + "south": {"uv": [39, 3], "uv_size": [1, 1]}, + "west": {"uv": [36, 3], "uv_size": [3, 1]}, + "up": {"uv": [35, 0], "uv_size": [1, 3]}, + "down": {"uv": [36, 3], "uv_size": [1, -3]} + } + }, + { + "origin": [-2.5, 2.5, -2], + "size": [1, 2, 1], + "inflate": 0.1, + "pivot": [0, 4, 0], + "rotation": [17.5, 0, 0], + "uv": { + "north": {"uv": [29, 21], "uv_size": [1, 2]}, + "east": {"uv": [28, 21], "uv_size": [1, 2]}, + "south": {"uv": [31, 21], "uv_size": [1, 2]}, + "west": {"uv": [30, 21], "uv_size": [1, 2]}, + "up": {"uv": [29, 20], "uv_size": [1, 1]}, + "down": {"uv": [30, 21], "uv_size": [1, -1]} + } + }, + { + "origin": [-2.5, -0.38813, -0.5398], + "size": [1, 2, 1], + "pivot": [0, 4.11187, 1.4602], + "rotation": [-25, 0, 0], + "uv": { + "north": {"uv": [23, 1], "uv_size": [1, 2]}, + "east": {"uv": [22, 1], "uv_size": [1, 2]}, + "south": {"uv": [25, 1], "uv_size": [1, 2]}, + "west": {"uv": [24, 1], "uv_size": [1, 2]}, + "up": {"uv": [23, 0], "uv_size": [1, 1]}, + "down": {"uv": [24, 1], "uv_size": [1, -1]} + } + }, + { + "origin": [-2, 0, -0.5], + "size": [0, 1, 2], + "uv": { + "north": {"uv": [12, 4], "uv_size": [0, 1]}, + "east": {"uv": [10, 4], "uv_size": [2, 1]}, + "south": {"uv": [14, 4], "uv_size": [0, 1]}, + "west": {"uv": [12, 4], "uv_size": [2, 1]}, + "up": {"uv": [12, 2], "uv_size": [0, 2]}, + "down": {"uv": [12, 4], "uv_size": [0, -2]} + } + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/pokemon.json b/pokemon.json index 1b1b8a0da..f56def7e0 100644 --- a/pokemon.json +++ b/pokemon.json @@ -238,6 +238,7 @@ "ralts", "kirlia", "gardevoir", + "shroomish", "breloom", "azurill", "sableye", @@ -335,6 +336,8 @@ "frogadier", "greninja", "vivillon", + "meowstic", + "meowsticf", "tyrunt", "sylveon", "rowlet", diff --git a/texts/en_US.lang b/texts/en_US.lang index a20e17aa4..dd1f2ed90 100644 --- a/texts/en_US.lang +++ b/texts/en_US.lang @@ -1,4 +1,4 @@ -pack.name=§lPokeBedrock v2.9.4 RES +pack.name=§lPokeBedrock v2.9.5 RES pack.description=§aA High Level Pokemon Addon Created by Smell of curry for Minecraft Bedrock ## Orbs diff --git a/textures/entity/pokemon/meowstic/meowstic.png b/textures/entity/pokemon/meowstic/meowstic.png new file mode 100644 index 000000000..c2ff1e7ec Binary files /dev/null and b/textures/entity/pokemon/meowstic/meowstic.png differ diff --git a/textures/entity/pokemon/meowstic/shiny_meowstic.png b/textures/entity/pokemon/meowstic/shiny_meowstic.png new file mode 100644 index 000000000..3e869b163 Binary files /dev/null and b/textures/entity/pokemon/meowstic/shiny_meowstic.png differ diff --git a/textures/entity/pokemon/meowsticf/meowsticf.png b/textures/entity/pokemon/meowsticf/meowsticf.png new file mode 100644 index 000000000..4c2b6670d Binary files /dev/null and b/textures/entity/pokemon/meowsticf/meowsticf.png differ diff --git a/textures/entity/pokemon/meowsticf/shiny_meowsticf.png b/textures/entity/pokemon/meowsticf/shiny_meowsticf.png new file mode 100644 index 000000000..91079e80c Binary files /dev/null and b/textures/entity/pokemon/meowsticf/shiny_meowsticf.png differ diff --git a/textures/entity/pokemon/shroomish/shiny_shroomish.png b/textures/entity/pokemon/shroomish/shiny_shroomish.png new file mode 100644 index 000000000..02c6be044 Binary files /dev/null and b/textures/entity/pokemon/shroomish/shiny_shroomish.png differ diff --git a/textures/entity/pokemon/shroomish/shroomish.png b/textures/entity/pokemon/shroomish/shroomish.png new file mode 100644 index 000000000..629630ad1 Binary files /dev/null and b/textures/entity/pokemon/shroomish/shroomish.png differ