new animations for nidoran male, female, and nidorina

CHANGELOG.md

@@ -175,6 +175,9 @@
 ### Animation updates for the following Pokémon
 
 - Kakuna
+- Nidoran♀ (+ New shoulder mount)
+- Nidorina
+- Nidoran♂ (+ New shoulder mount)
 - Happiny
 - Poliwhirl
 - Poliwrath

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranfModel.kt

@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.CobblemonPose
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class NidoranfModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("nidoran_f")
-    override val head = getPart("head")
-    override val foreLeftLeg = getPart("leg_front_left")
-    override val foreRightLeg = getPart("leg_front_right")
-    override val hindLeftLeg = getPart("leg_back_left")
-    override val hindRightLeg = getPart("leg_back_right")
-
-    override var portraitScale = 2.0F
-    override var portraitTranslation = Vec3(-0.16, -0.85, 0.0)
-
-    override var profileScale = 1.03F
-    override var profileTranslation = Vec3(0.02, 0.21, 0.0)
-
-    lateinit var sleep: CobblemonPose
-    lateinit var standing: CobblemonPose
-    lateinit var walk: CobblemonPose
-
-    override val cryAnimation = CryProvider { bedrockStateful("nidoranf", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("nidoranf", "blink") }
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            transformTicks = 10,
-                quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("nidoranf", "idle")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            transformTicks = 10,
-                quirks = arrayOf(blink),
-            animations = arrayOf(
-                    singleBoneLook(),
-                    bedrock("nidoranf", "idle"),
-                    QuadrupedWalkAnimation(this)
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidoranf", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranmModel.kt

@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class NidoranmModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("nidoran_m")
-    override val head = getPart("head")
-    override val foreLeftLeg = getPart("leg_front_left")
-    override val foreRightLeg = getPart("leg_front_right")
-    override val hindLeftLeg = getPart("leg_back_left")
-    override val hindRightLeg = getPart("leg_back_right")
-
-    override var portraitScale = 1.97F
-    override var portraitTranslation = Vec3(-0.18, -1.28, 0.0)
-
-    override var profileScale = 1.05F
-    override var profileTranslation = Vec3(0.03, 0.11, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("nidoranm", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("nidoranm", "blink") }
-        standing = registerPose(
-                poseName = "standing",
-                poseTypes = STATIONARY_POSES + UI_POSES,
-                transformTicks = 10,
-                quirks = arrayOf(blink),
-                animations = arrayOf(
-                        singleBoneLook(),
-                        bedrock("nidoranm", "idle")
-                )
-        )
-
-        walk = registerPose(
-                poseName = "walk",
-                poseTypes = MOVING_POSES,
-                transformTicks = 10,
-                quirks = arrayOf(blink),
-                animations = arrayOf(
-                        singleBoneLook(),
-                        bedrock("nidoranm", "idle"),
-                        QuadrupedWalkAnimation(this)
-                )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidoranm", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt

@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2023 Cobblemon Contributors
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- */
-
-package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1
-
-import com.cobblemon.mod.common.client.render.models.blockbench.animation.QuadrupedWalkAnimation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider
-import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel
-import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose
-import com.cobblemon.mod.common.entity.PoseType
-import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES
-import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES
-import com.cobblemon.mod.common.util.isBattling
-import net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class NidorinaModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, QuadrupedFrame {
-    override val rootPart = root.registerChildWithAllChildren("nidorina")
-    override val head = getPart("head")
-    override val foreLeftLeg= getPart("left_upper_arm")
-    override val foreRightLeg = getPart("right_upper_arm")
-    override val hindLeftLeg = getPart("left_leg")
-    override val hindRightLeg = getPart("right_leg")
-
-    override var portraitScale = 2.13F
-    override var portraitTranslation = Vec3(-0.05, -0.71, 0.0)
-
-    override var profileScale = 1.0F
-    override var profileTranslation = Vec3(0.0, 0.21, 0.0)
-
-    lateinit var sleep: Pose
-    lateinit var standing: Pose
-    lateinit var walk: Pose
-    lateinit var battleidle: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("nidorina", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("nidorina", "blink")}
-        standing = registerPose(
-            poseName = "standing",
-            poseTypes = STATIONARY_POSES + UI_POSES,
-            condition = { !it.isBattling },
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("nidorina", "idle3")
-            )
-        )
-
-        sleep = registerPose(
-                poseType = PoseType.SLEEP,
-                animations = arrayOf(bedrock("nidorina", "idle2"))
-        )
-
-        walk = registerPose(
-            poseName = "walk",
-            poseTypes = MOVING_POSES,
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("nidorina", "idle2"),
-                QuadrupedWalkAnimation(this)
-            )
-        )
-
-        battleidle = registerPose(
-            poseName = "battle_idle",
-            poseTypes = PoseType.STATIONARY_POSES,
-            transformTicks = 10,
-            quirks = arrayOf(blink),
-            condition = { it.isBattling },
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("nidorina", "idle")
-            )
-        )
-    }
-
-//    override fun getFaintAnimation(
-//        pokemonEntity: PokemonEntity,
-//        state: PosableState<PokemonEntity>
-//    ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidorina", "faint") else null
-}

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt

