mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-10-26 17:16:25 -04:00
Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 ewwww
|
f14de9ab58 | ||
|
ewwww
|
8a1c846c2c | ||
 Kenji_64
|
a1b930a21f | ||
|
Kenji_64
|
7728ff3892 | ||
|
Kenji_64
|
236b98fa78 | ||
|
Kenji_64
|
ac61e0d4d0 | ||
|
Kenji_64
|
d8956fd66f | ||
|
ewwww
|
50a5a78dd4 | ||
|
ewwww
|
76c2654399 |
@@ -8,8 +8,16 @@
|
||||
### Pokémon Added
|
||||
|
||||
### Model updates for the following Pokémon
|
||||
- Froakie
|
||||
- Frogadier
|
||||
- Greninja
|
||||
(They have eyelids now.)
|
||||
|
||||
### Animation updates for the following Pokémon
|
||||
- Froakie
|
||||
- Frogadier
|
||||
- Greninja
|
||||
(They can blink now.)
|
||||
|
||||
### Changes
|
||||
- Reworked spawn presets and added structure tags for spawns
|
||||
@@ -26,6 +34,7 @@
|
||||
- Added `q.target_fainted` function to move action effects that checks if any opponents fainted from the move.
|
||||
|
||||
### Particles
|
||||
- Updated Water shuriken to account for new `q.target_fainted` function
|
||||
|
||||
#### New Move Animations
|
||||
|
||||
|
||||
+1
-1
@@ -64,7 +64,7 @@
|
||||
"rotation": "math.random_integer(0,3)*90"
|
||||
},
|
||||
"minecraft:particle_motion_parametric": {
|
||||
"relative_position": ["-(v.target_deltax+((v.particle_random_1-0.5)*2))*(v.particle_age / v.particle_lifetime)", "(v.target_deltay+((v.particle_random_2-0.5)*2))*(v.particle_age / v.particle_lifetime)", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
|
||||
"relative_position": ["-(v.target_deltax+((v.particle_random_1-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "(v.target_deltay+((v.particle_random_2-0.5)*1.33))*(v.particle_age / v.particle_lifetime)", "-v.target_deltaz*(v.particle_age / v.particle_lifetime)"]
|
||||
},
|
||||
"minecraft:particle_appearance_billboard": {
|
||||
"size": ["0.4*v.rsize", "0.4*v.rsize"],
|
||||
|
||||
+195
-273
File diff suppressed because it is too large
Load Diff
+938
-184
File diff suppressed because it is too large
Load Diff
+594
-321
File diff suppressed because it is too large
Load Diff
+1428
-369
File diff suppressed because it is too large
Load Diff
+16
@@ -227,6 +227,14 @@
|
||||
{"origin": [3.1, 20.8, -0.84], "size": [2, 1, 1], "inflate": 0.1, "uv": [60, 42]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eyelid_closed_left",
|
||||
"parent": "head_left",
|
||||
"pivot": [3.6, 19.7, -0.91],
|
||||
"cubes": [
|
||||
{"origin": [2.1, 17.2, -0.66], "size": [3, 5, 1], "inflate": 0.25, "uv": [98, 2]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "face_ditto_left",
|
||||
"parent": "head_left",
|
||||
@@ -332,6 +340,14 @@
|
||||
{"origin": [-5.1, 20.8, -0.84], "size": [2, 1, 1], "inflate": 0.1, "uv": [51, 42], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eyelid_closed_right",
|
||||
"parent": "head_right",
|
||||
"pivot": [-3.6, 19.7, -0.91],
|
||||
"cubes": [
|
||||
{"origin": [-5.1, 17.2, -0.66], "size": [3, 5, 1], "inflate": 0.25, "uv": [89, 2], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "face_ditto_right",
|
||||
"parent": "head_right",
|
||||
|
||||
+193
-177
@@ -134,229 +134,114 @@
|
||||
"jaw2": [0, 27, -7.35]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "head_right",
|
||||
"parent": "head_angle",
|
||||
"pivot": [-3.525, 31, 0.25],
|
||||
"rotation": [5, 0, 0],
|
||||
"cubes": [
|
||||
{"origin": [-4.525, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 11]},
|
||||
{"origin": [-3.625, 31.5, 0.25], "size": [0, 3, 5], "uv": [52, 55]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_eye_right",
|
||||
"parent": "head_right",
|
||||
"pivot": [-4.5, 31, -2.5],
|
||||
"rotation": [0, 90, 0],
|
||||
"locators": {
|
||||
"eye1": [-4.5, 31, -2.5]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "eye_right",
|
||||
"parent": "head_right",
|
||||
"pivot": [-4.525, 31.35, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.525, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [66, 2], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_neutral_right",
|
||||
"parent": "eye_right",
|
||||
"pivot": [-4.525, 32.85095, -2.27179],
|
||||
"cubes": [
|
||||
{"origin": [-4.505, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 12], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_angry_right",
|
||||
"parent": "eye_right",
|
||||
"pivot": [-4.435, 32.1, -2.5],
|
||||
"cubes": [
|
||||
{"origin": [-4.405, 30.85, -4.25], "size": [1, 3, 4], "inflate": 0.05, "uv": [66, 26], "mirror": true},
|
||||
{"origin": [-4.44, 31.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [73, 27], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_sad_right",
|
||||
"parent": "eye_right",
|
||||
"pivot": [-4.435, 32.85, -2.5],
|
||||
"cubes": [
|
||||
{"origin": [-4.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 19], "mirror": true},
|
||||
{"origin": [-4.44, 32.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [73, 20], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pupil_right",
|
||||
"parent": "eye_right",
|
||||
"pivot": [-4.525, 30.85095, -3.02179],
|
||||
"cubes": [
|
||||
{"origin": [-4.525, 29.35, -4.04], "size": [1, 3, 2], "inflate": 0.02, "uv": [73, 0], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pupil_right2",
|
||||
"parent": "pupil_right",
|
||||
"pivot": [-4.55, 31.35095, -3.02179],
|
||||
"cubes": [
|
||||
{"origin": [-4.55, 30.35, -3.55], "size": [1, 2, 1], "uv": [84, 2], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eyelid_right",
|
||||
"parent": "head_right",
|
||||
"pivot": [-3.925, 31.35095, -2.27179],
|
||||
"cubes": [
|
||||
{"origin": [-4.425, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [77, 2], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pupil_eyelid_right",
|
||||
"parent": "eyelid_right",
|
||||
"pivot": [-4.425, 30.80095, -2.27179],
|
||||
"cubes": [
|
||||
{"origin": [-4.435, 30.3, -3.75], "size": [1, 1, 3], "inflate": 0.01, "uv": [77, 14], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eyelid_right2",
|
||||
"parent": "eyelid_right",
|
||||
"pivot": [-3.925, 32.85095, -2.27179],
|
||||
"cubes": [
|
||||
{"origin": [-4.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [66, 12], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pupil_happy_right",
|
||||
"parent": "eyelid_right",
|
||||
"pivot": [-4.325, 30.80095, -2.27179],
|
||||
"cubes": [
|
||||
{"origin": [-4.325, 30.30095, -3.77179], "size": [1, 2, 3], "inflate": 0.05, "uv": [77, 20], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "face_ditto_right",
|
||||
"parent": "head_right",
|
||||
"pivot": [-4.435, 32, -2.25]
|
||||
},
|
||||
{
|
||||
"name": "eye_ditto_right",
|
||||
"parent": "face_ditto_right",
|
||||
"pivot": [-4.435, 32, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [113, 1]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_closed_ditto_right",
|
||||
"parent": "face_ditto_right",
|
||||
"pivot": [-4.335, 32, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [112, 2]},
|
||||
{"origin": [-4.345, 32, -2.75], "size": [0, 1, 1], "uv": [113, 5]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "head_left",
|
||||
"parent": "head_angle",
|
||||
"pivot": [3.525, 31, 0.25],
|
||||
"pivot": [3.53, 31, 0.25],
|
||||
"rotation": [5, 0, 0],
|
||||
"cubes": [
|
||||
{"origin": [2.525, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 21], "mirror": true},
|
||||
{"origin": [3.625, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55], "mirror": true}
|
||||
{"origin": [2.53, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 21], "mirror": true},
|
||||
{"origin": [3.63, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_eye_left",
|
||||
"parent": "head_left",
|
||||
"pivot": [4.5, 31, -2.5],
|
||||
"rotation": [0, -90, 0],
|
||||
"locators": {
|
||||
"eye2": [4.5, 31, -2.5]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "eye_left",
|
||||
"parent": "head_left",
|
||||
"pivot": [4.525, 31.35, -2.25],
|
||||
"pivot": [4.53, 31.5, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [3.525, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [88, 2]}
|
||||
{"origin": [3.54, 29, -4.25], "size": [1, 5, 4], "uv": [88, 2]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_neutral_left",
|
||||
"parent": "eye_left",
|
||||
"pivot": [4.525, 32.85095, -2.27179],
|
||||
"pivot": [4.54, 33, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [3.505, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 12]}
|
||||
{"origin": [3.54, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 12]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_angry_left",
|
||||
"parent": "eye_left",
|
||||
"pivot": [4.435, 32.1, -2.5],
|
||||
"pivot": [4.44, 32.5, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [3.405, 30.85, -4.25], "size": [1, 3, 4], "inflate": 0.05, "uv": [88, 26]},
|
||||
{"origin": [3.44, 31.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [95, 27]}
|
||||
{"origin": [3.44, 31, -4.25], "size": [1, 3, 4], "inflate": 0.021, "uv": [88, 26]},
|
||||
{"origin": [3.44, 31.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [95, 27]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_sad_left",
|
||||
"parent": "eye_left",
|
||||
"pivot": [4.435, 32.85, -2.5],
|
||||
"pivot": [4.43, 33, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [3.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 19]},
|
||||
{"origin": [3.44, 32.35, -3.27], "size": [1, 1, 1], "inflate": 0.02, "uv": [95, 20]}
|
||||
{"origin": [3.44, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 19]},
|
||||
{"origin": [3.44, 32.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [95, 20]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pupil_left",
|
||||
"parent": "eye_left",
|
||||
"pivot": [4.525, 30.85095, -3.02179],
|
||||
"pivot": [4.55, 31, -3.05],
|
||||
"cubes": [
|
||||
{"origin": [3.525, 29.35, -4.04], "size": [1, 3, 2], "inflate": 0.02, "uv": [95, 0]}
|
||||
{"origin": [3.55, 29.5, -4.05], "size": [1, 3, 2], "uv": [95, 0]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pupil_left2",
|
||||
"name": "eye_shine_left",
|
||||
"parent": "pupil_left",
|
||||
"pivot": [4.55, 31.35095, -3.02179],
|
||||
"pivot": [4.55, 31.5, -3.05],
|
||||
"cubes": [
|
||||
{"origin": [3.55, 30.35, -3.55], "size": [1, 2, 1], "uv": [106, 2]}
|
||||
{"origin": [3.56, 30.5, -3.55], "size": [1, 2, 1], "uv": [106, 2]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "open_eye_left",
|
||||
"parent": "head_left",
|
||||
"pivot": [4.44, 31.5, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [3.44, 29, -4.25], "size": [1, 5, 4], "uv": [99, 2]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "open_pupil_left",
|
||||
"parent": "open_eye_left",
|
||||
"pivot": [4.45, 31.5, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [3.45, 31, -3.75], "size": [1, 1, 3], "uv": [99, 14]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "open_neutral_left",
|
||||
"parent": "open_eye_left",
|
||||
"pivot": [4.34, 33, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [3.34, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [88, 12]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "open_happy_left",
|
||||
"parent": "open_eye_left",
|
||||
"pivot": [4.35, 32, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [3.35, 31, -3.75], "size": [1, 2, 3], "uv": [99, 20]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eyelid_left",
|
||||
"parent": "head_left",
|
||||
"pivot": [3.925, 31.35095, -2.27179],
|
||||
"pivot": [4.44, 31.5, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [3.425, 28.85, -4.25], "size": [1, 5, 4], "inflate": 0.01, "uv": [99, 2]}
|
||||
{"origin": [3.44, 29, -4.25], "size": [1, 5, 4], "inflate": 0.022, "uv": [99, 26]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pupil_eyelid_left",
|
||||
"parent": "eyelid_left",
|
||||
"pivot": [4.425, 30.80095, -2.27179],
|
||||
"cubes": [
|
||||
{"origin": [3.435, 30.3, -3.75], "size": [1, 1, 3], "inflate": 0.01, "uv": [99, 14]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eyelid_left2",
|
||||
"parent": "eyelid_left",
|
||||
"pivot": [3.925, 32.85095, -2.27179],
|
||||
"cubes": [
|
||||
{"origin": [3.405, 31.85, -4.25], "size": [1, 2, 4], "inflate": 0.05, "uv": [88, 12]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pupil_happy_left",
|
||||
"parent": "eyelid_left",
|
||||
"pivot": [4.325, 30.80095, -2.27179],
|
||||
"cubes": [
|
||||
{"origin": [3.325, 30.30095, -3.77179], "size": [1, 2, 3], "inflate": 0.05, "uv": [99, 20]}
|
||||
]
|
||||
"name": "locator_eye_left",
|
||||
"parent": "head_left",
|
||||
"pivot": [4.54, 31, -2.46],
|
||||
"rotation": [0, -90, 0],
|
||||
"locators": {
|
||||
"eye2": [4.54, 31, -2.46]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "face_ditto_left",
|
||||
@@ -368,7 +253,7 @@
|
||||
"parent": "face_ditto_left",
|
||||
"pivot": [4.435, 32, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [118, 1], "mirror": true}
|
||||
{"origin": [4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [113, 1]}
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -376,8 +261,139 @@
|
||||
"parent": "face_ditto_left",
|
||||
"pivot": [4.335, 32, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [117, 2], "mirror": true},
|
||||
{"origin": [4.345, 32, -2.75], "size": [0, 1, 1], "uv": [118, 5], "mirror": true}
|
||||
{"origin": [4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [112, 2]},
|
||||
{"origin": [4.345, 32, -2.75], "size": [0, 1, 1], "uv": [113, 5]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "head_right",
|
||||
"parent": "head_angle",
|
||||
"pivot": [-3.53, 31, 0.25],
|
||||
"rotation": [5, 0, 0],
|
||||
"cubes": [
|
||||
{"origin": [-4.53, 29.5, -4.75], "size": [2, 5, 5], "uv": [51, 11]},
|
||||
{"origin": [-3.63, 31.5, 0.25], "size": [0, 3, 5], "uv": [40, 55]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_right",
|
||||
"parent": "head_right",
|
||||
"pivot": [-4.53, 31.5, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.54, 29, -4.25], "size": [1, 5, 4], "uv": [66, 2], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_neutral_right",
|
||||
"parent": "eye_right",
|
||||
"pivot": [-4.54, 33, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.54, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 12], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_angry_right",
|
||||
"parent": "eye_right",
|
||||
"pivot": [-4.44, 32.5, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.44, 31, -4.25], "size": [1, 3, 4], "inflate": 0.021, "uv": [66, 26], "mirror": true},
|
||||
{"origin": [-4.44, 31.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [73, 27], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_sad_right",
|
||||
"parent": "eye_right",
|
||||
"pivot": [-4.43, 33, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.44, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 19], "mirror": true},
|
||||
{"origin": [-4.44, 32.5, -3.25], "size": [1, 1, 1], "inflate": 0.03, "uv": [73, 20], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pupil_right",
|
||||
"parent": "eye_right",
|
||||
"pivot": [-4.55, 31, -3.05],
|
||||
"cubes": [
|
||||
{"origin": [-4.55, 29.5, -4.05], "size": [1, 3, 2], "uv": [73, 0], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_shine_right",
|
||||
"parent": "pupil_right",
|
||||
"pivot": [-4.55, 31.5, -3.05],
|
||||
"cubes": [
|
||||
{"origin": [-4.56, 30.5, -3.55], "size": [1, 2, 1], "uv": [84, 2], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "open_eye_right",
|
||||
"parent": "head_right",
|
||||
"pivot": [-4.44, 31.5, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.44, 29, -4.25], "size": [1, 5, 4], "uv": [77, 2], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "open_pupil_right",
|
||||
"parent": "open_eye_right",
|
||||
"pivot": [-4.45, 31.5, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.45, 31, -3.75], "size": [1, 1, 3], "uv": [77, 14], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "open_neutral_right",
|
||||
"parent": "open_eye_right",
|
||||
"pivot": [-4.34, 33, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.34, 32, -4.25], "size": [1, 2, 4], "inflate": 0.021, "uv": [66, 12], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "open_happy_right",
|
||||
"parent": "open_eye_right",
|
||||
"pivot": [-4.35, 32, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.35, 31, -3.75], "size": [1, 2, 3], "uv": [77, 20], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eyelid_right",
|
||||
"parent": "head_right",
|
||||
"pivot": [-4.44, 31.5, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.44, 29, -4.25], "size": [1, 5, 4], "inflate": 0.022, "uv": [77, 26], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "locator_eye_right",
|
||||
"parent": "head_right",
|
||||
"pivot": [-4.54, 31, -2.46],
|
||||
"rotation": [0, 90, 0],
|
||||
"locators": {
|
||||
"eye1": [-4.54, 31, -2.46]
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "face_ditto_right",
|
||||
"parent": "head_right",
|
||||
"pivot": [-4.435, 32, -2.25]
|
||||
},
|
||||
{
|
||||
"name": "eye_ditto_right",
|
||||
"parent": "face_ditto_right",
|
||||
"pivot": [-4.435, 32, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.435, 31.5, -2.75], "size": [0, 1, 1], "uv": [118, 1], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_closed_ditto_right",
|
||||
"parent": "face_ditto_right",
|
||||
"pivot": [-4.335, 32, -2.25],
|
||||
"cubes": [
|
||||
{"origin": [-4.335, 31.5, -3.25], "size": [0, 1, 2], "uv": [117, 2], "mirror": true},
|
||||
{"origin": [-4.345, 32, -2.75], "size": [0, 1, 1], "uv": [118, 5], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
+22
-9
@@ -830,11 +830,6 @@
|
||||
{"origin": [-3.5, 38.3, 33.75], "size": [7, 5, 9], "uv": [106, 33]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "tongue6",
|
||||
"parent": "tongue5",
|
||||
"pivot": [0, 40.8, 40.5]
|
||||
},
|
||||
{
|
||||
"name": "muzzle",
|
||||
"parent": "head_angle",
|
||||
@@ -913,6 +908,15 @@
|
||||
{"origin": [-0.1, 44.3, -8.11], "size": [4, 2, 1], "uv": [87, 72]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eyelid_base_left",
|
||||
"parent": "eye_left_base",
|
||||
"pivot": [1.9, 43.9, -8.11],
|
||||
"cubes": [
|
||||
{"origin": [-0.1, 45.3, -8.11], "size": [4, 1, 1], "uv": [87, 76]},
|
||||
{"origin": [-0.1, 41.9, -8.11], "size": [4, 4, 1], "uv": [87, 79]}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_left",
|
||||
"parent": "eye_left_base",
|
||||
@@ -950,7 +954,7 @@
|
||||
"parent": "eye_left",
|
||||
"pivot": [1.9, 44.2, -8.07],
|
||||
"cubes": [
|
||||
{"origin": [0.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [87, 76]}
|
||||
{"origin": [0.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [87, 85]}
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -958,7 +962,7 @@
|
||||
"parent": "eye_left",
|
||||
"pivot": [1.9, 44.2, -8.07],
|
||||
"cubes": [
|
||||
{"origin": [0.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [87, 79]}
|
||||
{"origin": [0.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [87, 88]}
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -995,6 +999,15 @@
|
||||
{"origin": [-3.9, 44.3, -8.11], "size": [4, 2, 1], "uv": [76, 72], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eyelid_base_right",
|
||||
"parent": "eye_right_base",
|
||||
"pivot": [-1.9, 43.9, -8.11],
|
||||
"cubes": [
|
||||
{"origin": [-3.9, 45.3, -8.11], "size": [4, 1, 1], "uv": [76, 76], "mirror": true},
|
||||
{"origin": [-3.9, 41.9, -8.11], "size": [4, 4, 1], "uv": [76, 79], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "eye_right",
|
||||
"parent": "eye_right_base",
|
||||
@@ -1032,7 +1045,7 @@
|
||||
"parent": "eye_right",
|
||||
"pivot": [-1.9, 44.2, -8.07],
|
||||
"cubes": [
|
||||
{"origin": [-3.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [76, 76], "mirror": true}
|
||||
{"origin": [-3.4, 43.7, -8.07], "size": [3, 1, 1], "inflate": 0.02, "uv": [76, 85], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
@@ -1040,7 +1053,7 @@
|
||||
"parent": "eye_right",
|
||||
"pivot": [-1.9, 44.2, -8.07],
|
||||
"cubes": [
|
||||
{"origin": [-3.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [76, 79], "mirror": true}
|
||||
{"origin": [-3.4, 42.95, -8.07], "size": [3, 2, 1], "inflate": 0.02, "uv": [76, 88], "mirror": true}
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
+12
-1
@@ -8,7 +8,6 @@
|
||||
"poses": {
|
||||
"standing": {
|
||||
"poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
|
||||
"isBattle": false,
|
||||
"animations": [
|
||||
"q.look('neck', 1, 1, 70, -10, 20, -20)",
|
||||
"q.look('head_ai')",
|
||||
@@ -35,6 +34,9 @@
|
||||
"part": "wing_closed_left",
|
||||
"isVisible": true
|
||||
}
|
||||
],
|
||||
"quirks": [
|
||||
"q.bedrock_quirk('fearow', 'blink')"
|
||||
]
|
||||
},
|
||||
"walking": {
|
||||
@@ -65,6 +67,9 @@
|
||||
"part": "wing_closed_left",
|
||||
"isVisible": true
|
||||
}
|
||||
],
|
||||
"quirks": [
|
||||
"q.bedrock_quirk('fearow', 'blink')"
|
||||
]
|
||||
},
|
||||
"hover": {
|
||||
@@ -96,6 +101,9 @@
|
||||
"part": "wing_closed_left",
|
||||
"isVisible": false
|
||||
}
|
||||
],
|
||||
"quirks": [
|
||||
"q.bedrock_quirk('fearow', 'blink')"
|
||||
]
|
||||
},
|
||||
"fly": {
|
||||
@@ -128,6 +136,9 @@
|
||||
"part": "wing_closed_left",
|
||||
"isVisible": false
|
||||
}
|
||||
],
|
||||
"quirks": [
|
||||
"q.bedrock_quirk('fearow', 'blink')"
|
||||
]
|
||||
},
|
||||
"sleep": {
|
||||
|
||||
+4
-4
@@ -27,7 +27,7 @@
|
||||
"q.look('head_ai')",
|
||||
"q.bedrock('froakie', 'ground_idle')"
|
||||
],
|
||||
"quirks": []
|
||||
"quirks": ["q.bedrock_quirk('froakie', 'blink')"]
|
||||
},
|
||||
"walking": {
|
||||
"poseTypes": ["WALK"],
|
||||
@@ -36,7 +36,7 @@
|
||||
"q.look('head_ai')",
|
||||
"q.bedrock('froakie', 'ground_walk')"
|
||||
],
|
||||
"quirks": []
|
||||
"quirks": ["q.bedrock_quirk('froakie', 'blink')"]
|
||||
},
|
||||
"swimming": {
|
||||
"poseTypes": ["WALK","SWIM"],
|
||||
@@ -46,7 +46,7 @@
|
||||
"q.look('head_ai')",
|
||||
"q.bedrock('froakie', 'water_swim')"
|
||||
],
|
||||
"quirks": []
|
||||
"quirks": ["q.bedrock_quirk('froakie', 'blink')"]
|
||||
},
|
||||
"float": {
|
||||
"poseTypes": ["STAND","FLOAT"],
|
||||
@@ -55,7 +55,7 @@
|
||||
"q.look('head_ai')",
|
||||
"q.bedrock('froakie', 'water_idle')"
|
||||
],
|
||||
"quirks": []
|
||||
"quirks": ["q.bedrock_quirk('froakie', 'blink')"]
|
||||
},
|
||||
"sleep": {
|
||||
"poseTypes": ["SLEEP"],
|
||||
|
||||
+4
-4
@@ -27,7 +27,7 @@
|
||||
"q.look('head_ai', 1, 1, 5, -45, 45, -45)",
|
||||
"q.bedrock('frogadier', 'ground_idle')"
|
||||
],
|
||||
"quirks": []
|
||||
"quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
|
||||
},
|
||||
"walking": {
|
||||
"poseTypes": ["WALK"],
|
||||
@@ -36,7 +36,7 @@
|
||||
"q.look('head_ai', 1, 1, 0, -45, 45, -45)",
|
||||
"q.bedrock('frogadier', 'ground_walk')"
|
||||
],
|
||||
"quirks": []
|
||||
"quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
|
||||
},
|
||||
"swimming": {
|
||||
"poseTypes": ["WALK","SWIM"],
|
||||
@@ -46,7 +46,7 @@
|
||||
"q.look('head_ai')",
|
||||
"q.bedrock('frogadier', 'water_swim')"
|
||||
],
|
||||
"quirks": []
|
||||
"quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
|
||||
},
|
||||
"float": {
|
||||
"poseTypes": ["STAND","FLOAT"],
|
||||
@@ -55,7 +55,7 @@
|
||||
"q.look('head_ai')",
|
||||
"q.bedrock('frogadier', 'water_idle')"
|
||||
],
|
||||
"quirks": []
|
||||
"quirks": ["q.bedrock_quirk('frogadier', 'blink')"]
|
||||
},
|
||||
"sleep": {
|
||||
"poseTypes": ["SLEEP"],
|
||||
|
||||
+7
-7
@@ -66,7 +66,7 @@
|
||||
"q.bedrock('greninja', math.random(0, 1) < 0.4 ? 'ground_idle_alt' : 'ground_idle')"
|
||||
],
|
||||
"quirks": [
|
||||
"q.bedrock_quirk('greninja', q.array('quirk_look_left', 'quirk_look_right'), 8, 30, 1)"
|
||||
"q.bedrock_quirk('greninja', 'blink')","q.bedrock_quirk('greninja', q.array('quirk_look_left', 'quirk_look_right'), 8, 30, 1)"
|
||||
]
|
||||
},
|
||||
"walking": {
|
||||
@@ -78,7 +78,7 @@
|
||||
"q.look('tongue1', -1, 1, 70, -45, 0, 0)",
|
||||
"q.bedrock('greninja', 'ground_walk')"
|
||||
],
|
||||
"quirks": []
|
||||
"quirks": ["q.bedrock_quirk('greninja', 'blink')"]
|
||||
},
|
||||
"running": {
|
||||
"poseTypes": ["WALK"],
|
||||
@@ -89,7 +89,7 @@
|
||||
"q.look('tongue1', -1, 1, 70, -45, 0, 0)",
|
||||
"q.bedrock('greninja', 'ground_run')"
|
||||
],
|
||||
"quirks": []
|
||||
"quirks": ["q.bedrock_quirk('greninja', 'blink')"]
|
||||
},
|
||||
"surface-swimming": {
|
||||
"poseTypes": ["WALK","SWIM"],
|
||||
@@ -101,7 +101,7 @@
|
||||
"q.look('tongue1', -1, 1, 70, -45, 0, 0)",
|
||||
"q.bedrock('greninja', 'water_swim')"
|
||||
],
|
||||
"quirks": [],
|
||||
"quirks": ["q.bedrock_quirk('greninja', 'blink')"],
|
||||
"transformedParts": [
|
||||
{
|
||||
"part": "body",
|
||||
@@ -118,7 +118,7 @@
|
||||
"q.look('tongue1', -1, 1, 70, -45, 0, 0)",
|
||||
"q.bedrock('greninja', 'water_idle')"
|
||||
],
|
||||
"quirks": [],
|
||||
"quirks": ["q.bedrock_quirk('greninja', 'blink')"],
|
||||
"transformedParts": [
|
||||
{
|
||||
"part": "body",
|
||||
@@ -136,7 +136,7 @@
|
||||
"q.look('tongue1', -1, 1, 70, -45, 0, 0)",
|
||||
"q.bedrock('greninja', 'water_swim')"
|
||||
],
|
||||
"quirks": [],
|
||||
"quirks": ["q.bedrock_quirk('greninja', 'blink')"],
|
||||
"transformedParts": [
|
||||
{
|
||||
"part": "body",
|
||||
@@ -153,7 +153,7 @@
|
||||
"q.look('tongue1', -1, 1, 70, -45, 0, 0)",
|
||||
"q.bedrock('greninja', 'water_idle')"
|
||||
],
|
||||
"quirks": [],
|
||||
"quirks": ["q.bedrock_quirk('greninja', 'blink')"],
|
||||
"transformedParts": [
|
||||
{
|
||||
"part": "body",
|
||||
|
||||
@@ -383,7 +383,7 @@
|
||||
"item.cobblemon.eject_pack.tooltip_1": "Switches out the holder if any stats are lowered",
|
||||
"item.cobblemon.eject_pack.tooltip_2": "Consumed after use",
|
||||
"item.cobblemon.electric_seed": "Electric Seed",
|
||||
"item.cobblemon.electric_seed.tooltip": "Boosts the holder's Defense in Electric terrain",
|
||||
"item.cobblemon.electric_seed.tooltip": "Boosts the holder's Defense in Electric Terrain",
|
||||
"item.cobblemon.everstone": "Everstone",
|
||||
"item.cobblemon.everstone.tooltip": "Prevents the holder from evolving",
|
||||
"item.cobblemon.eviolite": "Eviolite",
|
||||
@@ -402,7 +402,7 @@
|
||||
"item.cobblemon.focus_sash.tooltip_1": "Prevents the holder from fainting in a single hit",
|
||||
"item.cobblemon.focus_sash.tooltip_2": "Consumed after use",
|
||||
"item.cobblemon.grassy_seed": "Grassy Seed",
|
||||
"item.cobblemon.grassy_seed.tooltip": "Boosts the holder's Defense in Grassy terrain",
|
||||
"item.cobblemon.grassy_seed.tooltip": "Boosts the holder's Defense in Grassy Terrain",
|
||||
"item.cobblemon.grip_claw": "Grip Claw",
|
||||
"item.cobblemon.hard_stone": "Hard Stone",
|
||||
"item.cobblemon.hard_stone.tooltip": "Boosts the power of the holder's Rock-type moves",
|
||||
@@ -507,7 +507,7 @@
|
||||
"item.cobblemon.mirror_herb.tooltip_1": "Allows the holder to mirror an opponent's stat increases to boost its own stats",
|
||||
"item.cobblemon.mirror_herb.tooltip_2": "Consumed after use",
|
||||
"item.cobblemon.misty_seed": "Misty Seed",
|
||||
"item.cobblemon.misty_seed.tooltip": "Boosts the holder's Sp. Def in Misty terrain",
|
||||
"item.cobblemon.misty_seed.tooltip": "Boosts the holder's Sp. Def in Misty Terrain",
|
||||
"item.cobblemon.power_herb": "Power Herb",
|
||||
"item.cobblemon.power_herb.tooltip_1": "Allows the holder to immediately use a move that normally requires a change of turn to charge",
|
||||
"item.cobblemon.power_herb.tooltip_2": "Consumed after use",
|
||||
@@ -535,7 +535,7 @@
|
||||
"item.cobblemon.power_weight": "Power Weight",
|
||||
"item.cobblemon.power_weight.tooltip": "Grants 8 HP EVs when gaining experience in battle",
|
||||
"item.cobblemon.psychic_seed": "Psychic Seed",
|
||||
"item.cobblemon.psychic_seed.tooltip": "Boosts the holder's Sp. Def in Psychic terrain",
|
||||
"item.cobblemon.psychic_seed.tooltip": "Boosts the holder's Sp. Def in Psychic Terrain",
|
||||
"item.cobblemon.flame_orb": "Flame Orb",
|
||||
"item.cobblemon.flame_orb.tooltip": "Burns the holder",
|
||||
"item.cobblemon.smoke_ball": "Smoke Ball",
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 788 B After Width: | Height: | Size: 417 B |
Binary file not shown.
|
Before Width: | Height: | Size: 4.9 KiB After Width: | Height: | Size: 4.9 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 4.7 KiB After Width: | Height: | Size: 4.8 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 5.7 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 5.7 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
BIN
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 4.2 KiB |
@@ -42,7 +42,8 @@
|
||||
},
|
||||
{
|
||||
"type": "pause",
|
||||
"pause": 0.5
|
||||
"condition": "q.target_fainted == false",
|
||||
"pause": 1.25
|
||||
}
|
||||
]
|
||||
}
|
||||
+2
-1
@@ -141,7 +141,8 @@
|
||||
},
|
||||
{
|
||||
"type": "pause",
|
||||
"pause": 0.5
|
||||
"condition": "q.target_fainted == false",
|
||||
"pause": 1.25
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user