mirrors/cobblemon
1
0
Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-10-20 14:16:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'implement_pokemon' into 'main'

Browse Source 
implement_pokemon

See merge request cable-mc/cobblemon!2463
This commit is contained in:
Polymeta
2026-10-09 16:41:24 +00:00
parent d02441a273 90dc489547
commit 63afec184e
17 changed files with 333 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+3
View File
@@ -21,6 +21,8 @@
- Added custom sounds to a bunch of items that can be placed as blocks: liquid bottles, pill bottles, powders and dice.
- New Cosmetic Item for Pikachu: Paper
- Burmy changes its cloak after a battle it took part in, based on the biome: Trash Cloak in the Deep Dark, Nether and End, Plant Cloak in lush biomes such as forests, jungles, plains and swamps, and Sandy Cloak in sandy biomes, beaches and caves.
- The evolution tree can now be viewed on the Pokédex, showing a Pokémon's full family line and what's needed to evolve into each stage.
- Added custom sounds to a bunch of items that can be placed as blocks: liquid bottles, pill bottles, powders and dice.
### Fixes
- Medicinal Leeks can now be eaten when they aren't being planted, matching their food properties.
@@ -126,6 +128,7 @@
- Added TM creative tab
- Recall animation now renders ball in hand with the player arm raised.
- Made regional and Vivillon split-evo locations now mutually exclusive
- Vivillon's patterns are now viewable as forms with form names and unique Pokedex entries displayed.
- Item evolutions now unlock **all** locked evolutions whose requirements are met instead of stopping after the first.
- Exceptions being "forced" evolutions which will continue to stop after the first one
- Removed Mega Drain as a TM
common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0656_froakie/froakie.animation.json
+11 -11
View File
@@ -364,7 +364,7 @@
"bones": {
"body": {
"rotation": [55, 0, 0],
"position": [0, "-8+Math.cos((query.anim_time) * 90 * 2) * 0.2", -1]
"position": [0, "-3+Math.cos((query.anim_time) * 90 * 2) * 0.2", -1]
},
"torso2": {
"rotation": ["-12.5+Math.cos((query.anim_time-0.4) * 90 * 2) * 2", 0, 0]
@@ -426,16 +426,16 @@
"body": {
"rotation": [55, 0, 0],
"position": {
"0.0": [0, "-9+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", -1.5],
"0.25": [0, "-9+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 0.5],
"0.5": [0, "-9+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 3.5],
"0.6667": [0, "-9+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 5.17],
"0.75": [0, "-9+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 5.25],
"0.7917": [0, "-9+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 3.92],
"1.0": [0, "-9+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 1],
"1.2083": [0, "-9+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", -1.25],
"1.375": [0, "-9+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", -1.75],
"1.5": [0, "-9+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", -1.5]
"0.0": [0, "-3+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", -1.5],
"0.25": [0, "-3+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 0.5],
"0.5": [0, "-3+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 3.5],
"0.6667": [0, "-3+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 5.17],
"0.75": [0, "-3+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 5.25],
"0.7917": [0, "-3+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 3.92],
"1.0": [0, "-3+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", 1],
"1.2083": [0, "-3+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", -1.25],
"1.375": [0, "-3+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", -1.75],
"1.5": [0, "-3+Math.cos((query.anim_time) * 90 * (2+2/3)) * 0.2", -1.5]
}
},
"torso2": {
common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0657_frogadier/frogadier.animation.json
+2 -2
View File
@@ -313,7 +313,7 @@
"bones": {
"body": {
"rotation": [47.5, 0, 0],
"position": [0, "-10+Math.cos((query.anim_time) * 90 * 1) * 0.3", 0]
"position": [0, "-6+Math.cos((query.anim_time) * 90 * 1) * 0.3", 0]
},
"torso": {
"rotation": [35, 0, 0],
@@ -426,7 +426,7 @@
"bones": {
"body": {
"rotation": [47.5, 0, 0],
"position": [0, -10, "Math.cos((query.anim_time-0.5) * 90 * (2+2/3)) * 4"]
"position": [0, -6, "Math.cos((query.anim_time-0.5) * 90 * (2+2/3)) * 4"]
},
"torso": {
"rotation": [35, 0, 0],
common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0658_greninja/greninja.animation.json
+1 -1
View File
@@ -1925,7 +1925,7 @@
},
"body": {
"rotation": ["68.5-Math.cos((query.anim_time)*360/1-20)*-3", 0, 0],
"position": [0, "-24+Math.cos((query.anim_time)*360/1-90)*-0.5", "-1+Math.cos((query.anim_time)*360/1-45)*4"]
"position": [0, "Math.cos((query.anim_time)*360/1-90)*-0.5", "-1+Math.cos((query.anim_time)*360/1-45)*4"]
},
"neck": {
"rotation": [-7.5, 0, 0]
common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0222_corsola/corsola.geo.json
+7 -9
View File
@@ -96,13 +96,13 @@
"parent": "head",
"pivot": [0, 6, 0.25],
"cubes": [
{"origin": [-2.4, 4.4, -5.28], "size": [1, 1, 0], "inflate": 0.01, "pivot": [-2, 5, 0], "rotation": [0, 0, -45], "uv": [12, 19]},
{"origin": [-1.75, 5.25, 5.76], "size": [1, 1, 0], "pivot": [-2, 5, 0], "rotation": [0, 0, -45], "uv": [8, 10]},
{"origin": [1.25, 1.25, 5.76], "size": [1, 1, 0], "pivot": [-2, 5, 0], "rotation": [0, 0, -45], "uv": [9, 2]},
{"origin": [-4.51, 6, -2.75], "size": [0, 1, 1], "pivot": [-2, 6.5, -2.25], "rotation": [-45, 0, 0], "uv": [7, 1]},
{"origin": [4.51, 6.75, -2.75], "size": [0, 1, 1], "pivot": [-2, 6.5, -2.25], "rotation": [-45, 0, 0], "uv": [0, 5]},
{"origin": [4.51, 8, 0.5], "size": [0, 1, 1], "pivot": [-2, 6.5, -2.25], "rotation": [-45, 0, 0], "uv": [0, 1]},
{"origin": [-4.51, 6.5, 1.25], "size": [0, 1, 1], "pivot": [-2, 7, 1.75], "rotation": [-45, 0, 0], "uv": [0, 6]}
{"origin": [-2.5, 4.4, -5.28], "size": [1, 1, 0], "uv": [12, 19]},
{"origin": [-2.5, 5.5, 5.76], "size": [1, 1, 0], "uv": [8, 10]},
{"origin": [2.5, 4.5, 5.76], "size": [1, 1, 0], "uv": [9, 2]},
{"origin": [-4.51, 6, -2.75], "size": [0, 1, 1], "uv": [7, 1]},
{"origin": [4.51, 6.5, -2.25], "size": [0, 1, 1], "uv": [0, 5]},
{"origin": [4.51, 5, 0.75], "size": [0, 1, 1], "uv": [0, 1]},
{"origin": [-4.51, 6.5, 1.75], "size": [0, 1, 1], "uv": [0, 6]}
]
},
{
@@ -119,7 +119,6 @@
"name": "eye_right",
"parent": "eyes",
"pivot": [-1.5, 5.75, -5.25],
"rotation": [0, 0, 5],
"cubes": [
{"origin": [-2.5, 6, -5.26], "size": [1, 2, 0], "uv": [8, 19]}
]
@@ -152,7 +151,6 @@
"name": "eye_left",
"parent": "eyes",
"pivot": [1.5, 5.75, -5.25],
"rotation": [0, 0, -5],
"cubes": [
{"origin": [1.5, 6, -5.26], "size": [1, 2, 0], "uv": [8, 8]}
]
common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0439_mimejr/mime_jr.geo.json
+29 -21
View File
@@ -112,7 +112,7 @@
{
"name": "head",
"parent": "neck",
"pivot": [0, 9, -0.25],
"pivot": [0, 8.25, -0.25],
"cubes": [
{"origin": [-4, 7.5, -3.75], "size": [8, 6, 7], "uv": [0, 0]},
{"origin": [-1.25, 9.25, -4.75], "size": [2, 2, 1], "inflate": 0.01, "uv": [23, 1]},
@@ -151,67 +151,75 @@
{
"name": "eye_left",
"parent": "eyes",
"pivot": [2.75, 11, -3.76],
"rotation": [0, 0, -7.5],
"pivot": [2.75, 10.75, -3.76]
},
{
"name": "iris_left",
"parent": "eye_left",
"pivot": [2.75, 10.875, -3.765],
"cubes": [
{"origin": [2, 10, -3.76], "size": [1.5, 2, 0], "uv": [0, 0]}
{"origin": [2, 9.75, -3.76], "size": [1.5, 2, 0], "uv": [0, 0]}
]
},
{
"name": "pupil_left",
"parent": "eye_left",
"pivot": [2.75, 11.25, -3.77],
"parent": "iris_left",
"pivot": [2.75, 11, -3.77],
"cubes": [
{"origin": [2.25, 10.5, -3.77], "size": [1, 1, 0], "uv": [2, 0]}
{"origin": [2.25, 10.25, -3.77], "size": [1, 1, 0], "uv": [2, 0]}
]
},
{
"name": "locator_eye_left",
"parent": "pupil_left",
"pivot": [2.75, 11, -4],
"pivot": [2.75, 10.75, -4],
"locators": {
"eye2": [2.75, 11, -4]
"eye2": [2.75, 10.75, -4]
}
},
{
"name": "eyelid_left",
"parent": "eye_left",
"pivot": [2.75, 11, -3.17],
"pivot": [2.75, 10.75, -3.17],
"cubes": [
{"origin": [1.75, 10, -3.67], "size": [2, 2, 1], "inflate": 0.01, "uv": [1, 3]}
{"origin": [1.75, 9.75, -3.67], "size": [2, 2, 1], "inflate": 0.01, "uv": [1, 3]}
]
},
{
"name": "eye_right",
"parent": "eyes",
"pivot": [-2.75, 11, -3.76],
"rotation": [0, 0, 7.5],
"pivot": [-2.75, 10.75, -3.76]
},
{
"name": "iris_right",
"parent": "eye_right",
"pivot": [-2.75, 10.875, -3.765],
"cubes": [
{"origin": [-3.5, 10, -3.76], "size": [1.5, 2, 0], "uv": [0, 2], "mirror": true}
{"origin": [-3.5, 9.75, -3.76], "size": [1.5, 2, 0], "uv": [0, 2], "mirror": true}
]
},
{
"name": "pupil_right",
"parent": "eye_right",
"pivot": [-2.75, 11.25, -3.77],
"parent": "iris_right",
"pivot": [-2.75, 11, -3.77],
"cubes": [
{"origin": [-3.25, 10.5, -3.77], "size": [1, 1, 0], "uv": [2, 1], "mirror": true}
{"origin": [-3.25, 10.25, -3.77], "size": [1, 1, 0], "uv": [2, 1], "mirror": true}
]
},
{
"name": "locator_eye_right",
"parent": "pupil_right",
"pivot": [-2.75, 11, -4],
"pivot": [-2.75, 10.75, -4],
"locators": {
"eye1": [-2.75, 11, -4]
"eye1": [-2.75, 10.75, -4]
}
},
{
"name": "eyelid_right",
"parent": "eye_right",
"pivot": [-2.75, 11, -3.17],
"pivot": [-2.75, 10.75, -3.17],
"cubes": [
{"origin": [-3.75, 10, -3.67], "size": [2, 2, 1], "inflate": 0.01, "uv": [1, 15], "mirror": true}
{"origin": [-3.75, 9.75, -3.67], "size": [2, 2, 1], "inflate": 0.01, "uv": [1, 15], "mirror": true}
]
},
{
common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0774_minior/minior.geo.json
+5 -15
View File
@@ -247,9 +247,7 @@
"pivot": [0, 8.5, 0],
"cubes": [
{"origin": [-2, 12, -2], "size": [4, 4, 4], "inflate": -0.25, "uv": [31, 2]},
{"origin": [2, 16, 2], "size": [-4, -4, -4], "uv": [17, 30]},
{"origin": [-1, 14.25, -1], "size": [2, 3, 2], "uv": [44, 0]},
{"origin": [1, 17.25, 1], "size": [-2, -1, -2], "inflate": -0.25, "uv": [21, 29]}
{"origin": [-1, 14.25, -1], "size": [2, 3, 2], "uv": [44, 0]}
]
},
{
@@ -267,9 +265,7 @@
"rotation": [0, 0, 67.5],
"cubes": [
{"origin": [-2, 12, -2], "size": [4, 4, 4], "inflate": -0.25, "uv": [67, 2]},
{"origin": [2, 16, 2], "size": [-4, -4, -4], "uv": [49, 30]},
{"origin": [-1, 14.25, -1], "size": [2, 3, 2], "uv": [80, 0]},
{"origin": [1, 17.25, 1], "size": [-2, -1, -2], "inflate": -0.25, "uv": [37, 29]}
{"origin": [-1, 14.25, -1], "size": [2, 3, 2], "uv": [80, 0]}
]
},
{
@@ -279,9 +275,7 @@
"rotation": [0, 0, -67.5],
"cubes": [
{"origin": [-2, 12, -2], "size": [4, 4, 4], "inflate": -0.25, "uv": [49, 2]},
{"origin": [2, 16, 2], "size": [-4, -4, -4], "uv": [33, 30]},
{"origin": [-1, 14.25, -1], "size": [2, 3, 2], "uv": [62, 0]},
{"origin": [1, 17.25, 1], "size": [-2, -1, -2], "inflate": -0.25, "uv": [69, 29]}
{"origin": [-1, 14.25, -1], "size": [2, 3, 2], "uv": [62, 0]}
]
},
{
@@ -299,9 +293,7 @@
"rotation": [0, 0, -137.5],
"cubes": [
{"origin": [-2, 12, -2], "size": [4, 4, 4], "inflate": -0.25, "uv": [85, 2]},
{"origin": [2, 16, 2], "size": [-4, -4, -4], "uv": [81, 30]},
{"origin": [-1, 14.25, -1], "size": [2, 3, 2], "uv": [98, 0]},
{"origin": [1, 17.25, 1], "size": [-2, -1, -2], "inflate": -0.25, "uv": [85, 29]}
{"origin": [-1, 14.25, -1], "size": [2, 3, 2], "uv": [98, 0]}
]
},
{
@@ -311,9 +303,7 @@
"rotation": [0, 0, 137.5],
"cubes": [
{"origin": [-2, 12, -2], "size": [4, 4, 4], "inflate": -0.25, "uv": [103, 2]},
{"origin": [2, 16, 2], "size": [-4, -4, -4], "uv": [65, 30]},
{"origin": [-1, 14.25, -1], "size": [2, 3, 2], "uv": [116, 0]},
{"origin": [1, 17.25, 1], "size": [-2, -1, -2], "inflate": -0.25, "uv": [53, 29]}
{"origin": [-1, 14.25, -1], "size": [2, 3, 2], "uv": [116, 0]}
]
},
{
common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0439_mimejr/mimejr.json
+18 -5
View File
@@ -7,8 +7,9 @@
"poses": {
"standing": {
"poseTypes": ["STAND", "NONE", "FLOAT", "PORTRAIT", "PROFILE"],
"condition": "q.has_entity ? !q.in_air : 1.0",
"animations": [
"q.look('head_ai')",
"q.look('head')",
"q.bedrock('mime_jr', 'ground_idle')"
],
"quirks": [
@@ -19,7 +20,7 @@
"poseTypes": ["WALK", "SWIM"],
"condition": "!q.is_sprinting",
"animations": [
"q.look('head_ai')",
"q.look('head')",
"q.bedrock('mime_jr', 'ground_walk')"
],
"quirks": ["q.bedrock_quirk('mime_jr', 'blink')"]
@@ -28,7 +29,7 @@
"poseTypes": ["WALK", "SWIM"],
"condition": "q.is_sprinting",
"animations": [
"q.look('head_ai')",
"q.look('head')",
"q.bedrock('mime_jr', 'ground_run')"
],
"quirks": ["q.bedrock_quirk('mime_jr', 'blink')"]
@@ -36,21 +37,33 @@
"shoulder_left": {
"poseTypes": ["SHOULDER_LEFT"],
"animations": [
"q.look('head_ai')",
"q.look('head')",
"q.bedrock('mime_jr', 'shoulder_left')"
],
"quirks": [
"q.bedrock_quirk('mime_jr', 'blink')"
],
"transformedParts": [
{
"part": "body",
"position": [0, -0.25, 0]
}
]
},
"shoulder_right": {
"poseTypes": ["SHOULDER_RIGHT"],
"animations": [
"q.look('head_ai')",
"q.look('head')",
"q.bedrock('mime_jr', 'shoulder_right')"
],
"quirks": [
"q.bedrock_quirk('mime_jr', 'blink')"
],
"transformedParts": [
{
"part": "body",
"position": [0, -0.25, 0]
}
]
}
}
common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0656_froakie/froakie.json
+1 -7
View File
@@ -55,13 +55,7 @@
"q.look('head_ai')",
"q.bedrock('froakie', 'water_idle')"
],
"quirks": [],
"transformedParts": [
{
"part": "body",
"position": [0, -5, 0]
}
]
"quirks": []
},
"sleep": {
"poseTypes": ["SLEEP"],
common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0658_greninja/greninja.json
+45 -5
View File
@@ -10,8 +10,26 @@
"recoil": "q.bedrock_stateful('greninja', 'recoil')",
"physical": "q.bedrock_primary('greninja', 'physical', q.curve('symmetrical'))",
"lick": "q.bedrock_primary('greninja', 'physical_tongue', q.curve('symmetrical'))",
"gunkshot": "q.bedrock_primary('greninja', 'physical_tongue', q.curve('symmetrical'))",
"bounce": "q.bedrock_primary('greninja', 'physical_tongue', q.curve('symmetrical'))",
"thief": "q.bedrock_primary('greninja', 'physical_tongue', q.curve('symmetrical'))",
"pound": "q.bedrock_primary('greninja', 'physical_tongue', q.curve('symmetrical'))",
"punch": "q.bedrock_primary('greninja', 'physical_tongue', q.curve('symmetrical'))",
"kick": "q.bedrock_primary('greninja', 'physical_kick', q.curve('symmetrical'))",
"lowkick": "q.bedrock_primary('greninja', 'physical_kick', q.curve('symmetrical'))",
"lowsweep": "q.bedrock_primary('greninja', 'physical_kick', q.curve('symmetrical'))",
"acrobatics": "q.bedrock_primary('greninja', 'physical_kick', q.curve('symmetrical'))",
"takedown": "q.bedrock_primary('greninja', 'physical_kick', q.curve('symmetrical'))",
"gigaimpact": "q.bedrock_primary('greninja', 'physical_kick', q.curve('symmetrical'))",
"liquidation": "q.bedrock_primary('greninja', 'physical_kick', q.curve('symmetrical'))",
"cut": "q.bedrock_primary('greninja', 'physical_katana', q.curve('symmetrical'))",
"aerialace": "q.bedrock_primary('greninja', 'physical_katana', q.curve('symmetrical'))",
"nightslash": "q.bedrock_primary('greninja', 'physical_katana', q.curve('symmetrical'))",
"falseswipe": "q.bedrock_primary('greninja', 'physical_katana', q.curve('symmetrical'))",
"watershuriken_2hit": "q.bedrock_primary('greninja', 'watershuriken_2hit', q.curve('symmetrical'))",
"watershuriken_3hit": "q.bedrock_primary('greninja', 'watershuriken_3hit', q.curve('symmetrical'))",
"watershuriken_4hit": "q.bedrock_primary('greninja', 'watershuriken_4hit', q.curve('symmetrical'))",
"watershuriken_5hit": "q.bedrock_primary('greninja', 'watershuriken_5hit', q.curve('symmetrical'))",
"special": "q.bedrock_primary('greninja', 'special', q.curve('symmetrical'))",
"status": "q.bedrock_primary('greninja', 'status', q.curve('symmetrical'))"
},
@@ -30,14 +48,22 @@
},
"quirks": ["q.bedrock_quirk('greninja', 'blink')","q.bedrock_quirk('greninja','battle_quirk', 20, 40, 1)"]
},
"profile": {
"poseTypes": ["PORTRAIT", "PROFILE"],
"animations": [
"q.look('head_ai')",
"q.look('tongue1', -1, 1, 70, -45, 0, 0)",
"q.bedrock('greninja', 'ground_idle')"
]
},
"standing": {
"poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"],
"poseTypes": ["STAND", "NONE"],
"isBattle": false,
"isTouchingWater": false,
"animations": [
"q.look('head_ai')",
"q.look('tongue1', -1, 1, 70, -45, 0, 0)",
"q.bedrock('greninja', 'ground_idle')"
"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)"
@@ -75,7 +101,13 @@
"q.look('tongue1', -1, 1, 70, -45, 0, 0)",
"q.bedrock('greninja', 'water_swim')"
],
"quirks": []
"quirks": [],
"transformedParts": [
{
"part": "body",
"position": [0, 18, 0]
}
]
},
"surface-float": {
"poseTypes": ["STAND","FLOAT"],
@@ -97,6 +129,7 @@
"swimming": {
"poseTypes": ["WALK","SWIM"],
"isTouchingWater": true,
"isUnderWater": true,
"animations": [
"q.pitch_tilt('body')",
"q.look('head_ai')",
@@ -107,19 +140,26 @@
"transformedParts": [
{
"part": "body",
"position": [0, 24, 0]
"position": [0, 5, 0]
}
]
},
"float": {
"poseTypes": ["STAND","FLOAT"],
"isTouchingWater": true,
"isUnderWater": true,
"animations": [
"q.look('head_ai')",
"q.look('tongue1', -1, 1, 70, -45, 0, 0)",
"q.bedrock('greninja', 'water_idle')"
],
"quirks": []
"quirks": [],
"transformedParts": [
{
"part": "body",
"position": [0, 5, 0]
}
]
},
"sleep": {
"poseTypes": ["SLEEP"],
common/src/main/resources/assets/cobblemon/lang/en_us.json
+8 -8
View File
@@ -6885,12 +6885,14 @@
"cobblemon.ui.pokedex.info.form.latios-mega": "Mega Latios",
"cobblemon.species.latios-mega.desc": "It flies at speeds exceeding Mach 4. It is among the top tier of all Pokémon in terms of aerial combat capability.",
"cobblemon.species.kyogre.name": "Kyogre",
"cobblemon.ui.pokedex.info.form.kyogre": "",
"cobblemon.species.kyogre.desc": "Kyogre is said to be the personification of the sea itself. Legends tell of its many clashes against Groudon, as each sought to gain the power of nature.",
"cobblemon.ui.pokedex.info.form.kyogre-primal": "Primal Kyogre",
"cobblemon.ui.pokedex.info.form.kyogre-primal": "Primal Reversion",
"cobblemon.species.kyogre-primal.desc": "Through Primal Reversion and with nature's full power, it will take back its true form. It can summon storms that cause the sea levels to rise.",
"cobblemon.species.groudon.name": "Groudon",
"cobblemon.ui.pokedex.info.form.groudon": "",
"cobblemon.species.groudon.desc": "Groudon is said to be the personification of the land itself. Legends tell of its many clashes against Kyogre, as each sought to gain the power of nature.",
"cobblemon.ui.pokedex.info.form.groudon-primal": "Primal Groudon",
"cobblemon.ui.pokedex.info.form.groudon-primal": "Primal Reversion",
"cobblemon.species.groudon-primal.desc": "Through Primal Reversion and with nature's full power, it will take back its true form. It can cause magma to erupt and expand the landmass of the world.",
"cobblemon.species.rayquaza.name": "Rayquaza",
"cobblemon.ui.pokedex.info.form.rayquaza": "",
@@ -7699,7 +7701,6 @@
"cobblemon.species.spewpa.name": "Spewpa",
"cobblemon.species.spewpa.desc": "The beaks of bird Pokémon can't begin to scratch its stalwart body. To defend itself, it spews powder.",
"cobblemon.species.vivillon.name": "Vivillon",
"cobblemon.ui.pokedex.info.form.vivillon": "",
"cobblemon.species.vivillon.desc": "The patterns on this Pokémon's wings depend on the climate and topography of its habitat. It scatters colorful scales.",
"cobblemon.ui.pokedex.info.form.vivillon-icy snow": "Icy Snow Pattern",
"cobblemon.species.vivillon-icy-snow.desc": "The patterns on this Pokémon depend on the climate and topography of the land it was born in. This form is from frigid lands.",
@@ -8039,7 +8040,7 @@
"cobblemon.ui.pokedex.info.form.oricorio-pompom": "Pom-Pom Style",
"cobblemon.species.oricorio-pompom.desc": "This Oricorio has drunk bright yellow nectar. When it sees someone looking glum, it will try to cheer them up with a dance.",
"cobblemon.ui.pokedex.info.form.oricorio-pau": "Pa’u Style",
"cobblemon.species.oricorio-pau.desc": "This Oricorio has sipped pink nectar. It gets so caught up in its dancing that it sometimes doesn't hear its Trainer's orders.",
"cobblemon.species.oricorio-pa'u.desc": "This Oricorio has sipped pink nectar. It gets so caught up in its dancing that it sometimes doesn't hear its Trainer's orders.",
"cobblemon.ui.pokedex.info.form.oricorio-sensu": "Sensu Style",
"cobblemon.species.oricorio-sensu.desc": "This Oricorio has sipped purple nectar. Some dancers use its graceful, elegant dancing as inspiration.",
"cobblemon.species.cutiefly.name": "Cutiefly",
@@ -8156,11 +8157,8 @@
"cobblemon.ui.pokedex.info.form.silvally-fairy": "Type: Fairy",
"cobblemon.species.silvally-fairy.desc": "Thanks to its awakened powers, it can change to the Fairy type to match the memory it has equipped.",
"cobblemon.species.minior.name": "Minior",
"cobblemon.ui.pokedex.info.form.minior": "Core",
"cobblemon.species.minior.desc": "This is its form when its shell has fallen off. The color of its core depends on the materials that made up the food it ate.",
"cobblemon.ui.pokedex.info.form.minior-meteor": "Meteor Form",
"cobblemon.species.minior-meteor.desc": "This Pokémon is born in the ozone layer. It falls to the ground once the outer shell enclosing its core grows heavy.",
"cobblemon.ui.pokedex.info.form.minior-red": "Red Core",
"cobblemon.species.minior-red.desc": "This is its form when its shell has fallen off. The color of its core depends on the materials that made up the food it ate.",
"cobblemon.ui.pokedex.info.form.minior-orange": "Orange Core",
"cobblemon.species.minior-orange.desc": "This is its form when its shell has fallen off. The color of its core depends on the materials that made up the food it ate.",
"cobblemon.ui.pokedex.info.form.minior-yellow": "Yellow Core",
@@ -8173,6 +8171,8 @@
"cobblemon.species.minior-indigo.desc": "This is its form when its shell has fallen off. The color of its core depends on the materials that made up the food it ate.",
"cobblemon.ui.pokedex.info.form.minior-violet": "Violet Core",
"cobblemon.species.minior-violet.desc": "This is its form when its shell has fallen off. The color of its core depends on the materials that made up the food it ate.",
"cobblemon.ui.pokedex.info.form.minior-meteor": "Meteor Form",
"cobblemon.species.minior-meteor.desc": "This Pokémon is born in the ozone layer. It falls to the ground once the outer shell enclosing its core grows heavy.",
"cobblemon.species.komala.name": "Komala",
"cobblemon.species.komala.desc": "It remains asleep from birth to death as a result of the sedative properties of the leaves that form its diet.",
"cobblemon.species.turtonator.name": "Turtonator",
common/src/main/resources/assets/cobblemon/textures/pokemon/0658_greninja/greninja_shiny.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

common/src/main/resources/data/cobblemon/dex_entries/pokemon/alola/minior.json
+42 -20
View File
@@ -4,32 +4,54 @@
"displayAspects": [],
"conditionAspects": [],
"forms": [
{
"displayForm": "Normal",
"unlockForms": [
"Normal"
]
},
{
"displayForm": "Meteor",
"unlockForms": [
"Meteor"
]
}
],
"variations": [
},
{
"displayName": "cobblemon.pokedex.variation.color",
"icon": "cobblemon:textures/gui/pokedex/variation/color.png",
"aspects": [
"red-core",
"orange-core",
"yellow-core",
"green-core",
"blue-core",
"indigo-core",
"violet-core"
"displayForm": "Red",
"unlockForms": [
"Red"
]
},
{
"displayForm": "Orange",
"unlockForms": [
"Orange"
]
},
{
"displayForm": "Yellow",
"unlockForms": [
"Yellow"
]
},
{
"displayForm": "Green",
"unlockForms": [
"Green"
]
},
{
"displayForm": "Blue",
"unlockForms": [
"Blue"
]
},
{
"displayForm": "Indigo",
"unlockForms": [
"Indigo"
]
},
{
"displayForm": "Violet",
"unlockForms": [
"Violet"
]
}
]
],
"variations": []
}
common/src/main/resources/data/cobblemon/dex_entries/pokemon/kalos/vivillon.json
-6
View File
@@ -4,12 +4,6 @@
"displayAspects": [],
"conditionAspects": [],
"forms": [
{
"displayForm": "Normal",
"unlockForms": [
"Normal"
]
},
{
"displayForm": "Icy Snow",
"unlockForms": [
common/src/main/resources/data/cobblemon/species/generation2/politoed.json
+2 -2
View File
@@ -44,8 +44,8 @@
"baseFriendship": 50,
"baseScale": 1,
"hitbox": {
"width": 0.6,
"height": 1,
"width": 0.65,
"height": 1.35,
"fixed": false
},
"behaviour": {
common/src/main/resources/data/cobblemon/species/generation7/minior.json
+128 -2
View File
@@ -8,7 +8,7 @@
"height": 3,
"weight": 3,
"pokedex": [
"cobblemon.pokedex.minior.desc"
"cobblemon.species.minior.desc"
],
"labels": [
"gen7"
@@ -192,6 +192,132 @@
"evolutions": [],
"battleOnly": false,
"forms": [
{
"name": "Red",
"primaryType": "rock",
"secondaryType": "flying",
"maleRatio": -1,
"height": 3,
"weight": 3,
"pokedex": [
"cobblemon.species.minior-red.desc"
],
"labels": [
"gen7"
],
"aspects": [
"red-core"
],
"evolutions": []
},
{
"name": "Orange",
"primaryType": "rock",
"secondaryType": "flying",
"maleRatio": -1,
"height": 3,
"weight": 3,
"pokedex": [
"cobblemon.species.minior-orange.desc"
],
"labels": [
"gen7"
],
"aspects": [
"orange-core"
],
"evolutions": []
},
{
"name": "Yellow",
"primaryType": "rock",
"secondaryType": "flying",
"maleRatio": -1,
"height": 3,
"weight": 3,
"pokedex": [
"cobblemon.species.minior-yellow.desc"
],
"labels": [
"gen7"
],
"aspects": [
"yellow-core"
],
"evolutions": []
},
{
"name": "Green",
"primaryType": "rock",
"secondaryType": "flying",
"maleRatio": -1,
"height": 3,
"weight": 3,
"pokedex": [
"cobblemon.species.minior-green.desc"
],
"labels": [
"gen7"
],
"aspects": [
"green-core"
],
"evolutions": []
},
{
"name": "Blue",
"primaryType": "rock",
"secondaryType": "flying",
"maleRatio": -1,
"height": 3,
"weight": 3,
"pokedex": [
"cobblemon.species.minior-blue.desc"
],
"labels": [
"gen7"
],
"aspects": [
"blue-core"
],
"evolutions": []
},
{
"name": "Indigo",
"primaryType": "rock",
"secondaryType": "flying",
"maleRatio": -1,
"height": 3,
"weight": 3,
"pokedex": [
"cobblemon.species.minior-indigo.desc"
],
"labels": [
"gen7"
],
"aspects": [
"indigo-core"
],
"evolutions": []
},
{
"name": "Violet",
"primaryType": "rock",
"secondaryType": "flying",
"maleRatio": -1,
"height": 3,
"weight": 3,
"pokedex": [
"cobblemon.species.minior-violet.desc"
],
"labels": [
"gen7"
],
"aspects": [
"violet-core"
],
"evolutions": []
},
{
"name": "Meteor",
"primaryType": "rock",
@@ -200,7 +326,7 @@
"height": 3,
"weight": 400,
"pokedex": [
"cobblemon.pokedex.minior-meteor.desc"
"cobblemon.species.minior-meteor.desc"
],
"labels": [
"gen7"
common/src/main/resources/resourcepacks/regionbiasforms/assets/cobblemon/bedrock/pokemon/models/0439_mimejr/mime_jr_galar_bias.geo.json
+31 -23
View File
@@ -12,12 +12,12 @@
},
"bones": [
{
"name": "mime_jr",
"name": "mime_jr_galar_bias",
"pivot": [0, 0, 0]
},
{
"name": "body",
"parent": "mime_jr",
"parent": "mime_jr_galar_bias",
"pivot": [0, 0, 0]
},
{
@@ -112,7 +112,7 @@
{
"name": "head",
"parent": "neck",
"pivot": [0, 9, -0.25],
"pivot": [0, 8.25, -0.25],
"cubes": [
{"origin": [-4, 7.5, -3.75], "size": [8, 6, 7], "uv": [0, 0]},
{"origin": [-1.25, 9.25, -4.75], "size": [2, 2, 1], "inflate": 0.01, "uv": [23, 1]},
@@ -151,67 +151,75 @@
{
"name": "eye_left",
"parent": "eyes",
"pivot": [2.75, 11, -3.76],
"rotation": [0, 0, -7.5],
"pivot": [2.75, 10.75, -3.76]
},
{
"name": "iris_left",
"parent": "eye_left",
"pivot": [2.75, 10.875, -3.765],
"cubes": [
{"origin": [2, 10, -3.76], "size": [1.5, 2, 0], "uv": [0, 0]}
{"origin": [2, 9.75, -3.76], "size": [1.5, 2, 0], "uv": [0, 0]}
]
},
{
"name": "pupil_left",
"parent": "eye_left",
"pivot": [2.75, 11.25, -3.77],
"parent": "iris_left",
"pivot": [2.75, 11, -3.77],
"cubes": [
{"origin": [2.25, 10.5, -3.77], "size": [1, 1, 0], "uv": [2, 0]}
{"origin": [2.25, 10.25, -3.77], "size": [1, 1, 0], "uv": [2, 0]}
]
},
{
"name": "locator_eye_left",
"parent": "pupil_left",
"pivot": [2.75, 11, -4],
"pivot": [2.75, 10.75, -4],
"locators": {
"eye2": [2.75, 11, -4]
"eye2": [2.75, 10.75, -4]
}
},
{
"name": "eyelid_left",
"parent": "eye_left",
"pivot": [2.75, 11, -3.17],
"pivot": [2.75, 10.75, -3.17],
"cubes": [
{"origin": [1.75, 10, -3.67], "size": [2, 2, 1], "inflate": 0.01, "uv": [1, 3]}
{"origin": [1.75, 9.75, -3.67], "size": [2, 2, 1], "inflate": 0.01, "uv": [1, 3]}
]
},
{
"name": "eye_right",
"parent": "eyes",
"pivot": [-2.75, 11, -3.76],
"rotation": [0, 0, 7.5],
"pivot": [-2.75, 10.75, -3.76]
},
{
"name": "iris_right",
"parent": "eye_right",
"pivot": [-2.75, 10.875, -3.765],
"cubes": [
{"origin": [-3.5, 10, -3.76], "size": [1.5, 2, 0], "uv": [0, 2], "mirror": true}
{"origin": [-3.5, 9.75, -3.76], "size": [1.5, 2, 0], "uv": [0, 2], "mirror": true}
]
},
{
"name": "pupil_right",
"parent": "eye_right",
"pivot": [-2.75, 11.25, -3.77],
"parent": "iris_right",
"pivot": [-2.75, 11, -3.77],
"cubes": [
{"origin": [-3.25, 10.5, -3.77], "size": [1, 1, 0], "uv": [2, 1], "mirror": true}
{"origin": [-3.25, 10.25, -3.77], "size": [1, 1, 0], "uv": [2, 1], "mirror": true}
]
},
{
"name": "locator_eye_right",
"parent": "pupil_right",
"pivot": [-2.75, 11, -4],
"pivot": [-2.75, 10.75, -4],
"locators": {
"eye1": [-2.75, 11, -4]
"eye1": [-2.75, 10.75, -4]
}
},
{
"name": "eyelid_right",
"parent": "eye_right",
"pivot": [-2.75, 11, -3.17],
"pivot": [-2.75, 10.75, -3.17],
"cubes": [
{"origin": [-3.75, 10, -3.67], "size": [2, 2, 1], "inflate": 0.01, "uv": [1, 15], "mirror": true}
{"origin": [-3.75, 9.75, -3.67], "size": [2, 2, 1], "inflate": 0.01, "uv": [1, 15], "mirror": true}
]
},
{