From b72050da1d19af204af8d6f022da9fe4f71e938d Mon Sep 17 00:00:00 2001 From: FrankTheFarmer Date: Sun, 29 Sep 2024 20:46:36 +1000 Subject: [PATCH] Marshtomp remodel --- .../blockbench/pokemon/gen3/MarshtompModel.kt | 70 ---- .../0259_marshtomp/marshtomp.animation.json | 212 +++++----- .../models/0259_marshtomp/marshtomp.geo.json | 371 +++++++++++++++--- .../posers/0259_marshtomp/marshtomp.json | 42 ++ .../pokemon/0259_marshtomp/marshtomp.png | Bin 2155 -> 2977 bytes .../0259_marshtomp/marshtomp_shiny.png | Bin 857 -> 1525 bytes 6 files changed, 460 insertions(+), 235 deletions(-) delete mode 100644 common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt create mode 100644 common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0259_marshtomp/marshtomp.json diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt deleted file mode 100644 index 8f45fd209e..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt +++ /dev/null @@ -1,70 +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.gen3 - -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPosableModel -import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation -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.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 MarshtompModel(root: ModelPart) : PokemonPosableModel(root), HeadedFrame, BipedFrame { - override val rootPart = root.registerChildWithAllChildren("marshtomp") - override val head = getPart("head") - - override val leftLeg = getPart("leg_left") - override val rightLeg = getPart("leg_right") - - override var portraitScale = 2.4F - override var portraitTranslation = Vec3(-0.1, -0.6, 0.0) - - override var profileScale = 1.0F - override var profileTranslation = Vec3(0.0, 0.28, 0.0) - - lateinit var standing: Pose - lateinit var walk: Pose - - override val cryAnimation = CryProvider { bedrockStateful("marshtomp", "cry") } - - override fun registerPoses() { - val blink = quirk { bedrockStateful("marshtomp", "blink") } - standing = registerPose( - poseName = "standing", - poseTypes = STATIONARY_POSES + UI_POSES, - quirks = arrayOf(blink), - animations = arrayOf( - singleBoneLook(), - bedrock("marshtomp", "ground_idle") - ) - ) - - walk = registerPose( - poseName = "walk", - poseTypes = MOVING_POSES, - quirks = arrayOf(blink), - animations = arrayOf( - singleBoneLook(), - bedrock("marshtomp", "ground_idle"), - BipedWalkAnimation(this, periodMultiplier = 0.75F, amplitudeMultiplier = 0.8F) - //bedrock("marshtomp", "ground_walk") - ) - ) - } - -// override fun getFaintAnimation( -// pokemonEntity: PokemonEntity, -// state: PosableState -// ) = if (state.isPosedIn(standing, walk)) bedrockStateful("marshtomp", "faint") else null -} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0259_marshtomp/marshtomp.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0259_marshtomp/marshtomp.animation.json index 60aca8db24..7ed260767c 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0259_marshtomp/marshtomp.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0259_marshtomp/marshtomp.animation.json @@ -4,104 +4,79 @@ "animation.marshtomp.ground_idle": { "loop": true, "bones": { - "arm_left": { - "rotation": [0, 0, 55] + "torso": { + "rotation": [0, 0, 0] }, - "forearm_left": { - "rotation": [0, 0, 15] + "chest": { + "rotation": [-2.5, 0, 0] }, - "arm_right": { - "rotation": [0, 0, -55] - }, - "forearm_right": { - "rotation": [0, 0, -15] - }, - "tail_fin_right": { - "rotation": [0, -30, 0] - }, - "tail_fin_left": { - "rotation": [0, 30, 0] - } - } - }, - "animation.marshtomp.water_idle": { - "loop": true, - "bones": { "head": { - "rotation": [-25, 0, 0] + "rotation": [5, 0, 0] }, "arm_left": { - "rotation": [15, 15, 45] + "rotation": [7.5, 0, 27.5] }, - "forearm_left": { - "rotation": [0, 0, 15] + "arm_left2": { + "rotation": [0, 15, 2.5] + }, + "hand_left": { + "rotation": [0, 0, 5] + }, + "finger_front_left": { + "rotation": [0, 2.5, 15] + }, + "finger_middle_left": { + "rotation": [0, 0, 10] + }, + "finger_back_left": { + "rotation": [0, -5, 20] }, "arm_right": { - "rotation": [15, -15, -45] + "rotation": [7.5, 0, -27.5] }, - "forearm_right": { - "rotation": [0, 0, -15] + "arm_right2": { + "rotation": [0, -15, -2.5] }, - "tail_fin_right": { - "rotation": [0, -30, 0] + "hand_right": { + "rotation": [0, 0, -5] + }, + "finger_front_right": { + "rotation": [0, -2.5, -15] + }, + "finger_middle_right": { + "rotation": [0, 0, -10] + }, + "finger_back_right": { + "rotation": [0, 5, -20] }, "tail_fin_left": { - "rotation": [0, 30, 0] + "rotation": [-5, 45, 0] + }, + "tail_fin_right": { + "rotation": [-5, -45, 0] }, "leg_left": { - "rotation": [0, 0, -15] + "rotation": [2.5, 0, -2.5] + }, + "leg_left2": { + "rotation": [5, 0, 0] + }, + "foot_left": { + "rotation": [-7.5, 0, 2.5] }, "leg_right": { - "rotation": [0, 0, 15] + "rotation": [2.5, 0, 2.5] }, - "body": { - "rotation": [30, 0, 0] - } - } - }, - "animation.marshtomp.water_swim": { - "loop": true, - "bones": { - "head": { - "rotation": [-55, 0, 0] + "leg_right2": { + "rotation": [5, 0, 0] }, - "arm_left": { - "rotation": [15, -5, 55] - }, - "forearm_left": { - "rotation": [0, 0, 15] - }, - "arm_right": { - "rotation": [15, 5, -55] - }, - "forearm_right": { - "rotation": [0, 0, -15] - }, - "tail_fin_right": { - "rotation": [-15, -45, 0] - }, - "tail_fin_left": { - "rotation": [-15, 45, 0] - }, - "leg_left": { - "rotation": [5, 0, -5] - }, - "leg_right": { - "rotation": [5, 0, 5] - }, - "body": { - "rotation": [60, 0, 0] - }, - "atenna_left": { - "rotation": [0, -15, 0] - }, - "atenna_right": { - "rotation": [0, 15, 0] + "foot_right": { + "rotation": [-7.5, 0, -2.5] } } }, "animation.marshtomp.blink": { - "animation_length": 0.16667, + "animation_length": 0.1667, "bones": { "eyelid_left": { "position": { @@ -119,37 +94,64 @@ } } }, - "animation.marshtomp.cry": { - "animation_length": 0.95833, + "animation.marshtomp.shock": { + "loop": true, "bones": { - "head": { - "rotation": { - "0.0": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.125": { - "post": [-5, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.375": { - "post": [-2.5, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.6667": { - "post": [-7.5, 0, 0], - "lerp_mode": "catmullrom" - }, - "0.9583": { - "post": [0, 0, 0], - "lerp_mode": "catmullrom" - } - } + "jaw": { + "rotation": [25, 0, 0] + }, + "pupil_left": { + "scale": [0.7, 0.7, 1] + }, + "pupil_right": { + "scale": [0.7, 0.7, 1] } - }, - "sound_effects": { - "0.0417": { - "effect": "pokemon.marshtomp.cry" + } + }, + "animation.marshtomp.angry": { + "loop": true, + "bones": { + "eye_angry_left": { + "position": [0, 0, -0.1] + }, + "eye_angry_right": { + "position": [0, 0, -0.1] + } + } + }, + "animation.marshtomp.sad": { + "loop": true, + "bones": { + "eye_sad_left": { + "position": [0, 0, -0.1] + }, + "eye_sad_right": { + "position": [0, 0, -0.1] + } + } + }, + "animation.marshtomp.happy": { + "loop": true, + "bones": { + "jaw": { + "rotation": [25, 0, 0] + }, + "eyelid_happy_left": { + "position": [0, 0, -0.1] + }, + "eyelid_happy_right": { + "position": [0, 0, -0.1] + } + } + }, + "animation.marshtomp.recoil": { + "loop": true, + "bones": { + "eye_recoil_left": { + "position": [0, 0, -0.1] + }, + "eye_recoil_right": { + "position": [0, 0, -0.1] } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0259_marshtomp/marshtomp.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0259_marshtomp/marshtomp.geo.json index 38f622c380..2eebe28326 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0259_marshtomp/marshtomp.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0259_marshtomp/marshtomp.geo.json @@ -6,9 +6,9 @@ "identifier": "geometry.marshtomp", "texture_width": 64, "texture_height": 64, - "visible_bounds_width": 3, - "visible_bounds_height": 2.5, - "visible_bounds_offset": [0, 0.75, 0] + "visible_bounds_width": 4, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] }, "bones": [ { @@ -18,140 +18,391 @@ { "name": "body", "parent": "marshtomp", - "pivot": [0, 7.5, -1] + "pivot": [0, 6, 0] }, { "name": "torso", "parent": "body", - "pivot": [0, 4, -1], + "pivot": [0, 6, 0], "cubes": [ - {"origin": [-3.5, 2.5, -3.5], "size": [7, 9, 5], "uv": [18, 13]} + {"origin": [-4.5, 4, -3.5], "size": [9, 5, 7], "uv": [28, 17]}, + {"origin": [-3, 5, -3.5], "size": [6, 4, 1], "inflate": 0.01, "uv": [32, 52]} + ] + }, + { + "name": "chest", + "parent": "torso", + "pivot": [0, 9, 0], + "cubes": [ + {"origin": [-4, 8, -3], "size": [8, 5, 6], "inflate": 0.01, "uv": [6, 25]} + ] + }, + { + "name": "neck", + "parent": "chest", + "pivot": [0, 13, 0], + "cubes": [ + {"origin": [-3.5, 12.5, -2.5], "size": [7, 3, 5], "uv": [34, 29]} ] }, { "name": "head", - "parent": "torso", - "pivot": [0, 13, -1.5], + "parent": "neck", + "pivot": [0, 15.5, -0.25], "cubes": [ - {"origin": [-4, 11, -4.75], "size": [8, 6, 7], "uv": [0, 0]}, - {"origin": [-1.5, 13, -4.775], "size": [3, 1, 0], "inflate": 0.02, "uv": [0, 6]}, - {"origin": [0, 11, -4], "size": [0, 12, 9], "uv": [0, 4]} + {"origin": [-5, 14.5, -0.25], "size": [10, 3, 4], "inflate": 0.01, "uv": [28, 1]}, + {"origin": [-5, 17.5, -4.25], "size": [10, 5, 8], "inflate": 0.01, "uv": [0, 0]}, + {"origin": [-3, 16.9, -4.27], "size": [6, 1, 0], "inflate": 0.01, "uv": [24, 13]}, + {"origin": [-1.5, 17.4, -4.26], "size": [3, 1, 0], "inflate": 0.01, "uv": [24, 14]} ] }, + { + "name": "eyes", + "parent": "head", + "pivot": [0, 18.25, -4.27] + }, { "name": "eye_left", - "parent": "head", - "pivot": [2.5, 15, -4.775], + "parent": "eyes", + "pivot": [2.75, 19.5, -4.27], "rotation": [0, 0, -2.5], "cubes": [ - {"origin": [1.5, 14, -4.775], "size": [2, 2, 0], "inflate": 0.02, "uv": [0, 0]} + {"origin": [1.75, 18, -4.47], "size": [2, 3, 1], "inflate": -0.2, "uv": [0, 0]} ] }, { - "name": "eye_right", - "parent": "head", - "pivot": [-2.5, 15, -4.775], - "rotation": [0, 0, 2.5], + "name": "eye_angry_left", + "parent": "eye_left", + "pivot": [2.75, 20.65, -4.18], "cubes": [ - {"origin": [-3.5, 14, -4.775], "size": [2, 2, 0], "inflate": 0.02, "uv": [0, 0], "mirror": true} + {"origin": [2.75, 20.4, -4.18], "size": [1, 1, 0], "inflate": 0.01, "uv": [6, 1]}, + {"origin": [1.75, 19.95, -4.18], "size": [1, 1, 0], "inflate": 0.01, "uv": [6, 0]} + ] + }, + { + "name": "eye_sad_left", + "parent": "eye_left", + "pivot": [3.25, 20.9, -4.18], + "cubes": [ + {"origin": [2.75, 20.4, -4.18], "size": [1, 1, 0], "inflate": 0.01, "uv": [6, 4]} + ] + }, + { + "name": "pupil_left", + "parent": "eye_left", + "pivot": [2.75, 19.5, -3.88], + "cubes": [ + {"origin": [2.25, 18.5, -4.38], "size": [1, 2, 1], "inflate": -0.1, "uv": [28, 2]} ] }, { "name": "eyelid_left", - "parent": "head", - "pivot": [2.5, 15, -4.025], - "rotation": [0, 0, -2.5], + "parent": "eye_left", + "pivot": [2.75, 19.5, -3.88], "cubes": [ - {"origin": [1.5, 14, -4.525], "size": [2, 2, 1], "inflate": 0.04, "uv": [0, 2]} + {"origin": [1.75, 18, -4.38], "size": [2, 3, 1], "inflate": -0.19, "uv": [29, 14]} + ] + }, + { + "name": "eyelid_happy_left", + "parent": "eye_left", + "pivot": [2.75, 19.5, -3.88], + "cubes": [ + {"origin": [1.25, 18, -4.38], "size": [3, 3, 1], "inflate": -0.19, "uv": [32, 57]} + ] + }, + { + "name": "eye_recoil_left", + "parent": "eye_left", + "pivot": [3, 19.5, -3.88], + "cubes": [ + {"origin": [1.5, 18, -4.38], "size": [3, 3, 1], "inflate": -0.19, "uv": [46, 52]} + ] + }, + { + "name": "eye_right", + "parent": "eyes", + "pivot": [-2.75, 19.5, -4.27], + "rotation": [0, 0, 2.5], + "cubes": [ + {"origin": [-3.75, 18, -4.47], "size": [2, 3, 1], "inflate": -0.2, "uv": [0, 4], "mirror": true} + ] + }, + { + "name": "eye_angry_right", + "parent": "eye_right", + "pivot": [-2.75, 20.65, -4.18], + "cubes": [ + {"origin": [-3.75, 20.4, -4.18], "size": [1, 1, 0], "inflate": 0.01, "uv": [6, 3], "mirror": true}, + {"origin": [-2.75, 19.95, -4.18], "size": [1, 1, 0], "inflate": 0.01, "uv": [6, 2], "mirror": true} + ] + }, + { + "name": "eye_sad_right", + "parent": "eye_right", + "pivot": [-3.25, 20.9, -4.18], + "cubes": [ + {"origin": [-3.75, 20.4, -4.18], "size": [1, 1, 0], "inflate": 0.01, "uv": [6, 5], "mirror": true} + ] + }, + { + "name": "pupil_right", + "parent": "eye_right", + "pivot": [-2.75, 19.5, -3.88], + "cubes": [ + {"origin": [-3.25, 18.5, -4.38], "size": [1, 2, 1], "inflate": -0.1, "uv": [0, 14], "mirror": true} ] }, { "name": "eyelid_right", - "parent": "head", - "pivot": [-2.5, 15, -4.025], - "rotation": [0, 0, 2.5], + "parent": "eye_right", + "pivot": [-2.75, 19.5, -3.88], "cubes": [ - {"origin": [-3.5, 14, -4.525], "size": [2, 2, 1], "inflate": 0.04, "uv": [0, 2], "mirror": true} + {"origin": [-3.75, 18, -4.38], "size": [2, 3, 1], "inflate": -0.19, "uv": [29, 18], "mirror": true} ] }, { - "name": "atenna_left", - "parent": "head", - "pivot": [4, 13.5, -2], + "name": "eyelid_happy_right", + "parent": "eye_right", + "pivot": [-2.75, 19.5, -3.88], "cubes": [ - {"origin": [4, 12.5, -2], "size": [4, 2, 0], "uv": [23, 0]} + {"origin": [-4.25, 18, -4.38], "size": [3, 3, 1], "inflate": -0.19, "uv": [40, 57], "mirror": true} ] }, { - "name": "atenna_right", - "parent": "head", - "pivot": [-4, 13.5, -2], + "name": "eye_recoil_right", + "parent": "eye_right", + "pivot": [-3, 19.5, -3.88], "cubes": [ - {"origin": [-8, 12.5, -2], "size": [4, 2, 0], "uv": [23, 2]} + {"origin": [-4.5, 18, -4.38], "size": [3, 3, 1], "inflate": -0.19, "uv": [54, 52], "mirror": true} ] }, + { + "name": "jaw", + "parent": "head", + "pivot": [0, 16.5, -0.25], + "cubes": [ + {"origin": [-5, 14.5, -4.25], "size": [10, 3, 4], "uv": [0, 13]} + ] + }, + { + "name": "cheeks", + "parent": "head", + "pivot": [0, 18.5, -0.25] + }, + { + "name": "cheek_left", + "parent": "cheeks", + "pivot": [5.01, 18.5, -0.25], + "cubes": [ + {"origin": [5.01, 15, -3.75], "size": [0, 7, 7], "inflate": 0.01, "uv": [36, 3]} + ] + }, + { + "name": "cheek_left_end", + "parent": "cheek_left", + "pivot": [5.01, 18.5, -0.25], + "cubes": [ + {"origin": [4.51, 17.5, -1.25], "size": [3, 2, 2], "uv": [52, 1]}, + {"origin": [7.01, 18, -0.75], "size": [3, 1, 1], "inflate": 0.01, "uv": [38, 8]} + ] + }, + { + "name": "cheek_right", + "parent": "cheeks", + "pivot": [-5.01, 18.5, -0.25], + "cubes": [ + {"origin": [-5.01, 15, -3.75], "size": [0, 7, 7], "inflate": 0.01, "uv": [50, 3], "mirror": true} + ] + }, + { + "name": "cheek_right_end", + "parent": "cheek_right", + "pivot": [-5.01, 18.5, -0.25], + "cubes": [ + {"origin": [-7.51, 17.5, -1.25], "size": [3, 2, 2], "uv": [54, 6], "mirror": true}, + {"origin": [-10.01, 18, -0.75], "size": [3, 1, 1], "inflate": 0.01, "uv": [46, 8], "mirror": true} + ] + }, + { + "name": "head_fin", + "parent": "head", + "pivot": [0, 18.5, 3.25], + "rotation": [7.5, 0, 0], + "cubes": [ + {"origin": [0, 18, -1], "size": [0, 11, 6], "uv": [0, 14]} + ] + }, + { + "name": "arms", + "parent": "chest", + "pivot": [0, 13.5, 0.25] + }, { "name": "arm_left", - "parent": "torso", - "pivot": [3.5, 10.75, -1], + "parent": "arms", + "pivot": [3.5, 13.5, 0.25], "cubes": [ - {"origin": [3.5, 8.75, -2.5], "size": [5, 2, 3], "inflate": 0.01, "uv": [35, 33]} + {"origin": [3.5, 12.5, -1.25], "size": [4, 1, 3], "uv": [28, 37]} ] }, { - "name": "forearm_left", + "name": "arm_left2", "parent": "arm_left", - "pivot": [8.5, 10.75, 0.5], + "pivot": [7.5, 13.5, 1.75], "cubes": [ - {"origin": [8.5, 8.75, -2.5], "size": [4, 2, 3], "uv": [16, 36]} + {"origin": [7.5, 12.5, -1.75], "size": [4, 1, 4], "inflate": 0.01, "uv": [28, 41]} + ] + }, + { + "name": "hand_left", + "parent": "arm_left2", + "pivot": [11.5, 13.5, 0.25], + "cubes": [ + {"origin": [11.5, 12.5, -2.25], "size": [3, 1, 5], "inflate": 0.02, "uv": [32, 46]} + ] + }, + { + "name": "finger_front_left", + "parent": "hand_left", + "pivot": [14.5, 13.5, -0.25], + "cubes": [ + {"origin": [14.5, 12.5, -2.25], "size": [3, 1, 2], "uv": [12, 20]} + ] + }, + { + "name": "finger_middle_left", + "parent": "hand_left", + "pivot": [14.5, 13.5, 0.25], + "cubes": [ + {"origin": [14.5, 12.5, -0.75], "size": [3, 1, 2], "inflate": 0.01, "uv": [54, 21]} + ] + }, + { + "name": "finger_back_left", + "parent": "hand_left", + "pivot": [14.5, 13.5, 0.75], + "cubes": [ + {"origin": [14.5, 12.5, 0.75], "size": [3, 1, 2], "uv": [43, 48]} ] }, { "name": "arm_right", - "parent": "torso", - "pivot": [-3.5, 10.75, -1], + "parent": "arms", + "pivot": [-3.5, 13.5, 0.25], "cubes": [ - {"origin": [-8.5, 8.75, -2.5], "size": [5, 2, 3], "inflate": 0.01, "uv": [0, 36]} + {"origin": [-7.5, 12.5, -1.25], "size": [4, 1, 3], "uv": [42, 37], "mirror": true} ] }, { - "name": "forearm_right", + "name": "arm_right2", "parent": "arm_right", - "pivot": [-8.5, 10.75, 0.5], + "pivot": [-7.5, 13.5, 1.75], "cubes": [ - {"origin": [-12.5, 8.75, -2.5], "size": [4, 2, 3], "uv": [37, 9]} + {"origin": [-11.5, 12.5, -1.75], "size": [4, 1, 4], "inflate": 0.01, "uv": [44, 41], "mirror": true} ] }, { - "name": "tail_fin_right", - "parent": "torso", - "pivot": [-1.25, 6.75, 1.5], + "name": "hand_right", + "parent": "arm_right2", + "pivot": [-11.5, 13.5, 0.25], "cubes": [ - {"origin": [-1.25, 2.25, 1.5], "size": [0, 9, 6], "uv": [12, 21]} + {"origin": [-14.5, 12.5, -2.25], "size": [3, 1, 5], "inflate": 0.02, "uv": [48, 46], "mirror": true} + ] + }, + { + "name": "finger_front_right", + "parent": "hand_right", + "pivot": [-14.5, 13.5, -0.25], + "cubes": [ + {"origin": [-17.5, 12.5, -2.25], "size": [3, 1, 2], "uv": [20, 21], "mirror": true} + ] + }, + { + "name": "finger_middle_right", + "parent": "hand_right", + "pivot": [-14.5, 13.5, 0.25], + "cubes": [ + {"origin": [-17.5, 12.5, -0.75], "size": [3, 1, 2], "inflate": 0.01, "uv": [53, 31], "mirror": true} + ] + }, + { + "name": "finger_back_right", + "parent": "hand_right", + "pivot": [-14.5, 13.5, 0.75], + "cubes": [ + {"origin": [-17.5, 12.5, 0.75], "size": [3, 1, 2], "uv": [53, 37], "mirror": true} ] }, { "name": "tail_fin_left", "parent": "torso", - "pivot": [1.25, 6.75, 1.5], + "pivot": [2, 6.5, 3.5], "cubes": [ - {"origin": [1.25, 2.25, 1.5], "size": [0, 9, 6], "uv": [0, 19]} + {"origin": [2, 3.5, 3.25], "size": [0, 10, 7], "uv": [0, 29]} + ] + }, + { + "name": "tail_fin_right", + "parent": "torso", + "pivot": [-2, 6.5, 3.5], + "cubes": [ + {"origin": [-2, 3.5, 3.25], "size": [0, 10, 7], "uv": [14, 29], "mirror": true} + ] + }, + { + "name": "legs", + "parent": "body", + "pivot": [0, 4, -0.25] + }, + { + "name": "leg_left", + "parent": "legs", + "pivot": [2.75, 4.5, -0.25], + "cubes": [ + {"origin": [0.75, 2.5, -2.25], "size": [4, 3, 4], "inflate": 0.01, "uv": [0, 46]} + ] + }, + { + "name": "leg_left2", + "parent": "leg_left", + "pivot": [2.75, 2.5, -2.25], + "cubes": [ + {"origin": [0.75, 0.5, -2.25], "size": [4, 2, 4], "uv": [0, 53]} + ] + }, + { + "name": "foot_left", + "parent": "leg_left2", + "pivot": [2.75, 1, -0.25], + "cubes": [ + {"origin": [0.75, 0, -2.25], "size": [4, 1, 4], "inflate": 0.01, "uv": [0, 59]}, + {"origin": [1.25, 0, -2.25], "size": [3, 1, 1], "inflate": 0.02, "uv": [12, 59]} ] }, { "name": "leg_right", - "parent": "body", - "pivot": [-2.25, 4.5, -1], + "parent": "legs", + "pivot": [-2.75, 4.5, -0.25], "cubes": [ - {"origin": [-3.75, 0, -3], "size": [3, 5, 4], "uv": [24, 27]} + {"origin": [-4.75, 2.5, -2.25], "size": [4, 3, 4], "inflate": 0.01, "uv": [16, 46], "mirror": true} ] }, { - "name": "leg_left", - "parent": "body", - "pivot": [2.25, 4.5, -1], + "name": "leg_right2", + "parent": "leg_right", + "pivot": [-2.75, 2.5, -2.25], "cubes": [ - {"origin": [0.75, 0, -3], "size": [3, 5, 4], "uv": [30, 0]} + {"origin": [-4.75, 0.5, -2.25], "size": [4, 2, 4], "uv": [16, 53], "mirror": true} + ] + }, + { + "name": "foot_right", + "parent": "leg_right2", + "pivot": [-2.75, 1, -0.25], + "cubes": [ + {"origin": [-4.75, 0, -2.25], "size": [4, 1, 4], "inflate": 0.01, "uv": [16, 59], "mirror": true}, + {"origin": [-4.25, 0, -2.25], "size": [3, 1, 1], "inflate": 0.02, "uv": [12, 61], "mirror": true} ] } ] diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0259_marshtomp/marshtomp.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0259_marshtomp/marshtomp.json new file mode 100644 index 0000000000..77de8af6a6 --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0259_marshtomp/marshtomp.json @@ -0,0 +1,42 @@ +{ + "portraitScale": 1, + "portraitTranslation": [0,0,0], + "profileScale": 1, + "profileTranslation": [0,0,0], + "animations": { + "recoil": "q.bedrock_stateful('marshtomp', 'recoil')" + }, + "poses": { + "standing": { + "poseTypes": [ + "STAND", + "FLOAT", + "PORTRAIT", + "PROFILE", + "NONE" + ], + "animations": [ + "q.look('head')", + "q.bedrock('marshtomp', 'ground_idle')" + ], + "quirks": [ + "q.bedrock_quirk('marshtomp', 'blink')" + ] + }, + "walking": { + "poseTypes": [ + "WALK", + "SWIM" + ], + "animations": [ + "q.look('head')", + "q.bedrock('marshtomp', 'ground_idle')", + "q.biped_walk(0.66, 0.6, 'leg_left', 'leg_right')", + "q.bimanual_swing(0.66, 0.75, 'arm_left', 'arm_right')" + ], + "quirks": [ + "q.bedrock_quirk('marshtomp', 'blink')" + ] + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0259_marshtomp/marshtomp.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0259_marshtomp/marshtomp.png index 896876cc79bbe29e4460860d0af26090189f729f..9b50c7b0ed72b6890ad7f5443a3b083b7f669f16 100644 GIT binary patch delta 2972 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 VVAhD99nSy&002ovPDHLkV1f|iGc*7I diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0259_marshtomp/marshtomp_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0259_marshtomp/marshtomp_shiny.png index 1d3bc8b4e466a50d175688af7e24434bedba6964..182b4b41a9796fed43338e88918648541ce2a30a 100644 GIT binary patch delta 1507 zcmV<91swX>2K5V&B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00015P)t-s^p*I^ zbl~5E?n@Xb|NsC0?_^sdEUsnEmQla|#yS7xKL4mP|IShW`D*j1J9RccDlRh;6c>$C zRs4xCplxcqvCY!N;IV&r;?VAAIe&Rbjae;oL?UGX004_m%zr`v0016zQchF<|NsC0 z|NsC0|NsC0|NsC0|NsC0|NsC0|NsC00PGkXUH||932;bRa{vGi!vFvd!vV){sAK>D z1o}xtK~z{rjh72!+cpe@DS5Rlxt_Z?P2vat|KHqq2T-rB+b)SHNVo$Cg0xerQA*eK z9pG}95%2yTrGNhMjiDF22MmY9QEV=97`nmehSQ8%$7wpB#}N4TT|+TlPzFbk89+6L z;gk{s0@LM!MhJZWlR?Df_t3BYJ=7nyLN&kZpcnfrBK8_QqNbX$(4$YynD{&{Wz6L>DY>cxa8s!YeJ7rY zW@%i?NC&Ee_zk|;bMQ#L>ni?QGL!1oDh?58pb=vRclW6iZ!iD^aNb&_by{k);1NBm zNV$nQPJb=!wdF=SzP-JJx3}X@@bRH*${FXINN_|Sw^j(ee;V%+fG>rPCazuS)iN+d zGQs?nRn+g-;D3Hzp??8HB&_Dp8s2UunZV7)D(d%Zr0{;c!bgG2M+)>3kizXo`GuWT z%vd0EuH}8O&g3X@5tQUZ>|YZ3M*S67$H1f?L_WqVqTf@>uu0 zvz?SZ@B>boxe=Ry+-aUKMgCG3na!WQ!O*e4)EDeGo%5{`X8|enz0Up1R$wu8O9CkPDdqRaTrit}nzrjA11In335iE&oMfZXDt}pY z7{sj)g{@^oa$4Yz$SuTUYPG-!j>h}eV$66MZn1phRiKMnXm!)ZGNtSBoCTUiQp}7; z#Z5@ihse>UkbCg{UNLE$5Y-dwqE&roc%Sr-8Oc3amJY|9)B)j$14>} zFT{Z2;;n6NU3bMy>5c8C;Jy(WdA9W}7dRS#=(DhmQ3G!eIVU#uM!=z0V-pDfMPO~~ zpuYIuBfwegNRh>NXq z0c9QI4*t3in6?=F?QCXiT3j3Vh$7-od$?&%{H*OVz+8=cWgn;`BLS``A{{#9y>9$hYRJFaGe!oGje**#sB~S z0d!JMQvg8b*k%9#0=Y>~MSDQGcKaYR~?|Tox`(I#65B7k0t{OrfleqK& zgxffNevTt9FkOsE0JB>NWy;W=)WNcZKCao1eOMOh27fuNtISqX)JSORQEfZPvCpkk zkj^ret5^1UU-_x7Va>Du=@80hdvz*bI~cbuAg*2sCPp5Y03DWg@E+#%)TyM1bl}H4 zm=^%wxf%$iY7DN+E+C=ID+}=@U~t}f0x-D2Gk=lxk%X9g5ktY=xnVyYoMR)PBf}EV zm@tPL{C`#D2oAi?OUc+9>&vF=)LkWj?+zLDJ{h2}z)9-Q!2p5POH|1PB*77JO z@fdG_^*nJf(s_C-m@5b`!|K=QB>q=`8h;Kr$m8PRP5x@luK+OZ{4n6;+}@kK zt5^cg;izfLz17Q7bz~Q@tH?VKG1tx+z6U>zY;^>W*jxa0$5%;%*y6BD0 zA?PG_SpHI6^hTbZ^;T6NaC{1ob#^twz|A%jmH^<<^RGN_z{l-YQ_b`K1CpJ{8GQyw zEjzp2%Da$Nm$Z6j)=>Ec17W7yR~X`%-o*N`f|Qwh>#eumdh2iLKVMEA@Mtfyp#T5? M07*qoM6N<$g8coTBme*a