Orthworm mount animations test

common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt

@@ -831,7 +831,6 @@ object MoLangFunctions {
             map.put("in_battle") { DoubleValue(pokemonEntity.isBattling) }
             map.put("is_moving") { DoubleValue((pokemonEntity.moveControl as? PokemonMoveControl)?.hasWanted() == true) }
             map.put("is_flying") { DoubleValue(pokemonEntity.getBehaviourFlag(PokemonBehaviourFlag.FLYING)) }
-            map.put("is_flying") { DoubleValue(pokemonEntity.getBehaviourFlag(PokemonBehaviourFlag.FLYING)) }
             map.put("get_alt_pose") { StringValue(pokemonEntity.getAltPose()) }
             map.put("is_gliding") { DoubleValue(pokemonEntity.isUsingAltPose(cobblemonResource("gliding"))) }
             map.put("is_sprinting") { DoubleValue(pokemonEntity.isUsingAltPose(cobblemonResource("sprinting"))) }

common/src/main/kotlin/com/cobblemon/mod/common/api/riding/behaviour/types/GenericLandBehaviour.kt

@@ -385,7 +385,7 @@ class GenericLandBehaviour : RidingBehaviour<GenericLandSettings, GenericLandSta
         driver: Player
     ): ResourceLocation {
         when {
-            state.inAir.get() -> cobblemonResource("in_air")
+            state.inAir.get() -> return cobblemonResource("in_air")
             state.sprinting.get() -> return cobblemonResource("sprinting")
         }
         return cobblemonResource("no_pose")

common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorviknightModel.kt

@@ -1,125 +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.gen8
-
-import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame
-import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame
-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 net.minecraft.client.model.geom.ModelPart
-import net.minecraft.world.phys.Vec3
-
-class CorviknightModel (root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame, BiWingedFrame {
-    override val rootPart = root.registerChildWithAllChildren("corviknight")
-    override val leftWing = getPart("wing_left")
-    override val rightWing = getPart("wing_right")
-    override val leftLeg = getPart("leg_left")
-    override val rightLeg = getPart("leg_right")
-    override val head = getPart("head")
-
-    val openWingLeft = getPart("wing_open_left")
-    val openWingRight = getPart("wing_open_right")
-    val closedWingLeft = getPart("wing_closed_left")
-    val closedWingRight = getPart("wing_closed_right")
-
-    override var portraitScale = 1.0F
-    override var portraitTranslation = Vec3(-0.45, 3.0, 0.0)
-
-    override var profileScale = 0.36F
-    override var profileTranslation = Vec3(0.0, 1.2, 0.0)
-
-
-    lateinit var stand: Pose
-    lateinit var walk: Pose
-    lateinit var hover: Pose
-    lateinit var fly: Pose
-    lateinit var sleep: Pose
-
-    override val cryAnimation = CryProvider { bedrockStateful("corviknight", "cry") }
-
-    override fun registerPoses() {
-        val blink = quirk { bedrockStateful("corviknight", "blink") }
-        sleep = registerPose(
-            poseType = PoseType.SLEEP,
-            animations = arrayOf(bedrock("corviknight", "sleep"))
-        )
-
-        stand = registerPose(
-            poseName = "standing",
-            poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES - PoseType.HOVER,
-            transformTicks = 10,
-            transformedParts = arrayOf(
-                openWingLeft.createTransformation().withVisibility(visibility = false),
-                openWingRight.createTransformation().withVisibility(visibility = false),
-                closedWingLeft.createTransformation().withVisibility(visibility = true),
-                closedWingRight.createTransformation().withVisibility(visibility = true)
-            ),
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("corviknight", "ground_idle")
-            )
-        )
-
-        hover = registerPose(
-            poseName = "hover",
-            poseType = PoseType.HOVER,
-            transformTicks = 10,
-            transformedParts = arrayOf(
-                openWingLeft.createTransformation().withVisibility(visibility = true),
-                openWingRight.createTransformation().withVisibility(visibility = true),
-                closedWingLeft.createTransformation().withVisibility(visibility = false),
-                closedWingRight.createTransformation().withVisibility(visibility = false)
-            ),
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("corviknight", "air_idle")
-            )
-        )
-
-        fly = registerPose(
-            poseName = "fly",
-            poseType = PoseType.FLY,
-            transformTicks = 10,
-            transformedParts = arrayOf(
-                openWingLeft.createTransformation().withVisibility(visibility = true),
-                openWingRight.createTransformation().withVisibility(visibility = true),
-                closedWingLeft.createTransformation().withVisibility(visibility = false),
-                closedWingRight.createTransformation().withVisibility(visibility = false)
-            ),
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("corviknight", "air_fly")
-            )
-        )
-
-        walk = registerPose(
-            poseName = "walking",
-            poseTypes = PoseType.MOVING_POSES - PoseType.FLY,
-            transformTicks = 10,
-            transformedParts = arrayOf(
-                openWingLeft.createTransformation().withVisibility(visibility = false),
-                openWingRight.createTransformation().withVisibility(visibility = false),
-                closedWingLeft.createTransformation().withVisibility(visibility = true),
-                closedWingRight.createTransformation().withVisibility(visibility = true)
-            ),
-            quirks = arrayOf(blink),
-            animations = arrayOf(
-                singleBoneLook(),
-                bedrock("corviknight", "ground_walk")
-            )
-        )
-    }
-}

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