@@ -271,9 +271,6 @@ object VaryingModelRepository {
         inbuilt("marowak", ::MarowakModel)
         inbuilt("meowth", ::MeowthModel)
         inbuilt("nidoqueen", ::NidoqueenModel)
-        inbuilt("nidoranf", ::NidoranfModel)
-        inbuilt("nidoranm", ::NidoranmModel)
-        inbuilt("nidorina", ::NidorinaModel)
         inbuilt("nidorino", ::NidorinoModel)
         inbuilt("persian", ::PersianModel)
         inbuilt("pinsir", ::PinsirModel)

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0029_nidoranf/nidoranf.geo.json

@@ -111,6 +111,14 @@
 						{"origin": [2.9, 8.75, -7.65], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 2]}
 					]
 				},
+				{
+					"name": "eyelid_hurt_left",
+					"parent": "eyes",
+					"pivot": [2.9, 9.75, -6.15],
+					"cubes": [
+						{"origin": [2.9, 8.75, -7.65], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 41]}
+					]
+				},
 				{
 					"name": "eyelid_right",
 					"parent": "eyes",
@@ -119,6 +127,14 @@
 						{"origin": [-2.9, 8.75, -7.65], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 0]}
 					]
 				},
+				{
+					"name": "eyelid_hurt_right",
+					"parent": "eyes",
+					"pivot": [-2.9, 9.75, -6.15],
+					"cubes": [
+						{"origin": [-2.9, 8.75, -7.65], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 44]}
+					]
+				},
 				{
 					"name": "eye_right",
 					"parent": "eyes",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0030_nidorina/nidorina.geo.json

@@ -21,8 +21,13 @@
 					"pivot": [0, 0, 0]
 				},
 				{
-					"name": "torso",
+					"name": "hips",
 					"parent": "body",
+					"pivot": [0, 6, 3]
+				},
+				{
+					"name": "torso",
+					"parent": "hips",
 					"pivot": [0, 6, 3],
 					"cubes": [
 						{"origin": [-4, 3, 0], "size": [8, 7, 6], "inflate": 0.01, "uv": [0, 0]},
@@ -31,7 +36,7 @@
 					]
 				},
 				{
-					"name": "upper_torso",
+					"name": "torso2",
 					"parent": "torso",
 					"pivot": [0, 9.5, 0],
 					"cubes": [
@@ -40,7 +45,7 @@
 				},
 				{
 					"name": "neck",
-					"parent": "upper_torso",
+					"parent": "torso2",
 					"pivot": [0, 9.5, -3.5],
 					"cubes": [
 						{"origin": [-3, 4.5, -5.5], "size": [6, 5, 2], "inflate": -0.01, "uv": [0, 39]}
@@ -177,6 +182,14 @@
 						{"origin": [2.9, 6.5, -10], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 44]}
 					]
 				},
