Skip to content

Commit

Permalink
Merge pull request #64 from Jok3r00666/main
Browse files Browse the repository at this point in the history 
Updated Zekrom and Reshiram
  • Loading branch information
@smell-of-curry
smell-of-curry authored Jul 9, 2024
2 parents 4682c8f + 0ba02a9 commit 491c373
Show file tree
Hide file tree
Showing 8 changed files with 116 additions and 110 deletions.
66 changes: 39 additions & 27 deletions animations/pokemon/reshiram.animation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,20 +159,21 @@
},
"animation.reshiram.walking": {
"loop": true,
"animation_length": 1.20833,
"animation_length": 1.2083,
"bones": {
"reshiram": {
"position": {
"0.0": [0, "-3+math.cos(query.anim_time*297.939*2)*0.5", 0],
"0.5417": [0, "-3+math.cos(query.anim_time*297.939*2)*0.5", 0],
"0.5833": [0, -1.8, 0],
"0.5833": [0, -1.9, 0],
"0.625": [0, "-3+math.cos(query.anim_time*297.939*2)*0.5", 0],
"1.1667": [0, "-3+math.cos(query.anim_time*297.939*2)*0.5", 0],
"1.2083": [0, -1.8, 0]
"1.2083": [0, -1.9, 0]
}
},
"body": {
"rotation": ["math.cos(query.anim_time*297.939*2)*3", 0, 0]
"rotation": ["math.cos(query.anim_time*297.939*2)*3", 0, 0],
"position": [0, "math.cos(query.anim_time*297.939*2)*1", 0]
},
"tail": {
"rotation": ["math.cos((query.anim_time-0.1)*297.939*2)*3", 0, 0]
Expand Down Expand Up @@ -452,7 +453,8 @@
}
},
"upper": {
"rotation": ["-math.cos(query.anim_time*297.939*2)*3", 0, 0]
"rotation": ["-math.cos(query.anim_time*297.939*2)*3", 0, 0],
"position": [0, "math.cos(query.anim_time*297.939*2)*1", 0]
},
"neck": {
"rotation": ["10-math.cos((query.anim_time-0.1)*297.939*2)*2", 0, 0]
Expand Down Expand Up @@ -494,7 +496,7 @@
"rotation": ["-math.cos((query.anim_time-0.5)*297.939*2)*11", 0, 0]
},
"left_arm": {
"rotation": [-1.10693, -12.45167, 15.12076]
"rotation": [-3.28396, -12.06754, 25.34721]
},
"left_arm2": {
"rotation": [0, 0, "-math.cos((query.anim_time-0.1)*297.939*2)*3"]
Expand All @@ -515,7 +517,7 @@
"rotation": [0, 0, -10]
},
"right_arm": {
"rotation": [-1.10693, 12.45167, "-15.1208+math.cos(query.anim_time*297.939*2)*3"]
"rotation": [-3.28396, 12.06754, -25.34721]
},
"right_arm2": {
"rotation": [0, 0, "math.cos((query.anim_time-0.1)*297.939*2)*3"]
Expand All @@ -539,7 +541,7 @@
},
"animation.reshiram.air_idle": {
"loop": true,
"animation_length": 1.33333,
"animation_length": 1.3333,
"bones": {
"reshiram": {
"rotation": ["7.5+math.cos(query.anim_time*270.677)*4", 0, 0],
Expand Down Expand Up @@ -1098,7 +1100,7 @@
},
"animation.reshiram.swimming": {
"loop": true,
"animation_length": 1.33333,
"animation_length": 1.3333,
"bones": {
"reshiram": {
"rotation": ["47.5+math.cos(query.anim_time*270.677)*4", 0, 0],
Expand Down Expand Up @@ -1478,7 +1480,7 @@
},
"animation.reshiram.faint": {
"loop": "hold_on_last_frame",
"animation_length": 2.45833,
"animation_length": 2.4583,
"bones": {
"reshiram": {
"rotation": {
Expand Down Expand Up @@ -1832,72 +1834,81 @@
"1.0": [0, 0, 0]
},
"position": {
"0.0": [0, "-3+math.cos(query.anim_time*3600)*1", 0],
"0.2917": [0, "-3+math.cos(query.anim_time*3600)*1", 9],
"0.0": [0, -0.4, 0],
"0.3333": [0, -3, 9],
"0.4167": [7, -3, -11],
"0.4583": [7, -3, -11],
"0.5": [7, -1, -11],
"0.5417": [7, -3, -11],
"0.625": [7, -3, -11],
"1.0": [0, 0, 0]
"1.0": [0, -0.4, 0]
}
},
"left_leg": {
"rotation": {
"0.0": [0, 0, -7.5],
"0.1667": [-8.74647, -1.2393, -7.66326],
"0.0833": [-8.74647, -1.2393, -7.66326],
"0.2083": [7.50706, -2.4786, -7.82652],
"0.3333": [7.50706, -2.4786, -7.82652],
"0.375": [60.00706, -2.4786, -7.82652],
"0.4167": [-7.49294, -2.4786, -7.82652],
"0.4583": [-7.49294, -2.4786, -7.82652],
"0.625": [-2.49294, -2.4786, -7.82652],
"1.0": [0, 0, -7.5]
}
},
"left_leg2": {
"rotation": {
"0.0": [0, 0, 0],
"0.1667": [36.25, 0, 0],
"0.0833": [23.75, 0, 0],
"0.2083": [17.5, 0, 0],
"0.3333": [17.5, 0, 0],
"0.375": [-12.5, 0, 0],
"0.4167": [37.5, 0, 0],
"0.375": [30, 0, 0],
"0.4583": [37.5, 0, 0],
"0.625": [27.5, 0, 0],
"1.0": [0, 0, 0]
},
"position": {
"0.2083": [0, 0, 0],
"0.3333": [0, 0, 0],
"0.375": [0, 2, 0],
"0.4167": [0, 0, 0]
"0.4583": [0, 0, 0]
}
},
"left_leg3": {
"rotation": {
"0.0": [0, 0, 5],
"0.1667": [-72.5, 0, 5],
"0.0833": [-50, 0, 5],
"0.2083": [-50, 0, 5],
"0.3333": [-50, 0, 5],
"0.4167": [-50, 0, 5],
"0.4583": [-50, 0, 5],
"0.625": [-50, 0, 5],
"1.0": [0, 0, 5]
},
"position": {
"0.2083": [0, 0, 0],
"0.3333": [0, 0, 0],
"0.375": [0, 1, 0],
"0.4167": [0, 0, 0]
"0.4583": [0, 0, 0]
}
},
"left_leg4": {
"rotation": {
"0.0": [0, 2.5, 0],
"0.1667": [32.5, 2.5, 0],
"0.0833": [52.5, 2.5, 0],
"0.2083": [25, 2.5, 0],
"0.3333": [25, 2.5, 0],
"0.4167": [25, 2.5, 0],
"0.4583": [25, 2.5, 0],
"0.625": [25, 2.5, 0],
"1.0": [0, 2.5, 0]
},
"position": {
"0.0417": [0, 0, 0],
"0.0833": [0, 1, 0],
"0.125": [0, 0, 0],
"0.1667": [0, 1, 0],
"0.2083": [0, 0, 0],
"0.3333": [0, 0, 0],
"0.375": [0, 1, 0],
"0.4167": [0, 0, 0]
"0.4583": [0, 0, 0]
}
},
"right_leg": {
Expand Down Expand Up @@ -1991,7 +2002,8 @@
"right_arm": {
"rotation": {
"0.0": [0, 0, 15],
"0.3333": [0, -15, 15],
"0.25": [5.23619, -14.0761, -5.6469],
"0.3333": [5.23619, -14.0761, -5.6469],
"0.375": [8.49801, 28.1446, 19.82337],
"0.4167": [62.74697, 77.11328, 86.92001],
"0.625": [29.46415, 66.22909, 52.11227],
Expand Down
62 changes: 28 additions & 34 deletions animations/pokemon/zekrom.animation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"format_version": "1.8.0",
"animations": {
"animation.zekrom.blink": {
"animation_length": 0.29167,
"animation_length": 0.2917,
"bones": {
"eyes": {
"scale": {
Expand All @@ -18,7 +18,7 @@
"animation_length": 2,
"bones": {
"zekrom": {
"rotation": [0, 12.5, 0],
"rotation": [0, 4, 0],
"position": [0, "-0.3+math.cos(query.anim_time*180)*0.2", 0]
},
"neck": {
Expand Down Expand Up @@ -105,7 +105,7 @@
},
"animation.zekrom.walking": {
"loop": true,
"animation_length": 1.79167,
"animation_length": 1.7917,
"bones": {
"zekrom": {
"position": {
Expand Down Expand Up @@ -236,7 +236,7 @@
"lerp_mode": "catmullrom"
}
},
"position": [0, 1, 0]
"position": [0, "1+math.cos(query.anim_time*200.926*2)*1", 0]
},
"right_arm": {
"rotation": {
Expand Down Expand Up @@ -465,7 +465,7 @@
"lerp_mode": "catmullrom"
}
},
"position": [0, 2, 1]
"position": [0, "2+math.cos(query.anim_time*200.926*2)*1", 1]
},
"tail": {
"rotation": [7.5, 0, 0]
Expand Down Expand Up @@ -534,7 +534,7 @@
"animation_length": 2,
"bones": {
"zekrom": {
"rotation": [0, 12.5, 0],
"rotation": [0, 4, 0],
"position": [0, "19-math.cos(query.anim_time*180)*1.5", 0]
},
"neck": {
Expand Down Expand Up @@ -697,7 +697,7 @@
},
"animation.zekrom.water_idle": {
"loop": true,
"animation_length": 1.33333,
"animation_length": 1.3333,
"bones": {
"mewtwo": {
"position": {
Expand Down Expand Up @@ -1156,7 +1156,7 @@
"animation_length": 2,
"bones": {
"zekrom": {
"rotation": [0, 12.5, 0],
"rotation": [0, 4, 0],
"position": [0, "-0.3+math.cos(query.anim_time*180)*0.2", 0]
},
"neck": {
Expand Down Expand Up @@ -1331,13 +1331,13 @@
},
"animation.zekrom.faint": {
"loop": "hold_on_last_frame",
"animation_length": 2.83333,
"animation_length": 2.8333,
"bones": {
"zekrom": {
"rotation": {
"0.0": [0, 12.5, 0],
"1.875": [0, 12.5, 0],
"2.25": [87.5, 12.5, 0]
"0.0": [0, 4, 0],
"1.875": [0, 4, 0],
"2.25": [87.5, 4, 0]
},
"position": {
"0.0": [0, -0.3, 0],
Expand Down Expand Up @@ -1436,7 +1436,7 @@
"0.0": [0, 1, -2.3],
"0.25": [0, 1, 0],
"0.75": [0, 1, 0],
"1.2917": [0, 1, -2.3]
"1.2917": [1, 1, -2.3]
}
},
"left_arm2": {
Expand Down Expand Up @@ -1466,7 +1466,7 @@
"0.0": [0, 1, -2.4],
"0.25": [0, 1, 0],
"0.75": [0, 1, 0],
"1.2917": [0, 1, -2.3]
"1.2917": [-1, 1, -2.3]
}
},
"right_arm2": {
Expand Down Expand Up @@ -1575,26 +1575,19 @@
},
"animation.zekrom.attack": {
"loop": "hold_on_last_frame",
"animation_length": 1.33333,
"animation_length": 1.3333,
"bones": {
"zekrom": {
"rotation": {
"0.0": [0, 12.5, 0],
"0.375": [17.5, 12.5, 0],
"1.3333": [0, 12.5, 0]
"0.0": [0, 4, 0],
"0.375": [17.5, 4, 0],
"1.3333": [0, 4, 0]
},
"position": {
"0.0": [0, -0.3, 0],
"0.125": [0, -0.3, -3.67],
"0.1667": [0, 0.7, -4.89],
"0.2083": [0, -0.3, -6.11],
"0.25": [0, 0.7, -7.33],
"0.2917": [0, -0.3, -8.55],
"0.3333": [0, 1.7, -9.77],
"0.375": [0, -0.3, -11],
"0.5": [0, -0.3, -21],
"0.5417": [0, 2.7, -21],
"0.5833": [0, -0.3, -21],
"0.4583": [0, -0.3, -21],
"0.5": [0, 4, -21],
"0.5417": [0, -0.3, -21],
"0.75": [0, -0.3, -21],
"1.3333": [0, -0.3, 0]
}
Expand Down Expand Up @@ -1659,7 +1652,7 @@
"left_arm": {
"rotation": {
"0.0": [0, 15, 32.5],
"0.375": [-59.74463, -4.03012, 15.82733],
"0.375": [-61.53134, -12.13581, 5.47159],
"0.5": [25.30252, 26.03928, 66.85753],
"0.75": [25.30252, 26.03928, 66.85753],
"1.3333": [0, 15, 32.5]
Expand Down Expand Up @@ -1693,7 +1686,7 @@
"right_arm": {
"rotation": {
"0.0": [0, 0, -40],
"0.375": [-59.74463, 4.03012, -15.82733],
"0.375": [-61.53134, 12.13581, -5.47159],
"0.5": [25.30252, -26.03928, -66.85753],
"0.75": [25.30252, -26.03928, -66.85753],
"1.3333": [0, 0, -40]
Expand Down Expand Up @@ -1762,9 +1755,9 @@
"right_leg2": {
"rotation": {
"0.0": [15, 0, 0],
"0.25": [-25.68, 0, 0],
"0.375": [-46.77, 0, 0],
"0.4583": [-27.5, 0, 0],
"0.1667": [-40.68, 0, 0],
"0.3333": [-74.27, 0, 0],
"0.5": [-27.5, 0, 0],
"0.75": [-27.5, 0, 0],
"1.0417": [-13.75, 0, 0],
"1.3333": [15, 0, 0]
Expand Down Expand Up @@ -1798,7 +1791,8 @@
"right_leg5": {
"rotation": {
"0.0": [-17.5, 0, 0],
"0.4583": [7.5, 0, 0],
"0.3333": [16.25, 0, 0],
"0.5": [7.5, 0, 0],
"0.75": [12.5, 0, 0],
"1.0417": [-20, 0, 0],
"1.3333": [-17.5, 0, 0]
Expand Down
0 models/entity/pokemon/zekrom.geo.json → entity/pokemon/zekrom.geo.json
View file
File renamed without changes.
Loading

0 comments on commit 491c373

Please sign in to comment.