@@ -523,7 +523,6 @@ object VaryingModelRepository {
         inbuilt("sirfetchd", ::SirfetchdModel)
         inbuilt("rookidee", ::RookideeModel)
         inbuilt("corvisquire", ::CorvisquireModel)
-        inbuilt("corviknight", ::CorviknightModel)
         inbuilt("duskull", ::DuskullModel)
         inbuilt("dusclops", ::DusclopsModel)
         inbuilt("dusknoir", ::DusknoirModel)

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0959_tinkaton/tinkaton.geo.json

@@ -6,11 +6,18 @@
 				"identifier": "geometry.tinkaton",
 				"texture_width": 128,
 				"texture_height": 128,
-				"visible_bounds_width": 5,
+				"visible_bounds_width": 8,
 				"visible_bounds_height": 4.5,
 				"visible_bounds_offset": [0, 1.75, 0]
 			},
 			"bones": [
+				{
+					"name": "bb_main",
+					"pivot": [0, 0, 0],
+					"cubes": [
+						{"origin": [-2, 0, 0], "size": [2, 2, 2], "uv": [0, 0]}
+					]
+				},
 				{
 					"name": "tinkaton",
 					"pivot": [0, 0, 0]
@@ -26,8 +33,13 @@
 					"pivot": [0, 4, 0]
 				},
 				{
-					"name": "arm_hammer_right",
+					"name": "arms_hammer",
 					"parent": "torso_hammer",
+					"pivot": [0, 7, 0]
+				},
+				{
+					"name": "arm_hammer_right",
+					"parent": "arms_hammer",
 					"pivot": [-1.5, 6.5, 0]
 				},
 				{
@@ -98,6 +110,17 @@
 						{"origin": [-8, 17.75, -43.25], "size": [5, 5, 1], "uv": [24, 56]}
 					]
 				},
+				{
+					"name": "locator_hammer",
+					"parent": "hammer_front",
+					"pivot": [-8, 23, -28.75],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"hammer": [-8, 23, -28.75],
+						"physical": [-8, 23, -28.75],
+						"special2": [-8, 23, -28.75]
+					}
+				},
 				{
 					"name": "hammer_back",
 					"parent": "hammer_middle",
@@ -107,6 +130,15 @@
 						{"origin": [-12.5, -7.75, -33.5], "size": [9, 4, 9], "uv": [37, 49]}
 					]
 				},
+				{
+					"name": "seat_1_locator",
+					"parent": "hammer_middle",
+					"pivot": [-8, 15, -35],
+					"rotation": [90, 0, 0],
+					"locators": {
+						"seat_1": [-8, 15, -35]
+					}
+				},
 				{
 					"name": "body",
 					"parent": "tinkaton",
@@ -221,6 +253,14 @@
 						{"origin": [2, 10.25, -3.425], "size": [1, 2, 1], "inflate": 0.01, "uv": [76, 19]}
 					]
 				},
+				{
+					"name": "locator_eye_left",
+					"parent": "eye_left",
+					"pivot": [-2.5, 11.25, -3.5],
+					"locators": {
+						"eye1": [-2.5, 11.25, -3.5]
+					}
+				},
 				{
 					"name": "eye_right",
 					"parent": "head",
@@ -237,6 +277,14 @@
 						{"origin": [-3, 10.25, -3.425], "size": [1, 2, 1], "inflate": 0.01, "uv": [20, 72]}
 					]
 				},
+				{
+					"name": "locator_eye_right",
+					"parent": "eye_right",
+					"pivot": [2.5, 11.25, -3.5],
+					"locators": {
+						"eye2": [2.5, 11.25, -3.5]
+					}
+				},
 				{
 					"name": "mouths",
 					"parent": "head",
@@ -250,6 +298,14 @@
 						{"origin": [-2.5, 8.25, -3.41], "size": [5, 2, 0], "uv": [77, 0]}
 					]
 				},