+				{
+					"name": "left_eyelid_hurt",
+					"parent": "eyes",
+					"pivot": [2.9, 7.5, -8.5],
+					"cubes": [
+						{"origin": [2.9, 6.5, -10], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 49]}
+					]
+				},
 				{
 					"name": "right_eye",
 					"parent": "eyes",
@@ -202,6 +215,14 @@
 						{"origin": [-2.9, 6.5, -10], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 46], "mirror": true}
 					]
 				},
+				{
+					"name": "right_eyelid_hurt",
+					"parent": "eyes",
+					"pivot": [-2.9, 7.5, -8.5],
+					"cubes": [
+						{"origin": [-2.9, 6.5, -10], "size": [0, 2, 3], "inflate": 0.03, "uv": [0, 52], "mirror": true}
+					]
+				},
 				{
 					"name": "tail_1",
 					"parent": "torso",
@@ -237,18 +258,18 @@
 					}
 				},
 				{
-					"name": "arms_torso",
-					"parent": "body",
-					"pivot": [0, 6, 3]
-				},
-				{
-					"name": "arms_upper_torso",
-					"parent": "arms_torso",
+					"name": "ftorso2",
+					"parent": "hips",
 					"pivot": [0, 9.5, 0]
 				},
+				{
+					"name": "arms",
+					"parent": "ftorso2",
+					"pivot": [0, 4.25, -1.5]
+				},
 				{
 					"name": "left_upper_arm",
-					"parent": "arms_upper_torso",
+					"parent": "arms",
 					"pivot": [3.5, 4.5, -1.5],
 					"cubes": [
 						{"origin": [2.5, 3.5, -3], "size": [2, 2, 3], "inflate": 0.01, "uv": [42, 26]}
@@ -307,7 +328,7 @@
 				},
 				{
 					"name": "right_upper_arm",
-					"parent": "arms_upper_torso",
+					"parent": "arms",
 					"pivot": [-3.5, 4.5, -1.5],
 					"cubes": [
 						{"origin": [-4.5, 3.5, -3], "size": [2, 2, 3], "inflate": 0.01, "uv": [54, 0]}
@@ -374,43 +395,13 @@
 					}
 				},
 				{
-					"name": "left_leg",
+					"name": "legs",
 					"parent": "body",
-					"pivot": [3.5, 4.5, 3.5],
-					"cubes": [
-						{"origin": [2, 2, 1.5], "size": [3, 4, 4], "inflate": 0.01, "uv": [50, 5]}
-					]
-				},
-				{
-					"name": "left_foot",
-					"parent": "left_leg",
-					"pivot": [3.5, 2, 2],
-					"cubes": [
-						{"origin": [2, 0, 2], "size": [3, 2, 3], "uv": [16, 41]}
-					]
-				},
-				{
-					"name": "locator_foot_secondary",
-					"parent": "left_foot",
-					"pivot": [3.5, 1, 3.5],
-					"rotation": [90, 0, 0],
-					"locators": {
-						"foot_secondary": [3.5, 1, 3.5]
-					}
-				},
-				{
-					"name": "left_foot_claws",
-					"parent": "left_foot",
-					"pivot": [3.5, 1, 2.25],
-					"cubes": [
-						{"origin": [3.5, 0, 0.5], "size": [0, 1, 2], "uv": [0, 3]},
-						{"origin": [4.5, 0, 1], "size": [0, 1, 1], "pivot": [4.5, 0.5, 2], "rotation": [0, -10, 0], "uv": [0, 15]},
-						{"origin": [2.5, 0, 1], "size": [0, 1, 1], "pivot": [2.5, 0.5, 2], "rotation": [0, 10, 0], "uv": [2, 14]}
-					]
+					"pivot": [0, 4, 3.5]
 				},
 				{
 					"name": "right_leg",
-					"parent": "body",
+					"parent": "legs",
 					"pivot": [-3.5, 4.5, 3.5],
 					"cubes": [
 						{"origin": [-5, 2, 1.5], "size": [3, 4, 4], "inflate": 0.01, "uv": [28, 0]}
@@ -443,6 +434,41 @@
 						{"origin": [-2.5, 0, 1], "size": [0, 1, 1], "pivot": [-2.5, 0.5, 2], "rotation": [0, -10, 0], "uv": [4, 0]}
 					]
 				},
+				{
+					"name": "left_leg",
+					"parent": "legs",
+					"pivot": [3.5, 4.5, 3.5],
+					"cubes": [
+						{"origin": [2, 2, 1.5], "size": [3, 4, 4], "inflate": 0.01, "uv": [50, 5]}
+					]
+				},
+				{
+					"name": "left_foot",
+					"parent": "left_leg",
+					"pivot": [3.5, 2, 2],
+					"cubes": [
+						{"origin": [2, 0, 2], "size": [3, 2, 3], "uv": [16, 41]}
+					]
+				},
+				{
+					"name": "locator_foot_secondary",
+					"parent": "left_foot",
+					"pivot": [3.5, 1, 3.5],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"foot_secondary": [3.5, 1, 3.5]
+					}
+				},
+				{
+					"name": "left_foot_claws",
+					"parent": "left_foot",
+					"pivot": [3.5, 1, 2.25],
+					"cubes": [
+						{"origin": [3.5, 0, 0.5], "size": [0, 1, 2], "uv": [0, 3]},
+						{"origin": [4.5, 0, 1], "size": [0, 1, 1], "pivot": [4.5, 0.5, 2], "rotation": [0, -10, 0], "uv": [0, 15]},
+						{"origin": [2.5, 0, 1], "size": [0, 1, 1], "pivot": [2.5, 0.5, 2], "rotation": [0, 10, 0], "uv": [2, 14]}
+					]
+				},
 				{
 					"name": "locator_target",
 					"parent": "body",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0032_nidoranm/nidoranm.geo.json

@@ -102,6 +102,22 @@
 						"eye2": [3, 6.5, -8.05]
 					}
 				},
