diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d2024edf3..7b55703075 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranfModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranfModel.kt deleted file mode 100644 index c0be1ff641..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranfModel.kt +++ /dev/null @@ -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 -// ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidoranf", "faint") else null -} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranmModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranmModel.kt deleted file mode 100644 index 83f8b1c124..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoranmModel.kt +++ /dev/null @@ -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 -// ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidoranm", "faint") else null -} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt deleted file mode 100644 index f4551c3976..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt +++ /dev/null @@ -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 -// ) = if (state.isPosedIn(standing, walk)) bedrockStateful("nidorina", "faint") else null -} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt index c832efc58e..e71ab20a0b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/VaryingModelRepository.kt +++ b/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) diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0029_nidoranf/nidoranf.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0029_nidoranf/nidoranf.animation.json index a461e82afb..4498fab885 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0029_nidoranf/nidoranf.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0029_nidoranf/nidoranf.animation.json @@ -1,95 +1,1643 @@ { "format_version": "1.8.0", "animations": { - "animation.nidoranf.test": { + "animation.nidoranf.ground_idle": { "loop": true, "bones": { "torso": { - "rotation": [-7.5, 0, 0] - }, - "leg_back_left": { - "rotation": [-12.5, 0, 0], - "position": [0, 0.1, 0] - }, - "foot_left": { - "rotation": [12.5, 0, 0] - }, - "leg_front_left": { - "rotation": [-10, 0, 0], - "position": [0, -0.75, -0.25] - }, - "leg_front_left2": { - "rotation": [-7.5, 0, 0] + "rotation": ["-math.sin(q.anim_time*90*4-90)/2", 0, "-math.sin(q.anim_time*90*2-90)"], + "position": [0, "math.sin(q.anim_time*90*4)/12", 0] }, "head": { - "rotation": [10, 0, 0] + "rotation": ["-math.sin(q.anim_time*90*4-150)", 0, "-math.sin(q.anim_time*90*2-150)"] }, - "leg_front_right": { - "rotation": [7.5, 0, 0], - "position": [0, -0.25, 0] + "ear_left": { + "rotation": ["-math.sin(q.anim_time*90*4-180)*2", 0, "-math.cos(q.anim_time*90*4-180)*2"] }, - "leg_front_right2": { - "rotation": [-7.5, 0, 0] + "ear_right": { + "rotation": ["-math.sin(q.anim_time*90*4-210)*2", 0, "math.cos(q.anim_time*90*4-210)*2"] + }, + "whisker_top_left": { + "rotation": [0, 0, "math.sin(q.anim_time*90*4-210)*3"] + }, + "whisker_top_right": { + "rotation": [0, 0, "-math.sin(q.anim_time*90*4-180)*3"] + }, + "whisker_bottom_left": { + "rotation": [0, 0, "math.sin(q.anim_time*90*4-240)*3"] + }, + "whisker_bottom_right": { + "rotation": [0, 0, "-math.sin(q.anim_time*90*4-210)*3"] + }, + "leg_back_left": { + "rotation": ["-5+math.sin(q.anim_time*90*4)*2", -17.5, 0], + "position": ["math.sin(q.anim_time*90*4)/32", "0.1-math.sin(q.anim_time*90*4)/36", "-math.sin(q.anim_time*90*4)/11"] + }, + "foot_left": { + "rotation": ["5-math.sin(q.anim_time*90*4)*2", 0, 0] }, "leg_back_right": { - "rotation": [20, 0, 0], - "position": [0, 0.05, 0] + "rotation": ["-5+math.sin(q.anim_time*90*4)*2", 17.5, 0], + "position": ["-(math.sin(q.anim_time*90*4)/32)", "0.1-math.sin(q.anim_time*90*4)/36", "-math.sin(q.anim_time*90*4)/11"] }, "foot_right": { - "rotation": [15, 0, 0] + "rotation": ["5-math.sin(q.anim_time*90*4)*2", 0, 0] + }, + "leg_front_left": { + "rotation": ["7.5+math.sin(q.anim_time*90*4-30)*2", 0, 0], + "position": [0, "-0.15-math.sin(q.anim_time*90*4-30)/16", "-math.sin(q.anim_time*90*4-30)/16"] + }, + "leg_front_left2": { + "rotation": ["-7.5-math.sin(q.anim_time*90*4-30)*2", 0, 0] + }, + "leg_front_right": { + "rotation": ["7.5+math.sin(q.anim_time*90*4-30)*2", 0, 0], + "position": [0, "-0.15-math.sin(q.anim_time*90*4-30)/16", "-math.sin(q.anim_time*90*4-30)/16"] + }, + "leg_front_right2": { + "rotation": ["-7.5-math.sin(q.anim_time*90*4-30)*2", 0, 0] + } + } + }, + "animation.nidoranf.ground_walk": { + "loop": true, + "animation_length": 0.5, + "bones": { + "torso": { + "rotation": ["-math.sin(q.anim_time*90*16-180)", "math.sin(q.anim_time*90*8)*3", "-math.sin(q.anim_time*90*8-150)*8"], + "position": [0, "0.5+math.sin(q.anim_time*90*16-90)/4", 0] + }, + "head": { + "rotation": ["math.sin(q.anim_time*90*16-90)*2", "-math.sin(q.anim_time*90*8)*3", "-math.sin(q.anim_time*90*8)*8"] + }, + "ear_left": { + "rotation": [ + "-5+math.min((-math.sin(q.anim_time*90*16-60)*5),5)", + "-3+math.min((-math.sin(q.anim_time*90*16-90)*3),3)", + "-5+math.min((-math.sin(q.anim_time*90*16-120)*5),5)" + ] + }, + "ear_right": { + "rotation": [ + "-5+math.min((-math.sin(q.anim_time*90*16-90)*5),5)", + "-3+math.min((-math.sin(q.anim_time*90*16-90)*3),3)", + "5+math.min((math.sin(q.anim_time*90*16-150)*5),5)" + ] + }, + "whisker_top_left": { + "rotation": [0, "math.sin(q.anim_time*90*16-120)*3", "7.5+math.sin(q.anim_time*90*16-150)*5"] + }, + "whisker_top_right": { + "rotation": [0, "-math.sin(q.anim_time*90*16-90)*3", "-7.5-math.sin(q.anim_time*90*16-120)*5"] + }, + "whisker_bottom_left": { + "rotation": [0, "math.sin(q.anim_time*90*16-150)*3", "7.5+math.sin(q.anim_time*90*16-180)*5"] + }, + "whisker_bottom_right": { + "rotation": [0, "-math.sin(q.anim_time*90*16-120)*3", "-7.5-math.sin(q.anim_time*90*16-150)*5"] + }, + "leg_back_left": { + "rotation": { + "0.0": [-20, 0, 0], + "0.0833": [22.5, 0, 0], + "0.125": [35.75, 0, 0], + "0.25": { + "pre": [45.95, 0, -9.09], + "post": [45.95, 0, -9.09], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-12.29, 0, -5], + "lerp_mode": "catmullrom" + }, + "0.5": [-20, 0, 0] + }, + "position": { + "0.0": [0.5, 0.25, 0.75], + "0.0417": [0.5, 0.25, 0.5], + "0.0833": [0.5, 0.25, 0], + "0.125": [0.5, 0.25, 0], + "0.25": { + "pre": [0.5, 0.69, 0.33], + "post": [0.5, 0.69, 0.33], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0.48, 1.41, 0.75], + "lerp_mode": "catmullrom" + }, + "0.5": [0.5, 0.25, 0.75] + } + }, + "foot_left": { + "rotation": { + "0.0": [20, 0, 0], + "0.0417": [15.67, 0, 0], + "0.0833": [20.54, 0, 0], + "0.25": { + "pre": [42.5, 0, 0], + "post": [42.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [20, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.0417": [0, 0.1, -0.25], + "0.125": [0, 0, -0.75], + "0.25": { + "pre": [0, -0.5, 0], + "post": [0, -0.5, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [0, 0.1, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + } + }, + "foot_left2": { + "rotation": { + "0.0": [0, 0, 0], + "0.0417": [-16.25, 0, 0], + "0.0833": [-43.5, 0, 0], + "0.125": [-55, 0, 0], + "0.25": { + "pre": [-12.5, 0, 0], + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + } + }, + "leg_back_right": { + "rotation": { + "0.0": { + "post": [45.95, 0, 9.09], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-12.29, 0, 5], + "lerp_mode": "catmullrom" + }, + "0.25": [-20, 0, 0], + "0.3333": [22.5, 0, 0], + "0.375": [35.75, 0, 0], + "0.5": { + "pre": [45.95, 0, 9.09], + "post": [45.95, 0, 9.09], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [-0.5, 0.69, 0.33], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-0.48, 1.41, 0.75], + "lerp_mode": "catmullrom" + }, + "0.25": [-0.5, 0.25, 0.75], + "0.2917": [-0.5, 0.25, 0.5], + "0.3333": [-0.5, 0.25, 0], + "0.375": [-0.5, 0.25, 0], + "0.5": { + "pre": [-0.5, 0.69, 0.33], + "post": [-0.5, 0.69, 0.33], + "lerp_mode": "catmullrom" + } + } + }, + "foot_right": { + "rotation": { + "0.0": { + "post": [42.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": [20, 0, 0], + "0.2917": [15.67, 0, 0], + "0.3333": [20.54, 0, 0], + "0.5": { + "pre": [42.5, 0, 0], + "post": [42.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, -0.5, 0], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [0, 0.1, 0], + "lerp_mode": "catmullrom" + }, + "0.25": [0, 0, 0], + "0.2917": [0, 0.1, -0.25], + "0.375": [0, 0, -0.75], + "0.5": { + "pre": [0, -0.5, 0], + "post": [0, -0.5, 0], + "lerp_mode": "catmullrom" + } + } }, "foot_right2": { - "rotation": [-35, 0, 0] + "rotation": { + "0.0": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": [0, 0, 0], + "0.2917": [-16.25, 0, 0], + "0.3333": [-43.5, 0, 0], + "0.375": [-55, 0, 0], + "0.5": { + "pre": [-12.5, 0, 0], + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg_front_left": { + "rotation": { + "0.0": { + "post": [37.43, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [34.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-14.86, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": [-20, 0, 0], + "0.2917": [-10, 0, 0], + "0.4167": [27.27, 0, 0], + "0.5": { + "pre": [37.43, 0, 0], + "post": [37.43, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0.06, -0.65, 0.41], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [0, -0.49, 0.28], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [0, -0.28, -0.12], + "lerp_mode": "catmullrom" + }, + "0.25": [0.1, -0.75, -0.5], + "0.2917": [0.2, -0.25, -0.5], + "0.4167": [0.2, -0.89, 0.5], + "0.5": { + "pre": [0.06, -0.65, 0.41], + "post": [0.06, -0.65, 0.41], + "lerp_mode": "catmullrom" + } + } + }, + "leg_front_left2": { + "rotation": { + "0.0": { + "post": [-39.35, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [-39.72, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": [-7.5, 0, 0], + "0.2917": [0, 0, 0], + "0.4167": [-27.05, 0, 0], + "0.5": { + "pre": [-39.35, 0, 0], + "post": [-39.35, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg_front_right": { + "rotation": { + "0.0": [-20, 0, 0], + "0.0417": [-10, 0, 0], + "0.1667": [27.27, 0, 0], + "0.2917": { + "pre": [34.54, 0, 0], + "post": [34.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-14.86, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [-20, 0, 0] + }, + "position": { + "0.0": [-0.1, -0.75, -0.5], + "0.0417": [-0.2, -0.25, -0.5], + "0.1667": [-0.2, -0.89, 0.5], + "0.2917": { + "pre": [0, -0.49, 0.28], + "post": [0, -0.49, 0.28], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, -0.28, -0.12], + "lerp_mode": "catmullrom" + }, + "0.5": [-0.1, -0.75, -0.5] + } + }, + "leg_front_right2": { + "rotation": { + "0.0": [-7.5, 0, 0], + "0.0417": [0, 0, 0], + "0.1667": [-27.05, 0, 0], + "0.2917": { + "pre": [-39.72, 0, 0], + "post": [-39.72, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [-7.5, 0, 0] + } + } + } + }, + "animation.nidoranf.ground_run": { + "loop": true, + "animation_length": 1, + "bones": { + "body": { + "position": [0, 0, "math.sin(q.anim_time*90*8+30)*1.5"] + }, + "torso": { + "rotation": ["math.sin(q.anim_time*90*8-180)*12", 0, "math.sin(q.anim_time*90*4-180)*4"], + "position": [0, "0.5+math.sin(q.anim_time*90*8-90)", 0] + }, + "head": { + "rotation": ["-math.sin(q.anim_time*90*8-210)*12", 0, "-math.sin(q.anim_time*90*4-150)*4"] + }, + "ear_left": { + "rotation": ["math.sin(q.anim_time*90*8-270)*12", "-math.sin(q.anim_time*90*8)*8", 0] + }, + "ear_right": { + "rotation": ["math.sin(q.anim_time*90*8-300)*12", "math.sin(q.anim_time*90*8-30)*8", 0] + }, + "whisker_top_left": { + "rotation": [0, "math.sin(q.anim_time*90*8-30)*8", "math.sin(q.anim_time*90*8)*12"] + }, + "whisker_top_right": { + "rotation": [0, "-(math.sin(q.anim_time*90*8-60)*8)", "-(math.sin(q.anim_time*90*8-30)*12)"] + }, + "whisker_bottom_left": { + "rotation": [0, "math.sin(q.anim_time*90*8-40)*12", "math.sin(q.anim_time*90*8-10)*12"] + }, + "whisker_bottom_right": { + "rotation": [0, "-(math.sin(q.anim_time*90*8-70)*12)", "-(math.sin(q.anim_time*90*8-40)*12)"] + }, + "leg_back_left": { + "rotation": { + "0.0": [-22.5, -32.5, 0], + "0.125": [15, -12.5, 0], + "0.25": { + "pre": [62.5, 0.83, 0], + "post": [62.5, 0.83, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-14.53, -38.75, -11.25], + "lerp_mode": "catmullrom" + }, + "0.5": [-22.5, -32.5, 0], + "0.625": [15, -12.5, 0], + "0.75": { + "pre": [62.5, 0.83, 0], + "post": [62.5, 0.83, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-14.53, -38.75, -11.25], + "lerp_mode": "catmullrom" + }, + "1.0": [-22.5, -32.5, 0] + }, + "position": { + "0.0": [0.5, 0.1, 0], + "0.125": [0.5, 0.35, 1], + "0.25": { + "pre": [0.5, 0.27, 0.92], + "post": [0.5, 0.27, 0.92], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0.5, 1.18, 0.44], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0.5, 0.55, 0.22], + "lerp_mode": "catmullrom" + }, + "0.5": [0.5, 0.1, 0], + "0.625": [0.5, 0.35, 1], + "0.75": { + "pre": [0.5, 0.27, 0.92], + "post": [0.5, 0.27, 0.92], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [0.5, 1.18, 0.44], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0.5, 0.55, 0.22], + "lerp_mode": "catmullrom" + }, + "1.0": [0.5, 0.1, 0] + } + }, + "foot_left": { + "rotation": { + "0.0": [22.5, 0, 0], + "0.0833": [23.03, 0, 0], + "0.25": { + "pre": [50, 0, 0], + "post": [50, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [17.87, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [6.46, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [22.5, 0, 0], + "0.5833": [23.03, 0, 0], + "0.75": { + "pre": [50, 0, 0], + "post": [50, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [17.87, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [6.46, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [22.5, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.0833": [0, 0.25, 0], + "0.125": [0, 0, 0], + "0.25": { + "pre": [0, -0.25, 0], + "post": [0, -0.25, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0], + "0.5833": [0, 0.25, 0], + "0.625": [0, 0, 0], + "0.75": { + "pre": [0, -0.25, 0], + "post": [0, -0.25, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [0, 0, 0] + } + }, + "foot_left2": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [-37, 0, 0], + "0.25": { + "pre": [-7, 0, 0], + "post": [-7, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [-7, 0, 0], + "0.5": [0, 0, 0], + "0.625": [-37, 0, 0], + "0.75": { + "pre": [-7, 0, 0], + "post": [-7, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": [-7, 0, 0], + "1.0": [0, 0, 0] + } + }, + "leg_back_right": { + "rotation": { + "0.0": [-22.5, 32.5, 0], + "0.125": [15, 12.5, 0], + "0.25": { + "pre": [62.5, -0.83, 0], + "post": [62.5, -0.83, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-14.53, 38.75, 11.25], + "lerp_mode": "catmullrom" + }, + "0.5": [-22.5, 32.5, 0], + "0.625": [15, 12.5, 0], + "0.75": { + "pre": [62.5, -0.83, 0], + "post": [62.5, -0.83, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-14.53, 38.75, 11.25], + "lerp_mode": "catmullrom" + }, + "1.0": [-22.5, 32.5, 0] + }, + "position": { + "0.0": [-0.5, 0.1, 0], + "0.125": [-0.5, 0.35, 1], + "0.25": { + "pre": [-0.5, 0.27, 0.92], + "post": [-0.5, 0.27, 0.92], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [-0.5, 1.18, 0.44], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-0.5, 0.55, 0.22], + "lerp_mode": "catmullrom" + }, + "0.5": [-0.5, 0.1, 0], + "0.625": [-0.5, 0.35, 1], + "0.75": { + "pre": [-0.5, 0.27, 0.92], + "post": [-0.5, 0.27, 0.92], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [-0.5, 1.18, 0.44], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-0.5, 0.55, 0.22], + "lerp_mode": "catmullrom" + }, + "1.0": [-0.5, 0.1, 0] + } + }, + "foot_right": { + "rotation": { + "0.0": [22.5, 0, 0], + "0.0833": [23.03, 0, 0], + "0.25": { + "pre": [50, 0, 0], + "post": [50, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [17.87, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [6.46, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [22.5, 0, 0], + "0.5833": [23.03, 0, 0], + "0.75": { + "pre": [50, 0, 0], + "post": [50, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [17.87, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [6.46, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [22.5, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.0833": [0, 0.25, 0], + "0.125": [0, 0, 0], + "0.25": { + "pre": [0, -0.25, 0], + "post": [0, -0.25, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0], + "0.5833": [0, 0.25, 0], + "0.625": [0, 0, 0], + "0.75": { + "pre": [0, -0.25, 0], + "post": [0, -0.25, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [0, 0, 0] + } + }, + "foot_right2": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [-37, 0, 0], + "0.25": { + "pre": [-7, 0, 0], + "post": [-7, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [-7, 0, 0], + "0.5": [0, 0, 0], + "0.625": [-37, 0, 0], + "0.75": { + "pre": [-7, 0, 0], + "post": [-7, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": [-7, 0, 0], + "1.0": [0, 0, 0] + } + }, + "leg_front_left": { + "rotation": { + "0.0": [20, 0, 0], + "0.125": { + "pre": [27.5, 0, 0], + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [12.17, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [-44.37, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [-15.56, 0, 0], + "0.5": [20, 0, 0], + "0.625": { + "pre": [27.5, 0, 0], + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [12.17, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [-44.37, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": [-15.56, 0, 0], + "1.0": [20, 0, 0] + }, + "position": { + "0.0": [0, -0.7, 0.25], + "0.125": { + "pre": [0, 0.25, 0.25], + "post": [0, 0.25, 0.25], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [0, 0.72, 0.25], + "lerp_mode": "catmullrom" + }, + "0.375": [0, -0.34, -0.25], + "0.5": [0, -0.7, 0.25], + "0.625": { + "pre": [0, 0.25, 0.25], + "post": [0, 0.25, 0.25], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [0, 0.72, 0.25], + "lerp_mode": "catmullrom" + }, + "0.875": [0, -0.34, -0.25], + "1.0": [0, -0.7, 0.25] + } + }, + "leg_front_left2": { + "rotation": { + "0.0": [-20, 0, 0], + "0.125": { + "pre": [-2.5, 0, 0], + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-29.71, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [-3.14, 0, 0], + "0.5": [-20, 0, 0], + "0.625": { + "pre": [-2.5, 0, 0], + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [-29.71, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": [-3.14, 0, 0], + "1.0": [-20, 0, 0] + } + }, + "leg_front_right": { + "rotation": { + "0.0": [23.68, 0, 0], + "0.0833": { + "pre": [27.5, 0, 0], + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [12.17, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-44.37, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": [-15.56, 0, 0], + "0.5": [23.68, 0, 0], + "0.5833": { + "pre": [27.5, 0, 0], + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [12.17, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [-44.37, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": [-15.56, 0, 0], + "1.0": [23.68, 0, 0] + }, + "position": { + "0.0": [0, -0.8, 0.29], + "0.0833": { + "pre": [0, 0.25, 0.25], + "post": [0, 0.25, 0.25], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [0, 0.72, 0.25], + "lerp_mode": "catmullrom" + }, + "0.3333": [0, -0.34, -0.25], + "0.5": [0, -0.8, 0.29], + "0.5833": { + "pre": [0, 0.25, 0.25], + "post": [0, 0.25, 0.25], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [0, 0.72, 0.25], + "lerp_mode": "catmullrom" + }, + "0.8333": [0, -0.34, -0.25], + "1.0": [0, -0.8, 0.29] + } + }, + "leg_front_right2": { + "rotation": { + "0.0": [-24.49, 0, 0], + "0.0833": { + "pre": [-2.5, 0, 0], + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-29.71, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": [-3.14, 0, 0], + "0.5": [-24.49, 0, 0], + "0.5833": { + "pre": [-2.5, 0, 0], + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [-29.71, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": [-3.14, 0, 0], + "1.0": [-24.49, 0, 0] + } + } + } + }, + "animation.nidoranf.battle_idle": { + "loop": true, + "bones": { + "torso": { + "rotation": ["-17.5-math.sin(q.anim_time*90*4-90)/2", 0, "-math.sin(q.anim_time*90*2-90)"], + "position": [0, "-0.5+math.sin(q.anim_time*90*4)/12", 0] + }, + "head": { + "rotation": ["25-math.sin(q.anim_time*90*4-150)", 0, 0], + "position": [0, 0, -0.5] + }, + "leg_back_left": { + "rotation": ["22.5-math.sin(q.anim_time*90*4)*2", -20, 0], + "position": ["0.75-math.sin(q.anim_time*90*4)/32", "math.sin(q.anim_time*90*4)/13", "math.sin(q.anim_time*90*4)/13"] + }, + "foot_left": { + "rotation": ["25+math.sin(q.anim_time*90*4)*2", 0, 0] + }, + "foot_left2": { + "rotation": [-48, 0, 0] + }, + "leg_back_right": { + "rotation": ["22.5-math.sin(q.anim_time*90*4)*2", 20, 0], + "position": ["-0.75+math.sin(q.anim_time*90*4)/32", "math.sin(q.anim_time*90*4)/13", "math.sin(q.anim_time*90*4)/13"] + }, + "foot_right": { + "rotation": ["25+math.sin(q.anim_time*90*4)*2", 0, 0] + }, + "foot_right2": { + "rotation": [-48, 0, 0] + }, + "leg_front_left": { + "rotation": ["5-math.sin(q.anim_time*90*4-30)*2", 0, 0], + "position": [0, "-0.1+math.sin(q.anim_time*90*4-30)/17", "0.25+math.sin(q.anim_time*90*4-30)/17"] + }, + "leg_front_right": { + "rotation": ["5-math.sin(q.anim_time*90*4-30)*2", 0, 0], + "position": [0, "-0.1+math.sin(q.anim_time*90*4-30)/17", "0.25+math.sin(q.anim_time*90*4-30)/17"] + }, + "ear_left": { + "rotation": ["math.sin(q.anim_time*90*4-180)*2", "math.cos(q.anim_time*90*4-180)*2", 0] + }, + "ear_right": { + "rotation": ["math.sin(q.anim_time*90*4-180)*2", "-(math.cos(q.anim_time*90*4-180)*2)", 0] + }, + "whisker_top_left": { + "rotation": [0, 0, "-math.sin(q.anim_time*90*4-180)*2"] + }, + "whisker_top_right": { + "rotation": [0, 0, "math.sin(q.anim_time*90*4-210)*2"] + }, + "whisker_bottom_left": { + "rotation": [0, 0, "-math.sin(q.anim_time*90*4-210)*2"] + }, + "whisker_bottom_right": { + "rotation": [0, 0, "math.sin(q.anim_time*90*4-240)*2"] + }, + "leg_front_left2": { + "rotation": ["-5+math.sin(q.anim_time*90*4-30)*2", 0, 0] + }, + "leg_front_right2": { + "rotation": ["-5+math.sin(q.anim_time*90*4-30)*2", 0, 0] + } + } + }, + "animation.nidoranf.recoil": { + "animation_length": 0.75, + "bones": { + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": [0, 0, 0], + "0.1667": { + "pre": [-5, 0, 0], + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [0, 0, 0.5], + "post": [0, 0, 0.5], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [20, 0, 0], + "post": [20, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-20, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": [0, 0, 0] + } + }, + "eyelid_hurt_left": { + "position": { + "0.0": [0.1, 0, 0], + "0.5": {"pre": [0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "eyelid_hurt_right": { + "position": { + "0.0": [-0.1, 0, 0], + "0.5": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "ear_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [-15, -42.5, -17.5], + "post": [-15, -42.5, -17.5], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [12.5, -2.5, 32.5], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": [0, 0, 0] + } + }, + "ear_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [-15, 42.5, 17.5], + "post": [-15, 42.5, 17.5], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [12.5, 2.5, -32.5], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": [0, 0, 0] + } } } }, "animation.nidoranf.cry": { - "animation_length": 1.2, + "animation_length": 1.5, + "bones": { + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [7.5, 0, 0], + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-6.94, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": [-7.5, 0, 0], + "0.9167": { + "pre": [-1, 0, 0], + "post": [-1, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [0, 0, 0.25], + "post": [0, 0, 0.25], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [0, 0, -0.5], + "lerp_mode": "catmullrom" + }, + "0.5833": [0, 0, -0.5], + "1.0": { + "pre": [0, 0, -0.1], + "post": [0, 0, -0.1], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [-7.5, 0, 0], + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": [-7.5, 0, 0], + "0.875": { + "pre": [-13.75, 0, 0], + "post": [-13.75, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-2, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "ear_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [0, -10, 22.5], + "post": [0, -10, 22.5], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [25, -37.5, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [25, -37.5, "math.sin(q.anim_time*90*15)*10"], + "0.5833": [25, -37.5, 0], + "0.8333": { + "pre": [25, -37.5, -10], + "post": [25, -37.5, -10], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.125": [0, 0, 0], + "0.25": { + "pre": [0, 0.5, 0], + "post": [0, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [0, 0.5, 0], + "1.1667": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "ear_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [0, 10, -22.5], + "post": [0, 10, -22.5], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [25, 37.5, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [25, 37.5, "-(math.sin(q.anim_time*90*15)*10)"], + "0.5833": [25, 37.5, 0], + "0.8333": { + "pre": [25, 37.5, 10], + "post": [25, 37.5, 10], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.125": [0, 0, 0], + "0.25": { + "pre": [0, 0.5, 0], + "post": [0, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [0, 0.5, 0], + "1.1667": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "whisker_top_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [0, 0, -10], + "post": [0, 0, -10], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [0, 0, 20], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [0, 0, -10.62], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0], + "0.75": [0, 0, 0], + "1.0": { + "pre": [0, 0, -5], + "post": [0, 0, -5], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "whisker_top_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [0, 0, 10], + "post": [0, 0, 10], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [0, 0, -20], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [0, 0, 10.62], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0], + "0.75": [0, 0, 0], + "1.0": { + "pre": [0, 0, 5], + "post": [0, 0, 5], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "whisker_bottom_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [0, 0, -12.5], + "post": [0, 0, -12.5], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [0, 0, 20], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [0, 0, -15.47], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0], + "0.75": [0, 0, 0], + "1.0": { + "pre": [0, 0, -10], + "post": [0, 0, -10], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "whisker_bottom_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [0, 0, 12.5], + "post": [0, 0, 12.5], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [0, 0, -20], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [0, 0, 15.47], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0], + "0.75": [0, 0, 0], + "1.0": { + "pre": [0, 0, 10], + "post": [0, 0, 10], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.0": [0, 0, 0], + "0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, 0]}, + "0.1667": {"pre": [0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "eyelid_right": { + "position": { + "0.0": [0, 0, 0], + "0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, 0]}, + "0.1667": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]} + } + } + }, "sound_effects": { - "0.04": { + "0.2083": { "effect": "pokemon.nidoranf.cry" } } }, "animation.nidoranf.blink": { - "animation_length": 0.16667, + "animation_length": 0.1667, "bones": { "eyelid_left": { "position": { "0.0": [0.1, 0, 0], - "0.125": [0.1, 0, 0], - "0.1667": [0, 0, 0] + "0.1667": {"pre": [0.1, 0, 0], "post": [0, 0, 0]} } }, "eyelid_right": { "position": { "0.0": [-0.1, 0, 0], - "0.125": [-0.1, 0, 0], - "0.1667": [0, 0, 0] + "0.1667": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]} } } } }, - "animation.nidoranf.idle": { + "animation.nidoranf.sleep": { "loop": true, "bones": { "torso": { - "rotation": [-7.5, 0, 0] + "rotation": ["-math.sin(q.anim_time*90-90)", 0, 0], + "position": [0, "-2+math.sin(q.anim_time*90)/8", 0] }, "head": { - "rotation": [7.5, 0, 0] + "rotation": ["20-math.sin(q.anim_time*90-180)*2", 0, 0], + "position": [0, -1, -0.25] + }, + "eyelid_left": { + "position": [0.1, 0, 0] + }, + "eyelid_right": { + "position": [-0.1, 0, 0] + }, + "ear_left": { + "rotation": [-12.5, -35, "25-math.sin(q.anim_time*90-150)*4"], + "position": [0, 1, 0] + }, + "ear_right": { + "rotation": [-12.5, 35, "-25+math.sin(q.anim_time*90-180)*4"], + "position": [0, 1, 0] + }, + "whisker_top_left": { + "rotation": [0, 40, "-math.sin(q.anim_time*90-150)*4"] + }, + "whisker_top_right": { + "rotation": [0, -40, "math.sin(q.anim_time*90-150)*4"] + }, + "whisker_bottom_left": { + "rotation": [0, 47.5, "-math.sin(q.anim_time*90-180)*4"] + }, + "whisker_bottom_right": { + "rotation": [0, -47.5, "math.sin(q.anim_time*90-180)*4"] + }, + "leg_back_left": { + "rotation": [-90, -42.5, 0], + "position": [0.25, -1.5, 0.5] + }, + "foot_left": { + "rotation": ["17.5-math.sin(q.anim_time*90-90)*4", 0, 0] + }, + "foot_left2": { + "rotation": ["20-math.sin(q.anim_time*90-180)*4", 0, 0], + "position": [0, 0, 0.25] + }, + "leg_back_right": { + "rotation": [-90, 42.5, 0], + "position": [-0.25, -1.5, 0.5] + }, + "foot_right": { + "rotation": ["17.5-math.sin(q.anim_time*90-90)*4", 0, 0] + }, + "foot_right2": { + "rotation": ["20-math.sin(q.anim_time*90-180)*4", 0, 0], + "position": [0, 0, 0.25] }, "leg_front_left": { - "rotation": [2.5, 0, 0] + "rotation": [-37.5, -47.5, 0], + "position": [0.5, -2.5, 0.25] }, "leg_front_left2": { - "rotation": [-2.5, 0, 0] + "rotation": [-52.5, 0, 0] }, "leg_front_right": { - "rotation": [2.5, 0, 0] + "rotation": [-37.5, 47.5, 0], + "position": [-0.5, -2.5, 0.25] }, "leg_front_right2": { - "rotation": [-2.5, 0, 0] + "rotation": [-52.5, 0, 0] + } + } + }, + "animation.nidoranf.shoulder_left": { + "loop": true, + "bones": { + "body": { + "position": [7.25, -5, 3] + }, + "torso": { + "rotation": ["-27.5-math.sin(q.anim_time*90*4-90)/2", 0, "15-math.sin(q.anim_time*90*2-90)"], + "position": [0, "math.sin(q.anim_time*90*4)/12", 0] + }, + "head": { + "rotation": ["30-math.sin(q.anim_time*90*4-180)", "-math.sin(q.anim_time*90*2-30)*1.2", 0] + }, + "ear_left": { + "rotation": ["math.sin(q.anim_time*90*4-210)*3", "-math.cos(q.anim_time*90*4-210)*3", 0] + }, + "ear_right": { + "rotation": ["math.sin(q.anim_time*90*4-240)*3", "15+math.cos(q.anim_time*90*4-240)*3", 10] + }, + "whisker_top_left": { + "rotation": [0, 0, "-math.sin(q.anim_time*90*4-210)*2"] + }, + "whisker_top_right": { + "rotation": [0, 0, "27.5+math.sin(q.anim_time*90*4-240)*2"], + "position": [0.4, 0, 0] + }, + "whisker_bottom_left": { + "rotation": [0, 0, "-math.sin(q.anim_time*90*4-180)*2"] + }, + "whisker_bottom_right": { + "rotation": [0, 0, "22.5+math.sin(q.anim_time*90*4-210)*2"], + "position": [0.25, 0, 0] + }, + "leg_back_left": { + "rotation": [-20, -10, 10], + "position": [0, "-1.25+math.sin(q.anim_time*90*4-30)/12", 0] + }, + "foot_left": { + "rotation": ["42.5-math.sin(q.anim_time*90*4-120)*2", 0, 0], + "position": [0, -0.25, 0] + }, + "foot_left2": { + "rotation": ["-7.5-math.sin(q.anim_time*90*4-180)*2", 0, 0] + }, + "leg_back_right": { + "rotation": [-35, 0, 17.5], + "position": [-0.75, 0.5, 1.25] + }, + "foot_right": { + "rotation": [20, 0, 0], + "position": [0, -0.25, 0] + }, + "foot_right2": { + "rotation": [-75, 0, 0] + }, + "leg_front_left": { + "rotation": ["-45+math.sin(q.anim_time*90*4)*2", 12.5, 0], + "position": [0.5, "math.sin(q.anim_time*90*4)/64", "-math.sin(q.anim_time*90*4)/12"] + }, + "leg_front_left2": { + "rotation": ["-37.5-math.sin(q.anim_time*90*4)*2", 0, 0] + }, + "leg_front_right": { + "rotation": [-92.5, -17.5, 0], + "position": [-0.5, 0, 0] + }, + "leg_front_right2": { + "rotation": [0, 0, 0] + } + } + }, + "animation.nidoranf.shoulder_right": { + "loop": true, + "bones": { + "body": { + "position": [-7.25, -5, 3] + }, + "torso": { + "rotation": ["-27.5-math.sin(q.anim_time*90*4-90)/2", 0, "-15-math.sin(q.anim_time*90*2-90)"], + "position": [0, "math.sin(q.anim_time*90*4)/12", 0] + }, + "head": { + "rotation": ["30-math.sin(q.anim_time*90*4-180)", "math.sin(q.anim_time*90*2-30)*1.2", 0] + }, + "ear_left": { + "rotation": ["math.sin(q.anim_time*90*4-240)*3", "-15+math.cos(q.anim_time*90*4-240)*3", -10] + }, + "ear_right": { + "rotation": ["math.sin(q.anim_time*90*4-210)*3", "NaN-math.cos(q.anim_time*90*4-210)*3", 0] + }, + "whisker_top_left": { + "rotation": [0, 0, "-27.5+math.sin(q.anim_time*90*4-240)*2"], + "position": [-0.4, 0, 0] + }, + "whisker_top_right": { + "rotation": [0, 0, "NaN-math.sin(q.anim_time*90*4-210)*2"], + "position": [0.4, 0, 0] + }, + "whisker_bottom_left": { + "rotation": [0, 0, "-22.5+math.sin(q.anim_time*90*4-210)*2"], + "position": [-0.25, 0, 0] + }, + "whisker_bottom_right": { + "rotation": [0, 0, "NaN-math.sin(q.anim_time*90*4-180)*2"], + "position": [0.25, 0, 0] + }, + "leg_back_left": { + "rotation": [-35, 0, -17.5], + "position": [0.75, 0.5, 1.25] + }, + "foot_left": { + "rotation": [20, 0, 0], + "position": [0, -0.25, 0] + }, + "foot_left2": { + "rotation": [-75, 0, 0] + }, + "leg_back_right": { + "rotation": [-20, 10, -10], + "position": [0, "-1.25+math.sin(q.anim_time*90*4-30)/12", 0] + }, + "foot_right": { + "rotation": ["42.5-math.sin(q.anim_time*90*4-120)*2", 0, 0], + "position": [0, -0.25, 0] + }, + "foot_right2": { + "rotation": ["-7.5-math.sin(q.anim_time*90*4-180)*2", 0, 0] + }, + "leg_front_left": { + "rotation": [-92.5, 17.5, 0], + "position": [0.5, 0, 0] + }, + "leg_front_left2": { + "rotation": [0, 0, 0] + }, + "leg_front_right": { + "rotation": ["-45+math.sin(q.anim_time*90*4)*2", -12.5, 0], + "position": [-0.5, "math.sin(q.anim_time*90*4)/64", "-math.sin(q.anim_time*90*4)/12"] + }, + "leg_front_right2": { + "rotation": ["-37.5-math.sin(q.anim_time*90*4)*2", 0, 0] + } + } + }, + "animation.nidoranf.walkspeedtest": { + "loop": true, + "bones": { + "nidoran_f": { + "position": [0, 0, "47-q.anim_time*90*0.16"] + } + } + }, + "animation.nidoranf.runspeedtest": { + "loop": true, + "bones": { + "nidoran_f": { + "position": [0, 0, "47-q.anim_time*90*0.32"] + } + } + }, + "animation.nidoranf.scaletest": { + "loop": true, + "bones": { + "nidoran_f": { + "scale": 0.6 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0030_nidorina/nidorina.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0030_nidorina/nidorina.animation.json index 1f5e26ce74..2eb517e10d 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0030_nidorina/nidorina.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0030_nidorina/nidorina.animation.json @@ -1,56 +1,54 @@ { "format_version": "1.8.0", "animations": { - "animation.nidorina.idle": { + "animation.nidorina.ground_idle": { "loop": true, "bones": { - "torso": { - "rotation": [-35, 0, 0] - }, "head": { - "rotation": [15, 0, 0], + "rotation": ["15-math.sin(q.anim_time*90*2-210)", 0, 0], "position": [0, 0, -0.5], "scale": 1 }, "jaw": { "rotation": [0, 0, 0] }, - "upper_torso": { - "rotation": [12.5, 0, 0] + "torso2": { + "rotation": ["20-math.sin(q.anim_time*90*2-120)", 0, 0], + "position": [0, -0.1, 0] }, "body": { - "position": [0, -0.5, 0] + "position": [0, -0.5, -3] }, "left_leg": { - "rotation": [-14.59615, -12.97202, -0.17957] + "rotation": ["-14.5+math.sin(q.anim_time*90*2)*3", -13, 0], + "position": ["math.sin(q.anim_time*90*2)/32", "math.sin(q.anim_time*90*2)/10", "-math.sin(q.anim_time*90*2)/10"] }, "neck": { - "rotation": [5, 0, 0], - "position": [0, 0, 0] + "rotation": ["12.5-math.sin(q.anim_time*90*2-180)", 0, 0], + "position": [0, -0.25, 0] }, "left_foot": { - "rotation": [15, 0, 0] + "rotation": ["15-math.sin(q.anim_time*90*2)*3", 0, 0] }, - "arms_torso": { - "rotation": [-35, 0, 0] - }, - "arms_upper_torso": { - "rotation": [12.5, 0, 0] + "ftorso2": { + "rotation": ["12.5-math.sin(q.anim_time*90*2-120)", 0, 0], + "position": [0, -0.1, 0] }, "left_upper_arm": { - "rotation": [-0.88045, -9.96156, -17.42327] + "rotation": [25, 12.5, "7.5-math.sin(q.anim_time*90-120)*3"], + "position": [0, -0.75, 0.5] }, "left_lower_arm": { - "rotation": [-9.80908, -0.30951, 10.19366] + "rotation": ["-17.5-math.sin(q.anim_time*90*2-240)*2", 0, 0] }, "left_hand": { - "rotation": [-17.5, 0, 0] + "rotation": ["-25+math.sin(q.anim_time*90*2-30)*3", 0, 0] }, "tail_2": { - "rotation": [22.5, 0, 0] + "rotation": ["22.5+math.sin(q.anim_time*90*2-180)*6", "math.sin(q.anim_time*90-180)*12", 0] }, "tail_1": { - "rotation": [22.5, 0, 0] + "rotation": ["22.5+math.sin(q.anim_time*90*2-120)*4", "math.sin(q.anim_time*90-120)*6", 0] }, "left_middle_finger": { "rotation": [10, 0, 0] @@ -62,13 +60,14 @@ "rotation": [12.5, 0, 0] }, "right_upper_arm": { - "rotation": [-0.88045, 9.96156, 17.42327] + "rotation": [25, -12.5, "-7.5-math.sin(q.anim_time*90-120)*3"], + "position": [0, -0.75, 0.5] }, "right_lower_arm": { - "rotation": [-9.80908, 0.30951, -10.19366] + "rotation": ["-17.5-math.sin(q.anim_time*90*2-270)*2", 0, 0] }, "right_hand": { - "rotation": [-17.5, 0, 0] + "rotation": ["-25+math.sin(q.anim_time*90*2-60)*3", 0, 0] }, "right_middle_finger": { "rotation": [10, 0, 0] @@ -80,282 +79,1844 @@ "rotation": [12.5, 0, 0] }, "right_leg": { - "rotation": [-14.59615, 12.97202, 0.17957] + "rotation": ["-14.5+math.sin(q.anim_time*90*2)*3", 13, 0], + "position": ["-(math.sin(q.anim_time*90*2)/32)", "math.sin(q.anim_time*90*2)/10", "-math.sin(q.anim_time*90*2)/10"] }, "right_foot": { - "rotation": [15, 0, 0] + "rotation": ["15-math.sin(q.anim_time*90*2)*3", 0, 0] + }, + "left_ear": { + "rotation": [0, "math.sin(q.anim_time*90*2-30)*4", "math.sin(q.anim_time*90*2-30)*4"] + }, + "right_ear": { + "rotation": [0, "-(math.sin(q.anim_time*90*2-60)*4)", "-(math.sin(q.anim_time*90*2-60)*4)"] + }, + "hips": { + "rotation": ["-50-math.sin(q.anim_time*90*2-90)", 0, "-math.sin(q.anim_time*90-90)*3"], + "position": [0, "math.sin(q.anim_time*90*2)/4", 0] + }, + "arms": { + "rotation": ["-math.sin(q.anim_time*90*2-210)*3", 0, 0] } } }, - "animation.nidorina.idle2": { + "animation.nidorina.ground_walk": { "loop": true, + "animation_length": 1, "bones": { - "torso": { - "rotation": [-7.5, 0, 0] - }, - "head": { - "rotation": [-2.5, 0, 0], - "position": [0, 0, 0], - "scale": 1 - }, - "jaw": { - "rotation": [0, 0, 0] - }, - "upper_torso": { - "rotation": [10, 0, 0] - }, "body": { - "position": [0, -0.5, 0] + "position": [0, 0, -3] }, - "left_leg": { - "rotation": [-9.59615, -12.97202, -0.17957], - "position": [0, 0.25, 0.25] + "hips": { + "rotation": ["-55+math.sin(q.anim_time*90*8-180)*1.25", "-math.sin(q.anim_time*90*4-30)*20", "-math.sin(q.anim_time*90*4-180)*4"], + "position": [0, "-0.75-math.sin(q.anim_time*90*8-90)/4", 0] + }, + "torso2": { + "rotation": [30, "math.sin(q.anim_time*90*4-30)*10", "math.sin(q.anim_time*90*4-30)*10"], + "position": [0, -0.6, -1] }, "neck": { - "rotation": [5, 0, 0], - "position": [0, 0, 0] + "rotation": [17.5, 0, 0] }, - "left_foot": { - "rotation": [10, 0, 0] + "head": { + "rotation": ["-math.sin(q.anim_time*90*8-90)*2", "math.sin(q.anim_time*90*4-30)*8", 0] }, - "arms_torso": { - "rotation": [-7.5, 0, 0] + "left_ear": { + "rotation": ["-math.sin(q.anim_time*90*8-180)*2", "math.sin(q.anim_time*90*8-180)*2", "math.sin(q.anim_time*90*8-180)*4"] }, - "arms_upper_torso": { - "rotation": [10, 0, 0] - }, - "left_upper_arm": { - "rotation": [-10.88045, -9.96156, -17.42327], - "position": [0, -0.5, -0.5] - }, - "left_lower_arm": { - "rotation": [-17.49856, 2.71069, 6.74144] - }, - "left_hand": { - "rotation": [-14.81651, -1.97071, 8.21358] - }, - "tail_2": { - "rotation": [15, 0, 0] + "right_ear": { + "rotation": ["math.sin(q.anim_time*90*8-210)*2", "-(math.sin(q.anim_time*90*8-210)*2)", "-(math.sin(q.anim_time*90*8-210)*4)"] }, "tail_1": { - "rotation": [7.5, 0, 0] - }, - "left_middle_finger": { - "rotation": [-32.5, 0, 0], - "position": [0, 0.5, 0.25] - }, - "left_pinky_finger": { - "rotation": [-32.5, 0, 0], - "position": [0, 0.5, 0.25] - }, - "left_index_finger": { - "rotation": [-32.5, 0, 0], - "position": [0, 0.5, 0.25] - }, - "right_upper_arm": { - "rotation": [-10.88045, 9.96156, 17.42327], - "position": [0, -0.5, -0.5] - }, - "right_lower_arm": { - "rotation": [-17.49856, -2.71069, -6.74144] - }, - "right_hand": { - "rotation": [-14.81651, 1.97071, -8.21358] - }, - "right_middle_finger": { - "rotation": [-32.5, 0, 0], - "position": [0, 0.5, 0.25] - }, - "right_pinky_finger": { - "rotation": [-32.5, 0, 0], - "position": [0, 0.5, 0.25] - }, - "right_index_finger": { - "rotation": [-32.5, 0, 0], - "position": [0, 0.5, 0.25] - }, - "right_leg": { - "rotation": [-9.59615, 12.97202, 0.17957], - "position": [0, 0.25, 0.25] - }, - "right_foot": { - "rotation": [10, 0, 0] - } - } - }, - "animation.nidorina.idle3": { - "loop": true, - "bones": { - "torso": { - "rotation": [-65, 0, 0] - }, - "head": { - "rotation": [30, 0, 0], - "position": [0, 0, -1.25], - "scale": 1 - }, - "jaw": { - "rotation": [0, 0, 0] - }, - "upper_torso": { - "rotation": [17.5, 0, 0] - }, - "body": { - "position": [0, -0.5, 0] - }, - "left_leg": { - "rotation": [-14.59615, -12.97202, -0.17957] - }, - "neck": { - "rotation": [17.5, 0, 0], - "position": [0, 0, 0] - }, - "left_foot": { - "rotation": [15, 0, 0] - }, - "arms_torso": { - "rotation": [-65, 0, 0] - }, - "arms_upper_torso": { - "rotation": [17.5, 0, 0] - }, - "left_upper_arm": { - "rotation": [40.87027, 1.34519, -7.52204] - }, - "left_lower_arm": { - "rotation": [-9.80908, -0.30951, 10.19366] - }, - "left_hand": { - "rotation": [-17.5, 0, 0] + "rotation": [27.5, "-math.sin(q.anim_time*90*4-90)*16", "-math.sin(q.anim_time*90*4-90)*8"] }, "tail_2": { + "rotation": [17.5, "-math.sin(q.anim_time*90*4-150)*16", 0] + }, + "ftorso2": { + "rotation": [30, "math.sin(q.anim_time*90*4-30)*10", "math.sin(q.anim_time*90*4-30)*10"], + "position": [0, -0.6, -1] + }, + "left_upper_arm": { + "rotation": [0, 10, "12.5+math.sin(q.anim_time*90*4+90)*12"], + "position": [0.25, 0, 0] + }, + "left_lower_arm": { + "rotation": ["-7.5+math.sin(q.anim_time*90*8-120)*3", 0, 0], + "position": [0, 0.25, 0] + }, + "left_hand": { + "rotation": ["-32.5+math.sin(q.anim_time*90*8-180)*4", 0, 0] + }, + "left_middle_finger": { "rotation": [25, 0, 0] }, - "tail_1": { - "rotation": [30, 0, 0], - "position": [0, 0.25, 0.5] - }, - "left_middle_finger": { - "rotation": [10, 0, 0] - }, "left_pinky_finger": { - "rotation": [12.5, 0, 0] + "rotation": [25, 0, 0] }, "left_index_finger": { - "rotation": [12.5, 0, 0] + "rotation": [25, 0, 0] }, "right_upper_arm": { - "rotation": [40.87027, -1.34519, 7.52204] + "rotation": [0, -10, "-12.5+math.sin(q.anim_time*90*4+90)*12"], + "position": [-0.25, 0, 0] }, "right_lower_arm": { - "rotation": [-9.80908, 0.30951, -10.19366] + "rotation": ["-7.5+math.sin(q.anim_time*90*8-150)*3", 0, 0], + "position": [0, 0.25, 0] + }, + "right_hand": { + "rotation": ["-32.5+math.sin(q.anim_time*90*8-210)*4", 0, 0] + }, + "right_middle_finger": { + "rotation": [25, 0, 0] + }, + "right_pinky_finger": { + "rotation": [25, 0, 0] + }, + "right_index_finger": { + "rotation": [25, 0, 0] + }, + "right_leg": { + "rotation": { + "0.0": { + "post": [41.14, 31.12, 15.92], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [37.5, 25, 20], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-6.74, 15.25, 20.19], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-45.81, 18.71, 6.89], + "lerp_mode": "catmullrom" + }, + "0.5": [-35, 25, 0], + "0.7083": [-9.17, 35, 0], + "0.875": [35, 35, 0], + "1.0": { + "pre": [41.14, 31.12, 15.92], + "post": [41.14, 31.12, 15.92], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [-0.92, 0.31, 2.31], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [-0.75, 0.4, 2], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-0.87, 0.3, -0.5], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-0.86, 0.01, -0.74], + "lerp_mode": "catmullrom" + }, + "0.5": [-0.5, -1.35, -1.5], + "0.7083": [-0.5, -0.29, 1.28], + "0.875": [-1.5, -0.1, 2.3], + "1.0": { + "pre": [-0.92, 0.31, 2.31], + "post": [-0.92, 0.31, 2.31], + "lerp_mode": "catmullrom" + } + } + }, + "right_foot": { + "rotation": { + "0.0": { + "post": [25.76, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [39.09, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [50.2, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [35, 0, 0], + "0.7083": [10.28, 0, 0], + "0.875": [2.5, 0, 0], + "1.0": { + "pre": [25.76, 0, 0], + "post": [25.76, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "right_foot_claws": { + "rotation": { + "0.0": { + "post": [13.18, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0], + "0.7083": [0, 0, 0], + "0.875": [-37.5, 0, 0], + "1.0": { + "pre": [13.18, 0, 0], + "post": [13.18, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, -0.05, 0.1], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0], + "0.7083": [0, 0, 0], + "0.875": [0, -0.2, 0.45], + "1.0": { + "pre": [0, -0.05, 0.1], + "post": [0, -0.05, 0.1], + "lerp_mode": "catmullrom" + } + } + }, + "left_leg": { + "rotation": { + "0.0": [-35, -25, 0], + "0.2083": [-9.17, -35, 0], + "0.375": [35, -35, 0], + "0.5417": { + "pre": [37.5, -25, -20], + "post": [37.5, -25, -20], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [-6.74, -15.25, -20.19], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [-45.81, -18.71, -6.89], + "lerp_mode": "catmullrom" + }, + "1.0": [-35, -25, 0] + }, + "position": { + "0.0": [0.5, -1.35, -1.5], + "0.2083": [0.5, -0.29, 1.28], + "0.375": [1.5, -0.1, 2], + "0.5417": { + "pre": [0.75, 0.4, 2], + "post": [0.75, 0.4, 2], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0.87, 0.3, -0.5], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [0.86, 0.01, -0.74], + "lerp_mode": "catmullrom" + }, + "1.0": [0.5, -1.35, -1.5] + } + }, + "left_foot": { + "rotation": { + "0.0": [35, 0, 0], + "0.2083": [10.28, 0, 0], + "0.375": [2.5, 0, 0], + "0.5417": { + "pre": [32.5, 0, 0], + "post": [32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [39.09, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [50.2, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [35, 0, 0] + } + }, + "left_foot_claws": { + "rotation": { + "0.0": [0, 0, 0], + "0.2083": [0, 0, 0], + "0.375": [-37.5, 0, 0], + "0.5417": { + "pre": [25, 0, 0], + "post": [25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.2083": [0, 0, 0], + "0.375": [0, -0.2, 0.45], + "0.5417": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [0, 0, 0] + } + } + } + }, + "animation.nidorina.ground_run": { + "loop": true, + "animation_length": 1, + "bones": { + "body": { + "position": [0, 0, "-4-math.sin(q.anim_time*90*8-90)"] + }, + "torso": { + "rotation": ["math.sin(q.anim_time*90*8-120)*12", 0, "math.sin(q.anim_time*90*4-120)*4"], + "position": [0, "math.sin(q.anim_time*90*8)*0.75", 0] + }, + "torso2": { + "rotation": ["-math.sin(q.anim_time*90*8-30)*12", 0, "-math.sin(q.anim_time*90*4-150)*4"] + }, + "neck": { + "rotation": ["7.5-math.sin(q.anim_time*90*8-210)*8", 0, 0] + }, + "head": { + "rotation": ["-5-math.sin(q.anim_time*90*8+180)*8", 0, 0] + }, + "left_ear": { + "rotation": ["-math.sin(q.anim_time*90*8-90)*2", "-math.sin(q.anim_time*90*8-90)*12", "-math.sin(q.anim_time*90*8-90)*8"] + }, + "right_ear": { + "rotation": ["-math.sin(q.anim_time*90*8-90)*2", "math.sin(q.anim_time*90*8-90)*12", "math.sin(q.anim_time*90*8-90)*8"] + }, + "tail_1": { + "rotation": ["math.sin(q.anim_time*90*8-180)*16", "math.sin(q.anim_time*90*4-120)*8", 0] + }, + "tail_2": { + "rotation": ["math.sin(q.anim_time*90*8-240)*18", "math.sin(q.anim_time*90*4-180)*12", 0] + }, + "left_upper_arm": { + "rotation": { + "0.0": { + "post": [27.5, 0, -17.5], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-24.72, 0, -4.23], + "lerp_mode": "catmullrom" + }, + "0.2917": [-15, 0, 0], + "0.375": { + "pre": [15.75, 0, 0], + "post": [15.75, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [27.5, 0, -17.5], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [-24.72, 0, -4.23], + "lerp_mode": "catmullrom" + }, + "0.7917": [-15, 0, 0], + "0.875": { + "pre": [15.75, 0, 0], + "post": [15.75, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [27.5, 0, -17.5], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0.25, -0.25], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [0, 1.17, -1.95], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [0, -0.22, -1.92], + "lerp_mode": "catmullrom" + }, + "0.2917": [0, -1.25, -1.25], + "0.5": { + "pre": [0, 0.25, -0.25], + "post": [0, 0.25, -0.25], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [0, 1.17, -1.95], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [0, -0.22, -1.92], + "lerp_mode": "catmullrom" + }, + "0.7917": [0, -1.25, -1.25], + "1.0": { + "pre": [0, 0.25, -0.25], + "post": [0, 0.25, -0.25], + "lerp_mode": "catmullrom" + } + } + }, + "left_lower_arm": { + "rotation": { + "0.0": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [-22.77, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-4.66, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [28.37, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [-22.77, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [-4.66, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [28.37, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": [0, 0, 0], + "0.2917": [0, 1, -0.25], + "0.5": [0, 0, 0], + "0.7917": [0, 1, -0.25], + "1.0": [0, 0, 0] + } + }, + "left_hand": { + "rotation": { + "0.0": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [-39.56, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [-53.12, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-9.84, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": [-45, 0, 0], + "0.4167": { + "pre": [-22.54, 0, 0], + "post": [-22.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [-39.56, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [-53.12, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [-9.84, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": [-45, 0, 0], + "0.9167": { + "pre": [-22.54, 0, 0], + "post": [-22.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "left_middle_finger": { + "rotation": { + "0.0": { + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [27.5, 0, 0], + "0.2917": [-52.5, 0, 0], + "0.375": [-90, 0, 0], + "0.5": { + "pre": [3.8, 0, 0], + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [27.5, 0, 0], + "0.7917": [-52.5, 0, 0], + "0.875": [-90, 0, 0], + "1.0": { + "pre": [3.8, 0, 0], + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [0, 0, 0], + "0.2917": [0, 0.75, 0], + "0.375": [0, 0.75, 0], + "0.5": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [0, 0, 0], + "0.7917": [0, 0.75, 0], + "0.875": [0, 0.75, 0], + "1.0": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + } + } + }, + "left_pinky_finger": { + "rotation": { + "0.0": { + "post": [3.06, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [27.5, 0, 0], + "0.2917": [-55, 0, 0], + "0.375": [-90, 0, 0], + "0.5": { + "pre": [3.06, 0, 0], + "post": [3.06, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [27.5, 0, 0], + "0.7917": [-55, 0, 0], + "0.875": [-90, 0, 0], + "1.0": { + "pre": [3.06, 0, 0], + "post": [3.06, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [0, 0, 0], + "0.2917": [0, 0.75, 0], + "0.375": [0, 0.75, 0], + "0.5": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [0, 0, 0], + "0.7917": [0, 0.75, 0], + "0.875": [0, 0.75, 0], + "1.0": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + } + } + }, + "left_index_finger": { + "rotation": { + "0.0": { + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [27.5, 0, 0], + "0.2917": [-52.5, 0, 0], + "0.375": [-90, 0, 0], + "0.5": { + "pre": [3.8, 0, 0], + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [27.5, 0, 0], + "0.7917": [-52.5, 0, 0], + "0.875": [-90, 0, 0], + "1.0": { + "pre": [3.8, 0, 0], + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [0, 0, 0], + "0.2917": [0, 0.75, 0], + "0.375": [0, 0.75, 0], + "0.5": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [0, 0, 0], + "0.7917": [0, 0.75, 0], + "0.875": [0, 0.75, 0], + "1.0": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + } + } + }, + "right_upper_arm": { + "rotation": { + "0.0": { + "post": [27.5, 0, 17.5], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-24.72, 0, 4.23], + "lerp_mode": "catmullrom" + }, + "0.2917": [-15, 0, 0], + "0.375": { + "pre": [15.75, 0, 0], + "post": [15.75, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [27.5, 0, 17.5], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [-24.72, 0, 4.23], + "lerp_mode": "catmullrom" + }, + "0.7917": [-15, 0, 0], + "0.875": { + "pre": [15.75, 0, 0], + "post": [15.75, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [27.5, 0, 17.5], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0.25, -0.25], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [0, 1.17, -1.95], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [0, -0.22, -1.92], + "lerp_mode": "catmullrom" + }, + "0.2917": [0, -1.25, -1.25], + "0.5": { + "pre": [0, 0.25, -0.25], + "post": [0, 0.25, -0.25], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [0, 1.17, -1.95], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [0, -0.22, -1.92], + "lerp_mode": "catmullrom" + }, + "0.7917": [0, -1.25, -1.25], + "1.0": { + "pre": [0, 0.25, -0.25], + "post": [0, 0.25, -0.25], + "lerp_mode": "catmullrom" + } + } + }, + "right_lower_arm": { + "rotation": { + "0.0": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [-22.77, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-4.66, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [28.37, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [-22.77, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [-4.66, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [28.37, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": [0, 0, 0], + "0.2917": [0, 1, -0.25], + "0.5": [0, 0, 0], + "0.7917": [0, 1, -0.25], + "1.0": [0, 0, 0] + } + }, + "right_hand": { + "rotation": { + "0.0": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [-39.56, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [-53.12, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-9.84, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": [-45, 0, 0], + "0.4167": { + "pre": [-22.54, 0, 0], + "post": [-22.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [-39.56, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [-53.12, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [-9.84, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": [-45, 0, 0], + "0.9167": { + "pre": [-22.54, 0, 0], + "post": [-22.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "right_middle_finger": { + "rotation": { + "0.0": { + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [27.5, 0, 0], + "0.2917": [-52.5, 0, 0], + "0.375": [-90, 0, 0], + "0.5": { + "pre": [3.8, 0, 0], + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [27.5, 0, 0], + "0.7917": [-52.5, 0, 0], + "0.875": [-90, 0, 0], + "1.0": { + "pre": [3.8, 0, 0], + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [0, 0, 0], + "0.2917": [0, 0.75, 0], + "0.375": [0, 0.75, 0], + "0.5": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [0, 0, 0], + "0.7917": [0, 0.75, 0], + "0.875": [0, 0.75, 0], + "1.0": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + } + } + }, + "right_pinky_finger": { + "rotation": { + "0.0": { + "post": [3.06, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [27.5, 0, 0], + "0.2917": [-55, 0, 0], + "0.375": [-90, 0, 0], + "0.5": { + "pre": [3.06, 0, 0], + "post": [3.06, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [27.5, 0, 0], + "0.7917": [-55, 0, 0], + "0.875": [-90, 0, 0], + "1.0": { + "pre": [3.06, 0, 0], + "post": [3.06, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [0, 0, 0], + "0.2917": [0, 0.75, 0], + "0.375": [0, 0.75, 0], + "0.5": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [0, 0, 0], + "0.7917": [0, 0.75, 0], + "0.875": [0, 0.75, 0], + "1.0": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + } + } + }, + "right_index_finger": { + "rotation": { + "0.0": { + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [27.5, 0, 0], + "0.2917": [-52.5, 0, 0], + "0.375": [-90, 0, 0], + "0.5": { + "pre": [3.8, 0, 0], + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [27.5, 0, 0], + "0.7917": [-52.5, 0, 0], + "0.875": [-90, 0, 0], + "1.0": { + "pre": [3.8, 0, 0], + "post": [3.8, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": [0, 0, 0], + "0.2917": [0, 0.75, 0], + "0.375": [0, 0.75, 0], + "0.5": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [0, 0, 0], + "0.7917": [0, 0.75, 0], + "0.875": [0, 0.75, 0], + "1.0": { + "pre": [0, 0.22, 0], + "post": [0, 0.22, 0], + "lerp_mode": "catmullrom" + } + } + }, + "right_leg": { + "rotation": { + "0.0": [-27.5, 27.5, 0], + "0.125": [32.5, 5, 0], + "0.25": { + "pre": [63, -0.5, 22.5], + "post": [63, -0.5, 22.5], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-45.74, 27.3, 19.51], + "lerp_mode": "catmullrom" + }, + "0.5": [-27.5, 27.5, 0], + "0.625": [32.5, 5, 0], + "0.75": { + "pre": [63, -0.5, 22.5], + "post": [63, -0.5, 22.5], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [-45.74, 27.3, 19.51], + "lerp_mode": "catmullrom" + }, + "1.0": [-27.5, 27.5, 0] + }, + "position": { + "0.0": [0, -1, 0], + "0.125": [-0.5, -0.25, 1.5], + "0.25": { + "pre": [-0.4, 0.1, 1.05], + "post": [-0.4, 0.1, 1.05], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-0.16, 0.03, 0.4], + "lerp_mode": "catmullrom" + }, + "0.5": [0, -1, 0], + "0.625": [-0.5, -0.25, 1.5], + "0.75": { + "pre": [-0.4, 0.1, 1.05], + "post": [-0.4, 0.1, 1.05], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [-0.16, 0.03, 0.4], + "lerp_mode": "catmullrom" + }, + "1.0": [0, -1, 0] + } + }, + "right_foot": { + "rotation": { + "0.0": [27.5, 0, 0], + "0.125": [12.5, 0, 0], + "0.25": { + "pre": [8, 0, 0], + "post": [8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [36.64, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [27.5, 0, 0], + "0.625": [12.5, 0, 0], + "0.75": { + "pre": [8, 0, 0], + "post": [8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [36.64, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [27.5, 0, 0] + } + }, + "right_foot_claws": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [-45, 0, 0], + "0.25": { + "pre": [27.5, 0, 0], + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [0, 0, 0], + "0.5": [0, 0, 0], + "0.625": [-45, 0, 0], + "0.75": { + "pre": [27.5, 0, 0], + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": [0, 0, 0], + "1.0": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.125": [0, -0.5, 0.5], + "0.25": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [0, 0, 0], + "0.5": [0, 0, 0], + "0.625": [0, -0.5, 0.5], + "0.75": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": [0, 0, 0], + "1.0": [0, 0, 0] + } + }, + "left_leg": { + "rotation": { + "0.0": [-27.5, -27.5, 0], + "0.125": [32.5, -5, 0], + "0.25": { + "pre": [63, 0.5, -22.5], + "post": [63, 0.5, -22.5], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-45.74, -27.3, -19.51], + "lerp_mode": "catmullrom" + }, + "0.5": [-27.5, -27.5, 0], + "0.625": [32.5, -5, 0], + "0.75": { + "pre": [63, 0.5, -22.5], + "post": [63, 0.5, -22.5], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [-45.74, -27.3, -19.51], + "lerp_mode": "catmullrom" + }, + "1.0": [-27.5, -27.5, 0] + }, + "position": { + "0.0": [0, -1, 0], + "0.125": [0.5, -0.25, 1.5], + "0.25": { + "pre": [0.4, 0.1, 1.05], + "post": [0.4, 0.1, 1.05], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [0.16, 0.03, 0.4], + "lerp_mode": "catmullrom" + }, + "0.5": [0, -1, 0], + "0.625": [0.5, -0.25, 1.5], + "0.75": { + "pre": [0.4, 0.1, 1.05], + "post": [0.4, 0.1, 1.05], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [0.16, 0.03, 0.4], + "lerp_mode": "catmullrom" + }, + "1.0": [0, -1, 0] + } + }, + "left_foot": { + "rotation": { + "0.0": [27.5, 0, 0], + "0.125": [12.5, 0, 0], + "0.25": { + "pre": [8, 0, 0], + "post": [8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [36.64, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [27.5, 0, 0], + "0.625": [12.5, 0, 0], + "0.75": { + "pre": [8, 0, 0], + "post": [8, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [36.64, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [27.5, 0, 0] + } + }, + "left_foot_claws": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [-45, 0, 0], + "0.25": { + "pre": [27.5, 0, 0], + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [0, 0, 0], + "0.5": [0, 0, 0], + "0.625": [-45, 0, 0], + "0.75": { + "pre": [27.5, 0, 0], + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": [0, 0, 0], + "1.0": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.125": [0, -0.5, 0.5], + "0.25": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": [0, 0, 0], + "0.5": [0, 0, 0], + "0.625": [0, -0.5, 0.5], + "0.75": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": [0, 0, 0], + "1.0": [0, 0, 0] + } + } + } + }, + "animation.nidorina.battle_idle": { + "loop": true, + "bones": { + "torso": { + "rotation": ["-17.5-math.sin(q.anim_time*90*4-90)", 0, "-math.sin(q.anim_time*90*2-90)*2"], + "position": [0, "-0.25+math.sin(q.anim_time*90*4)/6", 0.25] + }, + "head": { + "rotation": ["-2.5-math.sin(q.anim_time*90*4-180)", 0, 0], + "position": [0, 0, 0] + }, + "jaw": { + "rotation": [0, 0, 0] + }, + "torso2": { + "rotation": ["17.5-math.sin(q.anim_time*90*4-150)", 0, "math.sin(q.anim_time*90*2-150)"] + }, + "body": { + "position": [0, -0.5, -4] + }, + "left_leg": { + "rotation": ["-9.5+math.sin(q.anim_time*90*4)*3", -30, 0], + "position": ["0.25+math.sin(q.anim_time*90*4)/16", "0.25+math.sin(q.anim_time*90*4)/10", "1-math.sin(q.anim_time*90*4)/10"] + }, + "neck": { + "rotation": [5, 0, 0], + "position": [0, 0, 0] + }, + "left_foot": { + "rotation": ["10-math.sin(q.anim_time*90*4)*3", 0, 0] + }, + "ftorso2": { + "rotation": [10, 0, 0] + }, + "left_upper_arm": { + "rotation": ["-10-math.sin(q.anim_time*90*4)*4", -30, -5], + "position": ["-math.sin(q.anim_time*90*4)/12", "0.25-math.sin(q.anim_time*90*4)/32", "-0.5+math.sin(q.anim_time*90*4)/6"] + }, + "left_lower_arm": { + "rotation": [-22.5, 3, 6] + }, + "left_hand": { + "rotation": ["-12.5+math.sin(q.anim_time*90*4)*4", 0, 0] + }, + "tail_2": { + "rotation": ["15-math.sin(q.anim_time*90*4-210)*6", "math.sin(q.anim_time*90*2-210)*16", 0] + }, + "tail_1": { + "rotation": ["7.5-math.sin(q.anim_time*90*4-150)*4", "math.sin(q.anim_time*90*2-150)*16", 0] + }, + "left_middle_finger": { + "rotation": [-32.5, 0, 0], + "position": [0, 0.5, 0.25] + }, + "left_pinky_finger": { + "rotation": [-32.5, 0, 0], + "position": [0, 0.5, 0.25] + }, + "left_index_finger": { + "rotation": [-32.5, 0, 0], + "position": [0, 0.5, 0.25] + }, + "right_upper_arm": { + "rotation": ["-10-math.sin(q.anim_time*90*4)*4", 30, 5], + "position": ["math.sin(q.anim_time*90*4)/12", "0.25-math.sin(q.anim_time*90*4)/32", "-0.5+math.sin(q.anim_time*90*4)/6"] + }, + "right_lower_arm": { + "rotation": [-22.5, -3, -6] + }, + "right_hand": { + "rotation": ["-12.5+math.sin(q.anim_time*90*4)*4", 0, 0] + }, + "right_middle_finger": { + "rotation": [-32.5, 0, 0], + "position": [0, 0.5, 0.25] + }, + "right_pinky_finger": { + "rotation": [-32.5, 0, 0], + "position": [0, 0.5, 0.25] + }, + "right_index_finger": { + "rotation": [-32.5, 0, 0], + "position": [0, 0.5, 0.25] + }, + "right_leg": { + "rotation": ["-9.5+math.sin(q.anim_time*90*4)*3", 30, 0], + "position": ["-0.25-math.sin(q.anim_time*90*4)/16", "0.25+math.sin(q.anim_time*90*4)/10", "1-math.sin(q.anim_time*90*4)/10"] + }, + "right_foot": { + "rotation": ["10-math.sin(q.anim_time*90*4)*3", 0, 0] + }, + "left_ear": { + "rotation": ["math.sin(q.anim_time*90*4-180)*4", "-(math.sin(q.anim_time*90*4-180)*2)", "-(math.sin(q.anim_time*90*4-180)*4)"] + }, + "right_ear": { + "rotation": ["math.sin(q.anim_time*90*4-210)*4", "math.sin(q.anim_time*90*4-210)*2", "math.sin(q.anim_time*90*4-210)*4"] + } + } + }, + "animation.nidorina.recoil": { + "animation_length": 0.75, + "bones": { + "left_eyelid_hurt": { + "position": { + "0.0": [0.1, 0, 0], + "0.5": {"pre": [0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "right_eyelid_hurt": { + "position": { + "0.0": [-0.1, 0, 0], + "0.5": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": [0, 0, 0], + "0.1667": { + "pre": [-5, 0, 0], + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [0, 0, 0.5], + "post": [0, 0, 0.5], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + } + }, + "torso2": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [7.5, 0, 0], + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [-5.78, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [7.5, 0, 0], + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": [0, 0, 0] + } + }, + "left_ear": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [-22.5, 2.5, 15], + "post": [-22.5, 2.5, 15], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [0, -7.5, -15], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [0, -7.5, -2.5], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": [0, 0, 0] + } + }, + "right_ear": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [-22.5, -2.5, -15], + "post": [-22.5, -2.5, -15], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [0, 7.5, 15], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [0, 7.5, 2.5], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": [0, 0, 0] + } + }, + "arms": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [-12.5, 0, 0], + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [0, -0.5, 0.5], + "post": [0, -0.5, 0.5], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + } + } + } + }, + "animation.nidorina.cry": { + "animation_length": 1.5, + "bones": { + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [10, 0, 0], + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-20, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [-15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": [-15, 0, 0], + "1.1667": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [0, -0.75, -0.25], + "post": [0, -0.75, -0.25], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + } + }, + "jaw": { + "rotation": { + "0.0": [0, 0, 0], + "0.1667": [0, 0, 0], + "0.2917": { + "pre": [50, 0, 0], + "post": [50, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [40, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": [40, 0, 0], + "1.1667": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "left_ear": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [10, 0, 22.5], + "post": [10, 0, 22.5], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, -7.5, -12.5], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [0, -7.5, -12.5], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "right_ear": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [10, 0, -22.5], + "post": [10, 0, -22.5], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 7.5, 12.5], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [0, 7.5, 12.5], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + } + }, + "sound_effects": { + "0.25": { + "effect": "pokemon.nidorina.cry" + } + } + }, + "animation.nidorina.sleep": { + "loop": true, + "bones": { + "torso": { + "rotation": [0, 0, "-math.sin(q.anim_time*90/2-90)*2"], + "position": [0, "-3+math.sin(q.anim_time*90)/8", 0] + }, + "torso2": { + "rotation": ["-math.sin(q.anim_time*90-150)", 0, "math.sin(q.anim_time*90/2-120)*2"] + }, + "neck": { + "rotation": [7.5, 0, 0], + "position": [0, -0.5, 0] + }, + "head": { + "rotation": ["-10-math.sin(q.anim_time*90-210)", 0, 0] + }, + "left_ear": { + "rotation": ["0-math.cos(q.anim_time*90-210)*4", "10-math.sin(q.anim_time*90-210)*4", "25-math.sin(q.anim_time*90-210)*4"], + "position": [-0.25, 0.75, 0.25] + }, + "right_ear": { + "rotation": ["-math.cos(q.anim_time*90-210)*4", "-10+math.sin(q.anim_time*90-210)*4", "-25+math.sin(q.anim_time*90-210)*4"], + "position": [0.25, 0.75, 0.25] + }, + "left_eyelid": { + "position": [0.1, 0, 0] + }, + "right_eyelid": { + "position": [-0.1, 0, 0] + }, + "tail_1": { + "rotation": ["-20-math.sin(q.anim_time*90-180)*4", "-math.sin(q.anim_time*90/2-180)*6", 0], + "position": [0, 0, -0.5] + }, + "tail_2": { + "rotation": ["-math.sin(q.anim_time*90-240)*4", "-math.sin(q.anim_time*90/2-240)*6", 0] + }, + "left_upper_arm": { + "rotation": [-72.5, -25, 0], + "position": [0, -3, 0.25] + }, + "left_hand": { + "rotation": [-17.5, 0, 0] + }, + "left_middle_finger": { + "rotation": [25, 0, 0] + }, + "left_pinky_finger": { + "rotation": [25, 0, 0] + }, + "left_index_finger": { + "rotation": [25, 0, 0] + }, + "right_upper_arm": { + "rotation": [-72.5, 25, 0], + "position": [0, -3, 0.25] }, "right_hand": { "rotation": [-17.5, 0, 0] }, "right_middle_finger": { - "rotation": [10, 0, 0] + "rotation": [25, 0, 0] }, "right_pinky_finger": { - "rotation": [12.5, 0, 0] + "rotation": [25, 0, 0] }, "right_index_finger": { - "rotation": [12.5, 0, 0] + "rotation": [25, 0, 0] }, "right_leg": { - "rotation": [-14.59615, 12.97202, 0.17957] + "rotation": [-90, 17.5, 0], + "position": [-1, -2.5, 1] }, "right_foot": { - "rotation": [15, 0, 0] + "rotation": ["32.5+math.sin(q.anim_time*120)*2", 0, 0] + }, + "right_foot_claws": { + "rotation": [27.5, 0, 0] + }, + "left_leg": { + "rotation": [-90, -17.5, 0], + "position": [1, -2.5, 1] + }, + "left_foot": { + "rotation": ["32.5+math.sin(q.anim_time*90)*2", 0, 0] + }, + "left_foot_claws": { + "rotation": [27.5, 0, 0] } } }, "animation.nidorina.blink": { - "animation_length": 0.16667, + "animation_length": 0.1667, "bones": { "left_eyelid": { "position": { "0.0": [0.1, 0, 0], - "0.125": {"pre": [0.1, 0, 0], "post": [0.1, 0, 0]}, "0.1667": {"pre": [0.1, 0, 0], "post": [0, 0, 0]} } }, "right_eyelid": { "position": { "0.0": [-0.1, 0, 0], - "0.125": {"pre": [-0.1, 0, 0], "post": [-0.1, 0, 0]}, "0.1667": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]} } } } }, - "animation.nidorina.cry": { - "animation_length": 1, + "animation.nidorina.walkspeedtest": { + "loop": true, "bones": { - "upper_torso": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [-5, 0, 0], - "0.5417": [-4, 0, 0], - "0.9583": [0, 0, 0] - } - }, - "neck": { - "rotation": { - "0.0": [0, 0, 0], - "0.3333": [-2.5, 0, 0], - "0.6667": [-2, 0, 0], - "0.9583": [0, 0, 0] - } - }, - "head": { - "rotation": { - "0.0": [0, 0, 0], - "0.125": [-5, 0, 0], - "0.2917": [-2.5, 0, 0], - "0.4583": [-4, 0, 0], - "0.6667": [-1.5, 0, 0], - "0.875": [0, 0, 0] - } - }, - "jaw": { - "rotation": { - "0.0": [0, 0, 0], - "0.0833": [45, 0, 0], - "0.2083": [22.5, 0, 0], - "0.3333": [35, 0, 0], - "0.5833": [17.5, 0, 0], - "0.75": [0, 0, 0] - } - }, - "arms_upper_torso": { - "rotation": { - "0.0": [0, 0, 0], - "0.25": [-5, 0, 0], - "0.5417": [-4, 0, 0], - "0.9583": [0, 0, 0] - } - }, - "left_upper_arm": { - "rotation": { - "0.0": [0, 0, 0], - "0.2917": [5, 0, 0], - "0.625": [3, 0, 0], - "0.9583": [0, 0, 0] - } - }, - "right_upper_arm": { - "rotation": { - "0.0": [0, 0, 0], - "0.2917": [5, 0, 0], - "0.625": [3, 0, 0], - "0.9583": [0, 0, 0] - } + "nidorina": { + "position": [0, 0, "47-q.anim_time*90*0.18"] } - }, - "sound_effects": { - "0.04": { - "effect": "pokemon.nidorina.cry" + } + }, + "animation.nidorina.runspeedtest": { + "loop": true, + "bones": { + "nidorina": { + "position": [0, 0, "47-q.anim_time*90*0.3"] + } + } + }, + "animation.nidorina.scaletest": { + "loop": true, + "bones": { + "nidorina": { + "scale": 0.9 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0032_nidoranm/nidoranm.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0032_nidoranm/nidoranm.animation.json index c049c5a98e..128050f1f3 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0032_nidoranm/nidoranm.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0032_nidoranm/nidoranm.animation.json @@ -1,95 +1,1281 @@ { "format_version": "1.8.0", "animations": { - "animation.nidoranm.test": { + "animation.nidoranm.ground_idle": { "loop": true, "bones": { "torso": { - "rotation": [7.5, 0, 0] + "rotation": ["-math.sin(q.anim_time*90*4-90)/2", 0, "-math.sin(q.anim_time*90*2-30)"], + "position": [0, "math.sin(q.anim_time*90*4)/12", 0] }, "head": { - "rotation": [-5, 0, 0] + "rotation": ["-math.sin(q.anim_time*90*4-150)", 0, "-math.sin(q.anim_time*90*2-90)*1.2"] + }, + "ear_left": { + "rotation": [0, 0, "-math.sin(q.anim_time*90*4-120)*4"] + }, + "ear_right": { + "rotation": [0, 0, "math.sin(q.anim_time*90*4-150)*4"] }, "leg_front_left": { - "rotation": [-17.5, -7.5, -1], - "position": [0, -1, -0.25] - }, - "leg_front_right": { - "rotation": [-17.5, 7.5, 1], - "position": [0, -1, -0.25] - }, - "leg_back_left": { - "rotation": [30, 0, 0] - }, - "foot_back_left": { - "rotation": [32.5, 0, 0] - }, - "leg_back_right": { - "rotation": [30, 0, 0] - }, - "foot_back_right": { - "rotation": [32.5, 0, 0] - }, - "foot_back_left2": { - "rotation": [-62.5, 0, 0] - }, - "foot_back_right2": { - "rotation": [-62.5, 0, 0] - }, - "leg_front_right2": { - "rotation": [-12.5, 0, 0] + "rotation": ["7.5-math.sin(q.anim_time*90*4)*2", 0, 0], + "position": [0, "-0.25+math.sin(q.anim_time*90*4)/16", "math.sin(q.anim_time*90*4)/16"] }, "leg_front_left2": { - "rotation": [-12.5, 0, 0] + "rotation": ["-7.5+math.sin(q.anim_time*90*4)*2", 0, 0] }, - "muzzle": { - "rotation": [5, 0, 0] + "leg_front_right": { + "rotation": ["7.5-math.sin(q.anim_time*90*4)*2", 0, 0], + "position": [0, "-0.25+math.sin(q.anim_time*90*4)/16", "math.sin(q.anim_time*90*4)/16"] + }, + "leg_front_right2": { + "rotation": ["-7.5+math.sin(q.anim_time*90*4)*2", 0, 0] + }, + "leg_back_left": { + "rotation": ["-math.sin(q.anim_time*90*4)*2", -17.5, 0], + "position": ["0.25-math.sin(q.anim_time*90*4)/24", "math.sin(q.anim_time*90*4)/16", "math.sin(q.anim_time*90*4)/8"] + }, + "foot_back_left": { + "rotation": ["math.sin(q.anim_time*90*4)*2", 0, 0] + }, + "leg_back_right": { + "rotation": ["-math.sin(q.anim_time*90*4)*2", 17.5, 0], + "position": ["-0.25+math.sin(q.anim_time*90*4)/24", "math.sin(q.anim_time*90*4)/16", "math.sin(q.anim_time*90*4)/8"] + }, + "foot_back_right": { + "rotation": ["math.sin(q.anim_time*90*4)*2", 0, 0] + } + } + }, + "animation.nidoranm.ground_walk": { + "loop": true, + "animation_length": 0.5, + "bones": { + "torso": { + "rotation": ["-math.sin(q.anim_time*90*16-120)", "math.sin(q.anim_time*90*8)*3", "-math.sin(q.anim_time*90*8-150)*6"], + "position": [0, "math.sin(q.anim_time*90*16-90)/4", 0] + }, + "head": { + "rotation": ["math.sin(q.anim_time*90*16-90)*2", "-math.sin(q.anim_time*90*8)*3", "-math.sin(q.anim_time*90*8)"] + }, + "ear_left": { + "rotation": ["-math.sin(q.anim_time*90*16+30)*3", 0, "-math.sin(q.anim_time*90*8+30)*12"] + }, + "ear_right": { + "rotation": ["-math.sin(q.anim_time*90*16+60)*3", 0, "-math.sin(q.anim_time*90*8+60)*12"] + }, + "leg_front_left": { + "rotation": { + "0.0": { + "post": [34.06, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [34.98, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": [-20.62, 0, 0], + "0.2917": [-7.5, 0, 0], + "0.4167": [17.5, 0, 0], + "0.5": { + "pre": [34.06, 0, 0], + "post": [34.06, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, -0.16, 0.23], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [0, 0.05, -0.05], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [0, 0.25, -0.5], + "lerp_mode": "catmullrom" + }, + "0.25": [0, -0.8, -1], + "0.2917": [0, -0.3, -1.25], + "0.4167": [0, -0.58, 0.56], + "0.5": { + "pre": [0, -0.16, 0.23], + "post": [0, -0.16, 0.23], + "lerp_mode": "catmullrom" + } + } + }, + "leg_front_left2": { + "rotation": { + "0.0": { + "post": [-27.87, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": [-15, 0, 0], + "0.2917": [0, 0, 0], + "0.4167": [-17.5, 0, 0], + "0.5": { + "pre": [-27.87, 0, 0], + "post": [-27.87, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "leg_front_right": { + "rotation": { + "0.0": [-20.62, 0, 0], + "0.0417": [-7.5, 0, 0], + "0.1667": [17.5, 0, 0], + "0.2917": { + "pre": [34.98, 0, 0], + "post": [34.98, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [-20.62, 0, 0] + }, + "position": { + "0.0": [0, -0.8, -1], + "0.0417": [0, -0.3, -1.25], + "0.1667": [0, -0.58, 0.56], + "0.2917": { + "pre": [0, 0.05, -0.05], + "post": [0, 0.05, -0.05], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0.25, -0.5], + "lerp_mode": "catmullrom" + }, + "0.5": [0, -0.8, -1] + } + }, + "leg_front_right2": { + "rotation": { + "0.0": [-15, 0, 0], + "0.0417": [0, 0, 0], + "0.1667": [-17.5, 0, 0], + "0.2917": { + "pre": [-30, 0, 0], + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [-15, 0, 0] + } + }, + "leg_back_left": { + "rotation": { + "0.0": [-2.5, 0, 0], + "0.125": [35, 0, 0], + "0.25": { + "pre": [70, 0, 0], + "post": [70, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [39.76, -7.28, -9.71], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [-6.39, -5.66, -7.55], + "lerp_mode": "catmullrom" + }, + "0.5": [-2.5, 0, 0] + }, + "position": { + "0.0": [0.5, 0.15, 0.25], + "0.0833": [0.5, 0.44, 0.07], + "0.125": [0.5, 0.05, 0.2], + "0.25": { + "pre": [0.5, -0.3, -0.75], + "post": [0.5, -0.3, -0.75], + "lerp_mode": "catmullrom" + }, + "0.375": [0.5, 1.64, 0.54], + "0.5": [0.5, 0.15, 0.25] + } + }, + "foot_back_left": { + "rotation": { + "0.0": [2.5, 0, 0], + "0.0833": [25, 0, 0], + "0.125": [25, 0, 0], + "0.25": { + "pre": [40, 0, 0], + "post": [40, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [2.5, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": { + "pre": [0, -0.16, -1], + "post": [0, -0.16, -1], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + } + }, + "foot_back_left2": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": [-47.5, 0, 0], + "0.125": [-60.25, 0, 0], + "0.25": { + "pre": [-12.5, 0, 0], + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-19, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + } + }, + "leg_back_right": { + "rotation": { + "0.0": { + "post": [70, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [39.76, 7.28, 9.71], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-6.39, 5.66, 7.55], + "lerp_mode": "catmullrom" + }, + "0.25": [-2.5, 0, 0], + "0.375": [35, 0, 0], + "0.5": { + "pre": [70, 0, 0], + "post": [70, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [-0.5, -0.3, -0.75], + "lerp_mode": "catmullrom" + }, + "0.125": [-0.5, 1.64, 0.54], + "0.25": [-0.5, 0.15, 0.25], + "0.3333": [-0.5, 0.44, 0.07], + "0.375": [-0.5, 0.05, 0.2], + "0.5": { + "pre": [-0.5, -0.3, -0.75], + "post": [-0.5, -0.3, -0.75], + "lerp_mode": "catmullrom" + } + } + }, + "foot_back_right": { + "rotation": { + "0.0": { + "post": [40, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": [2.5, 0, 0], + "0.3333": [25, 0, 0], + "0.375": [25, 0, 0], + "0.5": { + "pre": [40, 0, 0], + "post": [40, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, -0.16, -1], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": [0, 0, 0], + "0.5": { + "pre": [0, -0.16, -1], + "post": [0, -0.16, -1], + "lerp_mode": "catmullrom" + } + } + }, + "foot_back_right2": { + "rotation": { + "0.0": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [-19, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": [0, 0, 0], + "0.3333": [-47.5, 0, 0], + "0.375": [-60.25, 0, 0], + "0.5": { + "pre": [-12.5, 0, 0], + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + } + } + } + } + }, + "animation.nidoranm.ground_run": { + "loop": true, + "animation_length": 1, + "bones": { + "body": { + "position": [0, 0, "math.sin(q.anim_time*90*8)"] + }, + "torso": { + "rotation": ["math.sin(q.anim_time*90*8-180)*12", 0, "math.sin(q.anim_time*90*4-90)*4"], + "position": [0, "math.sin(q.anim_time*90*8-90)", 0] + }, + "head": { + "rotation": ["math.sin(q.anim_time*90*8)*8", 0, "-math.sin(q.anim_time*90*4-60)*2"] + }, + "ear_left": { + "rotation": [0, 0, "math.sin(q.anim_time*90*8-120)*8"] + }, + "ear_right": { + "rotation": [0, 0, "-(math.sin(q.anim_time*90*8-120)*8)"] + }, + "leg_front_left": { + "rotation": { + "0.0": [25, 0, 0], + "0.125": { + "pre": [38.28, 0, 0], + "post": [38.28, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [25, 0, 0], + "0.625": { + "pre": [38.28, 0, 0], + "post": [38.28, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [-32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [25, 0, 0] + }, + "position": { + "0.0": [0, -1, -0.25], + "0.125": { + "pre": [0, -0.45, 0], + "post": [0, -0.45, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0.25, -0.75], + "lerp_mode": "catmullrom" + }, + "0.5": [0, -1, -0.25], + "0.625": { + "pre": [0, -0.45, 0], + "post": [0, -0.45, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 0.25, -0.75], + "lerp_mode": "catmullrom" + }, + "1.0": [0, -1, -0.25] + } + }, + "leg_front_left2": { + "rotation": { + "0.0": [-25, 0, 0], + "0.125": { + "pre": [-16.72, 0, 0], + "post": [-16.72, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": [-7.13, 0, 0], + "0.5": [-25, 0, 0], + "0.625": { + "pre": [-16.72, 0, 0], + "post": [-16.72, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [-22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": [-7.13, 0, 0], + "1.0": [-25, 0, 0] + } + }, + "leg_front_right": { + "rotation": { + "0.0": [25, 0, 0], + "0.125": { + "pre": [38.28, 0, 0], + "post": [38.28, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": [-15, 0, 0], + "0.4167": [12.5, 0, 0], + "0.5": [25, 0, 0], + "0.625": { + "pre": [38.28, 0, 0], + "post": [38.28, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [-32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": [-15, 0, 0], + "0.9167": [12.5, 0, 0], + "1.0": [25, 0, 0] + }, + "position": { + "0.0": [0, -1, -0.25], + "0.125": { + "pre": [0, -0.45, 0], + "post": [0, -0.45, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [0, 0.25, -0.75], + "lerp_mode": "catmullrom" + }, + "0.3333": [0, -0.5, -0.5], + "0.4167": [0, -0.5, -0.37], + "0.5": [0, -1, -0.25], + "0.625": { + "pre": [0, -0.45, 0], + "post": [0, -0.45, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [0, 0.25, -0.75], + "lerp_mode": "catmullrom" + }, + "0.8333": [0, -0.5, -0.5], + "0.9167": [0, -0.5, -0.37], + "1.0": [0, -1, -0.25] + } + }, + "leg_front_right2": { + "rotation": { + "0.0": [-25, 0, 0], + "0.125": { + "pre": [-16.72, 0, 0], + "post": [-16.72, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": [0, 0, 0], + "0.5": [-25, 0, 0], + "0.625": { + "pre": [-16.72, 0, 0], + "post": [-16.72, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [-22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": [0, 0, 0], + "1.0": [-25, 0, 0] + } + }, + "leg_back_left": { + "rotation": { + "0.0": [-37.5, -35, 0], + "0.125": [-2.5, -27.5, 0], + "0.25": { + "pre": [60, -5, 0], + "post": [60, -5, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [5.47, -19.06, -27.5], + "lerp_mode": "catmullrom" + }, + "0.5": [-37.5, -35, 0], + "0.625": [-2.5, -27.5, 0], + "0.75": { + "pre": [60, -5, 0], + "post": [60, -5, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [5.47, -19.06, -27.5], + "lerp_mode": "catmullrom" + }, + "1.0": [-37.5, -35, 0] + }, + "position": { + "0.0": [0, 0, -0.25], + "0.125": [0, 0.85, 1.75], + "0.25": { + "pre": [0, 0.85, 1.75], + "post": [0, 0.85, 1.75], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 1.37, 0.63], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, -0.25], + "0.625": [0, 0.85, 1.75], + "0.75": { + "pre": [0, 0.85, 1.75], + "post": [0, 0.85, 1.75], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [0, 1.37, 0.63], + "lerp_mode": "catmullrom" + }, + "1.0": [0, 0, -0.25] + } + }, + "foot_back_left": { + "rotation": { + "0.0": [37.5, 0, 0], + "0.125": [35, 0, 0], + "0.25": { + "pre": [52.5, 0, 0], + "post": [52.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": [24.6, 0, 0], + "0.5": [37.5, 0, 0], + "0.625": [35, 0, 0], + "0.75": { + "pre": [52.5, 0, 0], + "post": [52.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": [24.6, 0, 0], + "1.0": [37.5, 0, 0] + } + }, + "foot_back_left2": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [-32.5, 0, 0], + "0.25": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [-40.94, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0], + "0.625": [-32.5, 0, 0], + "0.75": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [-40.94, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [0, 0, 0] + } + }, + "leg_back_right": { + "rotation": { + "0.0": [-37.5, 35, 0], + "0.1667": [-2.5, 27.5, 0], + "0.2917": { + "pre": [60, 5, 0], + "post": [60, 5, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [5.47, 19.06, 27.5], + "lerp_mode": "catmullrom" + }, + "0.5": [-37.5, 35, 0], + "0.6667": [-2.5, 27.5, 0], + "0.7917": { + "pre": [60, 5, 0], + "post": [60, 5, 0], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [5.47, 19.06, 27.5], + "lerp_mode": "catmullrom" + }, + "1.0": [-37.5, 35, 0] + }, + "position": { + "0.0": [0, 0, -0.25], + "0.1667": [0, 0.85, 1.75], + "0.2917": { + "pre": [0, 0.85, 1.75], + "post": [0, 0.85, 1.75], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [0, 1.37, 0.63], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, -0.25], + "0.6667": [0, 0.85, 1.75], + "0.7917": { + "pre": [0, 0.85, 1.75], + "post": [0, 0.85, 1.75], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [0, 1.37, 0.63], + "lerp_mode": "catmullrom" + }, + "1.0": [0, 0, -0.25] + } + }, + "foot_back_right": { + "rotation": { + "0.0": [37.5, 0, 0], + "0.1667": [35, 0, 0], + "0.2917": { + "pre": [52.5, 0, 0], + "post": [52.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4167": [24.6, 0, 0], + "0.5": [37.5, 0, 0], + "0.6667": [35, 0, 0], + "0.7917": { + "pre": [52.5, 0, 0], + "post": [52.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": [24.6, 0, 0], + "1.0": [37.5, 0, 0] + } + }, + "foot_back_right2": { + "rotation": { + "0.0": [0, 0, 0], + "0.1667": [-32.5, 0, 0], + "0.2917": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-40.94, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0], + "0.6667": [-32.5, 0, 0], + "0.7917": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [-40.94, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": [0, 0, 0] + } + }, + "eye_left": { + "position": [0, 0, 0] + }, + "eye_right": { + "position": [0, 0, 0] + } + } + }, + "animation.nidoranm.battle_idle": { + "loop": true, + "bones": { + "torso": { + "rotation": ["12.5-math.sin(q.anim_time*90*4-90)*0.75", 0, "-math.sin(q.anim_time*90*2-90)"], + "position": [0, "math.sin(q.anim_time*90*4)/8", 0] + }, + "head": { + "rotation": ["-13.5-math.sin(q.anim_time*90*4-150)*1.25", 0, "-math.sin(q.anim_time*90*2-150)*1.25"] + }, + "leg_front_left": { + "rotation": ["22.5+math.sin(q.anim_time*90*4-180)*2", 0, 0], + "position": [0.5, "-0.75-math.sin(q.anim_time*90*4-180)/13", "-math.sin(q.anim_time*90*4-180)/24"] + }, + "leg_front_left2": { + "rotation": ["-22.5-math.sin(q.anim_time*90*4-180)*2", 0, 0] + }, + "leg_front_right": { + "rotation": ["22.5+math.sin(q.anim_time*90*4-180)*2", 0, 0], + "position": [-0.5, "-0.75-math.sin(q.anim_time*90*4-180)/13", "-math.sin(q.anim_time*90*4-180)/24"] + }, + "leg_front_right2": { + "rotation": ["-22.5-math.sin(q.anim_time*90*4-180)*2", 0, 0] + }, + "leg_back_left": { + "rotation": ["22.5+math.sin(q.anim_time*90*4-150)*2", -15, 0], + "position": ["0.75+math.sin(q.anim_time*90*4-150)/32", "0.35-math.sin(q.anim_time*90*4-150)/10", "-math.sin(q.anim_time*90*4-150)/10"] + }, + "foot_back_left": { + "rotation": ["41.5-math.sin(q.anim_time*90*4-150)*2", 0, 0] + }, + "foot_back_left2": { + "rotation": [-64, 0, 0] + }, + "leg_back_right": { + "rotation": ["22.5+math.sin(q.anim_time*90*4-150)*2", 15, 0], + "position": ["-0.75-math.sin(q.anim_time*90*4-150)/32", "0.35-math.sin(q.anim_time*90*4-150)/10", "-math.sin(q.anim_time*90*4-150)/10"] + }, + "foot_back_right": { + "rotation": ["41.5-math.sin(q.anim_time*90*4-150)*2", 0, 0] + }, + "foot_back_right2": { + "rotation": [-64, 0, 0] } } }, "animation.nidoranm.cry": { - "animation_length": 1.2, + "animation_length": 1.5, + "bones": { + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [10, 0, 0], + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-7.94, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [-9, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [-2, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [0, -0.25, 0.75], + "post": [0, -0.25, 0.75], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": [0, 0, 0], + "0.75": [0, 0, 0], + "1.1667": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [-7.5, 0, 0], + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [13.28, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-19.14, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [-4.61, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": [-10, 0, 0], + "0.9167": { + "pre": [-7, 0, 0], + "post": [-7, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0833": { + "post": [-2, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "ear_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [0, 0, 45], + "post": [0, 0, 45], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": [0, 0, "math.sin(q.anim_time*90*15)*20"], + "0.75": [0, 0, 0], + "1.1667": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "ear_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [0, 0, -45], + "post": [0, 0, -45], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": [0, 0, "-(math.sin(q.anim_time*90*15)*20)"], + "0.75": [0, 0, 0], + "1.1667": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + } + }, "sound_effects": { - "0.04": { + "0.2083": { "effect": "pokemon.nidoranm.cry" } } }, "animation.nidoranm.blink": { - "animation_length": 0.16667, + "animation_length": 0.1667, "bones": { "eyelid_left": { "position": { "0.0": [0.1, 0, 0], - "0.125": [0.1, 0, 0], - "0.1667": [0, 0, 0] + "0.1667": {"pre": [0.1, 0, 0], "post": [0, 0, 0]} } }, "eyelid_right": { "position": { "0.0": [-0.1, 0, 0], - "0.125": [-0.1, 0, 0], - "0.1667": [0, 0, 0] + "0.1667": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "eye_left": { + "position": { + "0.0": [-0.2, 0, 0.2], + "0.1667": {"pre": [-0.2, 0, 0.2], "post": [0, 0, 0]} + } + }, + "eye_right": { + "position": { + "0.0": [0.2, 0, 0.2], + "0.1667": {"pre": [0.2, 0, 0.2], "post": [0, 0, 0]} } } } }, - "animation.nidoranm.idle": { + "animation.nidoranm.recoil": { + "animation_length": 0.75, + "bones": { + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": [0, 0, 0], + "0.1667": { + "pre": [-7.5, 0, 0], + "post": [-7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [0, 0, 0.5], + "post": [0, 0, 0.5], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [15, 0, 0], + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.1667": { + "post": [-15, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [-19.37, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": [0, 0, 0] + } + }, + "ear_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [0, 0, -12.5], + "post": [0, 0, -12.5], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, 35], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, -9.53], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": [0, 0, 0] + } + }, + "ear_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [0, 0, 12.5], + "post": [0, 0, 12.5], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0, 0, -35], + "lerp_mode": "catmullrom" + }, + "0.4167": { + "post": [0, 0, 9.53], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.75": [0, 0, 0] + } + }, + "eyelid_hurt_left": { + "position": { + "0.0": [0.1, 0, 0], + "0.5": {"pre": [0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "eyelid_hurt_right": { + "position": { + "0.0": [-0.1, 0, 0], + "0.5": {"pre": [-0.1, 0, 0], "post": [0, 0, 0]} + } + }, + "eye_left": { + "position": { + "0.0": [-0.2, 0, 0.2], + "0.5": {"pre": [-0.2, 0, 0.2], "post": [0, 0, 0]} + } + }, + "eye_right": { + "position": { + "0.0": [0.2, 0, 0.2], + "0.5": {"pre": [0.2, 0, 0.2], "post": [0, 0, 0]} + } + } + } + }, + "animation.nidoranm.sleep": { "loop": true, "bones": { "torso": { - "rotation": [2.5, 0, 0] + "rotation": ["math.sin(q.anim_time*90-90)/2", 0, "math.sin(q.anim_time*90/2-90)"], + "position": [0, "-2-math.sin(q.anim_time*90)/12", 0] }, "head": { - "rotation": [5, 0, 0] + "rotation": ["math.sin(q.anim_time*90-180)", 0, "math.sin(q.anim_time*90/2-180)*2"] + }, + "eyelid_left": { + "position": [0.1, 0, 0] + }, + "eyelid_right": { + "position": [-0.1, 0, 0] + }, + "ear_left": { + "rotation": [0, 0, "35+math.sin(q.anim_time*90-120)*4"] + }, + "ear_right": { + "rotation": [0, 0, "-35-math.sin(q.anim_time*90-150)*4"] }, "leg_front_left": { - "rotation": [-7.5, 0, 0], - "position": [0, -0.25, 0] + "rotation": [-90, -22.5, 0], + "position": [0, -3.5, 0] }, "leg_front_right": { - "rotation": [-7.5, 0, 0], - "position": [0, -0.25, 0] + "rotation": [-90, 22.5, 0], + "position": [0, -3.5, 0] + }, + "leg_back_left": { + "rotation": [-90, -27.5, 0], + "position": [0.75, -2.5, 2] + }, + "foot_back_left": { + "rotation": [90, 0, 0], + "position": [0, 0.5, 0] + }, + "leg_back_right": { + "rotation": [-90, 27.5, 0], + "position": [-0.75, -2.5, 2] + }, + "foot_back_right": { + "rotation": [90, 0, 0], + "position": [0, 0.5, 0] + }, + "eye_left": { + "position": [-0.2, 0, 0.2] + }, + "eye_right": { + "position": [0.2, 0, 0.2] + } + } + }, + "animation.nidoranm.shoulder_left": { + "loop": true, + "bones": { + "body": { + "position": [8, -3, 3] + }, + "torso": { + "rotation": ["-30-math.sin(q.anim_time*90*4-90)/3", 0, "-math.sin(q.anim_time*90*2-90)"], + "position": [0, "math.sin(q.anim_time*90*4)/12", 0] + }, + "head": { + "rotation": ["30-math.sin(q.anim_time*90*4-150)", 0, "-math.sin(q.anim_time*90*2-150)"] + }, + "ear_left": { + "rotation": [0, 0, "-math.sin(q.anim_time*90*4-120)*3"] + }, + "ear_right": { + "rotation": [0, 0, "math.sin(q.anim_time*90*4-90)*3"] + }, + "leg_front_left": { + "rotation": [-40, 0, 40], + "position": [0.25, -0.25, 0] + }, + "leg_front_left2": { + "rotation": [-5, 0, 0] + }, + "leg_front_right": { + "rotation": [-45, 22.5, 2.5] + }, + "leg_front_right2": { + "rotation": [-27.5, 0, 0] + }, + "leg_back_left": { + "rotation": [-32.5, 0, 15], + "position": [0, -2, 0] + }, + "foot_back_left": { + "rotation": [42.5, 0, 0] + }, + "foot_back_left2": { + "rotation": [-30, 0, 0] + }, + "leg_back_right": { + "rotation": [-37.5, 0, 0], + "position": [0, -1.5, 0.5] + }, + "foot_back_right": { + "rotation": [57.5, 0, 0] + }, + "foot_back_right2": { + "rotation": [-85, 0, 0] + } + } + }, + "animation.nidoranm.shoulder_right": { + "loop": true, + "bones": { + "body": { + "position": [-8, -3, 3] + }, + "torso": { + "rotation": ["-30-math.sin(q.anim_time*90*4-90)/3", 0, "NaN-math.sin(q.anim_time*90*2-90)"], + "position": [0, "math.sin(q.anim_time*90*4)/12", 0] + }, + "head": { + "rotation": ["30-math.sin(q.anim_time*90*4-150)", 0, "NaN-math.sin(q.anim_time*90*2-150)"] + }, + "ear_left": { + "rotation": [0, 0, "-(math.sin(q.anim_time*90*4-90)*3)"] + }, + "ear_right": { + "rotation": [0, 0, "NaN-math.sin(q.anim_time*90*4-120)*3"] + }, + "leg_front_left": { + "rotation": [-45, -22.5, -2.5], + "position": [0.25, -0.25, 0] + }, + "leg_front_left2": { + "rotation": [-27.5, 0, 0] + }, + "leg_front_right": { + "rotation": [-40, 0, -40], + "position": [-0.25, -0.25, 0] + }, + "leg_front_right2": { + "rotation": [-5, 0, 0] + }, + "leg_back_left": { + "rotation": [-37.5, 0, 0], + "position": [0, -1.5, 0.5] + }, + "foot_back_left": { + "rotation": [57.5, 0, 0] + }, + "foot_back_left2": { + "rotation": [-85, 0, 0] + }, + "leg_back_right": { + "rotation": [-32.5, 0, -15], + "position": [0, -2, 0] + }, + "foot_back_right": { + "rotation": [42.5, 0, 0] + }, + "foot_back_right2": { + "rotation": [-30, 0, 0] + } + } + }, + "animation.nidoranm.walkspeedtest": { + "loop": true, + "bones": { + "nidoran_m": { + "position": [0, 0, "47-q.anim_time*90*0.16"] + } + } + }, + "animation.nidoranm.runspeedtest": { + "loop": true, + "bones": { + "nidoran_m": { + "position": [0, 0, "47-q.anim_time*90*0.3"] + } + } + }, + "animation.nidoranm.scaletest": { + "loop": true, + "bones": { + "nidoran_m": { + "scale": 0.6 } } } diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0029_nidoranf/nidoranf.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0029_nidoranf/nidoranf.geo.json index 90d81ce763..5502addc4a 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0029_nidoranf/nidoranf.geo.json +++ b/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", diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0030_nidorina/nidorina.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0030_nidorina/nidorina.geo.json index 7678d4d108..00f98c355f 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0030_nidorina/nidorina.geo.json +++ b/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", diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0032_nidoranm/nidoranm.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0032_nidoranm/nidoranm.geo.json index 895b169089..a643489de7 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0032_nidoranm/nidoranm.geo.json +++ b/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", diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0029_nidoranf/nidoranf.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0029_nidoranf/nidoranf.json new file mode 100644 index 0000000000..9a5a93f74b --- /dev/null +++ b/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] + } + ] + } + } +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0030_nidorina/nidorina.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0030_nidorina/nidorina.json new file mode 100644 index 0000000000..cf45651246 --- /dev/null +++ b/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')" + } + } + } +} diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0032_nidoranm/nidoranm.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/0032_nidoranm/nidoranm.json new file mode 100644 index 0000000000..3a42f5cd27 --- /dev/null +++ b/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] + } + ] + } + } +} diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json index 47c01b1d8d..de28033e21 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoranf.json +++ b/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 } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json b/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json index d9494bbe21..135a441c1c 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidoranm.json +++ b/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 } diff --git a/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json b/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json index 3c0614592b..bc0231ac50 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/nidorina.json @@ -77,6 +77,9 @@ ] }, "moving": { + "walk": { + "walkSpeed": 0.22 + }, "swim": { "avoidsWater": true }