+				{
+					"name": "locator_mouth",
+					"parent": "mouth_open",
+					"pivot": [0, 9.25, -3.5],
+					"locators": {
+						"mouth": [0, 9.25, -3.5]
+					}
+				},
 				{
 					"name": "mouth_closed",
 					"parent": "mouths",
@@ -307,8 +363,53 @@
 					]
 				},
 				{
-					"name": "arm_left",
+					"name": "locator_head",
+					"parent": "head",
+					"pivot": [0, 15.25, -2.5],
+					"locators": {
+						"head": [0, 15.25, -2.5]
+					}
+				},
+				{
+					"name": "locator_item_hat",
+					"parent": "head",
+					"pivot": [0, 16.25, 0],
+					"locators": {
+						"item_hat": [0, 16.25, 0]
+					}
+				},
+				{
+					"name": "locator_tera_hat",
+					"parent": "head",
+					"pivot": [0, 15.25, 0],
+					"locators": {
+						"tera_hat": [0, 15.25, 0]
+					}
+				},
+				{
+					"name": "locator_face",
+					"parent": "head",
+					"pivot": [0, 10.25, -3.5],
+					"locators": {
+						"face": [0, 10.25, -3.5]
+					}
+				},
+				{
+					"name": "locator_item_face",
+					"parent": "head",
+					"pivot": [0, 11.5, -3.5],
+					"locators": {
+						"item_face": [0, 11.5, -3.5]
+					}
+				},
+				{
+					"name": "arms",
 					"parent": "torso",
+					"pivot": [0, 7, 0]
+				},
+				{
+					"name": "arm_left",
+					"parent": "arms",
 					"pivot": [1.5, 6.5, 0],
 					"cubes": [
 						{"origin": [1.5, 5.5, -1.5], "size": [3, 2, 3], "uv": [94, 16]}
@@ -369,7 +470,7 @@
 				},
 				{
 					"name": "arm_right",
-					"parent": "torso",
+					"parent": "arms",
 					"pivot": [-1.5, 6.5, 0],
 					"cubes": [
 						{"origin": [-4.5, 5.5, -1.5], "size": [3, 2, 3], "uv": [58, 93]}
@@ -459,6 +560,46 @@
 					"cubes": [
 						{"origin": [0.25, 0, -1], "size": [2, 2, 2], "inflate": 0.2, "uv": [38, 54]}
 					]
+				},
+				{
+					"name": "locator_middle",
+					"parent": "body",
+					"pivot": [0, 7, 0],
+					"locators": {
+						"middle": [0, 7, 0]
+					}
+				},
+				{
+					"name": "locator_target",
+					"parent": "body",
+					"pivot": [0, 7, -6],
+					"locators": {
+						"target": [0, 7, -6]
+					}
+				},
+				{
+					"name": "locator_root",
+					"parent": "tinkaton",
+					"pivot": [0, 0, 0],
+					"locators": {
+						"root": [0, 0, 0]
+					}
+				},
+				{
+					"name": "locator_special",
+					"parent": "tinkaton",
+					"pivot": [0, 7, -8],
+					"locators": {
+						"special": [0, 7, -8]
+					}
+				},
+				{
+					"name": "locator_top",
+					"parent": "tinkaton",
+					"pivot": [0, 23, 0],
+					"locators": {
+						"top": [0, 23, 0]
+					}
 				}
 			]
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0968_orthworm/orthworm.geo.json

@@ -33,9 +33,9 @@
 					"parent": "top_body",
 					"pivot": [0, 4.5, -0.25],
 					"cubes": [
-						{"origin": [-4, 0.5, -10.25], "size": [8, 8, 10], "inflate": 0.11, "uv": [0, 21]},
+						{"origin": [-3.75, 2.5, -8.25], "size": [0, 4, 6], "uv": [70, -2], "mirror": true},
 						{"origin": [3.75, 2.5, -8.25], "size": [0, 4, 6], "uv": [70, -6]},
-						{"origin": [-3.75, 2.5, -8.25], "size": [0, 4, 6], "uv": [70, -2], "mirror": true}
+						{"origin": [-4, 0.5, -10.25], "size": [8, 8, 10], "inflate": 0.11, "uv": [0, 21]}
 					]
 				},
 				{
@@ -87,6 +87,25 @@
 						{"origin": [8.5, 2.5, -21.25], "size": [3, 3, 3], "uv": [0, 57]}
 					]
 				},