+				{
+					"name": "eye_right",
+					"parent": "eyes",
+					"pivot": [-3, 7, -7],
+					"cubes": [
+						{"origin": [-3, 6, -8.5], "size": [0, 2, 3], "inflate": 0.01, "uv": [22, 13]}
+					]
+				},
+				{
+					"name": "locator_eye_right",
+					"parent": "eye_right",
+					"pivot": [-3, 6.5, -8.05],
+					"locators": {
+						"eye3": [-3, 6.5, -8.05]
+					}
+				},
 				{
 					"name": "eyelid_left",
 					"parent": "eyes",
@@ -119,20 +135,36 @@
 					]
 				},
 				{
-					"name": "eye_right",
+					"name": "eyelid_happy_left",
 					"parent": "eyes",
-					"pivot": [-3, 7, -7],
+					"pivot": [3.9, 7, -7],
 					"cubes": [
-						{"origin": [-3, 6, -8.5], "size": [0, 2, 3], "inflate": 0.01, "uv": [22, 13]}
+						{"origin": [2.9, 6, -8.5], "size": [0, 2, 3], "inflate": 0.02, "uv": [0, 48]}
 					]
 				},
 				{
-					"name": "locator_eye_right",
-					"parent": "eye_right",
-					"pivot": [-3, 6.5, -8.05],
-					"locators": {
-						"eye1": [-3, 6.5, -8.05]
-					}
+					"name": "eyelid_happy_right",
+					"parent": "eyes",
+					"pivot": [-3.9, 7, -7],
+					"cubes": [
+						{"origin": [-2.9, 6, -8.5], "size": [0, 2, 3], "inflate": 0.02, "uv": [0, 51]}
+					]
+				},
+				{
+					"name": "eyelid_hurt_left",
+					"parent": "eyes",
+					"pivot": [3.9, 7, -7],
+					"cubes": [
+						{"origin": [2.9, 6, -8.5], "size": [0, 2, 3], "inflate": 0.02, "uv": [0, 54]}
+					]
+				},
+				{
+					"name": "eyelid_hurt_right",
+					"parent": "eyes",
+					"pivot": [-3.9, 7, -7],
+					"cubes": [
+						{"origin": [-2.9, 6, -8.5], "size": [0, 2, 3], "inflate": 0.02, "uv": [0, 57]}
+					]
 				},
 				{
 					"name": "ear_left",

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0029_nidoranf/nidoranf.json

@@ -0,0 +1,83 @@
+{
+  "portraitScale": 2.0,
+  "portraitTranslation": [-0.16, -0.85, 0],
+  "profileScale": 1.03,
+  "profileTranslation": [0.02, 0.21, 0],
+  "rootBone": "nidoranf",
+  "animations": {
+    "cry": "q.bedrock_stateful('nidoranf', 'cry')",
+    "recoil": "q.bedrock_stateful('nidoranf', 'recoil')"
+  },
+  "poses": {
+    "standing": {
+      "poseTypes": ["STAND", "FLOAT", "NONE", "PORTRAIT", "PROFILE"],
+      "isBattle": false,
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranf', 'ground_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranf', 'blink')"]
+    },
+    "battle-standing": {
+      "poseTypes": ["STAND"],
+      "isBattle": true,
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranf', 'battle_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranf', 'blink')"]
+    },
+    "walking": {
+      "poseTypes": ["WALK", "SWIM"],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranf', 'ground_walk')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranf', 'blink')"]
+    },
+    "run": {
+      "poseTypes": ["WALK", "SWIM"],
+      "condition": "q.is_sprinting",
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranf', 'ground_run')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranf', 'blink')"]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "animations": ["q.bedrock('nidoranf', 'sleep')"],
+      "namedAnimations": {
+        "cry": "q.bedrock_stateful('dummy', 'cry')"
+      }
+    },
+    "shoulder_left": {
+      "poseTypes": ["SHOULDER_LEFT"],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranf', 'shoulder_left')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranf', 'blink')"],
+      "transformedParts": [
+        {
+          "part": "body",
+          "position": [-5, 0, 0]
+        }
+      ]
+    },
+    "shoulder_right": {
+      "poseTypes": ["SHOULDER_RIGHT"],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranf', 'shoulder_right')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranf', 'blink')"],
+      "transformedParts": [
+        {
+          "part": "body",
+          "position": [5, 0, 0]
+        }
+      ]
+    }
+  }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0030_nidorina/nidorina.json

