diff --git a/CHANGELOG.md b/CHANGELOG.md index a927cbe81..ba696b478 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ -**Update v2.9.8** +**Update v2.9.9** -- Updated Pokedex on all devices -- Added armaldo model -- Removed unused blocks in blocks.json \ No newline at end of file +- Fixed Dex Rewards that had broken items +- Added Armaldo And Taillow Models into the addon +- On Evolution, and Shed Evolution, Pokémon will get added to your Pokedex +- Added new `/serverdrop` wich will initate a server drop, when required. +- The Pokedex now shows close buttons so mobile, and other devices can close. \ No newline at end of file diff --git a/animations/pokemon/armaldo.animation.json b/animations/pokemon/armaldo.animation.json index dd8f304be..165224775 100644 --- a/animations/pokemon/armaldo.animation.json +++ b/animations/pokemon/armaldo.animation.json @@ -5,7 +5,7 @@ "loop": true, "bones": { "torso": { - "rotation": ["2.54.5+math.sin(q.anim_time*80)*4", "-0.5+math.sin(q.anim_time*100)*5", 0], + "rotation": ["2.54+math.sin(q.anim_time*80)*4", "-0.5+math.sin(q.anim_time*100)*5", 0], "position": [0, "-math.cos(query.anim_time*40*3-0)*0.3-0.3", 0] }, "tail": { diff --git a/animations/pokemon/houndoom.animation.json b/animations/pokemon/houndoom.animation.json index 03184f9f9..a0c45e8b0 100644 --- a/animations/pokemon/houndoom.animation.json +++ b/animations/pokemon/houndoom.animation.json @@ -3,103 +3,1038 @@ "animations": { "animation.houndoom.ground_idle": { "loop": true, - "animation_length": 1, + "animation_length": 4, "bones": { - "Body": { - "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "tail": { + "rotation": ["5+math.sin(query.anim_time*90*2-20)*1", "math.sin(query.anim_time*90*1-20)*2", 0] + }, + "tail2": { + "rotation": ["5+math.sin(query.anim_time*90*2-30)*1", "math.sin(query.anim_time*90*1-30)*2", 0] + }, + "tail3": { + "rotation": ["5+math.sin(query.anim_time*90*2-40)*1", "0+math.sin(query.anim_time*90*1-40)*2", 0] + }, + "tail4": { + "rotation": ["5+math.sin(query.anim_time*90*2-50)*1", "math.sin(query.anim_time*90*1-50)*2", 0] + }, + "tail5": { + "rotation": ["10+math.sin(query.anim_time*90*2-60)*1", "math.sin(query.anim_time*90*1-60)*2", 0] + }, + "tail6": { + "rotation": ["10+math.sin(query.anim_time*90*2-70)*1", "0+math.sin(query.anim_time*90*1-70)*2", 0] + }, + "tail7": { + "rotation": ["10+math.sin(query.anim_time*90*2-80)*1", "math.sin(query.anim_time*90*1-80)*2", 0] + }, + "tail8": { + "rotation": ["10+math.sin(query.anim_time*90*2-90)*1", "0+math.sin(query.anim_time*90*1-90)*2", 0] + }, + "tail9": { + "rotation": ["10+math.sin(query.anim_time*90*2-100)*4", "math.sin(query.anim_time*90*1-100)*2", 0] + }, + "neck": { + "rotation": ["math.sin(query.anim_time*90*2-20)*2", "math.sin(query.anim_time*90*1-20)*1", 0] + }, + "head": { + "rotation": ["5-math.sin(query.anim_time*90*2-40)*4", "-math.sin(query.anim_time*90*1-40)*2", 0] + }, + "body": { + "position": [0, "math.cos(query.anim_time*90*2-0)*0.3-0.3", 0] + }, + "torso": { + "rotation": ["math.sin(query.anim_time*90*2-0)*2", "math.sin(query.anim_time*90*1-0)*1", 0] + }, + "mouth": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.1667": { + "post": [4.72, 0, 0], + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } } + } + } + }, + "animation.houndoom.walking": { + "loop": true, + "animation_length": 4, + "bones": { + "tail": { + "rotation": ["5+math.sin(query.anim_time*90*8-20)*1", "math.sin(query.anim_time*90*4-20)*2", 0] + }, + "tail2": { + "rotation": ["5+math.sin(query.anim_time*90*8-30)*1", "math.sin(query.anim_time*90*4-30)*2", 0] + }, + "tail3": { + "rotation": ["5+math.sin(query.anim_time*90*8-40)*1", "0+math.sin(query.anim_time*90*4-40)*2", 0] + }, + "tail4": { + "rotation": ["5+math.sin(query.anim_time*90*8-50)*1", "math.sin(query.anim_time*90*4-50)*2", 0] + }, + "tail5": { + "rotation": ["10+math.sin(query.anim_time*90*8-60)*1", "math.sin(query.anim_time*90*4-60)*4", 0] + }, + "tail6": { + "rotation": ["10+math.sin(query.anim_time*90*8-70)*1", "0+math.sin(query.anim_time*90*4-70)*4", 0] + }, + "tail7": { + "rotation": ["10+math.sin(query.anim_time*90*8-80)*1", "math.sin(query.anim_time*90*4-80)*4", 0] + }, + "tail8": { + "rotation": ["10+math.sin(query.anim_time*90*8-90)*1", "0+math.sin(query.anim_time*90*4-90)*4", 0] + }, + "tail9": { + "rotation": ["10+math.sin(query.anim_time*90*8-100)*8", "math.sin(query.anim_time*90*4-100)*4", 0] + }, + "neck": { + "rotation": ["math.sin(query.anim_time*90*8-20)*2", "math.sin(query.anim_time*90*4-20)*1", 0] + }, + "head": { + "rotation": ["5-math.sin(query.anim_time*90*8-40)*4", "-math.sin(query.anim_time*90*4-40)*2", 0] + }, + "leg_left_front": { + "rotation": ["-math.sin(query.anim_time*90*4-30)*20", 0, 0], + "position": [0, "math.clamp(-math.cos(query.anim_time*90*4+150)*2,0,2)-math.clamp(-math.cos(query.anim_time*90*4+240)*0.5+0,0,0.5)", 0] }, - "Head": { + "leg_left_front2": { + "rotation": ["-math.sin(query.anim_time*90*4-210)*15+math.clamp(-math.cos(query.anim_time*90*4+150)*25+0,0,25)", 0, 0], + "position": [0, "math.clamp(-math.cos(query.anim_time*90*4+150)*0.5,0,0.5)", 0] + }, + "leg_left_front3": { + "rotation": ["-math.sin(query.anim_time*90*4-210)*5+math.clamp(-math.cos(query.anim_time*90*4+150)*15,0,15)", 0, 0] + }, + "leg_right_front": { + "rotation": ["math.sin(query.anim_time*90*4-30)*20", 0, 0], + "position": [0, "math.clamp(-math.cos(query.anim_time*90*4-30)*2,0,2)-math.clamp(-math.cos(query.anim_time*90*4+60)*0.5+0,0,0.5)", 0] + }, + "leg_right_front2": { + "rotation": ["-math.sin(query.anim_time*90*4-30)*15+math.clamp(-math.cos(query.anim_time*90*4-30)*25+0,0,25)", 0, 0], + "position": [0, "math.clamp(-math.cos(query.anim_time*90*4-30)*0.5,0,0.5)", 0] + }, + "leg_right_front3": { + "rotation": ["-math.sin(query.anim_time*90*4-30)*5+math.clamp(-math.cos(query.anim_time*90*4-30)*15,0,15)", 0, 0] + }, + "leg_left_back": { + "rotation": ["math.sin(query.anim_time*90*4-0)*20", 0, 0], + "position": [0, "math.clamp(-math.cos(query.anim_time*90*4+0)*2,0,2)-math.clamp(-math.cos(query.anim_time*90*4+90)*1+0,0,1)", 0] + }, + "leg_left_back3": { + "rotation": ["-math.sin(query.anim_time*90*4-0)*5+math.clamp(-math.cos(query.anim_time*90*4+0)*10,0,10)", 0, 0] + }, + "leg_right_back": { + "rotation": ["-math.sin(query.anim_time*90*4-0)*20", 0, 0], + "position": [0, "math.clamp(-math.cos(query.anim_time*90*4+180)*2,0,2)-math.clamp(-math.cos(query.anim_time*90*4+270)*1+0,0,1)", 0] + }, + "leg_right_back3": { + "rotation": ["-math.sin(query.anim_time*90*4-180)*5+math.clamp(-math.cos(query.anim_time*90*4+180)*10,0,10)", 0, 0] + }, + "torso": { + "rotation": ["math.sin(query.anim_time*90*8-0)*2", "math.sin(query.anim_time*90*4-0)*1", 0] + }, + "leg_left_back2": { + "rotation": ["-math.sin(query.anim_time*90*4-0)*15+math.clamp(-math.cos(query.anim_time*90*4+0)*25+0,0,25)", 0, 0], + "position": [0, "math.clamp(-math.cos(query.anim_time*90*4+0)*0.5,0,0.5)", 0] + }, + "leg_right_back2": { + "rotation": ["-math.sin(query.anim_time*90*4-180)*15+math.clamp(-math.cos(query.anim_time*90*4+180)*25+0,0,25)", 0, 0], + "position": [0, "math.clamp(-math.cos(query.anim_time*90*4+180)*0.5,0,0.5)", 0] + } + } + }, + "animation.houndoom.battle_idle": { + "loop": true, + "animation_length": 2.25, + "bones": { + "houndoom": { + "rotation": [0, 17.5, 0] + }, + "body": { + "rotation": { + "0.0": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [5.89483, -1.05444, 2.12717], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [8.39483, -1.05444, 2.12717], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [10.39483, -1.05444, 2.12717], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + } + }, "position": { - "0.0": [0, -0.5, 0], - "0.52": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": { + "post": [0, -2, -1], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, -2.7, -1], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, -3.3, -1], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [0, -2.29, -1], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [0, -2, -1], + "lerp_mode": "catmullrom" + } + } + }, + "tail": { + "rotation": [22.5, 0, 0] + }, + "tail2": { + "rotation": [27.5, 0, 0] + }, + "tail3": { + "rotation": [27.5, 0, 0] + }, + "tail4": { + "rotation": [22.5, 0, 0] + }, + "tail5": { + "rotation": [5, 0, 0] + }, + "tail6": { + "rotation": [7.5, 0, 0] + }, + "tail7": { + "rotation": [10, 0, 0] + }, + "tail8": { + "rotation": [17.5, 0, 0] + }, + "tail9": { + "rotation": [12.5, 0, 0] + }, + "neck": { + "rotation": { + "0.0": { + "post": [-9.95317, -20.92381, 3.34956], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0.37358, -20, 0], + "lerp_mode": "catmullrom" + }, + "1.0833": { + "post": [2.87358, -20, 0], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [2.87358, -20, 0], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [-9.95317, -20.92381, 3.34956], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0833": { + "post": [5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [12.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "mouth": { + "rotation": { + "0.0": { + "post": [2.03911, 0.33633, -1.40085], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [14.53911, 0.33633, -1.40085], + "lerp_mode": "catmullrom" + }, + "1.0833": { + "post": [21.97337, 0.33633, -1.40085], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [9.53911, 0.33633, -1.40085], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [2.03911, 0.33633, -1.40085], + "lerp_mode": "catmullrom" + } } } } }, - "animation.houndoom.sitting": { + "animation.houndoom.water_idle": { "loop": true, "animation_length": 1, "bones": { - "Houndour": { - "position": [0, -9, 0] + "houndoom": { + "position": [0, -8, 0] + }, + "tail": { + "rotation": { + "0.0": [-12.5, 0, 0], + "0.125": [-12.55, 5.66, -0.82], + "0.25": [-12.60443, 7.32123, -1.63219], + "0.375": [-12.55, 5.66, -0.82], + "0.5": [-12.5, 0, 0], + "0.625": [-12.55, -5.66, 0.82], + "0.75": [-12.60443, -7.32123, 1.63219], + "0.875": [-12.55, -5.66, 0.82], + "1.0": [-12.5, 0, 0] + } + }, + "tail2": { + "rotation": { + "0.0": [-22.5, 0, 0], + "0.125": [-22.59, 4.46, -1.44], + "0.25": [-22.67458, 6.92618, -2.88419], + "0.375": [-22.59, 4.46, -1.44], + "0.5": [-22.5, 0, 0], + "0.625": [-22.59, -5.46, 1.44], + "0.75": [-22.67458, -6.92618, 2.88419], + "0.875": [-22.59, -5.46, 1.44], + "1.0": [-22.5, 0, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [-5, 0, 0], + "0.125": [-5.02, 5.74, -0.33], + "0.25": [-5.04292, 7.4713, -0.6574], + "0.375": [-5.02, 5.74, -0.33], + "0.5": [-5, 0, 0], + "0.625": [-5.02, -5.74, 0.33], + "0.75": [-5.04292, -7.4713, 0.6574], + "0.875": [-5.02, -5.74, 0.33], + "1.0": [-5, 0, 0] + } + }, + "tail4": { + "rotation": { + "0.0": [12.60443, -7.32123, -1.63219], + "0.125": [12.55, -4.66, -0.82], + "0.25": [12.5, 0, 0], + "0.375": [12.45, 5.67, 0.73], + "0.5": [12.39805, 7.34699, 1.45395], + "0.625": [12.45, 5.67, 0.73], + "0.75": [12.5, 0, 0], + "0.875": [12.55, -5.66, -0.82], + "1.0": [12.60443, -7.32123, -1.63219] + } + }, + "tail5": { + "rotation": { + "0.0": [7.56397, -7.43547, -0.98448], + "0.25": [7.5, 0, 0], + "0.5": [7.56397, 7.43547, 0.98448], + "0.75": [7.5, 0, 0], + "1.0": [7.83275, -7.48402, 0.33823] + } + }, + "tail6": { + "rotation": { + "0.0": [7.52832, -4.95712, -0.65426], + "0.25": [7.5, 0, 0], + "0.5": [7.52832, 4.95712, 0.65426], + "0.75": [7.5, 0, 0], + "1.0": [7.52832, -4.95712, -0.65426] + } + }, + "tail7": { + "rotation": { + "0.0": [9.98787, -6.08137, -0.87499], + "0.25": [9.93, -1.16, -0.01], + "0.5": [9.94964, 3.76504, 0.85303], + "0.75": [9.93, -1.16, -0.01], + "1.0": [9.98477, -6.08478, -0.87604] + } + }, + "tail8": { + "rotation": { + "0.0": [5.00474, -2.49048, -0.21803], + "0.25": [5, 0, 0], + "0.5": [5.00474, 2.49048, 0.21803], + "0.75": [5, 0, 0], + "1.0": [5.00474, -2.49048, -0.21803] + } + }, + "neck": { + "rotation": [48.5, 0, 0] + }, + "leg_left_front": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [-1.12, 0, 0], + "0.25": [-5.08, 0, 0], + "0.375": [-11.04, 0, 0], + "0.5": [-12.5, 0, 0], + "0.625": [-11.37, 0, 0], + "0.75": [-7.58, 0, 0], + "0.875": [-1.79, 0, 0], + "1.0": [0, 0, 0] + } }, - "Back_Left_Leg": { - "rotation": [90, 0, 0], - "position": [0, 0, -2] + "leg_left_front2": { + "rotation": { + "0.0": [-2.5, 0, 0], + "0.125": [-3.62, 0, 0], + "0.25": [-5.91, 0, 0], + "0.375": [-9.56, 0, 0], + "0.5": [-13.21, 0, 0], + "0.625": [-15, 0, 0], + "0.75": [-12.87, 0, 0], + "0.875": [-4.29, 0, 0], + "1.0": [-2.5, 0, 0] + } + }, + "leg_right_front": { + "rotation": { + "0.0": [-12.91424, -1.28887, 0.8497], + "0.125": [-11.16, -1.29, 0.85], + "0.25": [-7.41, -1.29, 0.85], + "0.375": [-3.16, -1.29, 0.85], + "0.5": [-1.91424, -1.28887, 0.8497], + "0.625": [-2.79, -1.29, 0.85], + "0.75": [-6.67, -1.29, 0.85], + "0.875": [-12.29, -1.29, 0.85], + "1.0": [-12.91424, -1.28887, 0.8497] + } + }, + "leg_right_front2": { + "rotation": { + "0.0": [-25, 0, 0], + "0.125": [-7.25, 0, 0], + "0.25": [0.5, 0, 0], + "0.375": [-2.75, 0, 0], + "0.5": [-12, 0, 0], + "0.625": [-25, 0, 0], + "0.75": [-30, 0, 0], + "0.875": [-29.5, 0, 0], + "1.0": [-25, 0, 0] + } + }, + "leg_left_back": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [1.21, 0, 0], + "0.375": [6.63, 0, 0], + "0.5": [7.5, 0, 0], + "0.625": [6.63, 0, 0], + "0.875": [1.21, 0, 0], + "1.0": [0, 0, 0] + } + }, + "leg_right_back": { + "rotation": { + "0.0": [7.5, 0, 0], + "0.125": [6.38, 0, 0], + "0.375": [-3.21, 0, 0], + "0.5": [-5, 0, 0], + "0.625": [-2.87, 0, 0], + "0.875": [6.04, 0, 0], + "1.0": [7.5, 0, 0] + } }, - "Back_Right_Leg": { - "rotation": [90, 0, 0], - "position": [0, 0, -2] + "leg_right_back2": { + "rotation": { + "0.0": [2.5, 0, 0], + "0.125": [1.88, 0, 0], + "0.375": [-2.04, 0, 0], + "0.5": [-3, 0, 0], + "0.625": [-2.62, 0, 0], + "0.875": [1.79, 0, 0], + "1.0": [2.5, 0, 0] + } + }, + "body": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [0.5, 0, 0], + "0.25": [0.7, 0, 0], + "0.375": [0.5, 0, 0], + "0.5": [0, 0, 0], + "0.625": [-0.5, 0, 0], + "0.75": [-0.7, 0, 0], + "0.875": [-0.5, 0, 0], + "1.0": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.5": [0, -0.3, 0], + "1.0": [0, 0, 0] + } + }, + "tail9": { + "rotation": { + "0.0": [5.04292, -7.4713, -0.6574], + "0.25": [5, 0, 0], + "0.5": [5.04292, 7.4713, 0.6574], + "0.75": [5, 0, 0], + "1.0": [5.04292, -7.4713, -0.6574] + } + }, + "head": { + "rotation": { + "0.0": [-42.45349, -0.46497, 0.12961], + "0.125": [-41.45175, -0.46248, 0.1298], + "0.25": [-42.45, -0.46, 0.13], + "0.5": [-44.95, -0.46, 0.13], + "0.625": [-45.95, -0.46, 0.13], + "0.75": [-44.95, -0.46, 0.13], + "1.0": [-42.45, -0.46, 0.13] + } }, - "Front_Left_Leg": { - "rotation": [-90, 20, 0] + "leg_left_front3": { + "rotation": { + "0.0": [70, 0, 0], + "0.25": [47.5, 0, 0], + "0.5": [47.5, 0, 0], + "0.75": [70, 0, 0], + "1.0": [70, 0, 0] + } }, - "Front_Right_Leg": { - "rotation": [-90, -20, 0] + "leg_right_front3": { + "rotation": { + "0.0": [50, 0, 0], + "0.25": [72.5, 0, 0], + "0.5": [72.5, 0, 0], + "0.75": [50, 0, 0], + "1.0": [50, 0, 0] + } + }, + "leg_left_back2": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [0.96, 0, 0], + "0.375": [5.88, 0, 0], + "0.5": [6.5, 0, 0], + "0.625": [5.88, 0, 0], + "0.875": [0.96, 0, 0], + "1.0": [0, 0, 0] + } + }, + "leg_left_back3": { + "rotation": [47.5, 0, 0] + }, + "leg_right_back3": { + "rotation": [52.5, 0, 0] } } }, - "animation.houndoom.walking": { + "animation.houndoom.swimming": { "loop": true, "animation_length": 1, "bones": { - "Body": { - "position": { - "0.0": [0, -0.5, 0], - "0.24": [0, 0, 0], - "0.52": [0, -0.5, 0], - "0.76": [0, 0, 0], - "1.0": [0, -0.5, 0] + "houndoom": { + "rotation": [12.5, 0, 0], + "position": [0, -11, 2] + }, + "tail": { + "rotation": { + "0.0": [-12.5, 0, 0], + "0.125": [-12.55, 5.66, -0.82], + "0.25": [-12.60443, 7.32123, -1.63219], + "0.375": [-12.55, 5.66, -0.82], + "0.5": [-12.5, 0, 0], + "0.625": [-12.55, -5.66, 0.82], + "0.75": [-12.60443, -7.32123, 1.63219], + "0.875": [-12.55, -5.66, 0.82], + "1.0": [-12.5, 0, 0] } }, - "Back_Left_Leg": { + "tail2": { "rotation": { - "0.0": [30, 0, 0], - "0.24": [0, 0, 0], - "0.52": [-15, 0, 0], - "0.76": [0, 0, 0], - "1.0": [30, 0, 0] + "0.0": [-22.5, 0, 0], + "0.125": [-22.59, 4.46, -1.44], + "0.25": [-22.67458, 6.92618, -2.88419], + "0.375": [-22.59, 4.46, -1.44], + "0.5": [-22.5, 0, 0], + "0.625": [-22.59, -5.46, 1.44], + "0.75": [-22.67458, -6.92618, 2.88419], + "0.875": [-22.59, -5.46, 1.44], + "1.0": [-22.5, 0, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [-5, 0, 0], + "0.125": [-5.02, 5.74, -0.33], + "0.25": [-5.04292, 7.4713, -0.6574], + "0.375": [-5.02, 5.74, -0.33], + "0.5": [-5, 0, 0], + "0.625": [-5.02, -5.74, 0.33], + "0.75": [-5.04292, -7.4713, 0.6574], + "0.875": [-5.02, -5.74, 0.33], + "1.0": [-5, 0, 0] + } + }, + "tail4": { + "rotation": { + "0.0": [12.60443, -7.32123, -1.63219], + "0.125": [12.55, -4.66, -0.82], + "0.25": [12.5, 0, 0], + "0.375": [12.45, 5.67, 0.73], + "0.5": [12.39805, 7.34699, 1.45395], + "0.625": [12.45, 5.67, 0.73], + "0.75": [12.5, 0, 0], + "0.875": [12.55, -5.66, -0.82], + "1.0": [12.60443, -7.32123, -1.63219] + } + }, + "tail5": { + "rotation": { + "0.0": [7.56397, -7.43547, -0.98448], + "0.25": [7.5, 0, 0], + "0.5": [7.56397, 7.43547, 0.98448], + "0.75": [7.5, 0, 0], + "1.0": [7.83275, -7.48402, 0.33823] + } + }, + "tail6": { + "rotation": { + "0.0": [7.52832, -4.95712, -0.65426], + "0.25": [7.5, 0, 0], + "0.5": [7.52832, 4.95712, 0.65426], + "0.75": [7.5, 0, 0], + "1.0": [7.52832, -4.95712, -0.65426] + } + }, + "tail7": { + "rotation": { + "0.0": [9.98787, -6.08137, -0.87499], + "0.25": [9.93, -1.16, -0.01], + "0.5": [9.94964, 3.76504, 0.85303], + "0.75": [9.93, -1.16, -0.01], + "1.0": [9.98477, -6.08478, -0.87604] + } + }, + "tail8": { + "rotation": { + "0.0": [5.00474, -2.49048, -0.21803], + "0.25": [5, 0, 0], + "0.5": [5.00474, 2.49048, 0.21803], + "0.75": [5, 0, 0], + "1.0": [5.00474, -2.49048, -0.21803] + } + }, + "neck": { + "rotation": [51, 0, 0] + }, + "leg_left_front": { + "rotation": { + "0.0": [22.5, 0, 0], + "0.125": [10.29, 0, 0], + "0.375": [-48.62, 0, 0], + "0.625": [-57.46, 0, 0], + "0.875": [5.63, 0, 0], + "1.0": [22.5, 0, 0] + } + }, + "leg_left_front2": { + "rotation": { + "0.0": [-8.5, 0, 0], + "0.125": [-30.25, 0, 0], + "0.25": [-40, 0, 0], + "0.375": [-32.25, 0, 0], + "0.5": [-14.5, 0, 0], + "0.625": [-1, 0, 0], + "0.75": [5.38, 0, 0], + "0.875": [1.75, 0, 0], + "1.0": [-8.5, 0, 0] + } + }, + "leg_right_front": { + "rotation": { + "0.0": [-50.41424, -1.28887, 0.8497], + "0.125": [-57.79, -1.29, 0.85], + "0.375": [5.13, -1.29, 0.85], + "0.5": [17.08576, -1.28887, 0.8497], + "0.625": [6.46, -1.29, 0.85], + "1.0": [-50.41424, -1.28887, 0.8497] + } + }, + "leg_right_front2": { + "rotation": [-25, 0, 0] + }, + "leg_left_back": { + "rotation": { + "0.0": [-17.5, 0, 0], + "0.125": [-9.62, 0, 0], + "0.375": [24.79, 0, 0], + "0.5": [30, 0, 0], + "0.625": [25.13, 0, 0], + "0.875": [-11.29, 0, 0], + "1.0": [-17.5, 0, 0] } }, - "Back_Right_Leg": { + "leg_right_back": { "rotation": { "0.0": [30, 0, 0], - "0.24": [0, 0, 0], - "0.52": [-15, 0, 0], - "0.76": [0, 0, 0], + "0.125": [25.5, 0, 0], + "0.375": [-15.83, 0, 0], + "0.5": [-20, 0, 0], + "0.625": [-13.5, 0, 0], + "0.875": [23.5, 0, 0], "1.0": [30, 0, 0] } }, - "Front_Left_Leg": { + "leg_right_back2": { "rotation": { - "0.0": [-25, 0, 0], - "0.24": [0, 0, 0], - "0.52": [20, 0, 0], - "0.76": [0, 0, 0], - "1.0": [-25, 0, 0] + "0.0": [15, 0, 0], + "0.25": [-10.5, 0, 0], + "0.375": [-13.5, 0, 0], + "0.5": [-10.5, 0, 0], + "0.75": [15, 0, 0], + "0.875": [19, 0, 0], + "1.0": [15, 0, 0] + } + }, + "body": { + "rotation": [0, "math.cos(query.anim_time*340)*10", 0], + "position": { + "0.0": [0, 0, 0], + "0.5": [0, -0.3, 0], + "1.0": [0, 0, 0] } }, - "Front_Right_Leg": { + "tail9": { "rotation": { - "0.0": [-25, 0, 0], - "0.24": [0, 0, 0], - "0.52": [20, 0, 0], - "0.76": [0, 0, 0], - "1.0": [-25, 0, 0] + "0.0": [5.04292, -7.4713, -0.6574], + "0.25": [5, 0, 0], + "0.5": [5.04292, 7.4713, 0.6574], + "0.75": [5, 0, 0], + "1.0": [5.04292, -7.4713, -0.6574] + } + }, + "head": { + "rotation": { + "0.0": [-49.95349, -0.46497, 0.12961], + "0.25": [-52.45, -0.46, 0.13], + "0.5": [-47.45, -0.46, 0.13], + "0.75": [-44.95, -0.46, 0.13], + "1.0": [-49.95, -0.46, 0.13] + } + }, + "leg_left_front3": { + "rotation": { + "0.0": [70, 0, 0], + "0.25": [47.5, 0, 0], + "0.5": [47.5, 0, 0], + "0.75": [70, 0, 0], + "1.0": [70, 0, 0] + } + }, + "leg_right_front3": { + "rotation": { + "0.0": [50, 0, 0], + "0.25": [72.5, 0, 0], + "0.5": [72.5, 0, 0], + "0.75": [50, 0, 0], + "1.0": [50, 0, 0] + } + }, + "leg_left_back2": { + "rotation": { + "0.0": [-5, 0, 0], + "0.25": [15.75, 0, 0], + "0.375": [19.75, 0, 0], + "0.5": [15.75, 0, 0], + "0.75": [-5, 0, 0], + "0.875": [-9, 0, 0], + "1.0": [-5, 0, 0] + } + }, + "leg_left_back3": { + "rotation": [47.5, 0, 0] + }, + "leg_right_back3": { + "rotation": [52.5, 0, 0] + } + } + }, + "animation.houndoom.blink": { + "loop": true, + "animation_length": 0.75, + "bones": { + "blink_left": { + "position": { + "0.0": [0, 0, 0], + "0.0833": [-0.7, 0, -0.8], + "0.125": [-0.7, 0, -0.8], + "0.1667": [0, 0, 0] + } + }, + "blink_right": { + "position": { + "0.0": [0, 0, 0], + "0.0833": [0.7, 0, -0.8], + "0.125": [0.7, 0, -0.8], + "0.1667": [0, 0, 0] + } + } + } + }, + "animation.houndoom.sleeping": { + "loop": true, + "animation_length": 2.08333, + "bones": { + "houndoom": { + "rotation": { + "0.0": { + "post": [0, 0, -90], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [12, 3, 0], + "lerp_mode": "catmullrom" + } + } + }, + "body": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0833": { + "post": [5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5417": { + "post": [-1.86, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "tail2": { + "rotation": { + "0.0": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "tail3": { + "rotation": { + "0.0": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "tail4": { + "rotation": { + "0.0": { + "post": [-27.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "tail5": { + "rotation": { + "0.0": { + "post": [-20, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "tail6": { + "rotation": { + "0.0": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "tail7": { + "rotation": { + "0.0": { + "post": [-20, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "tail8": { + "rotation": { + "0.0": { + "post": [-27.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "neck": { + "rotation": { + "0.0": { + "post": [50, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [57.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [60, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [57.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [55, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [50, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [35, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5417": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [30, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, -1, 0], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [0, -1, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg_left_front": { + "rotation": { + "0.0": { + "post": [-42.5, 0, 17.5], + "lerp_mode": "catmullrom" + } + } + }, + "leg_right_front": { + "rotation": { + "0.0": { + "post": [-52.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg_left_back": { + "rotation": { + "0.0": { + "post": [-24.36938, 16.24885, 22.47746], + "lerp_mode": "catmullrom" + } + } + }, + "leg_right_back": { + "rotation": { + "0.0": { + "post": [-37.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "blink_left": { + "position": { + "0.0": { + "post": [-0.7, 0, -0.7], + "lerp_mode": "catmullrom" + } } }, - "Head": { + "blink_right": { "position": { - "0.0": [0, -0.5, 0], - "0.24": [0, 0, 0], - "0.52": [0, -0.5, 0], - "0.76": [0, 0, 0], - "1.0": [0, -0.5, 0] + "0.0": { + "post": [0.7, 0, -0.7], + "lerp_mode": "catmullrom" + } } } } diff --git a/animations/pokemon/taillow.animation.json b/animations/pokemon/taillow.animation.json new file mode 100644 index 000000000..3cd63c110 --- /dev/null +++ b/animations/pokemon/taillow.animation.json @@ -0,0 +1,456 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.taillow.ground_idle": { + "loop": true, + "animation_length": 1.79167, + "bones": { + "body": { + "rotation": { + "0.0": { + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [-3.83318, -3.95612, -4.49271], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [-4.0415, -2.19834, -4.02518], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-5.02209, -1.02011, 0.96768], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-6.05254, 2.65983, 4.66846], + "lerp_mode": "catmullrom" + }, + "1.7917": { + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": [0, 0, 0], + "0.375": [0, -0.1, 0], + "1.25": [0, -0.14, 0], + "1.5417": [0, 0, 0], + "1.7917": [0, 0, 0] + } + }, + "rightdWing": { + "rotation": { + "0.0": [0, 90, -90], + "0.25": [90, 80, 0], + "0.4583": [0, 90, -90] + }, + "position": [1.6, -3, 1] + }, + "leftdWing": { + "rotation": { + "0.0": [90, -87.5, 0], + "0.25": [90, -80, 0], + "0.4583": [90, -87.5, 0] + }, + "position": [-0.6, -3, -1] + }, + "bone": { + "rotation": [0, 0, -2.5] + } + } + }, + "animation.taillow.flying": { + "loop": true, + "animation_length": 0.79167, + "bones": { + "root": { + "rotation": { + "0.0": [20, 0, 0], + "0.4167": [20, 0, 0], + "0.75": [20, 0, 0] + }, + "position": { + "0.0": { + "post": [0, 19, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 18, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 19, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone2": { + "rotation": { + "0.0": { + "post": [0, 0, 60], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, -80], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, 60], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [0, 0, 60], + "lerp_mode": "catmullrom" + } + }, + "position": [0.6, 0, 0] + }, + "bone3": { + "rotation": { + "0.0": { + "post": [0, 0, 37.5], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, -25], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, 37.5], + "lerp_mode": "catmullrom" + } + } + }, + "leftdWing": { + "rotation": { + "0.0": { + "post": [0, 0, -57.5], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [0, 0, 57.5], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, -57.5], + "lerp_mode": "catmullrom" + } + }, + "position": [-0.5, 0, 0] + }, + "bone": { + "rotation": { + "0.0": { + "post": [0, 0, -47.5], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [0, 0, 30], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, -47.5], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.taillow.air_idle": { + "loop": true, + "animation_length": 0.75, + "bones": { + "root": { + "position": { + "0.0": { + "post": [0, 9, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 16, 0], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [0, 16.61, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 9, 0], + "lerp_mode": "catmullrom" + } + } + }, + "bone2": { + "rotation": { + "0.0": { + "post": [0, 0, 62.5], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [0, 0, -80], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, 62.5], + "lerp_mode": "catmullrom" + } + }, + "position": [0.6, 0, 0] + }, + "bone3": { + "rotation": { + "0.0": { + "post": [0, 0, 37.5], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, -25], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, 37.5], + "lerp_mode": "catmullrom" + } + } + }, + "leftdWing": { + "rotation": { + "0.0": { + "post": [0, 0, -52.5], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [0, 0, 72.5], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, -52.5], + "lerp_mode": "catmullrom" + } + }, + "position": [-0.5, 0, 0] + }, + "bone": { + "rotation": { + "0.0": { + "post": [0, 0, -47.5], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, 30], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, -47.5], + "lerp_mode": "catmullrom" + } + } + }, + "rightFoot": { + "rotation": { + "0.0": [45, 0, 0], + "0.375": [0, 0, 0], + "0.75": [45, 0, 0] + } + }, + "leftFoot": { + "rotation": { + "0.0": [45, 0, 0], + "0.375": [2.5, 0, 0], + "0.75": [45, 0, 0] + } + } + } + }, + "animation.taillow.walking": { + "loop": true, + "animation_length": 0.83333, + "bones": { + "root": { + "position": { + "0.0": [0, 0, 1], + "0.1667": [0, 4, 1], + "0.2917": [0, 0.73, -3], + "0.5417": [0, 0, 1] + } + }, + "bone2": { + "rotation": [-267.84425, 86.53102, -2.38588], + "position": [0.8, -2, -1] + }, + "leftdWing": { + "rotation": [90, -87.5, 0], + "position": [-0.6, -3, -1] + }, + "rightFoot": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [34.61405, 0.76818, -0.55662], + "0.25": [-19.7485, 2.81667, -2.04095], + "0.4583": [0, 0, 0] + } + }, + "leftFoot": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [34.61405, 0.76818, -0.55662], + "0.25": [-22.5, 0, 0], + "0.4583": [0, 0, 0] + } + } + } + }, + "animation.taillow.attack": { + "loop": true, + "animation_length": 1.375, + "bones": { + "body": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "head": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [9.24, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "rightdWing": { + "rotation": [0, 90, -90], + "position": [1.6, -3, 1] + }, + "leftdWing": { + "rotation": [90, -87.5, 0], + "position": [-0.6, -3, -1] + } + } + }, + "animation.taillow.blink": { + "animation_length": 0.58333, + "bones": { + "blink_left": { + "position": { + "0.0": [0, 0, 1], + "0.0417": [0, 0, 1], + "0.0833": [-1, 0, -1], + "0.125": [-1, 0, -1], + "0.1667": [-1, 0, -1], + "0.2083": [0, 0, 1] + } + }, + "blink_right": { + "position": { + "0.0": [0, 0, 1], + "0.0417": [0, 0, 1], + "0.0833": [1, 0, -1], + "0.125": [1, 0, -1], + "0.1667": [1, 0, -1], + "0.2083": [0, 0, 1] + } + } + } + }, + "animation.taillow.sleeping": { + "loop": true, + "bones": { + "body": { + "rotation": ["7.5+math.sin(query.anim_time*100)*3", 0, 0], + "position": [0, "math.sin(query.anim_time)*1", 0] + }, + "head": { + "rotation": ["12.5+math.sin(query.anim_time*100)*3", 0, 0] + }, + "rightdWing": { + "rotation": [0, 90, -90], + "position": [1.6, -3, 1] + }, + "leftdWing": { + "rotation": [90, -87.5, 0], + "position": [-0.6, -3, -1] + }, + "blink_left": { + "position": [-1, 0, -1] + }, + "blink_right": { + "position": [1, -0.1, -1] + } + } + }, + "animation.taillow.swimming": { + "loop": true, + "bones": { + "root": { + "rotation": [0, "7.5+math.sin(query.anim_time*200)*10", 0] + }, + "rightdWing": { + "rotation": [0, 90, -90], + "position": [1.6, -3, 1] + }, + "leftdWing": { + "rotation": [90, -87.5, 0], + "position": [-0.6, -3, -1] + }, + "rightFoot": { + "rotation": ["65+math.sin(query.anim_time*200*10)*10", 0, 0] + }, + "leftFoot": { + "rotation": ["65+math.sin(query.anim_time*200*10)*10", 0, 0] + } + } + }, + "animation.taillow.water_idle": { + "loop": true, + "bones": { + "root": { + "rotation": ["2.5+math.sin(query.anim_time*200)*5", 0, 0], + "position": [0, -2, 0] + }, + "rightdWing": { + "rotation": [0, 90, -90], + "position": [1.6, -3, 1] + }, + "leftdWing": { + "rotation": [90, -87.5, 0], + "position": [-0.6, -3, -1] + }, + "rightFoot": { + "rotation": ["62.5+math.sin(query.anim_time*350*3)*10", 0, 0] + }, + "leftFoot": { + "rotation": ["62.5+math.sin(query.anim_time*350*3)*10", 0, 0] + } + } + } + } +} \ No newline at end of file diff --git a/entity/pokemon/houndoom.json b/entity/pokemon/houndoom.json index a9f5cb3a7..1377aefa6 100644 --- a/entity/pokemon/houndoom.json +++ b/entity/pokemon/houndoom.json @@ -28,11 +28,11 @@ "blink": "animation.houndoom.blink", "ground_idle": "animation.houndoom.ground_idle", "air_idle": "animation.houndoom.ground_idle", - "water_idle": "animation.houndoom.ground_idle", + "water_idle": "animation.houndoom.water_idle", "walking": "animation.houndoom.walking", "flying": "animation.houndoom.walking", - "swimming": "animation.houndoom.walking", - "sleeping": "animation.houndoom.ground_idle", + "swimming": "animation.houndoom.swimming", + "sleeping": "animation.houndoom.sleeping", "attack": "animation.houndoom.walking", "look_at_target": "animation.pokemon.look_at_target", "controller": "controller.animation.pokemon" diff --git a/entity/pokemon/taillow.json b/entity/pokemon/taillow.json index 57c178aec..e82c5fbde 100644 --- a/entity/pokemon/taillow.json +++ b/entity/pokemon/taillow.json @@ -4,21 +4,50 @@ "description": { "identifier": "pokemon:taillow", "materials": { - "default": "zombie" + "default": "entity_emissive_alpha", + "aura": "charged_creeper" }, "textures": { - "default": "textures/sprites/default/taillow", - "shiny": "textures/sprites/default/taillow", - "default_male": "textures/sprites/default/taillow", - "default_female": "textures/sprites/default/taillow", - "shiny_male": "textures/sprites/default/taillow", - "shiny_female": "textures/sprites/default/taillow" + "default": "textures/entity/pokemon/taillow/taillow", + "default_male": "textures/entity/pokemon/taillow/taillow", + "default_female": "textures/entity/pokemon/taillow/taillow", + "shiny": "textures/entity/pokemon/taillow/shiny_taillow", + "shiny_male": "textures/entity/pokemon/taillow/shiny_taillow", + "shiny_female": "textures/entity/pokemon/taillow/shiny_taillow", + "evo_aura": "textures/entity/evolving" }, "geometry": { - "default": "geometry.substitute" + "default": "geometry.taillow" + }, + "scripts": { + "animate": [ + "controller" + ] + }, + "animations": { + "blink": "animation.taillow.blink", + "ground_idle": "animation.taillow.ground_idle", + "air_idle": "animation.taillow.air_idle", + "water_idle": "animation.taillow.water_idle", + "walking": "animation.taillow.walking", + "flying": "animation.taillow.flying", + "swimming": "animation.taillow.swimming", + "sleeping": "animation.taillow.sleeping", + "attack": "animation.taillow.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": "taillow", diff --git a/manifest.json b/manifest.json index d1fc5c2f0..798974b27 100644 --- a/manifest.json +++ b/manifest.json @@ -4,15 +4,15 @@ "name": "pack.name", "description": "pack.description", "min_engine_version": [1, 20, 60], - "uuid": "2d739e34-d84f-43b1-880d-3017eb02110b", - "version": [2, 9, 8] + "uuid": "358dc189-8d9e-4fdb-b4e1-f8e0fb855f9a", + "version": [2, 9, 9] }, "modules": [ { "description": "Resources Module", "type": "resources", - "uuid": "a65cd788-8e71-4e70-a934-444ac6d6477b", - "version": [2, 9, 8] + "uuid": "388de949-18e5-4228-a447-f63237aa45a2", + "version": [2, 9, 9] } ], "metadata": { diff --git a/models/entity/pokemon/houndoom.geo.json b/models/entity/pokemon/houndoom.geo.json index 5efb48408..08c9e2bc3 100644 --- a/models/entity/pokemon/houndoom.geo.json +++ b/models/entity/pokemon/houndoom.geo.json @@ -6,121 +6,1228 @@ "identifier": "geometry.houndoom", "texture_width": 128, "texture_height": 128, - "visible_bounds_width": 4, + "visible_bounds_width": 6, "visible_bounds_height": 3.5, "visible_bounds_offset": [0, 1.25, 0] }, "bones": [ { - "name": "Houndour", - "pivot": [0, 0, -3] + "name": "houndoom", + "pivot": [0, 0, 0] }, { - "name": "Body", - "parent": "Houndour", - "pivot": [0, 15, 1], + "name": "body", + "parent": "houndoom", + "pivot": [0, 12.8, 0], "cubes": [ - {"origin": [-4, 11, -7], "size": [8, 6.4, 16], "uv": [0, 0]}, - {"origin": [-2.5, 12, -12], "size": [5, 5, 8.7], "pivot": [0, 15, -5], "rotation": [-65, 0, 0], "uv": [0, 22]}, - {"origin": [-3, 9.1, -10], "size": [6, 6, 1.7], "pivot": [0, 13, -3], "rotation": [-65, 0, 0], "uv": [57, 27]}, - {"origin": [-1, 9.6, -10], "size": [2, 1, 1.7], "pivot": [0, 13, -4], "rotation": [-65, 0, 0], "uv": [0, 14]}, - {"origin": [-5, 14.8, -3], "size": [10, 3, 2], "uv": [24, 37]}, - {"origin": [-5, 14.8, 1], "size": [10, 3, 2], "uv": [0, 35]}, - {"origin": [-5, 14.8, 5], "size": [10, 3, 2], "uv": [32, 10]} + { + "origin": [-2.88, 9.6, -3.36], + "size": [5.76, 5.76, 5.76], + "uv": { + "north": {"uv": [9, 29], "uv_size": [9, 9]}, + "east": {"uv": [0, 29], "uv_size": [9, 9]}, + "south": {"uv": [27, 29], "uv_size": [9, 9]}, + "west": {"uv": [18, 29], "uv_size": [9, 9]}, + "up": {"uv": [9, 20], "uv_size": [9, 9]}, + "down": {"uv": [18, 29], "uv_size": [9, -9]} + } + }, + { + "origin": [-2.56, 10.08, 2.4], + "size": [5.12, 5.12, 5.76], + "uv": { + "north": {"uv": [37, 39], "uv_size": [8, 8]}, + "east": {"uv": [28, 39], "uv_size": [9, 8]}, + "south": {"uv": [54, 39], "uv_size": [8, 8]}, + "west": {"uv": [45, 39], "uv_size": [9, 8]}, + "up": {"uv": [37, 30], "uv_size": [8, 9]}, + "down": {"uv": [45, 39], "uv_size": [8, -9]} + } + }, + { + "origin": [-1.92, 9.12, -2.72], + "size": [3.84, 1.28, 5.76], + "uv": { + "north": {"uv": [9, 48], "uv_size": [6, 2]}, + "east": {"uv": [0, 48], "uv_size": [9, 2]}, + "south": {"uv": [24, 48], "uv_size": [6, 2]}, + "west": {"uv": [15, 48], "uv_size": [9, 2]}, + "up": {"uv": [9, 39], "uv_size": [6, 9]}, + "down": {"uv": [15, 48], "uv_size": [6, -9]} + } + }, + { + "origin": [-1.92, 9.44, 3.04], + "size": [3.84, 0.64, 4.48], + "uv": { + "north": {"uv": [31, 55], "uv_size": [6, 1]}, + "east": {"uv": [24, 55], "uv_size": [7, 1]}, + "south": {"uv": [44, 55], "uv_size": [6, 1]}, + "west": {"uv": [37, 55], "uv_size": [7, 1]}, + "up": {"uv": [31, 48], "uv_size": [6, 7]}, + "down": {"uv": [37, 55], "uv_size": [6, -7]} + } + }, + { + "origin": [-3.2, 13.28, -0.48], + "size": [6.4, 2.56, 1.92], + "uv": { + "north": {"uv": [54, 51], "uv_size": [10, 4]}, + "east": {"uv": [51, 51], "uv_size": [3, 4]}, + "south": {"uv": [67, 51], "uv_size": [10, 4]}, + "west": {"uv": [64, 51], "uv_size": [3, 4]}, + "up": {"uv": [54, 48], "uv_size": [10, 3]}, + "down": {"uv": [64, 51], "uv_size": [10, -3]} + } + }, + { + "origin": [-2.88, 13.28, 2.56], + "size": [5.76, 2.56, 1.92], + "uv": { + "north": {"uv": [63, 14], "uv_size": [9, 4]}, + "east": {"uv": [60, 14], "uv_size": [3, 4]}, + "south": {"uv": [75, 14], "uv_size": [9, 4]}, + "west": {"uv": [72, 14], "uv_size": [3, 4]}, + "up": {"uv": [63, 11], "uv_size": [9, 3]}, + "down": {"uv": [72, 14], "uv_size": [9, -3]} + } + }, + { + "origin": [-2.88, 13.12, 5.44], + "size": [5.76, 2.56, 1.92], + "uv": { + "north": {"uv": [57, 3], "uv_size": [9, 4]}, + "east": {"uv": [54, 3], "uv_size": [3, 4]}, + "south": {"uv": [69, 3], "uv_size": [9, 4]}, + "west": {"uv": [66, 3], "uv_size": [3, 4]}, + "up": {"uv": [57, 0], "uv_size": [9, 3]}, + "down": {"uv": [66, 3], "uv_size": [9, -3]} + } + } ] }, { - "name": "Tail", - "parent": "Body", - "pivot": [0, 15, 9], - "rotation": [-30, 0, 0], + "name": "tail", + "parent": "body", + "pivot": [0, 14.63375, 7.80975], "cubes": [ - {"origin": [0, 15, 8], "size": [1, 1, 5], "pivot": [0, 14, 8], "rotation": [17.5, 0, 0], "uv": [56, 9]}, - {"origin": [0, 16.7, 13.1], "size": [1, 1, 5], "pivot": [0, 16, 13], "rotation": [60, 0, 0], "uv": [11, 55]}, - {"origin": [0, 22.05, 16.3], "size": [1, 1, 4], "pivot": [0, 21, 16], "rotation": [120, 0, 0], "uv": [0, 60]}, - {"origin": [0, 23.4, 11.2], "size": [1, 1, 9], "pivot": [1, 24, 12], "rotation": [152.5, 0, 0], "uv": [32, 0]}, - {"origin": [0.5, 20.1, 10.6], "size": [0, 3, 5], "pivot": [1, 24, 7], "rotation": [152.5, 0, 0], "uv": [18, 22]} + { + "origin": [-0.96, 13.6686, 7.42901], + "size": [1.92, 1.92, 2.2], + "uv": { + "north": {"uv": [53, 80], "uv_size": [3, 3]}, + "east": {"uv": [48, 80], "uv_size": [5, 3]}, + "south": {"uv": [61, 80], "uv_size": [3, 3]}, + "west": {"uv": [56, 80], "uv_size": [5, 3]}, + "up": {"uv": [53, 75], "uv_size": [3, 5]}, + "down": {"uv": [56, 80], "uv_size": [3, -5]} + } + } ] }, { - "name": "Back_Left_Leg", - "parent": "Houndour", - "pivot": [-3, 12, 7], + "name": "tail2", + "parent": "tail", + "pivot": [0, 14.6286, 9.62901], "cubes": [ - {"origin": [-4.2, 2, 6], "size": [3, 9, 3], "uv": [40, 42]}, - {"origin": [-4.2, 11, 5], "size": [3, 4, 4], "uv": [54, 56]}, - {"origin": [-4.7, 2, 5.6], "size": [4, 2, 4], "uv": [38, 56]}, - {"origin": [-4.7, 4.3, 5.6], "size": [4, 2, 4], "uv": [55, 3]}, - {"origin": [-4.2, 0, 4], "size": [3, 2, 5], "uv": [12, 48]} + { + "origin": [-0.64, 13.9886, 9.62901], + "size": [1.28, 1.28, 3.2], + "uv": { + "north": {"uv": [86, 19], "uv_size": [2, 2]}, + "east": {"uv": [81, 19], "uv_size": [5, 2]}, + "south": {"uv": [93, 19], "uv_size": [2, 2]}, + "west": {"uv": [88, 19], "uv_size": [5, 2]}, + "up": {"uv": [86, 14], "uv_size": [2, 5]}, + "down": {"uv": [88, 19], "uv_size": [2, -5]} + } + } ] }, { - "name": "Back_Right_Leg", - "parent": "Houndour", - "pivot": [3, 12, 7], + "name": "tail3", + "parent": "tail2", + "pivot": [0, 14.6286, 12.82901], "cubes": [ - {"origin": [1.2, 2, 6], "size": [3, 9, 3], "uv": [28, 42]}, - {"origin": [1.2, 11, 5], "size": [3, 4, 4], "uv": [24, 54]}, - {"origin": [0.7, 2, 5.6], "size": [4, 2, 4], "uv": [0, 54]}, - {"origin": [0.7, 4.3, 5.6], "size": [4, 2, 4], "uv": [52, 42]}, - {"origin": [1.2, 0, 4], "size": [3, 2, 5], "uv": [46, 29]} + { + "origin": [-0.64, 13.9886, 12.82901], + "size": [1.28, 1.28, 3.2], + "uv": { + "north": {"uv": [18, 86], "uv_size": [2, 2]}, + "east": {"uv": [13, 86], "uv_size": [5, 2]}, + "south": {"uv": [25, 86], "uv_size": [2, 2]}, + "west": {"uv": [20, 86], "uv_size": [5, 2]}, + "up": {"uv": [18, 81], "uv_size": [2, 5]}, + "down": {"uv": [20, 86], "uv_size": [2, -5]} + } + } ] }, { - "name": "Front_Left_Leg", - "parent": "Houndour", - "pivot": [-4, 12, -4], + "name": "tail4", + "parent": "tail3", + "pivot": [0, 14.6286, 16.02901], "cubes": [ - {"origin": [-4.2, 2, -6], "size": [3, 11, 3], "uv": [0, 40]}, - {"origin": [-4.7, 2, -6.4], "size": [4, 2, 4], "uv": [52, 21]}, - {"origin": [-4.7, 4.3, -6.4], "size": [4, 2, 4], "uv": [48, 50]}, - {"origin": [-4.2, 0, -8], "size": [3, 2, 5], "uv": [43, 0]} + { + "origin": [-0.64, 13.9886, 16.02901], + "size": [1.28, 1.28, 3.2], + "uv": { + "north": {"uv": [84, 70], "uv_size": [2, 2]}, + "east": {"uv": [79, 70], "uv_size": [5, 2]}, + "south": {"uv": [91, 70], "uv_size": [2, 2]}, + "west": {"uv": [86, 70], "uv_size": [5, 2]}, + "up": {"uv": [84, 65], "uv_size": [2, 5]}, + "down": {"uv": [86, 70], "uv_size": [2, -5]} + } + } ] }, { - "name": "Front_Right_Leg", - "parent": "Houndour", - "pivot": [4, 12, -4], + "name": "tail5", + "parent": "tail4", + "pivot": [0, 14.6286, 19.22901], "cubes": [ - {"origin": [1.2, 2, -6], "size": [3, 11, 3], "uv": [0, 0]}, - {"origin": [0.7, 2, -6.4], "size": [4, 2, 4], "uv": [48, 36]}, - {"origin": [0.7, 4.3, -6.4], "size": [4, 2, 4], "uv": [48, 15]}, - {"origin": [1.2, 0, -8], "size": [3, 2, 5], "uv": [41, 22]} + { + "origin": [-0.32, 14.3086, 19.22901], + "size": [0.64, 0.64, 3.2], + "uv": { + "north": {"uv": [96, 36], "uv_size": [1, 1]}, + "east": {"uv": [91, 36], "uv_size": [5, 1]}, + "south": {"uv": [102, 36], "uv_size": [1, 1]}, + "west": {"uv": [97, 36], "uv_size": [5, 1]}, + "up": {"uv": [96, 31], "uv_size": [1, 5]}, + "down": {"uv": [97, 36], "uv_size": [1, -5]} + } + } ] }, { - "name": "Head", - "parent": "Houndour", - "pivot": [0, 20, -8], + "name": "tail6", + "parent": "tail5", + "pivot": [0, 14.6286, 22.42901], "cubes": [ - {"origin": [-2.5, 20, -10.7], "size": [5, 6, 5.2], "uv": [26, 26]}, - {"origin": [-1.45, 20.9, -15], "size": [3.1, 3.1, 5.2], "uv": [12, 40]} + { + "origin": [-0.32, 14.3086, 22.42901], + "size": [0.64, 0.64, 3.2], + "uv": { + "north": {"uv": [96, 29], "uv_size": [1, 1]}, + "east": {"uv": [91, 29], "uv_size": [5, 1]}, + "south": {"uv": [102, 29], "uv_size": [1, 1]}, + "west": {"uv": [97, 29], "uv_size": [5, 1]}, + "up": {"uv": [96, 24], "uv_size": [1, 5]}, + "down": {"uv": [97, 29], "uv_size": [1, -5]} + } + } ] }, { - "name": "Horn", - "parent": "Head", - "pivot": [2, 25, -8], - "rotation": [0, 32.5, 0], + "name": "tail7", + "parent": "tail6", + "pivot": [0, 14.6286, 25.62901], "cubes": [ - {"origin": [0.5, 25, -9], "size": [2, 4, 2], "uv": [34, 62]}, - {"origin": [0.5, 29.5, -8.2], "size": [2, 4, 2], "pivot": [0, 30, -9], "rotation": [-57.5, 0, 0], "uv": [26, 62]}, - {"origin": [0.75, 29.4, -5.6], "size": [1.5, 3, 1.5], "pivot": [1, 29, -4], "rotation": [-170, 0, 0], "uv": [12, 0]}, - {"origin": [1, 25.5, -3.84154], "size": [1, 1.5, 1], "pivot": [2, 26, -3], "rotation": [140, 0, 0], "uv": [12, 6]}, - {"origin": [0.5, 35.2, -6.38968], "size": [2, 4, 2], "pivot": [0, 33, -7], "rotation": [-125, 0, 0], "uv": [10, 61]} + { + "origin": [-0.32, 14.3086, 25.62901], + "size": [0.64, 0.64, 3.2], + "uv": { + "north": {"uv": [96, 22], "uv_size": [1, 1]}, + "east": {"uv": [91, 22], "uv_size": [5, 1]}, + "south": {"uv": [102, 22], "uv_size": [1, 1]}, + "west": {"uv": [97, 22], "uv_size": [5, 1]}, + "up": {"uv": [96, 17], "uv_size": [1, 5]}, + "down": {"uv": [97, 22], "uv_size": [1, -5]} + } + } ] }, { - "name": "Horn2", - "parent": "Head", - "pivot": [-2, 25, -8], - "rotation": [0, -32.5, 0], + "name": "tail8", + "parent": "tail7", + "pivot": [0, 14.6286, 28.82901], "cubes": [ - {"origin": [-2.5, 25, -9], "size": [2, 4, 2], "uv": [60, 48]}, - {"origin": [-2.5, 29.5, -8.2], "size": [2, 4, 2], "pivot": [0, 30, -9], "rotation": [-57.5, 0, 0], "uv": [60, 34]}, - {"origin": [-2.25, 29.4, -5.6], "size": [1.5, 3, 1.5], "pivot": [-1, 29, -4], "rotation": [-170, 0, 0], "uv": [12, 12]}, - {"origin": [-2, 25.5, -3.84154], "size": [1, 1.5, 1], "pivot": [-2, 26, -3], "rotation": [140, 0, 0], "uv": [12, 4]}, - {"origin": [-2.5, 35.2, -6.38968], "size": [2, 4, 2], "pivot": [0, 33, -7], "rotation": [-125, 0, 0], "uv": [0, 22]} + { + "origin": [-0.32, 14.3086, 28.82901], + "size": [0.64, 0.64, 3.2], + "uv": { + "north": {"uv": [92, 11], "uv_size": [1, 1]}, + "east": {"uv": [87, 11], "uv_size": [5, 1]}, + "south": {"uv": [98, 11], "uv_size": [1, 1]}, + "west": {"uv": [93, 11], "uv_size": [5, 1]}, + "up": {"uv": [92, 6], "uv_size": [1, 5]}, + "down": {"uv": [93, 11], "uv_size": [1, -5]} + } + } + ] + }, + { + "name": "tail9", + "parent": "tail8", + "pivot": [0, 14.6286, 31.70901], + "cubes": [ + { + "origin": [-2.24, 14.6286, 31.38901], + "size": [4.48, 0, 6.4], + "uv": { + "north": {"uv": [39, 10], "uv_size": [7, 0]}, + "east": {"uv": [29, 10], "uv_size": [10, 0]}, + "south": {"uv": [56, 10], "uv_size": [7, 0]}, + "west": {"uv": [46, 10], "uv_size": [10, 0]}, + "up": {"uv": [39, 0], "uv_size": [7, 10]}, + "down": {"uv": [46, 10], "uv_size": [7, -10]} + } + } + ] + }, + { + "name": "neck", + "parent": "body", + "pivot": [0, 12.656, -1.76], + "cubes": [ + { + "origin": [-2.24, 13.296, -6.56], + "size": [4.48, 3.2, 8.96], + "pivot": [0, 15.00955, -2.29201], + "rotation": [-90, 0, 0], + "uv": { + "north": {"uv": [14, 14], "uv_size": [7, 5]}, + "east": {"uv": [0, 14], "uv_size": [14, 5]}, + "south": {"uv": [35, 14], "uv_size": [7, 5]}, + "west": {"uv": [21, 14], "uv_size": [14, 5]}, + "up": {"uv": [14, 0], "uv_size": [7, 14]}, + "down": {"uv": [21, 14], "uv_size": [7, -14]} + } + }, + { + "origin": [-0.96, 12.96, -2.24], + "size": [1.92, 0.64, 2.56], + "pivot": [0, 15.00955, -2.29201], + "rotation": [-90, 0, 0], + "uv": { + "north": {"uv": [92, 4], "uv_size": [3, 1]}, + "east": {"uv": [88, 4], "uv_size": [4, 1]}, + "south": {"uv": [99, 4], "uv_size": [3, 1]}, + "west": {"uv": [95, 4], "uv_size": [4, 1]}, + "up": {"uv": [92, 0], "uv_size": [3, 4]}, + "down": {"uv": [95, 4], "uv_size": [3, -4]} + } + }, + { + "origin": [-3.2, 12.3734, -3.2208], + "size": [1.92, 5.76, 1.28], + "pivot": [0, 15.00955, -2.29201], + "rotation": [-60, 0, 0], + "uv": { + "north": {"uv": [2, 91], "uv_size": [3, 9]}, + "east": {"uv": [0, 91], "uv_size": [2, 9]}, + "south": {"uv": [7, 91], "uv_size": [3, 9]}, + "west": {"uv": [5, 91], "uv_size": [2, 9]}, + "up": {"uv": [2, 89], "uv_size": [3, 2]}, + "down": {"uv": [5, 91], "uv_size": [3, -2]} + } + }, + { + "origin": [-1.28, 16.2134, -3.2208], + "size": [2.56, 1.92, 1.28], + "pivot": [0, 15.00955, -2.29201], + "rotation": [-60, 0, 0], + "uv": { + "north": {"uv": [91, 66], "uv_size": [4, 3]}, + "east": {"uv": [89, 66], "uv_size": [2, 3]}, + "south": {"uv": [97, 66], "uv_size": [4, 3]}, + "west": {"uv": [95, 66], "uv_size": [2, 3]}, + "up": {"uv": [91, 64], "uv_size": [4, 2]}, + "down": {"uv": [95, 66], "uv_size": [4, -2]} + } + }, + { + "origin": [1.28, 12.3734, -3.2208], + "size": [1.92, 5.76, 1.28], + "pivot": [0, 15.00955, -2.29201], + "rotation": [-60, 0, 0], + "uv": { + "north": {"uv": [28, 90], "uv_size": [3, 9]}, + "east": {"uv": [26, 90], "uv_size": [2, 9]}, + "south": {"uv": [33, 90], "uv_size": [3, 9]}, + "west": {"uv": [31, 90], "uv_size": [2, 9]}, + "up": {"uv": [28, 88], "uv_size": [3, 2]}, + "down": {"uv": [31, 90], "uv_size": [3, -2]} + } + } + ] + }, + { + "name": "head", + "parent": "neck", + "pivot": [0, 19.056, -2.72], + "cubes": [ + { + "origin": [-2.56, 19.056, -5.6], + "size": [5.12, 4.48, 5.12], + "uv": { + "north": {"uv": [43, 20], "uv_size": [8, 7]}, + "east": {"uv": [35, 20], "uv_size": [8, 7]}, + "south": {"uv": [59, 20], "uv_size": [8, 7]}, + "west": {"uv": [51, 20], "uv_size": [8, 7]}, + "up": {"uv": [43, 12], "uv_size": [8, 8]}, + "down": {"uv": [51, 20], "uv_size": [8, -8]} + } + }, + { + "origin": [2.31052, 22.211, -6.14121], + "size": [0.64, 1.92, 0.64], + "pivot": [2.63977, 22.17202, -5.59246], + "rotation": [176.48435, -10.96671, 83.59397], + "uv": { + "north": {"uv": [107, 23], "uv_size": [1, 3]}, + "east": {"uv": [106, 23], "uv_size": [1, 3]}, + "south": {"uv": [109, 23], "uv_size": [1, 3]}, + "west": {"uv": [108, 23], "uv_size": [1, 3]}, + "up": {"uv": [107, 22], "uv_size": [1, 1]}, + "down": {"uv": [108, 23], "uv_size": [1, -1]} + } + }, + { + "origin": [1.5253, 20.47382, -5.26838], + "size": [0.64, 1.92, 0.64], + "pivot": [1.8453, 22.16707, -5.39661], + "rotation": [94.33694, -13.45211, 85.38024], + "uv": { + "north": {"uv": [109, 29], "uv_size": [1, 3]}, + "east": {"uv": [108, 29], "uv_size": [1, 3]}, + "south": {"uv": [111, 29], "uv_size": [1, 3]}, + "west": {"uv": [110, 29], "uv_size": [1, 3]}, + "up": {"uv": [109, 28], "uv_size": [1, 1]}, + "down": {"uv": [110, 29], "uv_size": [1, -1]} + } + }, + { + "origin": [-2.95052, 22.211, -6.14121], + "size": [0.64, 1.92, 0.64], + "pivot": [-2.63977, 22.17202, -5.59246], + "rotation": [176.48435, 10.96671, -83.59397], + "uv": { + "north": {"uv": [105, 19], "uv_size": [1, 3]}, + "east": {"uv": [104, 19], "uv_size": [1, 3]}, + "south": {"uv": [107, 19], "uv_size": [1, 3]}, + "west": {"uv": [106, 19], "uv_size": [1, 3]}, + "up": {"uv": [105, 18], "uv_size": [1, 1]}, + "down": {"uv": [106, 19], "uv_size": [1, -1]} + } + }, + { + "origin": [-2.1653, 20.47382, -5.26838], + "size": [0.64, 1.92, 0.64], + "pivot": [-1.8453, 22.16707, -5.39661], + "rotation": [94.33694, 13.45211, -85.38024], + "uv": { + "north": {"uv": [107, 37], "uv_size": [1, 3]}, + "east": {"uv": [106, 37], "uv_size": [1, 3]}, + "south": {"uv": [109, 37], "uv_size": [1, 3]}, + "west": {"uv": [108, 37], "uv_size": [1, 3]}, + "up": {"uv": [107, 36], "uv_size": [1, 1]}, + "down": {"uv": [108, 37], "uv_size": [1, -1]} + } + }, + { + "origin": [-1.6, 19.376, -7.84], + "size": [3.2, 1.92, 3.84], + "uv": { + "north": {"uv": [60, 34], "uv_size": [5, 3]}, + "east": {"uv": [54, 34], "uv_size": [6, 3]}, + "south": {"uv": [71, 34], "uv_size": [5, 3]}, + "west": {"uv": [65, 34], "uv_size": [6, 3]}, + "up": {"uv": [60, 28], "uv_size": [5, 6]}, + "down": {"uv": [65, 34], "uv_size": [5, -6]} + } + }, + { + "origin": [-1.28, 18.928, -7.776], + "size": [0.64, 0.64, 0], + "uv": { + "north": {"uv": [25, 39], "uv_size": [1, 1]}, + "east": {"uv": [25, 39], "uv_size": [0, 1]}, + "south": {"uv": [26, 39], "uv_size": [1, 1]}, + "west": {"uv": [26, 39], "uv_size": [0, 1]}, + "up": {"uv": [25, 39], "uv_size": [1, 0]}, + "down": {"uv": [26, 39], "uv_size": [1, 0]} + } + }, + { + "origin": [0.64, 18.928, -7.776], + "size": [0.64, 0.64, 0], + "uv": { + "north": {"uv": [22, 39], "uv_size": [1, 1]}, + "east": {"uv": [22, 39], "uv_size": [0, 1]}, + "south": {"uv": [23, 39], "uv_size": [1, 1]}, + "west": {"uv": [23, 39], "uv_size": [0, 1]}, + "up": {"uv": [22, 39], "uv_size": [1, 0]}, + "down": {"uv": [23, 39], "uv_size": [1, 0]} + } + }, + { + "origin": [-0.64, 20.592, -8.16], + "size": [1.28, 0.64, 0.64], + "uv": { + "north": {"uv": [1, 27], "uv_size": [2, 1]}, + "east": {"uv": [0, 27], "uv_size": [1, 1]}, + "south": {"uv": [4, 27], "uv_size": [2, 1]}, + "west": {"uv": [3, 27], "uv_size": [1, 1]}, + "up": {"uv": [1, 26], "uv_size": [2, 1]}, + "down": {"uv": [3, 27], "uv_size": [2, -1]} + } + } + ] + }, + { + "name": "blink_right", + "parent": "head", + "pivot": [-0.64, 15.216, 2.88], + "cubes": [ + { + "origin": [0.064, 20.976, -5.024], + "size": [1.92, 1.28, 1.92], + "uv": { + "north": {"uv": [53, 10], "uv_size": [3, 2]}, + "east": {"uv": [50, 10], "uv_size": [3, 2]}, + "south": {"uv": [59, 10], "uv_size": [3, 2]}, + "west": {"uv": [56, 10], "uv_size": [3, 2]}, + "up": {"uv": [53, 7], "uv_size": [3, 3]}, + "down": {"uv": [56, 10], "uv_size": [3, -3]} + } + } + ] + }, + { + "name": "blink_left", + "parent": "head", + "pivot": [0.64, 15.216, 2.88], + "cubes": [ + { + "origin": [-1.984, 20.976, -5.024], + "size": [1.92, 1.28, 1.92], + "uv": { + "north": {"uv": [53, 10], "uv_size": [3, 2]}, + "east": {"uv": [50, 10], "uv_size": [3, 2]}, + "south": {"uv": [59, 10], "uv_size": [3, 2]}, + "west": {"uv": [56, 10], "uv_size": [3, 2]}, + "up": {"uv": [53, 7], "uv_size": [3, 3]}, + "down": {"uv": [56, 10], "uv_size": [3, -3]} + } + } + ] + }, + { + "name": "eye_left", + "parent": "head", + "pivot": [2.328, 21.636, -5.256], + "cubes": [ + { + "origin": [1.208, 21.184, -5.28], + "size": [0.64, 0.64, 0.64], + "pivot": [1.512, 21.616, -5.28], + "rotation": [0, 90, 0], + "uv": { + "north": {"uv": [30, 12], "uv_size": [1, 1]}, + "east": {"uv": [29, 12], "uv_size": [1, 1]}, + "south": {"uv": [32, 12], "uv_size": [1, 1]}, + "west": {"uv": [31, 12], "uv_size": [1, 1]}, + "up": {"uv": [30, 11], "uv_size": [1, 1]}, + "down": {"uv": [31, 12], "uv_size": [1, -1]} + } + }, + { + "origin": [1.392, 21.136, -4.624], + "size": [0.64, 1.28, 0], + "pivot": [1.936, 21.616, -5.28], + "rotation": [0, 90, 0], + "uv": { + "north": {"uv": [6, 39], "uv_size": [1, 2]}, + "east": {"uv": [6, 39], "uv_size": [0, 2]}, + "south": {"uv": [7, 39], "uv_size": [1, 2]}, + "west": {"uv": [7, 39], "uv_size": [0, 2]}, + "up": {"uv": [6, 39], "uv_size": [1, 0]}, + "down": {"uv": [7, 39], "uv_size": [1, 0]} + } + }, + { + "origin": [3.006, 21.488, -4.494], + "size": [0.39, 0.64, 0], + "pivot": [2.452, 21.808, -5.08], + "rotation": [0, 180, 0], + "uv": { + "north": {"uv": [37, 28], "uv_size": [1, 1]}, + "east": {"uv": [37, 28], "uv_size": [0, 1]}, + "south": {"uv": [38, 28], "uv_size": [1, 1]}, + "west": {"uv": [38, 28], "uv_size": [0, 1]}, + "up": {"uv": [37, 28], "uv_size": [1, 0]}, + "down": {"uv": [38, 28], "uv_size": [1, 0]} + } + }, + { + "origin": [-2.592, 21.488, -4.494], + "size": [0.39, 0.64, 0], + "pivot": [-1.976, 21.808, -5.08], + "rotation": [0, -180, 0], + "uv": { + "north": {"uv": [38, 28], "uv_size": [-1, 1]}, + "east": {"uv": [38, 28], "uv_size": [0, 1]}, + "south": {"uv": [39, 28], "uv_size": [-1, 1]}, + "west": {"uv": [37, 28], "uv_size": [0, 1]}, + "up": {"uv": [38, 28], "uv_size": [-1, 0]}, + "down": {"uv": [39, 28], "uv_size": [-1, 0]} + } + }, + { + "origin": [2.04, 20.976, -4.928], + "size": [0.44, 1.28, 0], + "pivot": [1.776, 21.616, -5.28], + "rotation": [0, 180, 0], + "uv": { + "north": {"uv": [3, 39], "uv_size": [1, 2]}, + "east": {"uv": [3, 39], "uv_size": [0, 2]}, + "south": {"uv": [4, 39], "uv_size": [1, 2]}, + "west": {"uv": [4, 39], "uv_size": [0, 2]}, + "up": {"uv": [3, 39], "uv_size": [1, 0]}, + "down": {"uv": [4, 39], "uv_size": [1, 0]} + } + } + ] + }, + { + "name": "eye_right", + "parent": "head", + "pivot": [-2.328, 21.636, -5.256], + "cubes": [ + { + "origin": [-1.972, 21.184, -5.552], + "size": [0.64, 0.64, 0.64], + "pivot": [-1.636, 21.616, -5.28], + "rotation": [0, -90, 0], + "uv": { + "north": {"uv": [30, 7], "uv_size": [1, 1]}, + "east": {"uv": [29, 7], "uv_size": [1, 1]}, + "south": {"uv": [32, 7], "uv_size": [1, 1]}, + "west": {"uv": [31, 7], "uv_size": [1, 1]}, + "up": {"uv": [30, 6], "uv_size": [1, 1]}, + "down": {"uv": [31, 7], "uv_size": [1, -1]} + } + }, + { + "origin": [-2.032, 21.136, -4.624], + "size": [0.64, 1.28, 0], + "pivot": [-1.936, 21.616, -5.28], + "rotation": [0, -90, 0], + "uv": { + "north": {"uv": [34, 11], "uv_size": [1, 2]}, + "east": {"uv": [34, 11], "uv_size": [0, 2]}, + "south": {"uv": [35, 11], "uv_size": [1, 2]}, + "west": {"uv": [35, 11], "uv_size": [0, 2]}, + "up": {"uv": [34, 11], "uv_size": [1, 0]}, + "down": {"uv": [35, 11], "uv_size": [1, 0]} + } + }, + { + "origin": [-2.848, 20.976, -4.928], + "size": [0.34, 1.28, 0], + "pivot": [-1.936, 21.616, -5.28], + "rotation": [0, -180, 0], + "uv": { + "north": {"uv": [34, 6], "uv_size": [1, 2]}, + "east": {"uv": [34, 6], "uv_size": [0, 2]}, + "south": {"uv": [35, 6], "uv_size": [1, 2]}, + "west": {"uv": [35, 6], "uv_size": [0, 2]}, + "up": {"uv": [34, 6], "uv_size": [1, 0]}, + "down": {"uv": [35, 6], "uv_size": [1, 0]} + } + } + ] + }, + { + "name": "mouth", + "parent": "head", + "pivot": [0, 19.376, -4.32], + "cubes": [ + { + "origin": [-0.96, 18.736, -7.52], + "size": [1.92, 0.64, 3.2], + "uv": { + "north": {"uv": [84, 32], "uv_size": [3, 1]}, + "east": {"uv": [79, 32], "uv_size": [5, 1]}, + "south": {"uv": [92, 32], "uv_size": [3, 1]}, + "west": {"uv": [87, 32], "uv_size": [5, 1]}, + "up": {"uv": [84, 27], "uv_size": [3, 5]}, + "down": {"uv": [87, 32], "uv_size": [3, -5]} + } + } + ] + }, + { + "name": "ear_left", + "parent": "head", + "pivot": [2.4, 23.216, -2.08], + "rotation": [-4.74942, 22.24971, 37.00439], + "cubes": [ + { + "origin": [1.12, 21.616, -3.36], + "size": [2.56, 3.2, 2.56], + "uv": { + "north": {"uv": [65, 74], "uv_size": [4, 5]}, + "east": {"uv": [61, 74], "uv_size": [4, 5]}, + "south": {"uv": [73, 74], "uv_size": [4, 5]}, + "west": {"uv": [69, 74], "uv_size": [4, 5]}, + "up": {"uv": [65, 70], "uv_size": [4, 4]}, + "down": {"uv": [69, 74], "uv_size": [4, -4]} + } + }, + { + "origin": [1.12, 23.92, -1.76], + "size": [2.56, 1.92, 2.56], + "pivot": [2.4, 28.08, -0.48], + "rotation": [-24.25, 0, 0], + "uv": { + "north": {"uv": [78, 80], "uv_size": [4, 3]}, + "east": {"uv": [74, 80], "uv_size": [4, 3]}, + "south": {"uv": [86, 80], "uv_size": [4, 3]}, + "west": {"uv": [82, 80], "uv_size": [4, 3]}, + "up": {"uv": [78, 76], "uv_size": [4, 4]}, + "down": {"uv": [82, 80], "uv_size": [4, -4]} + } + }, + { + "origin": [1.76, 24.97598, 0.83732], + "size": [1.28, 1.92, 1.28], + "pivot": [2.4, 25.82889, 1.9591], + "rotation": [-137, 0, 0], + "uv": { + "north": {"uv": [31, 2], "uv_size": [2, 3]}, + "east": {"uv": [29, 2], "uv_size": [2, 3]}, + "south": {"uv": [35, 2], "uv_size": [2, 3]}, + "west": {"uv": [33, 2], "uv_size": [2, 3]}, + "up": {"uv": [31, 0], "uv_size": [2, 2]}, + "down": {"uv": [33, 2], "uv_size": [2, -2]} + } + }, + { + "origin": [2.08, 26.01087, 0.56189], + "size": [0.64, 1.28, 0.64], + "pivot": [2.4, 25.82889, 1.9591], + "rotation": [-179, 0, 0], + "uv": { + "north": {"uv": [29, 25], "uv_size": [1, 2]}, + "east": {"uv": [28, 25], "uv_size": [1, 2]}, + "south": {"uv": [31, 25], "uv_size": [1, 2]}, + "west": {"uv": [30, 25], "uv_size": [1, 2]}, + "up": {"uv": [29, 24], "uv_size": [1, 1]}, + "down": {"uv": [30, 25], "uv_size": [1, -1]} + } + }, + { + "origin": [1.44, 23.36201, 0.34536], + "size": [1.92, 2.56, 1.92], + "pivot": [2.4, 25.82889, 1.9591], + "rotation": [-97.5, 0, 0], + "uv": { + "north": {"uv": [71, 93], "uv_size": [3, 4]}, + "east": {"uv": [68, 93], "uv_size": [3, 4]}, + "south": {"uv": [77, 93], "uv_size": [3, 4]}, + "west": {"uv": [74, 93], "uv_size": [3, 4]}, + "up": {"uv": [71, 90], "uv_size": [3, 3]}, + "down": {"uv": [74, 93], "uv_size": [3, -3]} + } + }, + { + "origin": [1.44, 23.12, 1.184], + "size": [1.92, 2.56, 1.92], + "pivot": [2.4, 27.92, 2.144], + "rotation": [-62.5, 0, 0], + "uv": { + "north": {"uv": [93, 42], "uv_size": [3, 4]}, + "east": {"uv": [90, 42], "uv_size": [3, 4]}, + "south": {"uv": [99, 42], "uv_size": [3, 4]}, + "west": {"uv": [96, 42], "uv_size": [3, 4]}, + "up": {"uv": [93, 39], "uv_size": [3, 3]}, + "down": {"uv": [96, 42], "uv_size": [3, -3]} + } + } + ] + }, + { + "name": "ear_right", + "parent": "head", + "pivot": [-2.4, 23.216, -2.08], + "rotation": [-4.74942, -22.24971, -37.00439], + "cubes": [ + { + "origin": [-3.68, 21.616, -3.36], + "size": [2.56, 3.2, 2.56], + "uv": { + "north": {"uv": [4, 70], "uv_size": [4, 5]}, + "east": {"uv": [0, 70], "uv_size": [4, 5]}, + "south": {"uv": [12, 70], "uv_size": [4, 5]}, + "west": {"uv": [8, 70], "uv_size": [4, 5]}, + "up": {"uv": [4, 66], "uv_size": [4, 4]}, + "down": {"uv": [8, 70], "uv_size": [4, -4]} + } + }, + { + "origin": [-3.68, 23.92, -1.76], + "size": [2.56, 1.92, 2.56], + "pivot": [-2.4, 28.08, -0.48], + "rotation": [-24.25, 0, 0], + "uv": { + "north": {"uv": [80, 38], "uv_size": [4, 3]}, + "east": {"uv": [76, 38], "uv_size": [4, 3]}, + "south": {"uv": [88, 38], "uv_size": [4, 3]}, + "west": {"uv": [84, 38], "uv_size": [4, 3]}, + "up": {"uv": [80, 34], "uv_size": [4, 4]}, + "down": {"uv": [84, 38], "uv_size": [4, -4]} + } + }, + { + "origin": [-3.04, 24.97598, 0.83732], + "size": [1.28, 1.92, 1.28], + "pivot": [-2.4, 25.82889, 1.9591], + "rotation": [-137, 0, 0], + "uv": { + "north": {"uv": [2, 22], "uv_size": [2, 3]}, + "east": {"uv": [0, 22], "uv_size": [2, 3]}, + "south": {"uv": [6, 22], "uv_size": [2, 3]}, + "west": {"uv": [4, 22], "uv_size": [2, 3]}, + "up": {"uv": [2, 20], "uv_size": [2, 2]}, + "down": {"uv": [4, 22], "uv_size": [2, -2]} + } + }, + { + "origin": [-2.72, 26.01087, 0.56189], + "size": [0.64, 1.28, 0.64], + "pivot": [-2.4, 25.82889, 1.9591], + "rotation": [-179, 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": [-3.36, 23.36201, 0.34536], + "size": [1.92, 2.56, 1.92], + "pivot": [-2.4, 25.82889, 1.9591], + "rotation": [-97.5, 0, 0], + "uv": { + "north": {"uv": [40, 93], "uv_size": [3, 4]}, + "east": {"uv": [37, 93], "uv_size": [3, 4]}, + "south": {"uv": [46, 93], "uv_size": [3, 4]}, + "west": {"uv": [43, 93], "uv_size": [3, 4]}, + "up": {"uv": [40, 90], "uv_size": [3, 3]}, + "down": {"uv": [43, 93], "uv_size": [3, -3]} + } + }, + { + "origin": [-3.36, 23.12, 1.184], + "size": [1.92, 2.56, 1.92], + "pivot": [-2.4, 27.92, 2.144], + "rotation": [-62.5, 0, 0], + "uv": { + "north": {"uv": [14, 92], "uv_size": [3, 4]}, + "east": {"uv": [11, 92], "uv_size": [3, 4]}, + "south": {"uv": [20, 92], "uv_size": [3, 4]}, + "west": {"uv": [17, 92], "uv_size": [3, 4]}, + "up": {"uv": [14, 89], "uv_size": [3, 3]}, + "down": {"uv": [17, 92], "uv_size": [3, -3]} + } + } + ] + }, + { + "name": "leg_left_front", + "parent": "houndoom", + "pivot": [2.4, 10.72, -1.92], + "rotation": [7.5, 0, 0], + "cubes": [ + { + "origin": [0.8, 6.31873, -3.60114], + "size": [2.56, 5.76, 3.2], + "uv": { + "north": {"uv": [51, 61], "uv_size": [4, 9]}, + "east": {"uv": [46, 61], "uv_size": [5, 9]}, + "south": {"uv": [60, 61], "uv_size": [4, 9]}, + "west": {"uv": [55, 61], "uv_size": [5, 9]}, + "up": {"uv": [51, 56], "uv_size": [4, 5]}, + "down": {"uv": [55, 61], "uv_size": [4, -5]} + } + } + ] + }, + { + "name": "leg_left_front2", + "parent": "leg_left_front", + "pivot": [2.4, 6.29063, -2.0329], + "rotation": [-9.25, 0, 0], + "cubes": [ + { + "origin": [0.8, 1.58717, -3.22894], + "size": [2.56, 0.64, 2.56], + "pivot": [2.4, 1.58717, -2.33294], + "rotation": [-2, 0, 0], + "uv": { + "north": {"uv": [91, 90], "uv_size": [4, 1]}, + "east": {"uv": [87, 90], "uv_size": [4, 1]}, + "south": {"uv": [99, 90], "uv_size": [4, 1]}, + "west": {"uv": [95, 90], "uv_size": [4, 1]}, + "up": {"uv": [91, 86], "uv_size": [4, 4]}, + "down": {"uv": [95, 90], "uv_size": [4, -4]} + } + }, + { + "origin": [0.8, 2.48317, -3.26094], + "size": [2.56, 0.64, 2.56], + "pivot": [2.4, 1.58717, -2.33294], + "rotation": [-2, 0, 0], + "uv": { + "north": {"uv": [91, 77], "uv_size": [4, 1]}, + "east": {"uv": [87, 77], "uv_size": [4, 1]}, + "south": {"uv": [99, 77], "uv_size": [4, 1]}, + "west": {"uv": [95, 77], "uv_size": [4, 1]}, + "up": {"uv": [91, 73], "uv_size": [4, 4]}, + "down": {"uv": [95, 77], "uv_size": [4, -4]} + } + }, + { + "origin": [1.12, 0.30717, -2.97294], + "size": [1.92, 6.4, 1.92], + "uv": { + "north": {"uv": [38, 71], "uv_size": [3, 10]}, + "east": {"uv": [35, 71], "uv_size": [3, 10]}, + "south": {"uv": [44, 71], "uv_size": [3, 10]}, + "west": {"uv": [41, 71], "uv_size": [3, 10]}, + "up": {"uv": [38, 68], "uv_size": [3, 3]}, + "down": {"uv": [41, 71], "uv_size": [3, -3]} + } + } + ] + }, + { + "name": "leg_left_front3", + "parent": "leg_left_front2", + "pivot": [2.4, 0.62717, -1.69294], + "rotation": [2.5, 0, 0], + "cubes": [ + { + "origin": [0.8, 0.01508, -3.93233], + "size": [2.56, 1.28, 2.56], + "uv": { + "north": {"uv": [65, 84], "uv_size": [4, 2]}, + "east": {"uv": [61, 84], "uv_size": [4, 2]}, + "south": {"uv": [73, 84], "uv_size": [4, 2]}, + "west": {"uv": [69, 84], "uv_size": [4, 2]}, + "up": {"uv": [65, 80], "uv_size": [4, 4]}, + "down": {"uv": [69, 84], "uv_size": [4, -4]} + } + } + ] + }, + { + "name": "leg_right_front", + "parent": "houndoom", + "pivot": [-2.4, 10.72, -1.92], + "rotation": [7.5, 0, 0], + "cubes": [ + { + "origin": [-3.36, 6.31873, -3.60114], + "size": [2.56, 5.76, 3.2], + "uv": { + "north": {"uv": [5, 56], "uv_size": [4, 9]}, + "east": {"uv": [0, 56], "uv_size": [5, 9]}, + "south": {"uv": [14, 56], "uv_size": [4, 9]}, + "west": {"uv": [9, 56], "uv_size": [5, 9]}, + "up": {"uv": [5, 51], "uv_size": [4, 5]}, + "down": {"uv": [9, 56], "uv_size": [4, -5]} + } + } + ] + }, + { + "name": "leg_right_front2", + "parent": "leg_right_front", + "pivot": [-2.4, 6.29063, -2.0329], + "rotation": [-9.25, 0, 0], + "cubes": [ + { + "origin": [-3.36, 1.58717, -3.22894], + "size": [2.56, 0.64, 2.56], + "pivot": [-2.4, 1.58717, -2.33294], + "rotation": [-2, 0, 0], + "uv": { + "north": {"uv": [78, 88], "uv_size": [4, 1]}, + "east": {"uv": [74, 88], "uv_size": [4, 1]}, + "south": {"uv": [86, 88], "uv_size": [4, 1]}, + "west": {"uv": [82, 88], "uv_size": [4, 1]}, + "up": {"uv": [78, 84], "uv_size": [4, 4]}, + "down": {"uv": [82, 88], "uv_size": [4, -4]} + } + }, + { + "origin": [-3.36, 2.48317, -3.26094], + "size": [2.56, 0.64, 2.56], + "pivot": [-2.4, 1.58717, -2.33294], + "rotation": [-2, 0, 0], + "uv": { + "north": {"uv": [88, 62], "uv_size": [4, 1]}, + "east": {"uv": [84, 62], "uv_size": [4, 1]}, + "south": {"uv": [96, 62], "uv_size": [4, 1]}, + "west": {"uv": [92, 62], "uv_size": [4, 1]}, + "up": {"uv": [88, 58], "uv_size": [4, 4]}, + "down": {"uv": [92, 62], "uv_size": [4, -4]} + } + }, + { + "origin": [-3.04, 0.30717, -2.97294], + "size": [1.92, 6.4, 1.92], + "uv": { + "north": {"uv": [3, 3], "uv_size": [3, 10]}, + "east": {"uv": [0, 3], "uv_size": [3, 10]}, + "south": {"uv": [9, 3], "uv_size": [3, 10]}, + "west": {"uv": [6, 3], "uv_size": [3, 10]}, + "up": {"uv": [3, 0], "uv_size": [3, 3]}, + "down": {"uv": [6, 3], "uv_size": [3, -3]} + } + } + ] + }, + { + "name": "leg_right_front3", + "parent": "leg_right_front2", + "pivot": [-2.4, 0.62717, -1.69294], + "rotation": [2.5, 0, 0], + "cubes": [ + { + "origin": [-3.36, 0.01508, -3.93233], + "size": [2.56, 1.28, 2.56], + "uv": { + "north": {"uv": [80, 48], "uv_size": [4, 2]}, + "east": {"uv": [76, 48], "uv_size": [4, 2]}, + "south": {"uv": [88, 48], "uv_size": [4, 2]}, + "west": {"uv": [84, 48], "uv_size": [4, 2]}, + "up": {"uv": [80, 44], "uv_size": [4, 4]}, + "down": {"uv": [84, 48], "uv_size": [4, -4]} + } + } + ] + }, + { + "name": "leg_left_back", + "parent": "houndoom", + "pivot": [2.24, 10.137, 5.94545], + "rotation": [-9.73968, -0.2998, -0.07833], + "cubes": [ + { + "origin": [0.95949, 6.8062, 4.45152], + "size": [2.56, 5.12, 3.2], + "uv": { + "north": {"uv": [70, 61], "uv_size": [4, 8]}, + "east": {"uv": [65, 61], "uv_size": [5, 8]}, + "south": {"uv": [79, 61], "uv_size": [4, 8]}, + "west": {"uv": [74, 61], "uv_size": [5, 8]}, + "up": {"uv": [70, 56], "uv_size": [4, 5]}, + "down": {"uv": [74, 61], "uv_size": [4, -5]} + } + } + ] + }, + { + "name": "leg_left_back1", + "parent": "leg_left_back", + "pivot": [2.23949, 6.81747, 4.47592], + "rotation": [46.25, 0, 0], + "cubes": [ + { + "origin": [0.95949, 3.62208, 4.45263], + "size": [2.56, 3.2, 2.56], + "uv": { + "north": {"uv": [21, 75], "uv_size": [4, 5]}, + "east": {"uv": [17, 75], "uv_size": [4, 5]}, + "south": {"uv": [29, 75], "uv_size": [4, 5]}, + "west": {"uv": [25, 75], "uv_size": [4, 5]}, + "up": {"uv": [21, 71], "uv_size": [4, 4]}, + "down": {"uv": [25, 75], "uv_size": [4, -4]} + } + } + ] + }, + { + "name": "leg_left_back2", + "parent": "leg_left_back1", + "pivot": [2.23949, 3.57599, 6.97815], + "rotation": [-36.25, 0, 0], + "cubes": [ + { + "origin": [0.95949, -0.88355, 4.77569], + "size": [2.56, 0.64, 2.56], + "pivot": [2.23949, -0.08355, 6.05569], + "rotation": [-2.25, 0, 0], + "uv": { + "north": {"uv": [91, 84], "uv_size": [4, 1]}, + "east": {"uv": [87, 84], "uv_size": [4, 1]}, + "south": {"uv": [99, 84], "uv_size": [4, 1]}, + "west": {"uv": [95, 84], "uv_size": [4, 1]}, + "up": {"uv": [91, 80], "uv_size": [4, 4]}, + "down": {"uv": [95, 84], "uv_size": [4, -4]} + } + }, + { + "origin": [0.95949, 0.07645, 4.77569], + "size": [2.56, 0.64, 2.56], + "pivot": [2.23949, -0.08355, 6.05569], + "rotation": [-2.25, 0, 0], + "uv": { + "north": {"uv": [58, 91], "uv_size": [4, 1]}, + "east": {"uv": [54, 91], "uv_size": [4, 1]}, + "south": {"uv": [66, 91], "uv_size": [4, 1]}, + "west": {"uv": [62, 91], "uv_size": [4, 1]}, + "up": {"uv": [58, 87], "uv_size": [4, 4]}, + "down": {"uv": [62, 91], "uv_size": [4, -4]} + } + }, + { + "origin": [1.27949, -2.12639, 5.06411], + "size": [1.92, 5.76, 1.92], + "uv": { + "north": {"uv": [3, 79], "uv_size": [3, 9]}, + "east": {"uv": [0, 79], "uv_size": [3, 9]}, + "south": {"uv": [9, 79], "uv_size": [3, 9]}, + "west": {"uv": [6, 79], "uv_size": [3, 9]}, + "up": {"uv": [3, 76], "uv_size": [3, 3]}, + "down": {"uv": [6, 79], "uv_size": [3, -3]} + } + } + ] + }, + { + "name": "leg_left_back3", + "parent": "leg_left_back2", + "pivot": [2.55949, -1.80639, 6.34411], + "cubes": [ + { + "origin": [0.95949, -2.44639, 4.10411], + "size": [2.56, 1.28, 2.56], + "uv": { + "north": {"uv": [83, 55], "uv_size": [4, 2]}, + "east": {"uv": [79, 55], "uv_size": [4, 2]}, + "south": {"uv": [91, 55], "uv_size": [4, 2]}, + "west": {"uv": [87, 55], "uv_size": [4, 2]}, + "up": {"uv": [83, 51], "uv_size": [4, 4]}, + "down": {"uv": [87, 55], "uv_size": [4, -4]} + } + } + ] + }, + { + "name": "leg_right_back", + "parent": "houndoom", + "pivot": [-2.24, 10.137, 5.94545], + "rotation": [-9.73968, 0.2998, 0.07833], + "cubes": [ + { + "origin": [-3.51949, 6.8062, 4.45152], + "size": [2.56, 5.12, 3.2], + "uv": { + "north": {"uv": [24, 62], "uv_size": [4, 8]}, + "east": {"uv": [19, 62], "uv_size": [5, 8]}, + "south": {"uv": [33, 62], "uv_size": [4, 8]}, + "west": {"uv": [28, 62], "uv_size": [5, 8]}, + "up": {"uv": [24, 57], "uv_size": [4, 5]}, + "down": {"uv": [28, 62], "uv_size": [4, -5]} + } + } + ] + }, + { + "name": "leg_right_back1", + "parent": "leg_right_back", + "pivot": [-2.23949, 6.81747, 4.47592], + "rotation": [46.25, 0, 0], + "cubes": [ + { + "origin": [-3.51949, 3.62208, 4.45263], + "size": [2.56, 3.2, 2.56], + "uv": { + "north": {"uv": [67, 42], "uv_size": [4, 5]}, + "east": {"uv": [63, 42], "uv_size": [4, 5]}, + "south": {"uv": [75, 42], "uv_size": [4, 5]}, + "west": {"uv": [71, 42], "uv_size": [4, 5]}, + "up": {"uv": [67, 38], "uv_size": [4, 4]}, + "down": {"uv": [71, 42], "uv_size": [4, -4]} + } + } + ] + }, + { + "name": "leg_right_back2", + "parent": "leg_right_back1", + "pivot": [-2.23949, 3.57599, 6.97815], + "rotation": [-36.25, 0, 0], + "cubes": [ + { + "origin": [-3.51949, -0.88355, 4.77569], + "size": [2.56, 0.64, 2.56], + "pivot": [-2.23949, -0.08355, 6.05569], + "rotation": [-2.25, 0, 0], + "uv": { + "north": {"uv": [45, 88], "uv_size": [4, 1]}, + "east": {"uv": [41, 88], "uv_size": [4, 1]}, + "south": {"uv": [53, 88], "uv_size": [4, 1]}, + "west": {"uv": [49, 88], "uv_size": [4, 1]}, + "up": {"uv": [45, 84], "uv_size": [4, 4]}, + "down": {"uv": [49, 88], "uv_size": [4, -4]} + } + }, + { + "origin": [-3.51949, 0.07645, 4.77569], + "size": [2.56, 0.64, 2.56], + "pivot": [-2.23949, -0.08355, 6.05569], + "rotation": [-2.25, 0, 0], + "uv": { + "north": {"uv": [32, 86], "uv_size": [4, 1]}, + "east": {"uv": [28, 86], "uv_size": [4, 1]}, + "south": {"uv": [40, 86], "uv_size": [4, 1]}, + "west": {"uv": [36, 86], "uv_size": [4, 1]}, + "up": {"uv": [32, 82], "uv_size": [4, 4]}, + "down": {"uv": [36, 86], "uv_size": [4, -4]} + } + }, + { + "origin": [-3.19949, -2.12639, 5.06411], + "size": [1.92, 5.76, 1.92], + "uv": { + "north": {"uv": [74, 22], "uv_size": [3, 9]}, + "east": {"uv": [71, 22], "uv_size": [3, 9]}, + "south": {"uv": [80, 22], "uv_size": [3, 9]}, + "west": {"uv": [77, 22], "uv_size": [3, 9]}, + "up": {"uv": [74, 19], "uv_size": [3, 3]}, + "down": {"uv": [77, 22], "uv_size": [3, -3]} + } + } + ] + }, + { + "name": "leg_right_back3", + "parent": "leg_right_back2", + "pivot": [-2.55949, -1.80639, 6.34411], + "cubes": [ + { + "origin": [-3.51949, -2.44639, 4.10411], + "size": [2.56, 1.28, 2.56], + "uv": { + "north": {"uv": [79, 8], "uv_size": [4, 2]}, + "east": {"uv": [75, 8], "uv_size": [4, 2]}, + "south": {"uv": [87, 8], "uv_size": [4, 2]}, + "west": {"uv": [83, 8], "uv_size": [4, 2]}, + "up": {"uv": [79, 4], "uv_size": [4, 4]}, + "down": {"uv": [83, 8], "uv_size": [4, -4]} + } + } ] } ] diff --git a/models/entity/pokemon/taillow.geo.json b/models/entity/pokemon/taillow.geo.json new file mode 100644 index 000000000..dc8c6e870 --- /dev/null +++ b/models/entity/pokemon/taillow.geo.json @@ -0,0 +1,135 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.taillow", + "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, 0, 0] + }, + { + "name": "body", + "parent": "root", + "pivot": [0, 1.95, 1], + "cubes": [ + {"origin": [-3, 1.4, -4.1], "size": [6, 5, 7], "pivot": [0, 3.95, 0], "rotation": [-22.5, 0, 0], "uv": [0, 8]}, + {"origin": [-2.5, 0.2, 0.5], "size": [5, 3, 5], "inflate": 0.1, "pivot": [0, 4.25, -0.8], "rotation": [20, 0, 0], "uv": [20, 20]}, + {"origin": [-4.5, -1.3, 2.65], "size": [9, 0, 8], "pivot": [0, 4.25, -0.8], "rotation": [52.5, 0, 0], "uv": [0, 0]} + ] + }, + { + "name": "rightFakeWing", + "parent": "body", + "pivot": [0, 3.95, 0] + }, + { + "name": "leftFakeWing", + "parent": "body", + "pivot": [0, 3.95, 0] + }, + { + "name": "head", + "parent": "body", + "pivot": [0, 5.45, -2], + "cubes": [ + {"origin": [-2.5, 4.45, -4.75], "size": [5, 7, 5], "pivot": [0, 5.45, -2], "rotation": [7.5, 0, 0], "uv": [0, 20]}, + {"origin": [-2.5, 7.7, -6.25], "size": [5, 1, 2], "inflate": 0.2, "pivot": [0, 5.45, -2], "rotation": [7.5, 0, 0], "uv": [26, 13]} + ] + }, + { + "name": "blink_left", + "parent": "head", + "pivot": [1, 5.45, -1], + "cubes": [ + {"origin": [-1.6, 8.45, -3.85], "size": [2.1, 2, 2], "pivot": [1, 5.45, -1], "rotation": [7.5, 0, 0], "uv": [19, 8]} + ] + }, + { + "name": "blink_right", + "parent": "head", + "pivot": [0, 5.45, -2], + "cubes": [ + {"origin": [-0.5, 8.45, -3.85], "size": [2.1, 2, 2], "pivot": [0, 5.45, -2], "rotation": [7.5, 0, 0], "uv": [19, 8]} + ] + }, + { + "name": "rightWing", + "parent": "body", + "pivot": [-3, 5.95, -1] + }, + { + "name": "rightdWing", + "parent": "rightWing", + "pivot": [-5, 6.95, -3] + }, + { + "name": "bone2", + "parent": "rightdWing", + "pivot": [-3.99619, 6.77552, -2], + "cubes": [ + {"origin": [-8.99619, 6.77552, -6], "size": [6, 0, 8], "inflate": 0.01, "uv": [27, 16]} + ] + }, + { + "name": "bone3", + "parent": "bone2", + "pivot": [-8.99619, 6.77552, -6], + "cubes": [ + {"origin": [-18.99619, 6.77552, -6], "size": [10, 0, 8], "inflate": 0.01, "uv": [-8, 52]} + ] + }, + { + "name": "leftWing", + "parent": "body", + "pivot": [-2, 3.95, 5] + }, + { + "name": "leftdWing", + "parent": "leftWing", + "pivot": [4, 6.95, -2], + "cubes": [ + {"origin": [2.99524, 6.7319, -5], "size": [6, 0, 8], "inflate": 0.01, "uv": [18, 0]} + ] + }, + { + "name": "bone", + "parent": "leftdWing", + "pivot": [8.99524, 6.7319, -5], + "cubes": [ + {"origin": [8.99524, 6.7319, -5], "size": [10, 0, 8], "inflate": 0.01, "uv": [-8, 52], "mirror": true} + ] + }, + { + "name": "rightFoot", + "parent": "root", + "pivot": [-1.75, 0.95, 1], + "cubes": [ + {"origin": [-2.75, -0.1, -0.15], "size": [2, 1, 2], "uv": [0, 3]}, + {"origin": [-2.75, -0.1, -2.15], "size": [2, 1, 2], "uv": [0, 0]}, + {"origin": [-1.75, -0.1, 1.85], "size": [0, 1, 1], "uv": [0, 0]}, + {"origin": [-1.75, -0.1, -2.15], "size": [0, 1, 2], "uv": [0, 4]} + ] + }, + { + "name": "leftFoot", + "parent": "root", + "pivot": [1.75, 0.95, 1], + "cubes": [ + {"origin": [0.75, -0.1, -0.15], "size": [2, 1, 2], "uv": [0, 3], "mirror": true}, + {"origin": [0.75, -0.1, -2.15], "size": [2, 1, 2], "uv": [0, 0], "mirror": true}, + {"origin": [1.75, -0.1, 1.85], "size": [0, 1, 1], "uv": [0, 0], "mirror": true}, + {"origin": [1.75, -0.1, -2.15], "size": [0, 1, 2], "uv": [0, 4], "mirror": true} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/pokemon.json b/pokemon.json index 27c927676..5fb731c9f 100644 --- a/pokemon.json +++ b/pokemon.json @@ -237,6 +237,7 @@ "mudkip", "marshtomp", "swampert", + "taillow", "ralts", "kirlia", "gardevoir", diff --git a/texts/en_US.lang b/texts/en_US.lang index 5d57e5553..8a0f94d86 100644 --- a/texts/en_US.lang +++ b/texts/en_US.lang @@ -1,4 +1,4 @@ -pack.name=§lPokeBedrock v2.9.8 RES +pack.name=§lPokeBedrock v2.9.9 RES pack.description=§aA High Level Pokemon Addon Created by Smell of curry for Minecraft Bedrock ## Orbs diff --git a/textures/entity/pokemon/houndoom/houndoom.png b/textures/entity/pokemon/houndoom/houndoom.png index b49232e62..b0f6105b4 100644 Binary files a/textures/entity/pokemon/houndoom/houndoom.png and b/textures/entity/pokemon/houndoom/houndoom.png differ diff --git a/textures/entity/pokemon/houndoom/shiny_houndoom.png b/textures/entity/pokemon/houndoom/shiny_houndoom.png index baa3f1186..5f77b4eca 100644 Binary files a/textures/entity/pokemon/houndoom/shiny_houndoom.png and b/textures/entity/pokemon/houndoom/shiny_houndoom.png differ diff --git a/textures/entity/pokemon/taillow/shiny_taillow.png b/textures/entity/pokemon/taillow/shiny_taillow.png new file mode 100644 index 000000000..a7d0d5a5c Binary files /dev/null and b/textures/entity/pokemon/taillow/shiny_taillow.png differ diff --git a/textures/entity/pokemon/taillow/taillow.png b/textures/entity/pokemon/taillow/taillow.png new file mode 100644 index 000000000..2077038a3 Binary files /dev/null and b/textures/entity/pokemon/taillow/taillow.png differ diff --git a/ui/pokemon/pokedex.json b/ui/pokemon/pokedex.json index 56901def4..91c134df5 100644 --- a/ui/pokemon/pokedex.json +++ b/ui/pokemon/pokedex.json @@ -306,6 +306,11 @@ "anchor_to": "center", "controls": [ + { + "close_button@common.light_close_button": { + "$close_button_offset": [-10, 111] + } + }, { "search_button@pokedex.button_stack": { "size": [163, 12], @@ -410,6 +415,11 @@ "anchor_from": "center", "anchor_to": "center", "controls": [ + { + "close_button@common.light_close_button": { + "$close_button_offset": [-10, 111] + } + }, { "top_details": { "type": "stack_panel",