+				{
+					"name": "locator_hand_primary1",
+					"parent": "arm_front_left3",
+					"pivot": [10, 4, -19.75],
+					"rotation": [0, -90, 0],
+					"locators": {
+						"physical": [10, 4, -19.75],
+						"hand_primary1": [10, 4, -19.75]
+					}
+				},
+				{
+					"name": "locator_item",
+					"parent": "arm_front_left3",
+					"pivot": [10, 4, -19.75],
+					"rotation": [0, -90, 0],
+					"locators": {
+						"item": [10, 4, -19.75]
+					}
+				},
 				{
 					"name": "arm_middle_left",
 					"parent": "arms",
@@ -111,6 +130,15 @@
 						{"origin": [8.5, 2.5, -17.5], "size": [3, 3, 3], "uv": [24, 57]}
 					]
 				},
+				{
+					"name": "locator_hand_secondary1",
+					"parent": "arm_middle_left3",
+					"pivot": [10, 4, -16],
+					"rotation": [0, -90, 0],
+					"locators": {
+						"hand_secondary1": [10, 4, -16]
+					}
+				},
 				{
 					"name": "arm_back_left",
 					"parent": "arms",
@@ -135,6 +163,15 @@
 						{"origin": [8.5, 2.5, -14.5], "size": [3, 3, 3], "uv": [65, 58]}
 					]
 				},
+				{
+					"name": "locator_hand_secondary3",
+					"parent": "arm_back_left3",
+					"pivot": [10, 4, -13],
+					"rotation": [0, -90, 0],
+					"locators": {
+						"hand_secondary3": [10, 4, -13]
+					}
+				},
 				{
 					"name": "arm_front_right",
 					"parent": "arms",
@@ -159,6 +196,15 @@
 						{"origin": [-11.5, 2.5, -21.25], "size": [3, 3, 3], "uv": [12, 57], "mirror": true}
 					]
 				},
+				{
+					"name": "locator_hand_primary2",
+					"parent": "arm_front_right3",
+					"pivot": [-10, 4, -19.75],
+					"rotation": [0, 90, 0],
+					"locators": {
+						"hand_primary2": [-10, 4, -19.75]
+					}
+				},
 				{
 					"name": "arm_middle_right",
 					"parent": "arms",
@@ -183,6 +229,15 @@
 						{"origin": [-11.5, 2.5, -17.5], "size": [3, 3, 3], "uv": [53, 58], "mirror": true}
 					]
 				},
+				{
+					"name": "locator_hand_secondary2",
+					"parent": "arm_middle_right3",
+					"pivot": [-10, 4, -16],
+					"rotation": [0, 90, 0],
+					"locators": {
+						"hand_secondary2": [-10, 4, -16]
+					}
+				},
 				{
 					"name": "arm_back_right",
 					"parent": "arms",
@@ -207,6 +262,15 @@
 						{"origin": [-11.5, 2.5, -14.5], "size": [3, 3, 3], "uv": [77, 58], "mirror": true}
 					]
 				},
+				{
+					"name": "locator_hand_secondary4",
+					"parent": "arm_back_right3",
+					"pivot": [-10, 4, -13],
+					"rotation": [0, 90, 0],
+					"locators": {
+						"hand_secondary4": [-10, 4, -13]
+					}
+				},
 				{
 					"name": "head",
 					"parent": "chest",
@@ -246,6 +310,14 @@
 						{"origin": [1, 5.5, -32.03], "size": [1, 1, 0], "uv": [4, 0]}
 					]
 				},
+				{
+					"name": "locator_eye_left",
+					"parent": "pupil_left",
+					"pivot": [1.5, 6, -32],
+					"locators": {
+						"eye_left": [1.5, 6, -32]
+					}
+				},
 				{
 					"name": "eyelid_left",
 					"parent": "eye_left",
@@ -285,6 +357,14 @@
 						{"origin": [-2, 5.5, -32.03], "size": [1, 1, 0], "uv": [4, 0], "mirror": true}
 					]
 				},
+				{
+					"name": "locator_eye_right",
+					"parent": "pupil_right",
+					"pivot": [-1.5, 6, -32],
+					"locators": {
+						"eye_right": [-1.5, 6, -32]
+					}
+				},
 				{
 					"name": "eyelid_right",
 					"parent": "eye_right",
@@ -311,6 +391,71 @@
 						{"origin": [-4, 1, -32.25], "size": [8, 3, 4], "uv": [0, 14]}
 					]
 				},