@@ -0,0 +1,55 @@
+{
+  "portraitScale": 2.13,
+  "portraitTranslation": [-0.39, -0.94, 0],
+  "profileScale": 1,
+  "profileTranslation": [0, 0.21, 0],
+  "rootBone": "nidorina",
+  "animations": {
+    "cry": "q.bedrock_stateful('nidorina', 'cry')",
+    "recoil": "q.bedrock_stateful('nidorina', 'recoil')"
+  },
+  "poses": {
+    "standing": {
+      "poseTypes": ["STAND", "FLOAT", "NONE", "PORTRAIT", "PROFILE"],
+      "isBattle": false,
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidorina', 'ground_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidorina', 'blink')"]
+    },
+    "battle-standing": {
+      "poseTypes": ["STAND"],
+      "isBattle": true,
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidorina', 'battle_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidorina', 'blink')"]
+    },
+    "walking": {
+      "poseTypes": ["WALK", "SWIM"],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidorina', 'ground_walk')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidorina', 'blink')"]
+    },
+    "run": {
+      "poseTypes": ["WALK", "SWIM"],
+      "condition": "q.is_sprinting",
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidorina', 'ground_run')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidorina', 'blink')"]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "animations": ["q.bedrock('nidorina', 'sleep')"],
+      "namedAnimations": {
+        "cry": "q.bedrock_stateful('dummy', 'cry')"
+      }
+    }
+  }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0032_nidoranm/nidoranm.json

