diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ModRenderTypes.java b/src/main/java/com/atsuishio/superbwarfare/client/ModRenderTypes.java index aa48114ce..56de3d712 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ModRenderTypes.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ModRenderTypes.java @@ -26,8 +26,8 @@ public class ModRenderTypes extends RenderType { public static final Function ILLUMINATED = Util.memoize((location) -> { TextureStateShard shard = new RenderStateShard.TextureStateShard(location, false, false); RenderType.CompositeState state = RenderType.CompositeState.builder().setTextureState(shard) - .setShaderState(RENDERTYPE_ENTITY_TRANSLUCENT_EMISSIVE_SHADER).setTransparencyState(ADDITIVE_TRANSPARENCY) - .setCullState(NO_CULL).setOverlayState(NO_OVERLAY).createCompositeState(false); + .setShaderState(RENDERTYPE_ENTITY_TRANSLUCENT_EMISSIVE_SHADER).setTransparencyState(RenderStateShard.GLINT_TRANSPARENCY) + .setCullState(NO_CULL).setOverlayState(NO_OVERLAY).setWriteMaskState(COLOR_WRITE).createCompositeState(false); return RenderType.create("illuminated", DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, true, false, state); }); } diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/MinigunHeatLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/MinigunHeatLayer.java index dc4c5cd48..573a27506 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/layer/MinigunHeatLayer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/MinigunHeatLayer.java @@ -1,10 +1,11 @@ package com.atsuishio.superbwarfare.client.layer; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.client.ModRenderTypes; import com.atsuishio.superbwarfare.init.ModTags; import com.atsuishio.superbwarfare.item.gun.machinegun.MinigunItem; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; @@ -25,7 +26,7 @@ public class MinigunHeatLayer extends GeoRenderLayer { @Override public void render(PoseStack poseStack, MinigunItem animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { - RenderType glowRenderType = RenderType.eyes(LAYER); + RenderType glowRenderType = ModRenderTypes.ILLUMINATED.apply(LAYER); Player player = Minecraft.getInstance().player; if (player == null) return; ItemStack stack = player.getMainHandItem(); diff --git a/src/main/java/com/atsuishio/superbwarfare/client/layer/SecondaryCataclysmLightLayer.java b/src/main/java/com/atsuishio/superbwarfare/client/layer/SecondaryCataclysmLightLayer.java new file mode 100644 index 000000000..c1bcdc4a3 --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/client/layer/SecondaryCataclysmLightLayer.java @@ -0,0 +1,28 @@ +package com.atsuishio.superbwarfare.client.layer; + +import com.atsuishio.superbwarfare.ModUtils; +import com.atsuishio.superbwarfare.client.ModRenderTypes; +import com.atsuishio.superbwarfare.item.gun.launcher.SecondaryCataclysm; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.texture.OverlayTexture; +import net.minecraft.resources.ResourceLocation; +import software.bernie.geckolib.cache.object.BakedGeoModel; +import software.bernie.geckolib.renderer.GeoRenderer; +import software.bernie.geckolib.renderer.layer.GeoRenderLayer; + +public class SecondaryCataclysmLightLayer extends GeoRenderLayer { + private static final ResourceLocation LAYER = new ResourceLocation(ModUtils.MODID, "textures/item/secondary_cataclysm_light.png"); + + public SecondaryCataclysmLightLayer(GeoRenderer itemGeoRenderer) { + super(itemGeoRenderer); + } + + @Override + public void render(PoseStack poseStack, SecondaryCataclysm animatable, BakedGeoModel bakedModel, RenderType renderType, MultiBufferSource bufferSource, VertexConsumer buffer, float partialTick, int packedLight, int packedOverlay) { + RenderType glowRenderType = ModRenderTypes.ILLUMINATED.apply(LAYER); + getRenderer().reRender(getDefaultBakedModel(animatable), poseStack, bufferSource, animatable, glowRenderType, bufferSource.getBuffer(glowRenderType), partialTick, packedLight, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); + } +} diff --git a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SecondaryCataclysmRenderer.java b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SecondaryCataclysmRenderer.java index b4026e971..905667f92 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SecondaryCataclysmRenderer.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/renderer/item/SecondaryCataclysmRenderer.java @@ -1,6 +1,7 @@ package com.atsuishio.superbwarfare.client.renderer.item; import com.atsuishio.superbwarfare.client.AnimationHelper; +import com.atsuishio.superbwarfare.client.layer.SecondaryCataclysmLightLayer; import com.atsuishio.superbwarfare.client.model.item.SecondaryCataclysmModel; import com.atsuishio.superbwarfare.event.ClientEventHandler; import com.atsuishio.superbwarfare.init.ModTags; @@ -30,6 +31,7 @@ public class SecondaryCataclysmRenderer extends GeoItemRenderer s.is(ModItems.CREATIVE_AMMO_BOX.get()))) { @@ -571,18 +584,23 @@ public class GunEventHandler { tag.putBoolean("force_stage3_start", true); } else if (stack.is(ModTags.Items.LAUNCHER) && GunsTool.getGunIntTag(stack, "MaxAmmo") == 0) { tag.putBoolean("force_stage3_start", true); + } else if (stack.is(ModItems.SECONDARY_CATACLYSM.get()) && GunsTool.getGunIntTag(stack, "Ammo", 0) >= GunsTool.getGunIntTag(stack, "Magazine", 0)) { + tag.putBoolean("force_stage3_start", true); } else { tag.putInt("reload_stage", 2); } } else { - tag.putInt("reload_stage", 2); + if (stack.is(ModItems.SECONDARY_CATACLYSM.get()) && GunsTool.getGunIntTag(stack, "Ammo", 0) >= GunsTool.getGunIntTag(stack, "Magazine", 0)) { + tag.putBoolean("force_stage3_start", true); + } else { + tag.putInt("reload_stage", 2); + } } // 检查备弹 - } // 强制停止换弹,进入三阶段 - if (tag.getBoolean("force_stop") && GunsTool.getGunIntTag(stack, "Ammo", 0) > 1) { + if (tag.getBoolean("force_stop") && tag.getInt("reload_stage") == 2 && tag.getInt("iterative") > 0) { tag.putBoolean("stop", true); } @@ -614,7 +632,7 @@ public class GunEventHandler { } if (stack.getItem() == ModItems.SECONDARY_CATACLYSM.get()) { - if (tag.getInt("iterative") == 5) { + if (tag.getInt("iterative") == 16) { singleLoad(player); } } @@ -657,6 +675,7 @@ public class GunEventHandler { // 三阶段 if ((tag.getInt("iterative") == 1 && tag.getInt("reload_stage") == 3) || tag.getBoolean("force_stage3_start")) { + tag.putInt("reload_stage", 3); tag.putBoolean("force_stage3_start", false); int finishTime = GunsTool.getGunIntTag(stack, "FinishTime", 0); tag.putInt("finish", finishTime + 2); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java b/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java index 0d96982f8..615e57c1f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java @@ -321,6 +321,9 @@ public class ModSounds { public static final RegistryObject SECONDARY_CATACLYSM_FIRE_3P = REGISTRY.register("secondary_cataclysm_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_fire_3p"))); public static final RegistryObject SECONDARY_CATACLYSM_FAR = REGISTRY.register("secondary_cataclysm_far", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_far"))); public static final RegistryObject SECONDARY_CATACLYSM_VERYFAR = REGISTRY.register("secondary_cataclysm_veryfar", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_veryfar"))); + public static final RegistryObject SECONDARY_CATACLYSM_PREPARE_LOAD = REGISTRY.register("secondary_cataclysm_prepare_load", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_prepare_load"))); + public static final RegistryObject SECONDARY_CATACLYSM_LOOP = REGISTRY.register("secondary_cataclysm_loop", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_loop"))); + public static final RegistryObject SECONDARY_CATACLYSM_END = REGISTRY.register("secondary_cataclysm_end", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("secondary_cataclysm_end"))); public static final RegistryObject M_2_FIRE_1P = REGISTRY.register("m2_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m2_fire_1p"))); public static final RegistryObject M_2_FIRE_3P = REGISTRY.register("m2_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("m2_fire_3p"))); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java index deb99b513..136dcc6c1 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/launcher/SecondaryCataclysm.java @@ -80,15 +80,36 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, AnimatedItem transformType = type; } - private PlayState idlePredicate(AnimationState event) { + private PlayState reloadAnimPredicate(AnimationState event) { LocalPlayer player = Minecraft.getInstance().player; if (player == null) return PlayState.STOP; ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; -// if (stack.getOrCreateTag().getBoolean("is_empty_reloading")) { -// return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.reload")); -// } + if (stack.getOrCreateTag().getInt("reload_stage") == 1 && stack.getOrCreateTag().getDouble("prepare_load") > 0) { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.prepare")); + } + + if (stack.getOrCreateTag().getDouble("load_index") == 0 && stack.getOrCreateTag().getInt("reload_stage") == 2) { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.iterativeload")); + } + + if (stack.getOrCreateTag().getDouble("load_index") == 1 && stack.getOrCreateTag().getInt("reload_stage") == 2) { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.iterativeload2")); + } + + if (stack.getOrCreateTag().getInt("reload_stage") == 3) { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sc.finish")); + } + + return event.setAndContinue(RawAnimation.begin().thenLoop("animation.sc.idle")); + } + + private PlayState idlePredicate(AnimationState event) { + LocalPlayer player = Minecraft.getInstance().player; + if (player == null) return PlayState.STOP; + ItemStack stack = player.getMainHandItem(); + if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { @@ -108,6 +129,8 @@ public class SecondaryCataclysm extends GunItem implements GeoItem, AnimatedItem @Override public void registerControllers(AnimatableManager.ControllerRegistrar data) { + var reloadAnimController = new AnimationController<>(this, "reloadAnimController", 1, this::reloadAnimPredicate); + data.add(reloadAnimController); var idleController = new AnimationController<>(this, "idleController", 3, this::idlePredicate); data.add(idleController); } diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java index 903bc914b..f9953cd04 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java @@ -576,7 +576,7 @@ public class FireMessage { } GunsTool.setGunIntTag(stack, "Ammo", GunsTool.getGunIntTag(stack, "Ammo", 0) - 1); - player.getCooldowns().addCooldown(stack.getItem(), 5); + player.getCooldowns().addCooldown(stack.getItem(), 6); if (player.level() instanceof ServerLevel && player instanceof ServerPlayer serverPlayer) { ModUtils.PACKET_HANDLER.send(PacketDistributor.PLAYER.with(() -> serverPlayer), new ShootClientMessage(10)); diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/CustomExplosion.java b/src/main/java/com/atsuishio/superbwarfare/tools/CustomExplosion.java index 8b08f57e0..e33ae82d5 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/CustomExplosion.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/CustomExplosion.java @@ -75,7 +75,7 @@ public class CustomExplosion extends Explosion { } } if (pLevel instanceof ServerLevel) { - pLevel.explode(source == null ? null : source.getEntity(), pToBlowX, pToBlowY, pToBlowZ, 0.8f * pRadius , ExplosionDestroyConfig.EXPLOSION_DESTROY.get() ? Level.ExplosionInteraction.BLOCK : Level.ExplosionInteraction.NONE); + pLevel.explode(source == null ? null : source.getEntity(), pToBlowX, pToBlowY, pToBlowZ, 0.5f * pRadius , ExplosionDestroyConfig.EXPLOSION_DESTROY.get() ? Level.ExplosionInteraction.BLOCK : Level.ExplosionInteraction.NONE); } } diff --git a/src/main/resources/assets/superbwarfare/animations/r870.animation.json b/src/main/resources/assets/superbwarfare/animations/r870.animation.json deleted file mode 100644 index c901aeaeb..000000000 --- a/src/main/resources/assets/superbwarfare/animations/r870.animation.json +++ /dev/null @@ -1,1436 +0,0 @@ -{ - "format_version": "1.8.0", - "animations": { - "animation.m870.idle": { - "loop": true, - "animation_length": 0.25 - }, - "animation.m870.run": { - "loop": true, - "animation_length": 0.79167, - "bones": { - "main": { - "rotation": { - "0.0": { - "vector": [-6.43684, -53.81118, 28.23538] - }, - "0.2083": { - "vector": [-8.21487, -54.00563, 27.97949], - "easing": "easeInSine" - }, - "0.4167": { - "vector": [-6.43684, -53.81118, 28.23538], - "easing": "easeOutSine" - }, - "0.5833": { - "vector": [-4.66546, -53.62149, 28.50015], - "easing": "easeInSine" - }, - "0.7917": { - "vector": [-6.43684, -53.81118, 28.23538] - } - }, - "position": { - "0.0": { - "vector": [7.5, 0, 0] - }, - "0.2083": { - "vector": [3.75, 1.5, 0], - "easing": "easeInSine" - }, - "0.4167": { - "vector": [0.5, 0, 0], - "easing": "easeOutSine" - }, - "0.5833": { - "vector": [3.75, 1.5, 0], - "easing": "easeInSine" - }, - "0.7917": { - "vector": [7.5, 0, 0] - } - } - } - } - }, - "animation.m870.hit": { - "animation_length": 0.58333, - "bones": { - "main": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [-21.99337, -14.9759, 75.09531] - }, - "0.1667": { - "vector": [-128.092, 21.97162, 95.01507], - "easing": "easeInCubic" - }, - "0.2083": { - "vector": [-130.08824, 23.80198, 97.59531] - }, - "0.25": { - "vector": [-128.092, 21.97162, 95.01507], - "easing": "easeInCubic" - }, - "0.4167": { - "vector": [-31.3822, -10.85573, 76.06618], - "easing": "easeInCirc" - }, - "0.5": { - "vector": [2.15316, -2.27468, 24.25623], - "easing": "easeInOutCirc" - }, - "0.5833": { - "vector": [0, 0, 0], - "easing": "easeOutQuart" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0833": { - "vector": [0, -3, -6.6] - }, - "0.1667": { - "vector": [10.4, 2.7, -41.9], - "easing": "easeInOutCubic" - }, - "0.2083": { - "vector": [10.4, 2.93828, -39.3] - }, - "0.25": { - "vector": [10.4, 2.7, -41.9], - "easing": "easeInCubic" - }, - "0.4167": { - "vector": [0, 0, 1.4], - "easing": "easeInSine" - }, - "0.5": { - "vector": [0, -0.3, 0.41], - "easing": "easeInOutSine" - }, - "0.5833": { - "vector": [0, 0, 0], - "easing": "easeOutQuart" - } - } - }, - "rightarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0833": { - "vector": [115.09874, -2.71949, 20.40737] - }, - "0.2917": { - "vector": [117.68159, -1.57214, 10.14378] - }, - "0.4167": { - "vector": [80.64562, -5.59257, -1.31049] - }, - "0.5833": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0833": { - "vector": [10.4, 33, -22.9] - }, - "0.2917": { - "vector": [5.9, 30.6, -17] - }, - "0.4167": { - "vector": [-0.27, 33.07, -9.33] - }, - "0.5": { - "vector": [0.6, 8.23, 2.91] - }, - "0.5833": { - "vector": [0, 0, 0] - } - } - }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0833": { - "vector": [160.00784, 26.63928, 97.85625] - }, - "0.2917": { - "vector": [154.48385, 19.44776, 48.11488] - }, - "0.4167": { - "vector": [23.58451, 31.70893, -30.10354] - }, - "0.5": { - "vector": [4.26641, -22.39453, -18.39143] - }, - "0.5833": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [-2.55, 33.85, 4.35] - }, - "0.0833": { - "vector": [3.5, 28.3, -18.1] - }, - "0.2917": { - "vector": [-9.7, 35.2, -21.3] - }, - "0.4167": { - "vector": [-0.17, 24.97, 5.47] - }, - "0.5": { - "vector": [-0.98, 3.54, -2.56] - }, - "0.5833": { - "vector": [0, 0, 0] - } - } - } - } - }, - "animation.m870.prepare": { - "animation_length": 0.75, - "bones": { - "main": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-6.72953, -6.59638, -33.47016] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-1.15, -1.525, -6.325] - } - } - }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [4.04413, -8.05565, 0.15192] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [-5.53884, -4.65373, 19.63745] - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [8.42447, 1.7317, -47.71025] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [1.54768, 2.31933, -0.45389] - } - } - } - }, - "sound_effects": { - "0.0": { - "effect": "foley_start" - } - } - }, - "animation.m870.preparealt": { - "animation_length": 2, - "bones": { - "main": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-6.52539, -6.79837, -35.22041] - }, - "0.35": { - "vector": [-6.46191, -7.22616, -35.73567] - }, - "0.45": { - "vector": [-7.74014, -6.28204, -25.00475] - }, - "0.55": { - "vector": [-6.95113, -7.14606, -31.74557] - }, - "0.65": { - "vector": [-7.11565, -6.55612, -30.18132] - }, - "0.75": { - "vector": [-6.98152, -6.49108, -31.27258] - }, - "0.9": { - "vector": [-6.52661, -6.24782, -33.47921] - }, - "1.0": { - "vector": [-7.20856, -5.64802, -27.43793] - }, - "1.15": { - "vector": [-6.77191, -5.8151, -31.93756] - }, - "1.25": { - "vector": [-6.65445, -6.14498, -33.35433] - }, - "1.35": { - "vector": [-7.64894, -4.70803, -22.84892] - }, - "1.4": { - "vector": [-6.74096, -5.86435, -32.34985] - }, - "1.55": { - "vector": [-6.58077, -3.57666, -34.2521] - }, - "1.7": { - "vector": [-6.72953, -6.59638, -33.47016], - "easing": "easeInSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [-1.15, -1.52, -2.63] - }, - "0.25": { - "vector": [-1.15, -1.52, -2.63] - }, - "0.4": { - "vector": [-0.825, -2.395, -2.63] - }, - "0.5": { - "vector": [-1.15, -1.52, 0.145] - }, - "0.65": { - "vector": [-1.15, -1.52, -1.395] - }, - "0.8": { - "vector": [-1.15, -1.52, -3.305] - }, - "0.95": { - "vector": [-1.15, -1.67, -2.66] - }, - "1.05": { - "vector": [-1.15, -1.855, -3.95] - }, - "1.25": { - "vector": [-1.15, -1.775, -3.21] - }, - "1.4": { - "vector": [-1.15, -2.65, -5.045] - }, - "1.5": { - "vector": [1.225, -4.415, -1.505] - }, - "1.7": { - "vector": [-1.15, -1.525, -6.325] - } - } - }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [-8.13399, 8.38314, 58.24975] - }, - "0.3": { - "vector": [-8.13399, 8.38314, 58.24975] - }, - "0.4": { - "vector": [-21.88399, 8.38314, 58.24975] - }, - "1.2": { - "vector": [-21.88399, 8.38314, 58.24975] - }, - "1.3": { - "vector": [-8.13399, 8.38314, 58.24975] - }, - "1.35": { - "vector": [-8.13399, 8.38314, 58.24975] - }, - "1.6": { - "vector": [-2.27643, -11.44806, 2.29565] - }, - "1.65": { - "vector": [4.04413, -8.05565, 0.15192] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [-16.80227, -3.96336, 1.291] - }, - "0.3": { - "vector": [-16.80227, -3.96336, 1.291] - }, - "0.4": { - "vector": [-17.79075, -5.84511, 2.83605] - }, - "1.2": { - "vector": [-17.79075, -5.84511, 2.83605] - }, - "1.3": { - "vector": [-16.80227, -3.96336, 1.291] - }, - "1.35": { - "vector": [-16.80227, -3.96336, 1.291] - }, - "1.6": { - "vector": [-6.2273, -3.75939, 18.06816] - }, - "1.65": { - "vector": [-5.53884, -4.65373, 19.63745] - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0, 0, 90.25] - }, - "0.4": { - "vector": [0, 0, 90.25] - }, - "0.65": { - "vector": [-0.25, 0.5, 90.25] - }, - "1.4": { - "vector": [0, 0, 90.25] - }, - "1.7": { - "vector": [8.42447, 1.7317, -47.71025], - "easing": "linear" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-11.53244, 6.97602, 0.53526] - }, - "0.4": { - "vector": [-11.53244, 6.97602, 0.53526] - }, - "1.4": { - "vector": [-11.53244, 6.97602, 0.53526] - }, - "1.65": { - "vector": [-0.09367, 1.49686, -0.16579], - "easing": "linear" - }, - "1.7": { - "vector": [1.54768, 2.31933, -0.45389], - "easing": "linear" - } - } - }, - "pump": { - "rotation": { - "0.2": { - "vector": [0, 0, 0] - }, - "1.3": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.2": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 7.5] - }, - "1.2": { - "vector": [0, 0, 7.5] - }, - "1.3": { - "vector": [0, 0, 0] - } - } - }, - "shell": { - "rotation": { - "0.2": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [-13.5, 0, 0] - }, - "0.7": { - "vector": [-5.30408, -17.65438, -0.52979] - }, - "0.8": { - "vector": [1.54954, -11.87057, -2.24114] - }, - "0.9": { - "vector": [0.24443, -11.54581, 5.41128] - }, - "1.0": { - "vector": [12.28068, -5.03058, 2.35329] - }, - "1.2": { - "vector": [12.28068, -5.03058, 2.35329] - }, - "1.3": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.2": { - "vector": [0, 0, 28] - }, - "0.25": { - "vector": [0, -7.9, 36.1] - }, - "0.4": { - "vector": [3.44294, -12.58368, 36.80056] - }, - "0.55": { - "vector": [-9.49251, -3.69301, 20.40323] - }, - "0.7": { - "vector": [-3.56542, 2.29791, 8.5668] - }, - "0.8": { - "vector": [-2.27699, 3.30244, 8.18202] - }, - "0.9": { - "vector": [-2.02699, 3.30244, 7.90702] - }, - "1.0": { - "vector": [-0.4668, 3.38709, 6.20071] - }, - "1.2": { - "vector": [-0.4668, 3.38709, 6.20071] - }, - "1.3": { - "vector": [0, 0, 28] - } - } - }, - "rightarm": { - "rotation": { - "0.2": { - "vector": [0, 0, 0] - }, - "0.55": { - "vector": [-5.65753, -3.93689, 1.61223] - }, - "0.7": { - "vector": [-15.86107, -22.47475, 44.32722] - }, - "0.8": { - "vector": [-9.36107, -22.47475, 44.32722] - }, - "0.9": { - "vector": [-9.06087, -21.31128, 47.3435] - }, - "1.0": { - "vector": [-11.98698, -14.37067, 52.83321] - }, - "1.1": { - "vector": [-11.98698, -14.37067, 52.83321] - }, - "1.2": { - "vector": [-11.17411, -9.23447, 41.16689] - }, - "1.65": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.2": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [-5.19, 0.715, 0.12] - }, - "0.4": { - "vector": [-15.1218, 1.89357, 14.31425] - }, - "0.55": { - "vector": [-7.07381, 7.97459, -7.67109] - }, - "0.65": { - "vector": [-10.40752, 9.02489, -19.53388] - }, - "0.7": { - "vector": [-10.78157, 10.10304, -25.67985] - }, - "0.8": { - "vector": [-9.72348, 11.45499, -26.15093] - }, - "0.9": { - "vector": [-9.34761, 11.38896, -25.66573] - }, - "1.0": { - "vector": [-9.26965, 9.16803, -26.59285] - }, - "1.1": { - "vector": [-9.26965, 9.16803, -26.59285] - }, - "1.2": { - "vector": [-10.36132, 11.15883, -13.5074] - }, - "1.3": { - "vector": [-11.41194, 8.95091, -1.62195] - }, - "1.65": { - "vector": [0, 0, 0] - } - } - } - }, - "sound_effects": { - "0.0": { - "effect": "foley_start" - } - } - }, - "animation.m870.iterativeload": { - "animation_length": 0.65, - "bones": { - "main": { - "rotation": { - "0.0": { - "vector": [-6.72953, -6.59638, -33.47016] - }, - "0.1667": { - "vector": [-5.03862, -5.77126, -33.31486] - }, - "0.2667": { - "vector": [-5.03862, -5.77126, -33.31486] - }, - "0.3667": { - "vector": [-5.06907, -6.50464, -37.02578] - }, - "0.4333": { - "vector": [-4.94201, -7.39721, -35.73568] - }, - "0.5": { - "vector": [-5.17455, -7.38321, -37.54794] - }, - "0.6667": { - "vector": [-6.72953, -6.59638, -33.47016] - } - }, - "position": { - "0.0": { - "vector": [-1.15, -1.525, -6.325] - }, - "0.1": { - "vector": [-1.3, -1.67, -5.53] - }, - "0.2667": { - "vector": [-0.925, -1.47, -5.88] - }, - "0.3333": { - "vector": [-1.075, -1.47, -6.03] - }, - "0.4": { - "vector": [-1.08, -1.47, -5.855] - }, - "0.4667": { - "vector": [-1.08, -1.47, -5.555] - }, - "0.5667": { - "vector": [-1.11, -1.5, -6.67] - }, - "0.6667": { - "vector": [-1.15, -1.525, -6.325] - } - } - }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [4.04413, -8.05565, 0.15192] - }, - "0.1": { - "vector": [19.14842, 15.8579, 2.23251], - "easing": "easeInSine" - }, - "0.2667": { - "vector": [19.22261, -1.23796, 2.91652] - }, - "0.4": { - "vector": [-12.70319, -18.33383, 3.60053] - }, - "0.5": { - "vector": [-11.98329, -20.75817, 1.31932] - }, - "0.5667": { - "vector": [-3.35006, -21.20881, -0.92908] - }, - "0.6": { - "vector": [-0.72529, -10.51757, -3.62576] - }, - "0.6667": { - "vector": [4.04413, -8.05565, 0.15192] - } - }, - "position": { - "0.0": { - "vector": [-5.53884, -4.65373, 19.63745] - }, - "0.1": { - "vector": [7.80526, -5.09226, 43.45727] - }, - "0.2667": { - "vector": [-1.59303, -7.68677, 35.57915] - }, - "0.4": { - "vector": [-4.13765, -10.21331, 20.19837] - }, - "0.5": { - "vector": [-4.13765, -10.21331, 20.19837] - }, - "0.5667": { - "vector": [-6.25256, -8.15332, 21.16549] - }, - "0.6": { - "vector": [-4.49992, -5.13809, 20.60967] - }, - "0.6667": { - "vector": [-5.53884, -4.65373, 19.63745] - } - } - }, - "shell": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [-34.99446, 10.91087, 1.22182] - }, - "0.5": { - "vector": [-35, 0, 0] - }, - "0.6": { - "vector": [-24, 0, 0] - }, - "0.6667": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 28] - }, - "0.0667": { - "vector": [1.08652, -19.96484, 22.2518] - }, - "0.2667": { - "vector": [-1.29017, -13.48642, 11.62394] - }, - "0.4": { - "vector": [1.175, -4.75, 6.9] - }, - "0.5": { - "vector": [0, -4.4, 6.425] - }, - "0.5667": { - "vector": [0, -3.125, 5.525] - }, - "0.6667": { - "vector": [0, 0, 0] - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [8.42447, 1.7317, -47.71025] - }, - "0.6667": { - "vector": [8.42447, 1.7317, -47.71025] - } - }, - "position": { - "0.0": { - "vector": [1.54768, 2.31933, -0.45389] - }, - "0.6667": { - "vector": [1.54768, 2.31933, -0.45389] - } - } - }, - "chamber": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3667": { - "vector": [0, 0, 0] - }, - "0.4667": { - "vector": [-4.5, 0, 0] - }, - "0.5": { - "vector": [-6.25, 0, 0] - }, - "0.5667": { - "vector": [-11.75, 0, 0] - }, - "0.6": { - "vector": [-15, 0, 0] - }, - "0.6667": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3667": { - "vector": [0, 0, 0] - } - } - } - }, - "sound_effects": { - "0.3667": { - "effect": "shell" - } - } - }, - "animation.m870.iterativeload2": { - "animation_length": 0.65, - "bones": { - "main": { - "rotation": { - "0.0": { - "vector": [-6.72953, -6.59638, -33.47016] - }, - "0.1667": { - "vector": [-5.03862, -5.77126, -33.31486] - }, - "0.2667": { - "vector": [-5.03862, -5.77126, -33.31486] - }, - "0.3667": { - "vector": [-5.06907, -6.50464, -37.02578] - }, - "0.4333": { - "vector": [-4.94201, -7.39721, -35.73568] - }, - "0.5": { - "vector": [-5.17455, -7.38321, -37.54794] - }, - "0.6667": { - "vector": [-6.72953, -6.59638, -33.47016] - } - }, - "position": { - "0.0": { - "vector": [-1.15, -1.525, -6.325] - }, - "0.1": { - "vector": [-1.3, -1.67, -5.53] - }, - "0.2667": { - "vector": [-0.925, -1.47, -5.88] - }, - "0.3333": { - "vector": [-1.075, -1.47, -6.03] - }, - "0.4": { - "vector": [-1.08, -1.47, -5.855] - }, - "0.4667": { - "vector": [-1.08, -1.47, -5.555] - }, - "0.5667": { - "vector": [-1.11, -1.5, -6.67] - }, - "0.6667": { - "vector": [-1.15, -1.525, -6.325] - } - } - }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [4.04413, -8.05565, 0.15192] - }, - "0.1": { - "vector": [19.14842, 15.8579, 2.23251], - "easing": "easeInSine" - }, - "0.2667": { - "vector": [19.22261, -1.23796, 2.91652] - }, - "0.4": { - "vector": [-12.70319, -18.33383, 3.60053] - }, - "0.5": { - "vector": [-11.98329, -20.75817, 1.31932] - }, - "0.5667": { - "vector": [-3.35006, -21.20881, -0.92908] - }, - "0.6": { - "vector": [-0.72529, -10.51757, -3.62576] - }, - "0.6667": { - "vector": [4.04413, -8.05565, 0.15192] - } - }, - "position": { - "0.0": { - "vector": [-5.53884, -4.65373, 19.63745] - }, - "0.1": { - "vector": [7.80526, -5.09226, 43.45727] - }, - "0.2667": { - "vector": [-1.59303, -7.68677, 35.57915] - }, - "0.4": { - "vector": [-4.13765, -10.21331, 20.19837] - }, - "0.5": { - "vector": [-4.13765, -10.21331, 20.19837] - }, - "0.5667": { - "vector": [-6.25256, -8.15332, 21.16549] - }, - "0.6": { - "vector": [-4.49992, -5.13809, 20.60967] - }, - "0.6667": { - "vector": [-5.53884, -4.65373, 19.63745] - } - } - }, - "shell": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [-34.99446, 10.91087, 1.22182] - }, - "0.5": { - "vector": [-35, 0, 0] - }, - "0.6": { - "vector": [-24, 0, 0] - }, - "0.6667": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 28] - }, - "0.0667": { - "vector": [1.08652, -19.96484, 22.2518] - }, - "0.2667": { - "vector": [-1.29017, -13.48642, 11.62394] - }, - "0.4": { - "vector": [1.175, -4.75, 6.9] - }, - "0.5": { - "vector": [0, -4.4, 6.425] - }, - "0.5667": { - "vector": [0, -3.125, 5.525] - }, - "0.6667": { - "vector": [0, 0, 0] - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [8.42447, 1.7317, -47.71025] - }, - "0.6667": { - "vector": [8.42447, 1.7317, -47.71025] - } - }, - "position": { - "0.0": { - "vector": [1.54768, 2.31933, -0.45389] - }, - "0.6667": { - "vector": [1.54768, 2.31933, -0.45389] - } - } - }, - "chamber": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3667": { - "vector": [0, 0, 0] - }, - "0.4667": { - "vector": [-4.5, 0, 0] - }, - "0.5": { - "vector": [-6.25, 0, 0] - }, - "0.5667": { - "vector": [-11.75, 0, 0] - }, - "0.6": { - "vector": [-15, 0, 0] - }, - "0.6667": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3667": { - "vector": [0, 0, 0] - } - } - } - }, - "sound_effects": { - "0.3667": { - "effect": "shell" - } - } - }, - "animation.m870.finish": { - "animation_length": 0.75, - "bones": { - "main": { - "rotation": { - "0.0": { - "vector": [-6.72953, -6.59638, -33.47016] - }, - "0.2": { - "vector": [0.45894, -0.32654, -3.37191] - }, - "0.35": { - "vector": [0.25943, 0.28397, 2.2624] - }, - "0.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [-1.15, -1.525, -6.325] - }, - "0.15": { - "vector": [-0.57, -0.76, 0.74] - }, - "0.3": { - "vector": [0, 0, -1.6] - }, - "0.4": { - "vector": [0, 0, 0] - } - } - }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [4.04413, -8.05565, 0.15192] - }, - "0.1": { - "vector": [11.26063, -3.6961, -0.99456] - }, - "0.2": { - "vector": [1.37769, -0.19994, -1.63034] - }, - "0.35": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [-5.53884, -4.65373, 19.63745] - }, - "0.2": { - "vector": [-1.86069, -1.53498, 4.67509] - }, - "0.35": { - "vector": [0, 0, 0] - } - } - }, - "gun": { - "rotation": { - "0.0": { - "vector": [8.42447, 1.7317, -47.71025] - }, - "0.35": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [1.54768, 2.31933, -0.45389] - }, - "0.25": { - "vector": [0, 0, 0] - } - } - } - }, - "sound_effects": { - "0.0": { - "effect": "foley_end" - } - } - }, - "animation.m870.shift": { - "animation_length": 0.675, - "bones": { - "main": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.05": { - "vector": [-8.70704, -2.00287, -6.82365] - }, - "0.175": { - "vector": [-4.73303, -1.97055, -6.0739] - }, - "0.225": { - "vector": [-4.60652, -1.80399, -2.32556] - }, - "0.3": { - "vector": [-4.38312, -0.94992, 5.14611] - }, - "0.375": { - "vector": [-3.70511, -0.81923, 0.79288] - }, - "0.475": { - "vector": [-1.24175, -0.61979, 2.35169] - }, - "0.575": { - "vector": [-0.61934, 0.1901, 0.17584] - }, - "0.675": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.05": { - "vector": [-0.375, -0.9, 6.575] - }, - "0.125": { - "vector": [-0.63, -0.4, 3.375] - }, - "0.225": { - "vector": [-0.39, -0.44, 4.06] - }, - "0.3": { - "vector": [-0.155, -0.475, 3.95] - }, - "0.45": { - "vector": [-0.06, -0.19, 1.48] - }, - "0.625": { - "vector": [0, 0, 0] - } - } - }, - "pump": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.525": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.275": { - "vector": [0, 0, 7.5] - }, - "0.45": { - "vector": [0, 0, 7.5] - }, - "0.525": { - "vector": [0, 0, 0] - } - } - }, - "action": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.525": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.275": { - "vector": [0, 0, 8.6] - }, - "0.45": { - "vector": [0, 0, 8.6] - }, - "0.525": { - "vector": [0, 0, 0] - } - } - }, - "shell": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [11.25, 0, 0] - }, - "0.3": { - "vector": [1.04852, 17.49725, 0.31528] - }, - "0.35": { - "vector": [40.13672, -11.72631, -51.54685] - }, - "0.4": { - "vector": [77.01537, 30.7905, -125.02275] - }, - "0.5": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-0.075, 3.45, 7.05] - }, - "0.3": { - "vector": [-1.87, 3.55, 9] - }, - "0.35": { - "vector": [-22.37, 4.175, 7.05] - }, - "0.4": { - "vector": [-58.615, -14.15, 7.05] - }, - "0.45": { - "vector": [-58.62, -42.175, 7.05] - }, - "0.5": { - "vector": [3.105, -42.18, 35.15] - }, - "0.55": { - "vector": [0.125, -0.79, 25.455] - }, - "0.6": { - "vector": [0, 0, 0] - } - }, - "scale": { - "0.0": { - "vector": [1, 1, 1] - }, - "0.2": { - "vector": [1, 1, 1] - }, - "0.45": { - "vector": [1, 1, 1] - }, - "0.5": { - "vector": [0.2625, 0.19, 0.0575] - }, - "0.55": { - "vector": [0.2625, 0.19, 0.0575] - }, - "0.6": { - "vector": [1, 1, 1] - } - } - }, - "leftarm": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.275": { - "vector": [-13.59079, 2.94012, -2.73376] - }, - "0.45": { - "vector": [-13.59079, 2.94012, -2.73376] - }, - "0.525": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.275": { - "vector": [3.29358, -2.47138, 4.13577] - }, - "0.45": { - "vector": [3.29358, -2.47138, 4.13577] - }, - "0.525": { - "vector": [0, 0, 0] - } - } - } - }, - "sound_effects": { - "0.05": { - "effect": "pump1" - }, - "0.375": { - "effect": "pump2" - } - } - }, - "animation.m870.fire": { - "animation_length": 0.00833, - "bones": { - "main": { - "rotation": { - "vector": [0, 0, 0] - } - } - } - }, - "animation.m870.fire2": { - "animation_length": 0.00833, - "bones": { - "main": { - "rotation": { - "vector": [0, 0, 0] - } - } - } - }, - "animation.m870.fire3": { - "animation_length": 0.00833, - "bones": { - "main": { - "rotation": { - "vector": [0, 0, 0] - } - } - } - }, - "animation.m870.fire4": { - "animation_length": 0.00833, - "bones": { - "main": { - "rotation": { - "vector": [0, 0, 0] - } - } - } - }, - "animation.m870.fire5": { - "animation_length": 0.00833, - "bones": { - "main": { - "rotation": { - "vector": [0, 0, 0] - } - } - } - } - }, - "geckolib_format_version": 2 -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/animations/secondary_cataclysm.animation.json b/src/main/resources/assets/superbwarfare/animations/secondary_cataclysm.animation.json index 1f47ac3cd..287bf3130 100644 --- a/src/main/resources/assets/superbwarfare/animations/secondary_cataclysm.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/secondary_cataclysm.animation.json @@ -116,6 +116,929 @@ } } } + }, + "animation.sc.prepare": { + "loop": "hold_on_last_frame", + "animation_length": 1.6, + "bones": { + "0": { + "rotation": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [-1.14197, -2.34076, 0.18917], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-4.05904, -5.51675, -3.35819], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [-11.26357, -19.36321, -11.82043], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-17.2, -21.38, -13.09], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-20.24067, -21.6486, -9.66188], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [-17.41472, -21.38985, -21.54716], + "lerp_mode": "catmullrom" + }, + "0.7583": { + "post": [-16.78559, -21.61034, -12.36682], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [-14.10313, -17.78258, -2.5504], + "lerp_mode": "catmullrom" + }, + "0.85": { + "post": [-16.15213, -21.25247, -11.36369], + "lerp_mode": "catmullrom" + }, + "0.9333": { + "post": [-18.50192, -18.58983, -4.47649], + "lerp_mode": "catmullrom" + }, + "0.9667": { + "post": [-18.18957, -18.98612, -5.44629], + "lerp_mode": "catmullrom" + }, + "1.0167": { + "post": [-16.51102, -20.88869, -10.36545], + "lerp_mode": "catmullrom" + }, + "1.0667": { + "post": [-17.84599, -18.46223, -6.08528], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [-16.36848, -13.61024, -10.43347], + "lerp_mode": "catmullrom" + }, + "1.1333": { + "post": [-16.36848, -13.61024, -10.43347], + "lerp_mode": "catmullrom" + }, + "1.275": { + "post": [-16.77926, -15.24198, -8.8549], + "lerp_mode": "catmullrom" + }, + "1.3833": { + "post": [-17.03737, -14.95113, -7.86393], + "lerp_mode": "catmullrom" + }, + "1.475": { + "post": [-17.48683, -11.49965, -6.81489], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [-17.17254, -8.6294, -7.71564], + "lerp_mode": "catmullrom" + }, + "1.5167": { + "post": [-17.32, -9.41, -7.03], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.125": { + "post": [-0.15, -0.6, 0.275], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [-0.195, -0.05, 0.24], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [-0.19, 0.685, 0.03], + "lerp_mode": "catmullrom" + }, + "0.375": { + "post": [-0.11, 1.13, -0.02], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-0.07, 1.415, -0.185], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [-0.15, 1.45, -0.345], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [-0.30618, 1.77267, 0.41637], + "lerp_mode": "catmullrom" + }, + "0.7583": { + "post": [-0.15, 1.43, 0.3], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [0.35, 0.68, 0.3], + "lerp_mode": "catmullrom" + }, + "0.8167": { + "post": [0.1, 1.23, 0.3], + "lerp_mode": "catmullrom" + }, + "0.925": { + "post": [0.1, 0.93, 0.3], + "lerp_mode": "catmullrom" + }, + "1.0167": { + "post": [0.1, 1.13, 0.3], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [0.1, 1.33, 1], + "lerp_mode": "catmullrom" + }, + "1.1333": { + "post": [0.1, 1.33, 1], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 1.33, 1.05], + "lerp_mode": "catmullrom" + }, + "1.3833": { + "post": [0.19, 1.45, 1.23], + "lerp_mode": "catmullrom" + }, + "1.4333": { + "post": [0.25, 1.48, 1.5], + "lerp_mode": "catmullrom" + }, + "1.4917": { + "post": [0.25, 1.48, 1.1], + "lerp_mode": "catmullrom" + }, + "1.5167": { + "post": [0.25, 1.44, 1.08], + "lerp_mode": "catmullrom" + } + } + }, + "Lefthand": { + "rotation": { + "0.225": [0, 0, 0], + "0.3167": [21.25527, 14.99479, -9.11665], + "0.5083": [36.2552, 11.40857, -27.21851], + "0.675": [36.2552, 11.40857, -27.21851], + "0.775": [62.26, 11.41, -27.22], + "0.8167": [62.26, 11.41, -27.22], + "0.975": [59.26, 11.41, -27.22], + "1.0167": [59.26, 11.41, -27.22], + "1.125": [28.25001, 10.19578, -18.28382], + "1.1333": [28.25001, 10.19578, -18.28382], + "1.3583": [34.77711, 73.21121, -54.48998], + "1.475": [-2.40546, 87.74156, -98.79624], + "1.4917": [-2.40546, 87.74156, -98.79624], + "1.5167": [3.85, 80.35, -91.87] + }, + "position": { + "0.225": [0, 0, 0], + "0.3417": [5.04, 3.64, 5.1], + "0.5083": [2.25, 5.9, 8.25], + "0.675": [2.25, 5.9, 8.25], + "0.725": [4.3, 4.325, 8.25], + "0.775": [5.4, 2.35, 8.25], + "0.8167": [5.4, 2.35, 8.25], + "0.875": [5.55, 1.735, 8.25], + "0.925": [5.24, 0.65, 8.25], + "0.975": [4.25, -0.375, 8.25], + "1.0167": [4.25, -0.375, 8.25], + "1.125": [14.7424, -7.81979, 16.8584], + "1.1333": [14.7424, -7.81979, 16.8584], + "1.15": [7.98, -2.33, 19.17], + "1.3167": [5.24, 4.07, 12.27], + "1.3583": [3.68, 4.34, 12.64], + "1.475": [2.69, 3.96, 11.8], + "1.4917": [2.69, 3.96, 11.8], + "1.5167": [3, 3.78, 11.61] + } + }, + "dangu": { + "rotation": { + "0.675": [0, 0, 0], + "0.775": [0, 0, 45], + "0.8": [0, 0, 45], + "1.1333": [0, 0, 45], + "1.5167": [0, 0, 45] + }, + "position": [0, 0, 0] + }, + "tiba": { + "rotation": { + "0.8167": [0, 0, 0], + "0.875": [0, 0, 7], + "0.975": [0, 0, 45], + "1.025": [0, 0, 45], + "1.1333": [0, 0, 0], + "1.5167": [0, 0, 0] + }, + "position": [0, 0, 0] + }, + "zhuanlun": { + "rotation": { + "0.8167": [0, 0, 0], + "0.875": [0, 0, -0.92], + "0.975": [0, 0, 45], + "1.1333": [0, 0, 45], + "1.4833": [0, 0, 45], + "1.4834": [0, 0, 0], + "1.5167": [0, 0, 0] + }, + "position": [0, 0, 0] + }, + "bullet2": { + "rotation": { + "0.9083": [0, 0, 0], + "0.9833": [4.77255, 5.82097, 2.96825], + "1.0417": [-1.30569, 29.09628, 17.35742], + "1.1333": [-35.89291, 25.70881, 4.73482], + "1.15": [-38.25694, 61.0539, -22.21459], + "1.3167": [13.39061, 36.60353, -1.65743], + "1.3583": [2.65, 3.23, 1.65], + "1.4833": [0, 0, 0], + "1.5167": [0, 0, 0] + }, + "position": { + "0.9083": [0, 0, 0], + "0.95": [0, 0, 0], + "1.0417": [0, 1.4, 13], + "1.1333": [5.1, 0, 16], + "1.15": [6.45, 4.03, 10], + "1.3167": [0.08, 0.2, 2.07], + "1.3583": [0, 0, 1.7], + "1.4833": [0, 0, 0], + "1.5167": [0, 0, 0] + } + }, + "head2": { + "scale": { + "0.9083": [1, 1, 1], + "0.9167": [0, 0, 0], + "1.1333": [0, 0, 0] + } + }, + "camera": { + "rotation": { + "0.0": [0, 0, 0], + "0.2917": [0.26, -0.08, 0.13], + "0.4": [0.3, 0.4, 0], + "0.5583": [-0.03, -0.19, -0.28], + "0.7083": [0.05, 1.45, -0.5], + "0.8083": [-1.65, 1.71, 3.79], + "0.925": [1.3, -2.05, -2.5], + "1.0333": [-0.07, 0.13, -1.05], + "1.225": [0, -0.1, 0.2], + "1.4083": [0, 0, 0] + } + } + } + }, + "animation.sc.iterativeload": { + "loop": true, + "animation_length": 1, + "bones": { + "0": { + "rotation": { + "0.0": { + "post": [-17.32, -9.41, -7.03], + "lerp_mode": "catmullrom" + }, + "0.05": { + "post": [-17.77798, -14.05342, -4.90713], + "lerp_mode": "catmullrom" + }, + "0.1167": { + "post": [-15.68439, -19.24192, -12.51449], + "lerp_mode": "catmullrom" + }, + "0.1833": { + "post": [-13.58667, -18.1323, -19.93792], + "lerp_mode": "catmullrom" + }, + "0.2583": { + "post": [-11.9364, -19.23755, -25.08583], + "lerp_mode": "catmullrom" + }, + "0.325": { + "post": [-16.51562, -15.52847, -9.8486], + "lerp_mode": "catmullrom" + }, + "0.3917": { + "post": [-12.94048, -18.59121, -21.98901], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-13.35941, -15.82208, -20.90997], + "lerp_mode": "catmullrom" + }, + "0.575": { + "post": [-16.36848, -13.61024, -10.43347], + "lerp_mode": "catmullrom" + }, + "0.7167": { + "post": [-16.77926, -15.24198, -8.8549], + "lerp_mode": "catmullrom" + }, + "0.825": { + "post": [-17.03737, -14.95113, -7.86393], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-17.48683, -11.49965, -6.81489], + "lerp_mode": "catmullrom" + }, + "0.9417": { + "post": [-17.17254, -8.6294, -7.71564], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [-17.32, -9.41, -7.03], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0.25, 1.44, 1.08], + "lerp_mode": "catmullrom" + }, + "0.1167": { + "post": [0.25, 1.18, 1.1], + "lerp_mode": "catmullrom" + }, + "0.2667": { + "post": [0.25, 1.58, 1.1], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0.25, 1.03, 1.1], + "lerp_mode": "catmullrom" + }, + "0.3583": { + "post": [0.1, 1.38, 1.1], + "lerp_mode": "catmullrom" + }, + "0.475": { + "post": [0.1, 1.42, 1.04], + "lerp_mode": "catmullrom" + }, + "0.575": { + "post": [0.1, 1.33, 1], + "lerp_mode": "catmullrom" + }, + "0.6917": { + "post": [0, 1.33, 1.05], + "lerp_mode": "catmullrom" + }, + "0.825": { + "post": [0.19, 1.45, 1.23], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [0.25, 1.48, 1.5], + "lerp_mode": "catmullrom" + }, + "0.9333": { + "post": [0.25, 1.48, 1.1], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [0.25, 1.44, 1.08], + "lerp_mode": "catmullrom" + } + } + }, + "Lefthand": { + "rotation": { + "0.0": [3.85, 80.35, -91.87], + "0.2333": [62.26, 11.41, -27.22], + "0.2583": [62.26, 11.41, -27.22], + "0.4167": [59.26, 11.41, -27.22], + "0.4583": [59.26, 11.41, -27.22], + "0.5667": [28.25001, 10.19578, -18.28382], + "0.575": [28.25001, 10.19578, -18.28382], + "0.8": [34.77711, 73.21121, -54.48998], + "0.9167": [-2.40546, 87.74156, -98.79624], + "0.9333": [-2.40546, 87.74156, -98.79624], + "0.9583": [3.85, 80.35, -91.87] + }, + "position": { + "0.0": [3, 3.78, 11.61], + "0.0917": [4.12, 3.11, 10.92], + "0.2333": [5.4, 2.35, 8.25], + "0.2583": [5.4, 2.35, 8.25], + "0.3167": [5.55, 1.535, 8.25], + "0.3667": [5.24, 0.65, 8.25], + "0.4167": [4.25, -0.375, 8.25], + "0.4583": [4.25, -0.375, 8.25], + "0.5667": [14.7424, -7.81979, 16.8584], + "0.575": [14.7424, -7.81979, 16.8584], + "0.5917": [7.98, -2.33, 19.17], + "0.7583": [5.24, 4.07, 12.27], + "0.8": [3.68, 4.34, 12.64], + "0.9167": [2.69, 3.96, 11.8], + "0.9333": [2.69, 3.96, 11.8], + "0.9583": [3, 3.78, 11.61] + } + }, + "dangu": { + "rotation": { + "0.0": [0, 0, 45], + "0.2583": [0, 0, 45], + "0.3167": [0, 0, 48], + "0.4167": [0, 0, 45], + "0.575": [0, 0, 45], + "0.9583": [0, 0, 45] + }, + "position": { + "0.0": [0, 0, 0], + "0.9583": [0, 0, 0] + } + }, + "tiba": { + "rotation": { + "0.0": [0, 0, 0], + "0.2583": [0, 0, 0], + "0.3167": [0, 0, 7], + "0.4167": [0, 0, 45], + "0.4667": [0, 0, 45], + "0.575": [0, 0, 0], + "0.9583": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.9583": [0, 0, 0] + } + }, + "zhuanlun": { + "rotation": { + "0.0": [0, 0, 0], + "0.2583": [0, 0, 0], + "0.3167": [0, 0, -0.92], + "0.4167": [0, 0, 45], + "0.575": [0, 0, 45], + "0.925": [0, 0, 45], + "0.926": [0, 0, 0], + "0.9583": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.9583": [0, 0, 0] + } + }, + "bullet2": { + "rotation": { + "0.0": [0, 0, 0], + "0.3417": [0, 0, 0], + "0.4167": [4.77255, 5.82097, 2.96825], + "0.475": [-1.30569, 29.09628, 17.35742], + "0.575": [-35.89291, 25.70881, 4.73482], + "0.5917": [-38.25694, 61.0539, -22.21459], + "0.7583": [13.39061, 36.60353, -1.65743], + "0.8": [2.65, 3.23, 1.65], + "0.925": [0, 0, 0], + "0.9583": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.3417": [0, 0, 0], + "0.3833": [0, 0, 0], + "0.475": [0, 1.4, 13], + "0.575": [5.1, 0, 16], + "0.5917": [6.45, 4.03, 10], + "0.7583": [0.08, 0.2, 2.07], + "0.8": [0, 0, 1.7], + "0.925": [0, 0, 0], + "0.9583": [0, 0, 0] + } + }, + "camera": { + "rotation": { + "0.0": [0, 0, 0], + "0.15": [0.05, 1.45, -0.5], + "0.25": [-1.65, 1.71, 3.79], + "0.3667": [1.3, -2.05, -2.5], + "0.475": [-0.07, 0.13, -1.05], + "0.6": [0, -0.1, 0.2], + "0.7417": [1.3, -2.05, -2.5], + "0.9333": [0, 0, 0] + } + } + } + }, + "animation.sc.iterativeload2": { + "loop": true, + "animation_length": 1, + "bones": { + "0": { + "rotation": { + "0.0": { + "post": [-17.32, -9.41, -7.03], + "lerp_mode": "catmullrom" + }, + "0.05": { + "post": [-17.77798, -14.05342, -4.90713], + "lerp_mode": "catmullrom" + }, + "0.1167": { + "post": [-15.68439, -19.24192, -12.51449], + "lerp_mode": "catmullrom" + }, + "0.1833": { + "post": [-13.58667, -18.1323, -19.93792], + "lerp_mode": "catmullrom" + }, + "0.2583": { + "post": [-11.9364, -19.23755, -25.08583], + "lerp_mode": "catmullrom" + }, + "0.325": { + "post": [-16.51562, -15.52847, -9.8486], + "lerp_mode": "catmullrom" + }, + "0.3917": { + "post": [-12.94048, -18.59121, -21.98901], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-13.35941, -15.82208, -20.90997], + "lerp_mode": "catmullrom" + }, + "0.575": { + "post": [-16.36848, -13.61024, -10.43347], + "lerp_mode": "catmullrom" + }, + "0.7167": { + "post": [-16.77926, -15.24198, -8.8549], + "lerp_mode": "catmullrom" + }, + "0.825": { + "post": [-17.03737, -14.95113, -7.86393], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-17.48683, -11.49965, -6.81489], + "lerp_mode": "catmullrom" + }, + "0.9417": { + "post": [-17.17254, -8.6294, -7.71564], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [-17.32, -9.41, -7.03], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0.25, 1.44, 1.08], + "lerp_mode": "catmullrom" + }, + "0.1167": { + "post": [0.25, 1.18, 1.1], + "lerp_mode": "catmullrom" + }, + "0.2667": { + "post": [0.25, 1.58, 1.1], + "lerp_mode": "catmullrom" + }, + "0.3": { + "post": [0.25, 1.03, 1.1], + "lerp_mode": "catmullrom" + }, + "0.3583": { + "post": [0.1, 1.38, 1.1], + "lerp_mode": "catmullrom" + }, + "0.475": { + "post": [0.1, 1.42, 1.04], + "lerp_mode": "catmullrom" + }, + "0.575": { + "post": [0.1, 1.33, 1], + "lerp_mode": "catmullrom" + }, + "0.6917": { + "post": [0, 1.33, 1.05], + "lerp_mode": "catmullrom" + }, + "0.825": { + "post": [0.19, 1.45, 1.23], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [0.25, 1.48, 1.5], + "lerp_mode": "catmullrom" + }, + "0.9333": { + "post": [0.25, 1.48, 1.1], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [0.25, 1.44, 1.08], + "lerp_mode": "catmullrom" + } + } + }, + "Lefthand": { + "rotation": { + "0.0": [3.85, 80.35, -91.87], + "0.2333": [62.26, 11.41, -27.22], + "0.2583": [62.26, 11.41, -27.22], + "0.4167": [59.26, 11.41, -27.22], + "0.4583": [59.26, 11.41, -27.22], + "0.5667": [28.25001, 10.19578, -18.28382], + "0.575": [28.25001, 10.19578, -18.28382], + "0.8": [34.77711, 73.21121, -54.48998], + "0.9167": [-2.40546, 87.74156, -98.79624], + "0.9333": [-2.40546, 87.74156, -98.79624], + "0.9583": [3.85, 80.35, -91.87] + }, + "position": { + "0.0": [3, 3.78, 11.61], + "0.0917": [4.12, 3.11, 10.92], + "0.2333": [5.4, 2.35, 8.25], + "0.2583": [5.4, 2.35, 8.25], + "0.3167": [5.55, 1.535, 8.25], + "0.3667": [5.24, 0.65, 8.25], + "0.4167": [4.25, -0.375, 8.25], + "0.4583": [4.25, -0.375, 8.25], + "0.5667": [14.7424, -7.81979, 16.8584], + "0.575": [14.7424, -7.81979, 16.8584], + "0.5917": [7.98, -2.33, 19.17], + "0.7583": [5.24, 4.07, 12.27], + "0.8": [3.68, 4.34, 12.64], + "0.9167": [2.69, 3.96, 11.8], + "0.9333": [2.69, 3.96, 11.8], + "0.9583": [3, 3.78, 11.61] + } + }, + "dangu": { + "rotation": { + "0.0": [0, 0, 45], + "0.2583": [0, 0, 45], + "0.3167": [0, 0, 48], + "0.4167": [0, 0, 45], + "0.575": [0, 0, 45], + "0.9583": [0, 0, 45] + }, + "position": { + "0.0": [0, 0, 0], + "0.9583": [0, 0, 0] + } + }, + "tiba": { + "rotation": { + "0.0": [0, 0, 0], + "0.2583": [0, 0, 0], + "0.3167": [0, 0, 7], + "0.4167": [0, 0, 45], + "0.4667": [0, 0, 45], + "0.575": [0, 0, 0], + "0.9583": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.9583": [0, 0, 0] + } + }, + "zhuanlun": { + "rotation": { + "0.0": [0, 0, 0], + "0.2583": [0, 0, 0], + "0.3167": [0, 0, -0.92], + "0.4167": [0, 0, 45], + "0.575": [0, 0, 45], + "0.925": [0, 0, 45], + "0.926": [0, 0, 0], + "0.9583": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.9583": [0, 0, 0] + } + }, + "bullet2": { + "rotation": { + "0.0": [0, 0, 0], + "0.3417": [0, 0, 0], + "0.4167": [4.77255, 5.82097, 2.96825], + "0.475": [-1.30569, 29.09628, 17.35742], + "0.575": [-35.89291, 25.70881, 4.73482], + "0.5917": [-38.25694, 61.0539, -22.21459], + "0.7583": [13.39061, 36.60353, -1.65743], + "0.8": [2.65, 3.23, 1.65], + "0.925": [0, 0, 0], + "0.9583": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.3417": [0, 0, 0], + "0.3833": [0, 0, 0], + "0.475": [0, 1.4, 13], + "0.575": [5.1, 0, 16], + "0.5917": [6.45, 4.03, 10], + "0.7583": [0.08, 0.2, 2.07], + "0.8": [0, 0, 1.7], + "0.925": [0, 0, 0], + "0.9583": [0, 0, 0] + } + }, + "camera": { + "rotation": { + "0.0": [0, 0, 0], + "0.15": [0.05, 1.45, -0.5], + "0.25": [-1.65, 1.71, 3.79], + "0.3667": [1.3, -2.05, -2.5], + "0.475": [-0.07, 0.13, -1.05], + "0.6": [0, -0.1, 0.2], + "0.7417": [1.3, -2.05, -2.5], + "0.9333": [0, 0, 0] + } + } + } + }, + "animation.sc.finish": { + "loop": "hold_on_last_frame", + "animation_length": 1, + "bones": { + "0": { + "rotation": { + "0.0": { + "post": [-17.32, -9.41, -7.03], + "lerp_mode": "catmullrom" + }, + "0.0667": { + "post": [-17.77798, -14.05342, -4.90713], + "lerp_mode": "catmullrom" + }, + "0.1333": { + "post": [-15.68439, -19.24192, -12.51449], + "lerp_mode": "catmullrom" + }, + "0.2": { + "post": [-13.58667, -18.1323, -19.93792], + "lerp_mode": "catmullrom" + }, + "0.3333": { + "post": [-13.68761, -11.10058, -7.71862], + "lerp_mode": "catmullrom" + }, + "0.3667": { + "post": [-14.76299, -11.73495, -3.09848], + "lerp_mode": "catmullrom" + }, + "0.3917": { + "post": [-13.78, -10.95, -2.69], + "lerp_mode": "catmullrom" + }, + "0.425": { + "post": [-13.03608, -5.74275, -3.2049], + "lerp_mode": "catmullrom" + }, + "0.4667": { + "post": [-7.22354, -5.98277, -3.16748], + "lerp_mode": "catmullrom" + }, + "0.575": { + "post": [-0.78429, -0.96449, -0.75002], + "lerp_mode": "catmullrom" + }, + "0.6833": { + "post": [-0.01963, 0.49961, 0.62491], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [0, 0.375, -0.125], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": { + "post": [0.25, 1.44, 1.08], + "lerp_mode": "catmullrom" + }, + "0.1333": { + "post": [0.25, 1.18, 1.1], + "lerp_mode": "catmullrom" + }, + "0.2333": { + "post": [0.2, 0.94, 0.9], + "lerp_mode": "catmullrom" + }, + "0.325": { + "post": [-0.37, 0.85, 0.81], + "lerp_mode": "catmullrom" + }, + "0.3583": { + "post": [-0.36, 1.19, 0.7], + "lerp_mode": "catmullrom" + }, + "0.3917": { + "post": [-0.33, 1.09, 0.63], + "lerp_mode": "catmullrom" + }, + "0.425": { + "post": [-0.69, 0.96, 0.55], + "lerp_mode": "catmullrom" + }, + "0.4667": { + "post": [-0.58, 0.82, 0.44], + "lerp_mode": "catmullrom" + }, + "0.5167": { + "post": [0.06, -0.23, -0.325], + "lerp_mode": "catmullrom" + }, + "0.6167": { + "post": [-0.025, -0.15, 0.2], + "lerp_mode": "catmullrom" + }, + "0.6833": { + "post": [0.05, 0.025, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [0, -0.05, 0.03125], + "lerp_mode": "catmullrom" + }, + "0.9": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "Lefthand": { + "rotation": { + "0.0": [3.85, 80.35, -91.87], + "0.1": [-28.45812, 56.42668, -88.31756], + "0.2417": [-13.00958, 34.84289, 24.0109], + "0.275": [7.87247, 11.69863, 25.90836], + "0.3917": [6.99523, 24.59271, 37.69543], + "0.4583": [5.24337, 8.70048, 21.52163], + "0.5167": [0, 0, 0] + }, + "position": { + "0.0": [3, 3.78, 11.61], + "0.2417": [7.39, -2.07, 8.73], + "0.275": [4.06, -0.34, 8.12], + "0.3917": [2.86, -0.34, 8.12], + "0.4583": [3.14, -0.23, 5.52], + "0.5167": [0, 0, 0] + } + }, + "dangu": { + "rotation": { + "0.0": [0, 0, 45], + "0.3167": [0, 0, 45], + "0.4167": [0, 0, 0] + }, + "position": [0, 0, 0] + }, + "tiba": { + "rotation": [0, 0, 0], + "position": [0, 0, 0] + }, + "zhuanlun": { + "rotation": [0, 0, 0], + "position": [0, 0, 0] + }, + "bullet2": { + "rotation": [0, 0, 0], + "position": [0, 0, 0] + }, + "camera": { + "rotation": { + "0.0": [0, 0, 0], + "0.1667": [0.2, 0, 2], + "0.3333": [1, 2, 1.8], + "0.4083": [-1.5, -3, -1.5], + "0.5167": [0.2, 1.5, 1.5], + "0.675": [0, 0, -0.5], + "0.8417": [0, 0, 0] + } + } + } } } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/geo/minigun.geo.json b/src/main/resources/assets/superbwarfare/geo/minigun.geo.json index 231e71bf0..b0224f3c1 100644 --- a/src/main/resources/assets/superbwarfare/geo/minigun.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/minigun.geo.json @@ -3852,8 +3852,6 @@ { "origin": [0.09007, 4.59677, 9.2425], "size": [0.86128, 0.1, 4.8], - "pivot": [0.99967, 2.97878, 2.98927], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [91, 80], "uv_size": [0.75, 0.25]}, "east": {"uv": [70, 80], "uv_size": [4.75, 0.25]}, diff --git a/src/main/resources/assets/superbwarfare/geo/secondary_cataclysm.geo.json b/src/main/resources/assets/superbwarfare/geo/secondary_cataclysm.geo.json index 0585ee2a0..8852f9669 100644 --- a/src/main/resources/assets/superbwarfare/geo/secondary_cataclysm.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/secondary_cataclysm.geo.json @@ -7,13 +7,13 @@ "texture_width": 64, "texture_height": 64, "visible_bounds_width": 4, - "visible_bounds_height": 2, - "visible_bounds_offset": [0, 0, 0] + "visible_bounds_height": 3, + "visible_bounds_offset": [0, 0.5, 0] }, "bones": [ { "name": "camera", - "pivot": [3.17141, 5.16276, 9.77702] + "pivot": [2.82141, 4.21276, 8.62702] }, { "name": "root", @@ -147,6 +147,20 @@ "parent": "0", "pivot": [0, -4.2526, -9.01459], "cubes": [ + { + "origin": [-1.975, -2.1526, -6.01271], + "size": [5.1, 0.6, 0.55], + "pivot": [0, -1.8526, -5.76271], + "rotation": [0, 90, 135], + "uv": { + "north": {"uv": [35, 34], "uv_size": [5, 0.5]}, + "east": {"uv": [54, 60], "uv_size": [0.5, 0.5]}, + "south": {"uv": [35, 35], "uv_size": [5, 0.5]}, + "west": {"uv": [60, 54], "uv_size": [0.5, 0.5]}, + "up": {"uv": [36, 1], "uv_size": [5, 0.5]}, + "down": {"uv": [36, 2.5], "uv_size": [5, -0.5]} + } + }, { "origin": [-0.32688, -4.4026, -9.16459], "size": [0.65375, 0.3, 0.3], @@ -281,20 +295,6 @@ "parent": "zhuanlun", "pivot": [0, -1.8526, -5.76271], "cubes": [ - { - "origin": [-1.975, -2.1526, -6.01271], - "size": [5.1, 0.6, 0.55], - "pivot": [0, -1.8526, -5.76271], - "rotation": [0, 90, 135], - "uv": { - "north": {"uv": [35, 34], "uv_size": [5, 0.5]}, - "east": {"uv": [54, 60], "uv_size": [0.5, 0.5]}, - "south": {"uv": [35, 35], "uv_size": [5, 0.5]}, - "west": {"uv": [60, 54], "uv_size": [0.5, 0.5]}, - "up": {"uv": [36, 1], "uv_size": [5, 0.5]}, - "down": {"uv": [36, 2.5], "uv_size": [5, -0.5]} - } - }, { "origin": [-0.8, -1.6228, -9.75483], "size": [1.6, 0.79, 0.99], @@ -759,8 +759,6 @@ { "origin": [-0.15135, 0.05553, -6.25064], "size": [0.31664, 0.31468, 0.10506], - "pivot": [0.00368, 0.21151, -5.95994], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [3, 62], "uv_size": [0.5, 0.5]}, "east": {"uv": [62, 3], "uv_size": [0.5, 0.5]}, @@ -1045,8 +1043,6 @@ { "origin": [-1.61135, -0.54447, -6.25064], "size": [0.31664, 0.31468, 0.10506], - "pivot": [-1.45632, -0.38849, -5.95994], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [3, 62], "uv_size": [0.5, 0.5]}, "east": {"uv": [62, 3], "uv_size": [0.5, 0.5]}, @@ -1331,8 +1327,6 @@ { "origin": [-2.21635, -2.00947, -6.25064], "size": [0.31664, 0.31468, 0.10506], - "pivot": [-2.06132, -1.85349, -5.95994], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [3, 62], "uv_size": [0.5, 0.5]}, "east": {"uv": [62, 3], "uv_size": [0.5, 0.5]}, @@ -1617,8 +1611,6 @@ { "origin": [-1.61135, -3.46947, -6.25064], "size": [0.31664, 0.31468, 0.10506], - "pivot": [-1.45632, -3.31349, -5.95994], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [3, 62], "uv_size": [0.5, 0.5]}, "east": {"uv": [62, 3], "uv_size": [0.5, 0.5]}, @@ -1903,8 +1895,6 @@ { "origin": [-0.15135, -4.06947, -6.25064], "size": [0.31664, 0.31468, 0.10506], - "pivot": [0.00368, -3.91349, -5.95994], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [3, 62], "uv_size": [0.5, 0.5]}, "east": {"uv": [62, 3], "uv_size": [0.5, 0.5]}, @@ -2189,8 +2179,6 @@ { "origin": [1.29471, -3.46947, -6.25064], "size": [0.31664, 0.31468, 0.10506], - "pivot": [1.45632, -3.31349, -5.95994], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [3.5, 62], "uv_size": [-0.5, 0.5]}, "east": {"uv": [4.5, 62], "uv_size": [-0.5, 0.5]}, @@ -2475,8 +2463,6 @@ { "origin": [1.89971, -2.00947, -6.25064], "size": [0.31664, 0.31468, 0.10506], - "pivot": [2.06132, -1.85349, -5.95994], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [3.5, 62], "uv_size": [-0.5, 0.5]}, "east": {"uv": [4.5, 62], "uv_size": [-0.5, 0.5]}, @@ -2761,8 +2747,6 @@ { "origin": [1.29471, -0.54447, -6.25064], "size": [0.31664, 0.31468, 0.10506], - "pivot": [1.45632, -0.38849, -5.95994], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [3.5, 62], "uv_size": [-0.5, 0.5]}, "east": {"uv": [4.5, 62], "uv_size": [-0.5, 0.5]}, @@ -3440,8 +3424,6 @@ { "origin": [0.56248, -0.0521, -8.73483], "size": [0.075, 0.528, 4.845], - "pivot": [0, 0.21195, -6.31233], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [60, 60], "uv_size": [0.5, 0.5]}, "east": {"uv": [15, 36], "uv_size": [5, 0.5]}, @@ -3544,8 +3526,6 @@ { "origin": [0.56248, -0.0521, -8.73483], "size": [0.075, 0.528, 4.845], - "pivot": [0, 0.21195, -6.31233], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [61, 6], "uv_size": [0.5, 0.5]}, "east": {"uv": [38, 14], "uv_size": [5, 0.5]}, @@ -3648,8 +3628,6 @@ { "origin": [0.56248, -0.0521, -8.73483], "size": [0.075, 0.528, 4.845], - "pivot": [0, 0.21195, -6.31233], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [61, 14], "uv_size": [0.5, 0.5]}, "east": {"uv": [5, 39], "uv_size": [5, 0.5]}, @@ -3752,8 +3730,6 @@ { "origin": [0.56248, -0.0521, -8.73483], "size": [0.075, 0.528, 4.845], - "pivot": [0, 0.21195, -6.31233], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [61, 22], "uv_size": [0.5, 0.5]}, "east": {"uv": [15, 40], "uv_size": [5, 0.5]}, @@ -3856,8 +3832,6 @@ { "origin": [0.56248, -0.0521, -8.73483], "size": [0.075, 0.528, 4.845], - "pivot": [0, 0.21195, -6.31233], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [61, 30], "uv_size": [0.5, 0.5]}, "east": {"uv": [5, 41], "uv_size": [5, 0.5]}, @@ -3960,8 +3934,6 @@ { "origin": [0.56248, -0.0521, -8.73483], "size": [0.075, 0.528, 4.845], - "pivot": [0, 0.21195, -6.31233], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [61, 38], "uv_size": [0.5, 0.5]}, "east": {"uv": [35, 41], "uv_size": [5, 0.5]}, @@ -4064,8 +4036,6 @@ { "origin": [0.56248, -0.0521, -8.73483], "size": [0.075, 0.528, 4.845], - "pivot": [0, 0.21195, -6.31233], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [61, 46], "uv_size": [0.5, 0.5]}, "east": {"uv": [0, 43], "uv_size": [5, 0.5]}, @@ -4168,8 +4138,6 @@ { "origin": [0.56248, -0.0521, -8.73483], "size": [0.075, 0.528, 4.845], - "pivot": [0, 0.21195, -6.31233], - "rotation": [0, 0, 0], "uv": { "north": {"uv": [61, 54], "uv_size": [0.5, 0.5]}, "east": {"uv": [43, 33], "uv_size": [5, 0.5]}, diff --git a/src/main/resources/assets/superbwarfare/sounds.json b/src/main/resources/assets/superbwarfare/sounds.json index cb05c124e..cd333fdcc 100644 --- a/src/main/resources/assets/superbwarfare/sounds.json +++ b/src/main/resources/assets/superbwarfare/sounds.json @@ -2640,5 +2640,29 @@ "stream": false } ] + }, + "secondary_cataclysm_loop": { + "sounds": [ + { + "name": "superbwarfare:secondary_cataclysm/secondary_cataclysm_loop", + "stream": false + } + ] + }, + "secondary_cataclysm_prepare_load": { + "sounds": [ + { + "name": "superbwarfare:secondary_cataclysm/secondary_cataclysm_start", + "stream": false + } + ] + }, + "secondary_cataclysm_end": { + "sounds": [ + { + "name": "superbwarfare:secondary_cataclysm/secondary_cataclysm_end", + "stream": false + } + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/sounds/marlin/marlin_end.wav b/src/main/resources/assets/superbwarfare/sounds/marlin/marlin_end.wav deleted file mode 100644 index 8b6330def..000000000 Binary files a/src/main/resources/assets/superbwarfare/sounds/marlin/marlin_end.wav and /dev/null differ diff --git a/src/main/resources/assets/superbwarfare/sounds/secondary_cataclysm/secondary_cataclysm_end.ogg b/src/main/resources/assets/superbwarfare/sounds/secondary_cataclysm/secondary_cataclysm_end.ogg new file mode 100644 index 000000000..4b16dda80 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/sounds/secondary_cataclysm/secondary_cataclysm_end.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/secondary_cataclysm/secondary_cataclysm_loop.ogg b/src/main/resources/assets/superbwarfare/sounds/secondary_cataclysm/secondary_cataclysm_loop.ogg new file mode 100644 index 000000000..006fd74a6 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/sounds/secondary_cataclysm/secondary_cataclysm_loop.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/secondary_cataclysm/secondary_cataclysm_start.ogg b/src/main/resources/assets/superbwarfare/sounds/secondary_cataclysm/secondary_cataclysm_start.ogg new file mode 100644 index 000000000..6b9b41a6d Binary files /dev/null and b/src/main/resources/assets/superbwarfare/sounds/secondary_cataclysm/secondary_cataclysm_start.ogg differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/light_saber.png b/src/main/resources/assets/superbwarfare/textures/item/light_saber.png deleted file mode 100644 index 30d3792c6..000000000 Binary files a/src/main/resources/assets/superbwarfare/textures/item/light_saber.png and /dev/null differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/light_saber_e.png b/src/main/resources/assets/superbwarfare/textures/item/light_saber_e.png deleted file mode 100644 index 18faeafb7..000000000 Binary files a/src/main/resources/assets/superbwarfare/textures/item/light_saber_e.png and /dev/null differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/minigun_heat_e.png b/src/main/resources/assets/superbwarfare/textures/item/minigun_heat_e.png index efa6592d7..1470d4c05 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/minigun_heat_e.png and b/src/main/resources/assets/superbwarfare/textures/item/minigun_heat_e.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/mp443.png b/src/main/resources/assets/superbwarfare/textures/item/mp443.png index 955471974..e0013e3a3 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/mp443.png and b/src/main/resources/assets/superbwarfare/textures/item/mp443.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm.png b/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm.png index 68d400493..9a5ad2270 100644 Binary files a/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm.png and b/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm.png differ diff --git a/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm_light.png b/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm_light.png new file mode 100644 index 000000000..1fec264fa Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/secondary_cataclysm_light.png differ diff --git a/src/main/resources/data/superbwarfare/guns/secondary_cataclysm.json b/src/main/resources/data/superbwarfare/guns/secondary_cataclysm.json index e7c28f7b2..89f2c38ea 100644 --- a/src/main/resources/data/superbwarfare/guns/secondary_cataclysm.json +++ b/src/main/resources/data/superbwarfare/guns/secondary_cataclysm.json @@ -8,9 +8,8 @@ "Velocity": 3.75, "Magazine": 8, "Weight": 9, - "PrepareTime": 29, - "PrepareEmptyTime": 16, - "IterativeTime": 11, - "FinishTime": 18, + "PrepareLoadTime": 31, + "IterativeTime": 20, + "FinishTime": 19, "SoundRadius": 8 } \ No newline at end of file