+				{
+					"name": "locator_jaw_lower",
+					"parent": "jaw",
+					"pivot": [0, 4, -32.5],
+					"locators": {
+						"jaw2": [0, 4, -32.5]
+					}
+				},
+				{
+					"name": "head_locator",
+					"parent": "head",
+					"pivot": [0, 9, -29],
+					"locators": {
+						"head": [0, 9, -29]
+					}
+				},
+				{
+					"name": "item_hat_locator",
+					"parent": "head",
+					"pivot": [0, 9, -27.25],
+					"locators": {
+						"item_hat": [0, 9, -27.25]
+					}
+				},
+				{
+					"name": "face_locator",
+					"parent": "head",
+					"pivot": [0, 5, -32.5],
+					"locators": {
+						"face": [0, 5, -32.5]
+					}
+				},
+				{
+					"name": "item_face_locator",
+					"parent": "head",
+					"pivot": [0, 6, -32.5],
+					"locators": {
+						"item_face": [0, 6, -32.5]
+					}
+				},
+				{
+					"name": "mouth_locator",
+					"parent": "head",
+					"pivot": [0, 4, -28.5],
+					"locators": {
+						"mouth": [0, 4, -28.5],
+						"special": [0, 4, -28.5]
+					}
+				},
+				{
+					"name": "locator_jaw_upper",
+					"parent": "head",
+					"pivot": [0, 4, -32.5],
+					"locators": {
+						"jaw1": [0, 4, -32.5]
+					}
+				},
+				{
+					"name": "seat_1_locator",
+					"parent": "chest",
+					"pivot": [0, 10, -16],
+					"locators": {
+						"seat_1": [0, 10, -16]
+					}
+				},
 				{
 					"name": "segment1",
 					"parent": "body",
@@ -354,6 +499,56 @@
 					"cubes": [
 						{"origin": [-4, 0.5, 22.75], "size": [8, 8, 9], "inflate": 0.1, "uv": [56, 41]}
 					]
+				},
+				{
+					"name": "locator_tail",
+					"parent": "segment5",
+					"pivot": [0, 4.5, 27.5],
+					"rotation": [0, 180, 0],
+					"locators": {
+						"tail": [0, 4.5, 27.5]
+					}
+				},
+				{
+					"name": "locator_tail_tip",
+					"parent": "segment5",
+					"pivot": [0, 4.5, 32],
+					"rotation": [0, 180, 0],
+					"locators": {
+						"tail_tip": [0, 4.5, 32]
+					}
+				},
+				{
+					"name": "locator_middle",
+					"parent": "body",
+					"pivot": [0, 4.5, 0],
+					"locators": {
+						"middle": [0, 4.5, 0]
+					}
+				},
+				{
+					"name": "locator_target",
+					"parent": "body",
+					"pivot": [0, 4.5, -36],
+					"locators": {
+						"target": [0, 4.5, -36]
+					}
+				},
+				{
+					"name": "locator_root",
+					"parent": "orthworm",
+					"pivot": [0, 0, 0],
+					"locators": {
+						"root": [0, 0, 0]
+					}
+				},
+				{
+					"name": "locator_top",
+					"parent": "orthworm",
+					"pivot": [0, 11, 0],
+					"locators": {
+						"top": [0, 11, 0]
+					}
 				}
 			]
 		}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0823_corviknight/corviknight.json

@@ -0,0 +1,102 @@
+{
+  "portraitScale": 1,
+  "portraitTranslation": [-0.45, 3, 0],
+  "profileScale": 0.36,
+  "profileTranslation": [0, 1.2, 0],
+  "rootBone": "corviknight",
+  "firstPersonCameraOffset": {
+    "seat_1": [0, 0.25, 0]
+  },
+  "thirdPersonCameraOffset": {
+    "seat_1": [0, 4, 10],
+    "seat_1_reverse": [0, 3, 8]
+  },
+  "animations": {
+    "cry": "q.bedrock_stateful('corviknight', 'cry')"
+  },
+  "poses": {
+    "standing": {
+      "poseName": "standing",
+      "poseTypes": [
+        "STAND",
+        "NONE",
+        "PORTRAIT",
+        "PROFILE"
+      ],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('corviknight', 'ground_idle')",
+        "q.bedrock('corviknight', 'folded_wangs')"
+      ],
+      "transformTicks": 10,
+      "quirks": [
+        "q.bedrock_quirk('corviknight', 'blink')"
+      ]
+    },
+    "walking": {
+      "poseName": "walking",
+      "poseTypes": [
+        "WALK"
+      ],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('corviknight', 'ground_walk')",
+        "q.bedrock('corviknight', 'folded_wangs')"
+      ],
+      "transformTicks": 10,
+      "quirks": [
+        "q.bedrock_quirk('corviknight', 'blink')"
+      ]
+    },
+    "hover": {
+      "poseName": "hover",
+      "poseTypes": [
+        "HOVER",
+        "FLOAT"
+      ],
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('corviknight', 'air_idle')",
+        "q.bedrock('corviknight', 'wangs')"
+      ],
+      "transformTicks": 10,
+      "quirks": [
+        "q.bedrock_quirk('corviknight', 'blink')"
+      ]
+    },
+    "fly": {
+      "poseName": "fly",
+      "poseTypes": [
+        "FLY",
+        "SWIM"
+      ],
+      "condition": "!q.is_gliding",
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('corviknight', 'air_fly')",
+        "q.bedrock('corviknight', 'wangs')"
+      ],
+      "transformTicks": 10,
+      "quirks": [
+        "q.bedrock_quirk('corviknight', 'blink')"
+      ]
+    },
+    "glide": {
+      "poseName": "fly",
+      "poseTypes": [
+        "FLY",
+        "SWIM"
+      ],
+      "condition": "q.is_gliding",
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('corviknight', 'air_glide_TEST')",
+        "q.bedrock('corviknight', 'wangs')"
+      ],
+      "transformTicks": 10,
+      "quirks": [
+        "q.bedrock_quirk('corviknight', 'blink')"
+      ]
+    }
+  }
+}

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0899_wyrdeer/wyrdeer.json