@@ -0,0 +1,83 @@
+{
+  "portraitScale": 1.97,
+  "portraitTranslation": [-0.19, -1.08, 0],
+  "profileScale": 1.05,
+  "profileTranslation": [0.03, 0.11, 0],
+  "rootBone": "nidoranm",
+  "animations": {
+    "cry": "q.bedrock_stateful('nidoranm', 'cry')",
+    "recoil": "q.bedrock_stateful('nidoranm', 'recoil')"
+  },
+  "poses": {
+    "standing": {
+      "poseTypes": ["STAND", "FLOAT", "NONE", "PORTRAIT", "PROFILE"],
+      "isBattle": false,
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranm', 'ground_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranm', 'blink')"]
+    },
+    "battle-standing": {
+      "poseTypes": ["STAND"],
+      "isBattle": true,
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranm', 'battle_idle')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranm', 'blink')"]
+    },
+    "walking": {
+      "poseTypes": ["WALK", "SWIM"],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranm', 'ground_walk')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranm', 'blink')"]
+    },
+    "run": {
+      "poseTypes": ["WALK", "SWIM"],
+      "condition": "q.is_sprinting",
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranm', 'ground_run')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranm', 'blink')"]
+    },
+    "sleep": {
+      "poseTypes": ["SLEEP"],
+      "animations": ["q.bedrock('nidoranm', 'sleep')"],
+      "namedAnimations": {
+        "cry": "q.bedrock_stateful('dummy', 'cry')"
+      }
+    },
+    "shoulder_left": {
+      "poseTypes": ["SHOULDER_LEFT"],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranm', 'shoulder_left')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranm', 'blink')"],
+      "transformedParts": [
+        {
+          "part": "body",
+          "position": [-5, 0, 0]
+        }
+      ]
+    },
+    "shoulder_right": {
+      "poseTypes": ["SHOULDER_RIGHT"],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('nidoranm', 'shoulder_right')"
+      ],
+      "quirks": ["q.bedrock_quirk('nidoranm', 'blink')"],
+      "transformedParts": [
+        {
+          "part": "body",
+          "position": [5, 0, 0]
+        }
+      ]
+    }
+  }
+}

common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json

@@ -43,6 +43,7 @@
   "catchRate": 235,
   "eggCycles": 20,
   "baseFriendship": 50,
+  "shoulderMountable": true,
   "baseScale": 0.6,
   "hitbox": {
     "width": 0.7,
@@ -87,6 +88,9 @@
       ]
     },
     "moving": {
+      "walk": {
+        "walkSpeed": 0.2
+      },
       "swim": {
         "avoidsWater": true
       }

common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json

@@ -43,6 +43,7 @@
   "catchRate": 235,
   "eggCycles": 20,
   "baseFriendship": 50,
+  "shoulderMountable": true,
   "baseScale": 0.6,
   "hitbox": {
     "width": 0.7,
@@ -87,6 +88,9 @@
       ]
     },
     "moving": {
+      "walk": {
+        "walkSpeed": 0.2
+      },
       "swim": {
         "avoidsWater": true
       }

common/src/main/resources/data/cobblemon/species/generation1/nidorina.json

@@ -77,6 +77,9 @@
       ]
     },
     "moving": {
+      "walk": {
+        "walkSpeed": 0.22
+      },
       "swim": {
         "avoidsWater": true
       }