@@ -8,7 +8,7 @@
     "poses": {
       "in_air": {
         "poseName": "in_air",
-        "poseTypes": ["WALK","STAND", "FLOAT", "NONE", "PORTRAIT"],
+        "poseTypes": ["STAND","WALK", "FLOAT"],
         "isBattle": false,
         "condition": "q.in_air",
         "animations": [

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0959_tinkaton/tinkaton.json

@@ -4,11 +4,34 @@
   "profileScale": 1,
   "profileTranslation": [0.0, 0.3, 0.0],
   "rootBone": "tinkaton",
+  "firstPersonCameraOffset": {
+    "seat_1": [0, 0.25, 0]
+  },
+  "thirdPersonCameraOffset": {
+    "seat_1": [0, 3, 6],
+    "seat_1_reverse": [0, 3, 6]
+  },
   "animations": {
     "faint": "q.bedrock_primary('tinkaton', 'faint', q.curve('one'))",
     "cry": "q.bedrock_stateful('tinkaton', 'cry')"
   },
   "poses": {
+    "in-air": {
+      "poseName": "in-air",
+      "poseTypes": ["STAND","WALK", "FLOAT"],
+      "condition": "q.in_air",
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('tinkaton', 'ride_jump')",
+        {
+          "condition": "q.is_ridden",
+          "animation": "q.bedrock('tinkaton', 'ride_mount_run')"
+        }
+      ],
+      "quirks": ["q.bedrock_quirk('tinkaton', 'blink')"],
+      "transformTicks": 2,
+      "transformToTicks": 2
+    },
     "battle-standing": {
       "poseName": "battle-standing",
       "poseTypes": ["STAND"],
@@ -26,15 +49,68 @@
         "sleeping": "q.bedrock_primary('tinkaton', 'sleep_transition')"
       }
     },
+    "mount-standing": {
+      "poseName": "mount-standing",
+      "poseTypes": ["STAND"],
+      "isBattle": false,
+      "condition": "q.is_ridden",
+      "animations": ["q.look('head')", "q.bedrock('tinkaton', 'mount_idle')", "q.bedrock('tinkaton', 'ride_mount_run')"],
+      "quirks": ["q.bedrock_quirk('tinkaton', 'blink')"],
+      "transitions": {
+        "sleeping": "q.bedrock_primary('tinkaton', 'sleep_transition')"
+      }
+    },
     "walking": {
       "poseName": "walking",
       "poseTypes": ["WALK"],
+      "condition": "!q.is_ridden && !q.is_sprinting",
       "animations": ["q.look('head')", "q.bedrock('tinkaton', 'ground_walk')"],
       "quirks": ["q.bedrock_quirk('tinkaton', 'blink')"],
       "transitions": {
         "sleeping": "q.bedrock_primary('tinkaton', 'sleep_transition')"
       }
     },
+    "mount-walking": {
+      "poseName": "mount-walking",
+      "poseTypes": ["WALK"],
+      "condition": "q.is_ridden && !q.is_sprinting",
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('tinkaton', 'mount_walk')",
+        "q.bedrock('tinkaton', 'ride_mount_run')"
+      ],
+      "quirks": ["q.bedrock_quirk('tinkaton', 'blink')"],
+      "transitions": {
+        "sleeping": "q.bedrock_primary('tinkaton', 'sleep_transition')"
+      }
+    },
+    "run": {
+      "poseName": "run",
+      "poseTypes": ["WALK"],
+      "condition": "!q.is_ridden && q.is_sprinting",
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('tinkaton', 'ground_run')"
+      ],
+      "quirks": ["q.bedrock_quirk('tinkaton', 'blink')"],
+      "transitions": {
+        "sleeping": "q.bedrock_primary('tinkaton', 'sleep_transition')"
+      }
+    },
+    "mount-run": {
+      "poseName": "mount-run",
+      "poseTypes": ["WALK"],
+      "condition": "q.is_ridden && q.is_sprinting",
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('tinkaton', 'mount_run')",
+        "q.bedrock('tinkaton', 'ride_mount_run')"
+      ],
+      "quirks": ["q.bedrock_quirk('tinkaton', 'blink')"],
+      "transitions": {
+        "sleeping": "q.bedrock_primary('tinkaton', 'sleep_transition')"
+      }
+    },
     "sleeping": {
       "poseName": "sleeping",
       "poseTypes": ["SLEEP"],

common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0968_orthworm/orthworm.json

@@ -4,7 +4,30 @@
   "profileScale": 0.59,
   "profileTranslation": [0.11, 1.09, 0],
   "rootBone": "orthworm",
+  "firstPersonCameraOffset": {
+    "seat_1": [0, 0.25, 0]
+  },
+  "thirdPersonCameraOffset": {
+    "seat_1": [0, 1.5, 5],
+    "seat_1_reverse": [0, 1.5, 5]
+  },
   "poses": {
+    "in-air": {
+      "poseName": "in-air",
+      "poseTypes": ["STAND", "WALK", "FLOAT", "NONE"],
+      "condition": "q.in_air",
+      "animations": [
+        "q.look('head')",
+        "q.bedrock('orthworm', 'ride_jump')",
+        {
+          "condition": "q.is_ridden",
+          "animation": "q.bedrock('orthworm', 'ride_ground_walk')"
+        }
+        ],
+      "quirks": ["q.bedrock_quirk('orthworm', 'blink')"],
+      "transformTicks": 2,
+      "transformToTicks": 2
+    },
     "portrait": {
       "poseTypes": ["PORTRAIT", "PROFILE"],
       "animations": [
@@ -22,16 +45,38 @@
     },
     "standing": {
       "poseTypes": ["STAND", "NONE"],
-      "condition": "q.in_battle() == false",
+      "condition": "q.in_battle() == false && !q.in_air",
       "animations": [
-        "q.bedrock('orthworm', 'ground_idle')"
+        "q.bedrock('orthworm', 'ground_idle')",
+        {
+          "condition": "q.is_ridden",
+          "animation": "q.bedrock('orthworm', 'ride_ground_walk')"
+        }
       ],
       "quirks": ["q.bedrock_quirk('orthworm', 'blink')"]
     },
     "walking": {
       "poseTypes": ["WALK"],
+      "condition": "!q.in_air && !q.is_sprinting",
       "animations": [
-        "q.bedrock('orthworm', 'ground_idle')"
+        "q.bedrock('orthworm', 'ground_walk')",
+        {
+          "condition": "q.is_ridden",
+          "animation": "q.bedrock('orthworm', 'ride_ground_walk')"
+        }
+      ],
+      "quirks": ["q.bedrock_quirk('orthworm', 'blink')"]
+    },
+    "run": {
+      "poseName": "run",
+      "poseTypes": ["WALK"],
+      "condition": "q.is_sprinting && !q.in_air",
+      "animations": [
+        "q.bedrock('orthworm', 'ground_run')",
+        {
+          "condition": "q.is_ridden",
+          "animation": "q.bedrock('orthworm', 'ride_ground_run')"
+        }
       ],
       "quirks": ["q.bedrock_quirk('orthworm', 'blink')"]
     }

common/src/main/resources/data/cobblemon/species/generation8/corviknight.json

@@ -49,10 +49,67 @@
     "height": 4.4,
     "fixed": false
   },
+  "riding": {
+    "stats": {
+      "SPEED": {
+        "ranges": {
+          "LAND": "5-15",
+          "AIR": "35-65"
+        }
+      },
+      "ACCELERATION": {
+        "ranges": {
+          "LAND": "10-100",
+          "AIR": "20-50"
+        }
+      },
+      "SKILL": {
+        "ranges": {
+          "LAND": "40-85",
+          "AIR": "25-50"
+        }
+      },
+      "JUMP": {
+        "ranges": {
+          "LAND": "20-55",
+          "AIR": "30-60"
+        }
+      },
+      "STAMINA": {
+        "ranges": {
+          "LAND": "55-85",
+          "AIR": "55-85"
+        }
+      }
+    },
+    "behaviour": {
+      "key": "cobblemon:composite",
+      "transitionStrategy": "cobblemon:strategy/jump",
+      "defaultBehaviour": {
+        "key": "cobblemon:land/generic"
+      },
+      "alternateBehaviour": {
+        "key": "cobblemon:air/bird"
+      }
+    },
+    "seats": [
+      {
+        "offset": {
+          "x": 0,
+          "y": 0,
+          "z": 0
+        }
+      }
+    ]
+  },
   "behaviour": {
     "moving": {
+      "walk": {
+        "walkSpeed": 0.147
+      },
       "fly": {
-        "canFly": true
+        "canFly": true,
+        "flySpeedHorizontal": 0.6
       }
     },
     "resting": {
@@ -207,43 +264,5 @@
       "evolutions": [],
       "battleOnly": true
     }
-  ],
-  "riding": {
-    "stats": {
-      "SPEED": {
-        "ranges": {
-          "LAND": "5-15",
-          "AIR": "35-65"
-        }
-      },
-      "ACCELERATION": {
-        "ranges": {
-          "LAND": "10-100",
-          "AIR": "20-50"
-        }
-      },
-      "SKILL": {
-        "ranges": {
-          "LAND": "40-85",
-          "AIR": "25-50"
-        }
-      },
-      "JUMP": {
-        "ranges": {
-          "LAND": "20-55",
-          "AIR": "30-60"
-        }
-      },
-      "STAMINA": {
-        "ranges": {
-          "LAND": "55-85",
-          "AIR": "55-85"
-        }
-      }
-    },
-    "seats": [],
-    "behaviour": {
-      "key": "cobblemon:land/generic"
-    }
-  }
+  ]
 }

common/src/main/resources/data/cobblemon/species/generation9/orthworm.json

@@ -53,6 +53,68 @@
       }
     ]
   },
+  "riding": {
+    "stats": {
+      "SPEED": {
+        "displayName": "Speed",
+        "description": "Its top speed",
+        "ranges": {
+          "LAND": "50-100"
+        }
+      },
+      "ACCELERATION": {
+        "displayName": "Acceleration",
+        "description": "How fast it can speed up",
+        "ranges": {
+          "LAND": "50-100"
+        }
+      },
+      "SKILL": {
+        "displayName": "Handling",
+        "description": "How fast it can turn",
+        "ranges": {
+          "LAND": "50-100"
+        }
+      },
+      "JUMP": {
+        "displayName": "Altitude",
+        "description": "How high it can jump",
+        "ranges": {
+          "LAND": "50-100"
+        }
+      },
+      "STAMINA": {
+        "displayName": "Fuel/Stamina",
+        "description": "How long it can sprint",
+        "ranges": {
+          "LAND": "50-100"
+        }
+      }
+    },
+    "behaviour": {
+      "key": "cobblemon:land/generic"
+    },
+    "seats": [
+      {
+        "offset": {
+          "x": 0,
+          "y": 0,
+          "z": 0
+        }
+      }
+    ]
+  },
+  "behaviour": {
+    "moving": {
+      "walk": {
+        "walkSpeed": 0.3
+      }
+    },
+    "resting": {
+      "canSleep": true,
+      "light": "0-4"
+    }
+  },
   "moves": [
     "1:tackle",
     "1:wrap",

common/src/main/resources/data/cobblemon/species/generation9/tinkaton.json

@@ -49,7 +49,63 @@
     "height": 0.95,
     "fixed": false
   },
+  "riding": {
+    "stats": {
+      "SPEED": {
+        "displayName": "Speed",
+        "description": "Its top speed",
+        "ranges": {
+          "LAND": "50-100"
+        }
+      },
+      "ACCELERATION": {
+        "displayName": "Acceleration",
+        "description": "How fast it can speed up",
+        "ranges": {
+          "LAND": "50-100"
+        }
+      },
+      "SKILL": {
+        "displayName": "Handling",
+        "description": "How fast it can turn",
+        "ranges": {
+          "LAND": "50-100"
+        }
+      },
+      "JUMP": {
+        "displayName": "Altitude",
+        "description": "How high it can jump",
+        "ranges": {
+          "LAND": "50-100"
+        }
+      },
+      "STAMINA": {
+        "displayName": "Fuel/Stamina",
+        "description": "How long it can sprint",
+        "ranges": {
+          "LAND": "50-100"
+        }
+      }
+    },
+    "behaviour": {
+      "key": "cobblemon:land/generic"
+    },
+    "seats": [
+      {
+        "offset": {
+          "x": 0,
+          "y": 0,
+          "z": 0
+        }
+      }
+    ]
+  },
   "behaviour": {
+    "moving": {
+      "walk": {
+        "walkSpeed": 0.18
+      }
+    },
     "resting": {
       "canSleep": true,
       "light": "0-4"