diff --git a/src/main/java/net/mcreator/target/client/model/item/Hk416ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/Hk416ItemModel.java index 852c10f87..29febad35 100644 --- a/src/main/java/net/mcreator/target/client/model/item/Hk416ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/Hk416ItemModel.java @@ -4,6 +4,7 @@ import net.mcreator.target.item.gun.Hk416Item; import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.core.animatable.model.CoreGeoBone; @@ -130,5 +131,13 @@ public class Hk416ItemModel extends GeoModel { move.setRotZ(3.7f * (float) yaw + 2.7f * (float) m); move.setRotY(1.9f * (float) yaw - 1.7f * (float) m); + + CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + + player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); + + player.getPersistentData().putDouble("camera_rot_y", Mth.RAD_TO_DEG * camera.getRotY()); + + player.getPersistentData().putDouble("camera_rot_z", Mth.RAD_TO_DEG * camera.getRotZ()); } } diff --git a/src/main/java/net/mcreator/target/client/model/item/M4ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/M4ItemModel.java index d1492d0ca..7a8908eee 100644 --- a/src/main/java/net/mcreator/target/client/model/item/M4ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/M4ItemModel.java @@ -4,6 +4,7 @@ import net.mcreator.target.item.gun.M4Item; import net.mcreator.target.network.TargetModVariables; import net.minecraft.client.Minecraft; import net.minecraft.resources.ResourceLocation; +import net.minecraft.util.Mth; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import software.bernie.geckolib.core.animatable.model.CoreGeoBone; @@ -120,5 +121,13 @@ public class M4ItemModel extends GeoModel { move.setRotZ(3.7f * (float) yaw + 2.7f * (float) m); move.setRotY(1.9f * (float) yaw - 1.7f * (float) m); + + CoreGeoBone camera = getAnimationProcessor().getBone("camera"); + + player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); + + player.getPersistentData().putDouble("camera_rot_y", Mth.RAD_TO_DEG * camera.getRotY()); + + player.getPersistentData().putDouble("camera_rot_z", Mth.RAD_TO_DEG * camera.getRotZ()); } } diff --git a/src/main/java/net/mcreator/target/client/renderer/item/M4ItemRenderer.java b/src/main/java/net/mcreator/target/client/renderer/item/M4ItemRenderer.java index 1d3037a7e..d8dd7e7be 100644 --- a/src/main/java/net/mcreator/target/client/renderer/item/M4ItemRenderer.java +++ b/src/main/java/net/mcreator/target/client/renderer/item/M4ItemRenderer.java @@ -1,29 +1,7 @@ package net.mcreator.target.client.renderer.item; -import software.bernie.geckolib.util.RenderUtils; import software.bernie.geckolib.renderer.GeoItemRenderer; -import software.bernie.geckolib.cache.object.GeoBone; -import software.bernie.geckolib.cache.object.BakedGeoModel; - -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.resources.ResourceLocation; -import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.client.renderer.entity.player.PlayerRenderer; -import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.player.AbstractClientPlayer; -import net.minecraft.client.model.PlayerModel; -import net.minecraft.client.Minecraft; - -import net.mcreator.target.tools.AnimUtils; - -import java.util.Set; -import java.util.HashSet; - -import com.mojang.blaze3d.vertex.VertexConsumer; -import com.mojang.blaze3d.vertex.PoseStack; - import net.mcreator.target.item.gun.M4Item; import net.mcreator.target.client.layer.M4Layer; @@ -35,82 +13,6 @@ public class M4ItemRenderer extends GeoItemRenderer { this.addRenderLayer(new M4Layer(this)); } - @Override - public RenderType getRenderType(M4Item animatable, ResourceLocation texture, MultiBufferSource bufferSource, float partialTick) { - return RenderType.entityTranslucent(getTextureLocation(animatable)); - } - - private static final float SCALE_RECIPROCAL = 1.0f / 16.0f; - protected boolean renderArms = false; - protected MultiBufferSource currentBuffer; - protected RenderType renderType; - public ItemDisplayContext transformType; - protected M4Item animatable; - private final Set hiddenBones = new HashSet<>(); - private final Set suppressedBones = new HashSet<>(); - - @Override - public void renderByItem(ItemStack stack, ItemDisplayContext transformType, PoseStack matrixStack, MultiBufferSource bufferIn, int combinedLightIn, int p_239207_6_) { - this.transformType = transformType; - if (this.animatable != null) - this.animatable.getTransformType(transformType); - super.renderByItem(stack, transformType, matrixStack, bufferIn, combinedLightIn, p_239207_6_); - } - - @Override - public void actuallyRender(PoseStack matrixStackIn, M4Item animatable, BakedGeoModel model, RenderType type, MultiBufferSource renderTypeBuffer, VertexConsumer vertexBuilder, boolean isRenderer, float partialTicks, int packedLightIn, - int packedOverlayIn, float red, float green, float blue, float alpha) { - this.currentBuffer = renderTypeBuffer; - this.renderType = type; - this.animatable = animatable; - super.actuallyRender(matrixStackIn, animatable, model, type, renderTypeBuffer, vertexBuilder, isRenderer, partialTicks, packedLightIn, packedOverlayIn, red, green, blue, alpha); - if (this.renderArms) { - this.renderArms = false; - } - } - - @Override - public void renderRecursively(PoseStack stack, M4Item animatable, GeoBone bone, RenderType type, MultiBufferSource buffer, VertexConsumer bufferIn, boolean isReRender, float partialTick, int packedLightIn, int packedOverlayIn, float red, - float green, float blue, float alpha) { - Minecraft mc = Minecraft.getInstance(); - String name = bone.getName(); - boolean renderingArms = false; - if (name.equals("Lefthand") || name.equals("Righthand")) { - bone.setHidden(true); - renderingArms = true; - } else { - bone.setHidden(this.hiddenBones.contains(name)); - } - if (this.transformType.firstPerson() && renderingArms) { - AbstractClientPlayer player = mc.player; - float armsAlpha = player.isInvisible() ? 0.15f : 1.0f; - PlayerRenderer playerRenderer = (PlayerRenderer) mc.getEntityRenderDispatcher().getRenderer(player); - PlayerModel model = playerRenderer.getModel(); - stack.pushPose(); - RenderUtils.translateMatrixToBone(stack, bone); - RenderUtils.translateToPivotPoint(stack, bone); - RenderUtils.rotateMatrixAroundBone(stack, bone); - RenderUtils.scaleMatrixForBone(stack, bone); - RenderUtils.translateAwayFromPivotPoint(stack, bone); - ResourceLocation loc = player.getSkinTextureLocation(); - VertexConsumer armBuilder = this.currentBuffer.getBuffer(RenderType.entitySolid(loc)); - VertexConsumer sleeveBuilder = this.currentBuffer.getBuffer(RenderType.entityTranslucent(loc)); - if (name.equals("Lefthand")) { - stack.translate(-1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimUtils.renderPartOverBone(model.leftArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, armsAlpha); - AnimUtils.renderPartOverBone(model.leftSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, armsAlpha); - } else if (name.equals("Righthand")) { - stack.translate(1.0f * SCALE_RECIPROCAL, 2.0f * SCALE_RECIPROCAL, 0.0f); - AnimUtils.renderPartOverBone(model.rightArm, bone, stack, armBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, armsAlpha); - AnimUtils.renderPartOverBone(model.rightSleeve, bone, stack, sleeveBuilder, packedLightIn, OverlayTexture.NO_OVERLAY, armsAlpha); - } - this.currentBuffer.getBuffer(RenderType.entityTranslucent(getTextureLocation(this.animatable))); - stack.popPose(); - } - super.renderRecursively(stack, animatable, bone, type, buffer, bufferIn, isReRender, partialTick, packedLightIn, packedOverlayIn, red, green, blue, alpha); - } - - @Override public ResourceLocation getTextureLocation(M4Item instance) { return super.getTextureLocation(instance); diff --git a/src/main/java/net/mcreator/target/event/ClientEventHandler.java b/src/main/java/net/mcreator/target/event/ClientEventHandler.java index 0398c9d27..5fcaf1579 100644 --- a/src/main/java/net/mcreator/target/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/target/event/ClientEventHandler.java @@ -79,9 +79,9 @@ public class ClientEventHandler { double on_ground; if (entity.onGround()) { if (entity.isSprinting()) { - on_ground = 1.2; + on_ground = 1.0; } else { - on_ground = 2.4; + on_ground = 2.0; } } else { on_ground = 0.001; diff --git a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java index fcc3babd8..4184893ce 100644 --- a/src/main/java/net/mcreator/target/item/gun/Hk416Item.java +++ b/src/main/java/net/mcreator/target/item/gun/Hk416Item.java @@ -87,11 +87,11 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { } if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_empty")); } if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload2")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_normal")); } if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) { @@ -180,7 +180,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { tag.putDouble("reload_time", 0); } if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 55) { + if (tag.getDouble("reload_time") == 61) { entity.getPersistentData().putDouble("id", id); if (entity instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, TargetModSounds.HK_416_RELOAD_EMPTY.get(), 100, 1); @@ -200,7 +200,7 @@ public class Hk416Item extends GunItem implements GeoItem, AnimatedItem { GunReload.reload(entity, GunInfo.Type.RIFLE); } } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 41) { + if (tag.getDouble("reload_time") == 53) { entity.getPersistentData().putDouble("id", id); { if (entity instanceof ServerPlayer serverPlayer) { diff --git a/src/main/java/net/mcreator/target/item/gun/M4Item.java b/src/main/java/net/mcreator/target/item/gun/M4Item.java index fe7700621..a9e356c21 100644 --- a/src/main/java/net/mcreator/target/item/gun/M4Item.java +++ b/src/main/java/net/mcreator/target/item/gun/M4Item.java @@ -87,11 +87,11 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { } if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_empty")); } if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload2")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.m4.reload_normal")); } if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) { @@ -179,7 +179,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { tag.putDouble("reload_time", 0); } if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 55) { + if (tag.getDouble("reload_time") == 61) { if (entity instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, TargetModSounds.M_4_RELOAD_EMPTY.get(), 100, 1); } @@ -199,7 +199,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { GunReload.reload(entity, GunInfo.Type.RIFLE); } } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 41) { + if (tag.getDouble("reload_time") == 53) { if (entity instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, TargetModSounds.M_4_RELOAD_NORMAL.get(), 100, 1); } diff --git a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java index 9940ee983..cc17df3d1 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -196,12 +196,12 @@ public class PlayerReloadProcedure { tag.putBoolean("reloading", true); tag.putBoolean("empty_reload", false); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 41); + tag.putDouble("reload_time", 53); } else if (tag.getInt("ammo") == 0) { tag.putBoolean("reloading", true); tag.putDouble("empty_reload", 1); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 55); + tag.putDouble("reload_time", 61); } } if (player.getMainHandItem().getItem() == TargetModItems.AA_12.get() diff --git a/src/main/resources/assets/target/animations/ak.animation.json b/src/main/resources/assets/target/animations/ak.animation.json index 08f8af0bc..1b438aa63 100644 --- a/src/main/resources/assets/target/animations/ak.animation.json +++ b/src/main/resources/assets/target/animations/ak.animation.json @@ -263,19 +263,19 @@ "camera": { "rotation": { "0.0": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] }, "0.2": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.4": { - "vector": [-0.5, 0.5, 0.5] + "vector": [-0.3, 0.3, 0.3] }, "0.6": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.8": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] } } } diff --git a/src/main/resources/assets/target/animations/hk416.animation.json b/src/main/resources/assets/target/animations/hk416.animation.json index 740c0ed08..ea00081da 100644 --- a/src/main/resources/assets/target/animations/hk416.animation.json +++ b/src/main/resources/assets/target/animations/hk416.animation.json @@ -6,7 +6,7 @@ "animation_length": 1 }, "animation.m4.draw": { - "animation_length": 0.9, + "animation_length": 1, "bones": { "0": { "rotation": { @@ -40,6 +40,24 @@ "vector": [0, 0, 0] } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4167": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0.25, -0.5, 0.5], + "easing": "easeInSine" + }, + "0.5833": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } } } }, @@ -172,107 +190,23 @@ "easing": "easeOutSine" } } - } - } - }, - "animation.m4.hit": { - "animation_length": 0.6, - "bones": { - "0": { + }, + "camera": { "rotation": { "0.0": { - "vector": [0, 0, 0] + "vector": [-0.3, -0.3, 0.3] }, "0.2": { - "vector": [-147.50541, 34.52809, 101.28078], - "easing": "easeOutSine" + "vector": [0.3, 0, -0.3] }, "0.4": { - "vector": [-13.26827, 5.92455, 35.88217], - "easing": "easeInSine" + "vector": [-0.3, 0.3, 0.3] }, "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] + "vector": [0.3, 0, -0.3] }, - "0.1": { - "vector": [3.36, -2.44, -4.42] - }, - "0.2": { - "vector": [8.55, -0.7, -9.85], - "easing": "easeOutSine" - }, - "0.4": { - "vector": [0.97, 0.75, -3.12], - "easing": "easeInSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, - "Righthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [112.5, 0, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 15, -10], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [135, 0, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [-4.29, 19.16875, -9.15] - }, - "0.3": { - "vector": [-6, 16, -10], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" + "0.8": { + "vector": [-0.3, -0.3, 0.3] } } } @@ -282,16 +216,6 @@ "animation_length": 0.04, "override_previous_animation": true, "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [-0.5, 0, -0.75] - }, - "0.04": { - "vector": [0, 0, 0] - } - } - }, "bolt": { "position": { "0.0": { @@ -306,62 +230,203 @@ } } }, - "animation.m4.reload": { - "animation_length": 2.7, - "override_previous_animation": true, + "animation.m4.reload_empty": { + "loop": "hold_on_last_frame", + "animation_length": 3.125, "bones": { "0": { + "rotation": { + "0.0417": { + "vector": [0, 0, 0] + }, + "0.125": { + "vector": [1.18324, 1.40448, 3.98547] + }, + "0.3333": { + "vector": [-14.01, 2.98, -9.37] + }, + "0.4167": { + "vector": [-12.25012, 1.71575, -15.23679] + }, + "0.5": { + "vector": [-13.67625, 0.53753, -20.43357] + }, + "0.5417": { + "vector": [-14.36146, -0.34228, -23.99804] + }, + "0.625": { + "vector": [-15.36586, -0.75486, -21.85957] + }, + "0.7083": { + "vector": [-3.42984, -0.39385, -15.87027] + }, + "0.875": { + "vector": [-12.35117, -0.9689, -22.83651] + }, + "1.0417": { + "vector": [-16.3817, -0.19101, -19.94063] + }, + "1.2083": { + "vector": [-11.33329, -1.14849, -23.82073] + }, + "1.4167": { + "vector": [-10.66408, -4.02619, -38.55877], + "easing": "easeInSine" + }, + "1.5": { + "vector": [-13.44223, -4.57576, -41.51634] + }, + "1.5833": { + "vector": [-10.27854, -4.93547, -43.49053] + }, + "1.6667": { + "vector": [-9.91402, -5.63696, -47.44539] + }, + "1.7917": { + "vector": [-11.91402, -5.63696, -47.44539] + }, + "1.875": { + "vector": [-17.49684, -6.85391, -51.27861] + }, + "2.25": { + "vector": [-13.3424, -0.71426, -23.88584], + "easing": "easeInElastic" + }, + "2.3333": { + "vector": [-13.9971, 5.8821, -30.62885], + "easing": "easeInElastic" + }, + "2.4583": { + "vector": [-13.35402, 0.44077, -19.02098], + "easing": "easeInElastic" + }, + "2.5417": { + "vector": [-9.53304, 1.46221, -17.39249] + }, + "2.6667": { + "vector": [-3.8135, -0.9118, -6.85724] + }, + "2.8333": { + "vector": [0, 0, -2] + }, + "2.9583": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0417": { + "vector": [0, 0, 0] + }, + "0.2917": { + "vector": [-1.1, 0.3, 1.9], + "easing": "easeInQuad" + }, + "0.4167": { + "vector": [-1.1, 0, 1.2], + "easing": "easeOutSine" + }, + "0.5417": { + "vector": [-1.1, 0, 1.4] + }, + "0.625": { + "vector": [-1.1, 0, 1.3] + }, + "0.7083": { + "vector": [-0.75494, -0.64671, 0.87721] + }, + "0.7917": { + "vector": [-1.1, 0, 1.3] + }, + "0.9583": { + "vector": [-0.95347, -0.36221, 1.21435] + }, + "1.125": { + "vector": [-0.84854, -0.60732, 1.04107] + }, + "1.2917": { + "vector": [-0.88449, -0.56099, 1.25543] + }, + "1.4167": { + "vector": [-0.89507, -0.06932, 1.3549] + }, + "1.5": { + "vector": [-1.16342, 0.21638, 1.44269] + }, + "1.5833": { + "vector": [-1.03823, 0.0689, 1.38061] + }, + "1.6667": { + "vector": [-0.91462, 0.05514, 1.36807] + }, + "1.7917": { + "vector": [-0.68888, -0.13612, 1.3186] + }, + "1.875": { + "vector": [-1.65765, 0.66955, 1.6243], + "easing": "easeInSine" + }, + "2.0": { + "vector": [-0.8044, 0.0239, 1.36148], + "easing": "easeOutSine" + }, + "2.125": { + "vector": [-0.55391, 0.01857, 1.28596], + "easing": "easeInSine" + }, + "2.25": { + "vector": [-0.62538, 0.12257, 1.2652] + }, + "2.3333": { + "vector": [-1.17857, -0.12293, 1.26252], + "easing": "easeInElastic" + }, + "2.375": { + "vector": [-1.14634, -0.11121, 1.26544] + }, + "2.4583": { + "vector": [-0.62538, 0.12257, 1.2652] + }, + "2.5833": { + "vector": [-0.47388, 0.04235, 0.71917] + }, + "2.75": { + "vector": [0, 0, 0.93] + }, + "2.875": { + "vector": [0, 0, -0.3] + }, + "2.9583": { + "vector": [0, 0, 0] + } + } + }, + "magazine": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.3": { - "vector": [-7.36643, -0.63834, -10.92412], - "easing": "easeInOutBack" + "0.6667": { + "vector": [0, 0, 0] }, - "0.4": { - "vector": [-7.36643, -0.63834, -10.92412], - "easing": "easeInOutBack" + "0.9167": { + "vector": [0, 0, 0], + "easing": "easeInElastic" }, - "0.5": { - "vector": [-5.73105, 0.56832, -2.74459] + "1.1667": { + "vector": [0, 0, 0], + "easing": "easeInElastic" }, - "0.6": { - "vector": [-5.74094, 1.82028, -2.37506] + "1.4167": { + "vector": [-21, 0, -11] }, - "0.8": { - "vector": [-8.80119, -0.6625, -13.87839] - }, - "0.9": { - "vector": [-9.99781, -1.28863, -15.42107] - }, - "1.2": { - "vector": [-8.05387, -0.21402, -9.97165] - }, - "1.4": { - "vector": [-7.36061, -1.11472, -16.0572] - }, - "1.5": { - "vector": [-8.61369, -0.04771, -16.4108] - }, - "1.7": { - "vector": [-3.15746, 3.15575, -8.04933] - }, - "1.8": { - "vector": [-3.45287, 3.53372, -17.77362], + "1.5833": { + "vector": [-14, 0, -5.83], "easing": "easeInSine" }, - "2.2": { - "vector": [0, 0, 0], - "easing": "easeOutSine" + "1.7917": { + "vector": [0, 0, 0] }, - "2.3": { - "vector": [0.58201, -1.04064, 2.6563] - }, - "2.4": { - "vector": [0.32388, 0.39763, -2.15014] - }, - "2.5": { + "1.9167": { "vector": [0, 0, 0] } }, @@ -369,53 +434,33 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [-0.06, 0.49, -1.47] + "0.6667": { + "vector": [0, 0, 0] }, - "0.3": { - "vector": [-0.07, 0.48547, -0.71] + "0.9167": { + "vector": [0, -15, 0], + "easing": "easeInElastic" }, - "0.4": { - "vector": [-0.1, 0.9, -0.98] + "1.1667": { + "vector": [0, -15, 0], + "easing": "easeInElastic" }, - "0.5": { - "vector": [-0.11, 0, -1.03] - }, - "0.6": { - "vector": [-0.12, 0.84, -1.09] - }, - "0.8": { - "vector": [-0.15, 1.31, -0.2] - }, - "1.1": { - "vector": [-0.2, 1.53, -0.11] - }, - "1.2": { - "vector": [-0.18, 1.49, -0.11] - }, - "1.4": { - "vector": [-0.16, 1.44, -0.12] - }, - "1.5": { - "vector": [-0.63, 1.98, -0.12] - }, - "1.6": { - "vector": [-0.11, 1.29, -0.12] - }, - "1.7": { - "vector": [0.34, 1.21, -0.13] - }, - "1.8": { - "vector": [-0.45, 0.83, -0.11], + "1.4167": { + "vector": [0.21094, -3.16719, -0.98516], "easing": "easeInSine" }, - "2.2": { - "vector": [0.4, 0, -0.6] + "1.5833": { + "vector": [0.14, -2.94422, -0.47], + "easing": "easeInSine" }, - "2.4": { - "vector": [0.16, -0.15, 0.275] + "1.7083": { + "vector": [0.07, -3.12625, -0.09719], + "easing": "easeInSine" }, - "2.5": { + "1.7917": { + "vector": [0, 0, 0] + }, + "1.9167": { "vector": [0, 0, 0] } } @@ -425,33 +470,56 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, 0, 22.5] + "0.375": { + "vector": [0, 0, 0] }, - "0.2": { - "vector": [0, 0, 15] + "0.4583": { + "vector": [-3.81928, -8.59364, -9.17363] }, - "1.6": { - "vector": [0, 0, 15] + "0.5417": { + "vector": [0, 1.5, 1] }, - "1.7": { - "vector": [-17.62507, -32.8034, 18.28494] + "0.625": { + "vector": [0, 1.5, 1] }, - "1.8": { - "vector": [-15.46722, -16.63005, 1.48245] + "0.9167": { + "vector": [0, 1.5, 1] }, - "1.9": { + "1.0": { + "vector": [-1.80149, -4.34261, -11.56806] + }, + "1.9167": { + "vector": [-1.80149, -4.34261, -11.56806] + }, + "2.0417": { + "vector": [8.98588, -28.60432, 4.50464] + }, + "2.1667": { + "vector": [-22.62507, -32.8034, 18.28494] + }, + "2.2083": { + "vector": [-22.62507, -32.8034, 18.28494] + }, + "2.2917": { + "vector": [-15.46722, -16.63005, 1.48245], + "easing": "easeInElastic" + }, + "2.375": { + "vector": [-15.46722, -16.63005, 1.48245], + "easing": "easeInElastic" + }, + "2.4583": { "vector": [-15.14496, -21.26229, 5.31052], "easing": "easeOutSine" }, - "2.0": { + "2.5417": { "vector": [3.06668, -17.33275, 4.18047], "easing": "easeInOutSine" }, - "2.1": { - "vector": [0, 0, 22.5] + "2.6667": { + "vector": [-8.03996, -14.46909, -5.02907] }, - "2.2": { + "2.75": { "vector": [0, 0, 0] } }, @@ -459,30 +527,270 @@ "0.0": { "vector": [0, 0, 0] }, - "0.2": { + "0.375": { + "vector": [0, 0, 0] + }, + "0.4583": { + "vector": [1.89205, -2.68839, 4.36626] + }, + "0.5417": { "vector": [0, -4, 5] }, - "1.6": { + "0.625": { "vector": [0, -4, 5] }, - "1.7": { + "0.9167": { + "vector": [0, -4, 5] + }, + "1.0": { + "vector": [-0.3, -3.7, 5.6] + }, + "1.9167": { + "vector": [-0.3, -3.7, 5.6] + }, + "2.1667": { "vector": [-1, -2, 7] }, - "1.8": { - "vector": [-0.51, -1.43, 7.2] + "2.2083": { + "vector": [-1, -2, 7] }, - "1.9": { + "2.2917": { + "vector": [-0.51, -1.43, 7.2], + "easing": "easeInElastic" + }, + "2.375": { + "vector": [-0.51, -1.43, 7.2], + "easing": "easeInElastic" + }, + "2.4583": { "vector": [-0.51, -1.43, 7.2], "easing": "easeOutSine" }, - "2.0": { + "2.5417": { "vector": [0.29, -0.14, 6.76], "easing": "easeInOutSine" }, - "2.1": { + "2.6667": { "vector": [0.14, -2.57, 2.38] }, - "2.2": { + "2.75": { + "vector": [0, 0, 0] + } + } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.2917": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "0.4167": { + "vector": [0, 0, 1] + }, + "0.625": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "0.7083": { + "vector": [1, 1, -1.5], + "easing": "easeInSine" + }, + "0.7917": { + "vector": [-0.5, -0.5, 1.5] + }, + "1.0": { + "vector": [0.5, 0, 1.2], + "easing": "easeOutSine" + }, + "1.25": { + "vector": [-0.1, 0, 2] + }, + "1.5": { + "vector": [0.5, 0, 2], + "easing": "easeInElastic" + }, + "1.6667": { + "vector": [-0.5, 0, 2.2], + "easing": "linear" + }, + "1.75": { + "vector": [1.5, -0.7, 1.2], + "easing": "easeInSine" + }, + "1.9583": { + "vector": [-0.4, 0.4, -0.2], + "easing": "easeOutSine" + }, + "2.125": { + "vector": [0.2, 0, 2] + }, + "2.25": { + "vector": [1, 2, 1.8] + }, + "2.3333": { + "vector": [-1.5, -3, -1.5] + }, + "2.5417": { + "vector": [0.2, 1.5, 1.5] + }, + "2.75": { + "vector": [0, 0, -0.5], + "easing": "easeInElastic" + }, + "2.9167": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + } + }, + "sound_effects": { + "0.0": { + "effect": "m_4_reload_empty" + } + } + }, + "animation.m4.reload_normal": { + "loop": "hold_on_last_frame", + "animation_length": 2.75, + "bones": { + "0": { + "rotation": { + "0.0417": { + "vector": [0, 0, 0] + }, + "0.125": { + "vector": [1.18324, 1.40448, 3.98547] + }, + "0.3333": { + "vector": [-14.01, 2.98, -9.37] + }, + "0.4167": { + "vector": [-12.25012, 1.71575, -15.23679] + }, + "0.5": { + "vector": [-13.67625, 0.53753, -20.43357] + }, + "0.5417": { + "vector": [-14.36146, -0.34228, -23.99804] + }, + "0.625": { + "vector": [-15.36586, -0.75486, -21.85957] + }, + "0.7083": { + "vector": [-3.42984, -0.39385, -15.87027] + }, + "0.875": { + "vector": [-12.35117, -0.9689, -22.83651] + }, + "1.0417": { + "vector": [-16.3817, -0.19101, -19.94063] + }, + "1.2083": { + "vector": [-11.33329, -1.14849, -23.82073] + }, + "1.4167": { + "vector": [-10.66408, -4.02619, -38.55877], + "easing": "easeInSine" + }, + "1.5": { + "vector": [-13.44223, -4.57576, -41.51634] + }, + "1.5833": { + "vector": [-10.27854, -4.93547, -43.49053] + }, + "1.6667": { + "vector": [-9.91402, -5.63696, -47.44539] + }, + "1.7917": { + "vector": [-11.91402, -5.63696, -47.44539] + }, + "1.875": { + "vector": [-17.49684, -6.85391, -51.27861] + }, + "2.125": { + "vector": [-9.53304, 1.46221, -17.39249], + "easing": "easeInSine" + }, + "2.25": { + "vector": [-3.8135, -0.9118, -6.85724] + }, + "2.4167": { + "vector": [0, 0, -2] + }, + "2.5417": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0417": { + "vector": [0, 0, 0] + }, + "0.2917": { + "vector": [-1.1, 0.3, 1.9], + "easing": "easeInQuad" + }, + "0.4167": { + "vector": [-1.1, 0, 1.2], + "easing": "easeOutSine" + }, + "0.5417": { + "vector": [-1.1, 0, 1.4] + }, + "0.625": { + "vector": [-1.1, 0, 1.3] + }, + "0.7083": { + "vector": [-0.75494, -0.64671, 0.87721] + }, + "0.7917": { + "vector": [-1.1, 0, 1.3] + }, + "0.9583": { + "vector": [-0.95347, -0.36221, 1.21435] + }, + "1.125": { + "vector": [-0.84854, -0.60732, 1.04107] + }, + "1.2917": { + "vector": [-0.88449, -0.56099, 1.25543] + }, + "1.4167": { + "vector": [-0.89507, -0.06932, 1.3549] + }, + "1.5": { + "vector": [-1.16342, 0.21638, 1.44269] + }, + "1.5833": { + "vector": [-1.03823, 0.0689, 1.38061] + }, + "1.6667": { + "vector": [-0.91462, 0.05514, 1.36807] + }, + "1.7917": { + "vector": [-0.68888, -0.13612, 1.3186] + }, + "1.875": { + "vector": [-1.65765, 0.66955, 1.6243], + "easing": "easeInSine" + }, + "2.0417": { + "vector": [-0.74327, -0.11758, 1.00447], + "easing": "easeInSine" + }, + "2.1667": { + "vector": [-0.47388, 0.04235, 0.71917] + }, + "2.3333": { + "vector": [0, 0, 0.93] + }, + "2.4583": { + "vector": [0, 0, -0.3] + }, + "2.5417": { "vector": [0, 0, 0] } } @@ -492,100 +800,28 @@ "0.0": { "vector": [0, 0, 0] }, - "0.4": { + "0.6667": { "vector": [0, 0, 0] }, - "1.4": { - "vector": [0, 0, 0] + "0.9167": { + "vector": [0, 0, 0], + "easing": "easeInElastic" }, - "1.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] + "1.1667": { + "vector": [0, 0, 0], + "easing": "easeInElastic" }, - "0.4": { - "vector": [0, 0, 0] + "1.4167": { + "vector": [-21, 0, -11] }, - "0.7": { - "vector": [0, -13, 0] - }, - "1.2": { - "vector": [0, -13, 0], + "1.5833": { + "vector": [-14, 0, -5.83], "easing": "easeInSine" }, - "1.4": { + "1.7917": { "vector": [0, 0, 0] }, - "1.5": { - "vector": [0, 0, 0] - } - } - }, - "gun": { - "position": { - "vector": [0, 0, 0] - } - }, - "bolt": { - "position": { - "vector": [0, 0, 0] - } - } - }, - "sound_effects": { - "0.0": { - "effect": "m4reload" - } - } - }, - "animation.m4.reload2": { - "animation_length": 2, - "override_previous_animation": true, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [-7.36643, -0.63834, -10.92412], - "easing": "easeInOutBack" - }, - "0.4": { - "vector": [-7.36643, -0.63834, -10.92412], - "easing": "easeInOutBack" - }, - "0.5": { - "vector": [-5.73105, 0.56832, -2.74459] - }, - "0.6": { - "vector": [-5.74094, 1.82028, -2.37506] - }, - "0.8": { - "vector": [-8.80119, -0.6625, -13.87839] - }, - "0.9": { - "vector": [-9.99781, -1.28863, -15.42107] - }, - "1.2": { - "vector": [-8.05387, -0.21402, -9.97165] - }, - "1.4": { - "vector": [-7.36061, -1.11472, -16.0572] - }, - "1.5": { - "vector": [-8.61369, -0.04771, -16.4108] - }, - "1.7": { - "vector": [-3.15746, 3.15575, -8.04933] - }, - "1.9": { - "vector": [0.32388, 0.39763, -2.15014] - }, - "2.0": { + "1.9167": { "vector": [0, 0, 0] } }, @@ -593,46 +829,33 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [-0.06, 0.49, -1.47] + "0.6667": { + "vector": [0, 0, 0] }, - "0.3": { - "vector": [-0.07, 0.48547, -0.71] + "0.9167": { + "vector": [0, -15, 0], + "easing": "easeInElastic" }, - "0.4": { - "vector": [-0.1, 0.9, -0.98] + "1.1667": { + "vector": [0, -15, 0], + "easing": "easeInElastic" }, - "0.5": { - "vector": [-0.11, 0, -1.03] + "1.4167": { + "vector": [0.21094, -3.16719, -0.98516], + "easing": "easeInSine" }, - "0.6": { - "vector": [-0.12, 0.84, -1.09] + "1.5833": { + "vector": [0.14, -2.94422, -0.47], + "easing": "easeInSine" }, - "0.8": { - "vector": [-0.15, 1.31, -0.2] + "1.7083": { + "vector": [0.07, -3.12625, -0.09719], + "easing": "easeInSine" }, - "1.1": { - "vector": [-0.2, 1.53, -0.11] + "1.7917": { + "vector": [0, 0, 0] }, - "1.2": { - "vector": [-0.18, 1.49, -0.11] - }, - "1.4": { - "vector": [-0.16, 1.44, -0.12] - }, - "1.5": { - "vector": [-0.63, 1.98, -0.12] - }, - "1.6": { - "vector": [-0.11, 1.29, -0.12] - }, - "1.7": { - "vector": [0.34, 1.21, -0.13] - }, - "1.9": { - "vector": [0.16, -0.15, 0.275] - }, - "2.0": { + "1.9167": { "vector": [0, 0, 0] } } @@ -642,88 +865,129 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, 0, 22.5] - }, - "0.2": { - "vector": [0, 0, 15] - }, - "1.6": { - "vector": [0, 0, 15] - }, - "1.8": { - "vector": [0, 0, 22.5] - }, - "1.9": { + "0.375": { "vector": [0, 0, 0] + }, + "0.4583": { + "vector": [-3.81928, -8.59364, -9.17363] + }, + "0.5417": { + "vector": [0, 1.5, 1] + }, + "0.625": { + "vector": [0, 1.5, 1] + }, + "0.9167": { + "vector": [0, 1.5, 1] + }, + "1.0": { + "vector": [-1.80149, -4.34261, -11.56806] + }, + "1.9167": { + "vector": [-1.80149, -4.34261, -11.56806] + }, + "2.0417": { + "vector": [-3.81928, -8.59364, -9.17363] + }, + "2.2917": { + "vector": [0, 0, 0], + "easing": "easeInElastic" } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [0, -4, 5] - }, - "1.6": { - "vector": [0, -4, 5] - }, - "1.9": { + "0.375": { "vector": [0, 0, 0] + }, + "0.4583": { + "vector": [1.89205, -2.68839, 4.36626] + }, + "0.5417": { + "vector": [0, -4, 5] + }, + "0.625": { + "vector": [0, -4, 5] + }, + "0.9167": { + "vector": [0, -4, 5] + }, + "1.0": { + "vector": [-0.3, -3.7, 5.6] + }, + "1.9167": { + "vector": [-0.3, -3.7, 5.6] + }, + "2.0417": { + "vector": [1.89205, -2.68839, 4.36626] + }, + "2.2917": { + "vector": [0, 0, 0], + "easing": "easeInElastic" } } }, - "magazine": { + "camera": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.4": { - "vector": [0, 0, 0] + "0.2917": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" }, - "1.4": { - "vector": [0, 0, 0] + "0.4167": { + "vector": [0, 0, 1] }, - "1.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] + "0.625": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.7": { - "vector": [0, -13, 0] - }, - "1.2": { - "vector": [0, -13, 0], + "0.7083": { + "vector": [1, 1, -1.5], "easing": "easeInSine" }, - "1.4": { - "vector": [0, 0, 0] + "0.7917": { + "vector": [-0.5, -0.5, 1.5] + }, + "1.0": { + "vector": [0.5, 0, 1.2], + "easing": "easeOutSine" + }, + "1.25": { + "vector": [-0.1, 0, 2] }, "1.5": { - "vector": [0, 0, 0] + "vector": [0.5, 0, 2], + "easing": "easeInElastic" + }, + "1.6667": { + "vector": [-0.5, 0, 2.2], + "easing": "linear" + }, + "1.75": { + "vector": [1.5, -0.7, 1.2], + "easing": "easeInSine" + }, + "2.0417": { + "vector": [0, 0, 1.5], + "easing": "linear" + }, + "2.25": { + "vector": [0, 0, -0.75], + "easing": "linear" + }, + "2.4167": { + "vector": [0, 0, 0], + "easing": "linear" } } - }, - "gun": { - "position": { - "vector": [0, 0, 0] - } - }, - "bolt": { - "position": { - "vector": [0, 0, 0] - } } }, "sound_effects": { "0.0": { - "effect": "m4reload2" + "effect": "m_4_reload_normal" } } } diff --git a/src/main/resources/assets/target/animations/m4.animation.json b/src/main/resources/assets/target/animations/m4.animation.json index 3ec38b421..ea00081da 100644 --- a/src/main/resources/assets/target/animations/m4.animation.json +++ b/src/main/resources/assets/target/animations/m4.animation.json @@ -40,6 +40,24 @@ "vector": [0, 0, 0] } } + }, + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.4167": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0.25, -0.5, 0.5], + "easing": "easeInSine" + }, + "0.5833": { + "vector": [0, 0, 0], + "easing": "easeOutSine" + } + } } } }, @@ -172,107 +190,23 @@ "easing": "easeOutSine" } } - } - } - }, - "animation.m4.hit": { - "animation_length": 0.6, - "bones": { - "0": { + }, + "camera": { "rotation": { "0.0": { - "vector": [0, 0, 0] + "vector": [-0.3, -0.3, 0.3] }, "0.2": { - "vector": [-147.50541, 34.52809, 101.28078], - "easing": "easeOutSine" + "vector": [0.3, 0, -0.3] }, "0.4": { - "vector": [-13.26827, 5.92455, 35.88217], - "easing": "easeInSine" + "vector": [-0.3, 0.3, 0.3] }, "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] + "vector": [0.3, 0, -0.3] }, - "0.1": { - "vector": [3.36, -2.44, -4.42] - }, - "0.2": { - "vector": [8.55, -0.7, -9.85], - "easing": "easeOutSine" - }, - "0.4": { - "vector": [0.97, 0.75, -3.12], - "easing": "easeInSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, - "Righthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [112.5, 0, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 15, -10], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [135, 0, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [-4.29, 19.16875, -9.15] - }, - "0.3": { - "vector": [-6, 16, -10], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" + "0.8": { + "vector": [-0.3, -0.3, 0.3] } } } @@ -296,62 +230,203 @@ } } }, - "animation.m4.reload": { - "animation_length": 2.7, - "override_previous_animation": true, + "animation.m4.reload_empty": { + "loop": "hold_on_last_frame", + "animation_length": 3.125, "bones": { "0": { + "rotation": { + "0.0417": { + "vector": [0, 0, 0] + }, + "0.125": { + "vector": [1.18324, 1.40448, 3.98547] + }, + "0.3333": { + "vector": [-14.01, 2.98, -9.37] + }, + "0.4167": { + "vector": [-12.25012, 1.71575, -15.23679] + }, + "0.5": { + "vector": [-13.67625, 0.53753, -20.43357] + }, + "0.5417": { + "vector": [-14.36146, -0.34228, -23.99804] + }, + "0.625": { + "vector": [-15.36586, -0.75486, -21.85957] + }, + "0.7083": { + "vector": [-3.42984, -0.39385, -15.87027] + }, + "0.875": { + "vector": [-12.35117, -0.9689, -22.83651] + }, + "1.0417": { + "vector": [-16.3817, -0.19101, -19.94063] + }, + "1.2083": { + "vector": [-11.33329, -1.14849, -23.82073] + }, + "1.4167": { + "vector": [-10.66408, -4.02619, -38.55877], + "easing": "easeInSine" + }, + "1.5": { + "vector": [-13.44223, -4.57576, -41.51634] + }, + "1.5833": { + "vector": [-10.27854, -4.93547, -43.49053] + }, + "1.6667": { + "vector": [-9.91402, -5.63696, -47.44539] + }, + "1.7917": { + "vector": [-11.91402, -5.63696, -47.44539] + }, + "1.875": { + "vector": [-17.49684, -6.85391, -51.27861] + }, + "2.25": { + "vector": [-13.3424, -0.71426, -23.88584], + "easing": "easeInElastic" + }, + "2.3333": { + "vector": [-13.9971, 5.8821, -30.62885], + "easing": "easeInElastic" + }, + "2.4583": { + "vector": [-13.35402, 0.44077, -19.02098], + "easing": "easeInElastic" + }, + "2.5417": { + "vector": [-9.53304, 1.46221, -17.39249] + }, + "2.6667": { + "vector": [-3.8135, -0.9118, -6.85724] + }, + "2.8333": { + "vector": [0, 0, -2] + }, + "2.9583": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0417": { + "vector": [0, 0, 0] + }, + "0.2917": { + "vector": [-1.1, 0.3, 1.9], + "easing": "easeInQuad" + }, + "0.4167": { + "vector": [-1.1, 0, 1.2], + "easing": "easeOutSine" + }, + "0.5417": { + "vector": [-1.1, 0, 1.4] + }, + "0.625": { + "vector": [-1.1, 0, 1.3] + }, + "0.7083": { + "vector": [-0.75494, -0.64671, 0.87721] + }, + "0.7917": { + "vector": [-1.1, 0, 1.3] + }, + "0.9583": { + "vector": [-0.95347, -0.36221, 1.21435] + }, + "1.125": { + "vector": [-0.84854, -0.60732, 1.04107] + }, + "1.2917": { + "vector": [-0.88449, -0.56099, 1.25543] + }, + "1.4167": { + "vector": [-0.89507, -0.06932, 1.3549] + }, + "1.5": { + "vector": [-1.16342, 0.21638, 1.44269] + }, + "1.5833": { + "vector": [-1.03823, 0.0689, 1.38061] + }, + "1.6667": { + "vector": [-0.91462, 0.05514, 1.36807] + }, + "1.7917": { + "vector": [-0.68888, -0.13612, 1.3186] + }, + "1.875": { + "vector": [-1.65765, 0.66955, 1.6243], + "easing": "easeInSine" + }, + "2.0": { + "vector": [-0.8044, 0.0239, 1.36148], + "easing": "easeOutSine" + }, + "2.125": { + "vector": [-0.55391, 0.01857, 1.28596], + "easing": "easeInSine" + }, + "2.25": { + "vector": [-0.62538, 0.12257, 1.2652] + }, + "2.3333": { + "vector": [-1.17857, -0.12293, 1.26252], + "easing": "easeInElastic" + }, + "2.375": { + "vector": [-1.14634, -0.11121, 1.26544] + }, + "2.4583": { + "vector": [-0.62538, 0.12257, 1.2652] + }, + "2.5833": { + "vector": [-0.47388, 0.04235, 0.71917] + }, + "2.75": { + "vector": [0, 0, 0.93] + }, + "2.875": { + "vector": [0, 0, -0.3] + }, + "2.9583": { + "vector": [0, 0, 0] + } + } + }, + "magazine": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.3": { - "vector": [-7.36643, -0.63834, -10.92412], - "easing": "easeInOutBack" + "0.6667": { + "vector": [0, 0, 0] }, - "0.4": { - "vector": [-7.36643, -0.63834, -10.92412], - "easing": "easeInOutBack" + "0.9167": { + "vector": [0, 0, 0], + "easing": "easeInElastic" }, - "0.5": { - "vector": [-5.73105, 0.56832, -2.74459] + "1.1667": { + "vector": [0, 0, 0], + "easing": "easeInElastic" }, - "0.6": { - "vector": [-5.74094, 1.82028, -2.37506] + "1.4167": { + "vector": [-21, 0, -11] }, - "0.8": { - "vector": [-8.80119, -0.6625, -13.87839] - }, - "0.9": { - "vector": [-9.99781, -1.28863, -15.42107] - }, - "1.2": { - "vector": [-8.05387, -0.21402, -9.97165] - }, - "1.4": { - "vector": [-7.36061, -1.11472, -16.0572] - }, - "1.5": { - "vector": [-8.61369, -0.04771, -16.4108] - }, - "1.7": { - "vector": [-3.15746, 3.15575, -8.04933] - }, - "1.8": { - "vector": [-3.45287, 3.53372, -17.77362], + "1.5833": { + "vector": [-14, 0, -5.83], "easing": "easeInSine" }, - "2.2": { - "vector": [0, 0, 0], - "easing": "easeOutSine" + "1.7917": { + "vector": [0, 0, 0] }, - "2.3": { - "vector": [0.58201, -1.04064, 2.6563] - }, - "2.4": { - "vector": [0.32388, 0.39763, -2.15014] - }, - "2.5": { + "1.9167": { "vector": [0, 0, 0] } }, @@ -359,53 +434,33 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [-0.06, 0.49, -1.47] + "0.6667": { + "vector": [0, 0, 0] }, - "0.3": { - "vector": [-0.07, 0.48547, -0.71] + "0.9167": { + "vector": [0, -15, 0], + "easing": "easeInElastic" }, - "0.4": { - "vector": [-0.1, 0.9, -0.98] + "1.1667": { + "vector": [0, -15, 0], + "easing": "easeInElastic" }, - "0.5": { - "vector": [-0.11, 0, -1.03] - }, - "0.6": { - "vector": [-0.12, 0.84, -1.09] - }, - "0.8": { - "vector": [-0.15, 1.31, -0.2] - }, - "1.1": { - "vector": [-0.2, 1.53, -0.11] - }, - "1.2": { - "vector": [-0.18, 1.49, -0.11] - }, - "1.4": { - "vector": [-0.16, 1.44, -0.12] - }, - "1.5": { - "vector": [-0.63, 1.98, -0.12] - }, - "1.6": { - "vector": [-0.11, 1.29, -0.12] - }, - "1.7": { - "vector": [0.34, 1.21, -0.13] - }, - "1.8": { - "vector": [-0.45, 0.83, -0.11], + "1.4167": { + "vector": [0.21094, -3.16719, -0.98516], "easing": "easeInSine" }, - "2.2": { - "vector": [0.4, 0, -0.6] + "1.5833": { + "vector": [0.14, -2.94422, -0.47], + "easing": "easeInSine" }, - "2.4": { - "vector": [0.16, -0.15, 0.275] + "1.7083": { + "vector": [0.07, -3.12625, -0.09719], + "easing": "easeInSine" }, - "2.5": { + "1.7917": { + "vector": [0, 0, 0] + }, + "1.9167": { "vector": [0, 0, 0] } } @@ -415,33 +470,56 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, 0, 22.5] + "0.375": { + "vector": [0, 0, 0] }, - "0.2": { - "vector": [0, 0, 15] + "0.4583": { + "vector": [-3.81928, -8.59364, -9.17363] }, - "1.6": { - "vector": [0, 0, 15] + "0.5417": { + "vector": [0, 1.5, 1] }, - "1.7": { - "vector": [-17.62507, -32.8034, 18.28494] + "0.625": { + "vector": [0, 1.5, 1] }, - "1.8": { - "vector": [-15.46722, -16.63005, 1.48245] + "0.9167": { + "vector": [0, 1.5, 1] }, - "1.9": { + "1.0": { + "vector": [-1.80149, -4.34261, -11.56806] + }, + "1.9167": { + "vector": [-1.80149, -4.34261, -11.56806] + }, + "2.0417": { + "vector": [8.98588, -28.60432, 4.50464] + }, + "2.1667": { + "vector": [-22.62507, -32.8034, 18.28494] + }, + "2.2083": { + "vector": [-22.62507, -32.8034, 18.28494] + }, + "2.2917": { + "vector": [-15.46722, -16.63005, 1.48245], + "easing": "easeInElastic" + }, + "2.375": { + "vector": [-15.46722, -16.63005, 1.48245], + "easing": "easeInElastic" + }, + "2.4583": { "vector": [-15.14496, -21.26229, 5.31052], "easing": "easeOutSine" }, - "2.0": { + "2.5417": { "vector": [3.06668, -17.33275, 4.18047], "easing": "easeInOutSine" }, - "2.1": { - "vector": [0, 0, 22.5] + "2.6667": { + "vector": [-8.03996, -14.46909, -5.02907] }, - "2.2": { + "2.75": { "vector": [0, 0, 0] } }, @@ -449,42 +527,272 @@ "0.0": { "vector": [0, 0, 0] }, - "0.2": { + "0.375": { + "vector": [0, 0, 0] + }, + "0.4583": { + "vector": [1.89205, -2.68839, 4.36626] + }, + "0.5417": { "vector": [0, -4, 5] }, - "1.6": { + "0.625": { "vector": [0, -4, 5] }, - "1.7": { + "0.9167": { + "vector": [0, -4, 5] + }, + "1.0": { + "vector": [-0.3, -3.7, 5.6] + }, + "1.9167": { + "vector": [-0.3, -3.7, 5.6] + }, + "2.1667": { "vector": [-1, -2, 7] }, - "1.8": { - "vector": [-0.51, -1.43, 7.2] + "2.2083": { + "vector": [-1, -2, 7] }, - "1.9": { + "2.2917": { + "vector": [-0.51, -1.43, 7.2], + "easing": "easeInElastic" + }, + "2.375": { + "vector": [-0.51, -1.43, 7.2], + "easing": "easeInElastic" + }, + "2.4583": { "vector": [-0.51, -1.43, 7.2], "easing": "easeOutSine" }, - "2.0": { + "2.5417": { "vector": [0.29, -0.14, 6.76], "easing": "easeInOutSine" }, - "2.1": { + "2.6667": { "vector": [0.14, -2.57, 2.38] }, - "2.2": { + "2.75": { "vector": [0, 0, 0] } } }, - "gun": { - "position": { - "vector": [0, 0, 0] + "camera": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.2917": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "0.4167": { + "vector": [0, 0, 1] + }, + "0.625": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "0.7083": { + "vector": [1, 1, -1.5], + "easing": "easeInSine" + }, + "0.7917": { + "vector": [-0.5, -0.5, 1.5] + }, + "1.0": { + "vector": [0.5, 0, 1.2], + "easing": "easeOutSine" + }, + "1.25": { + "vector": [-0.1, 0, 2] + }, + "1.5": { + "vector": [0.5, 0, 2], + "easing": "easeInElastic" + }, + "1.6667": { + "vector": [-0.5, 0, 2.2], + "easing": "linear" + }, + "1.75": { + "vector": [1.5, -0.7, 1.2], + "easing": "easeInSine" + }, + "1.9583": { + "vector": [-0.4, 0.4, -0.2], + "easing": "easeOutSine" + }, + "2.125": { + "vector": [0.2, 0, 2] + }, + "2.25": { + "vector": [1, 2, 1.8] + }, + "2.3333": { + "vector": [-1.5, -3, -1.5] + }, + "2.5417": { + "vector": [0.2, 1.5, 1.5] + }, + "2.75": { + "vector": [0, 0, -0.5], + "easing": "easeInElastic" + }, + "2.9167": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } } - }, - "bolt": { + } + }, + "sound_effects": { + "0.0": { + "effect": "m_4_reload_empty" + } + } + }, + "animation.m4.reload_normal": { + "loop": "hold_on_last_frame", + "animation_length": 2.75, + "bones": { + "0": { + "rotation": { + "0.0417": { + "vector": [0, 0, 0] + }, + "0.125": { + "vector": [1.18324, 1.40448, 3.98547] + }, + "0.3333": { + "vector": [-14.01, 2.98, -9.37] + }, + "0.4167": { + "vector": [-12.25012, 1.71575, -15.23679] + }, + "0.5": { + "vector": [-13.67625, 0.53753, -20.43357] + }, + "0.5417": { + "vector": [-14.36146, -0.34228, -23.99804] + }, + "0.625": { + "vector": [-15.36586, -0.75486, -21.85957] + }, + "0.7083": { + "vector": [-3.42984, -0.39385, -15.87027] + }, + "0.875": { + "vector": [-12.35117, -0.9689, -22.83651] + }, + "1.0417": { + "vector": [-16.3817, -0.19101, -19.94063] + }, + "1.2083": { + "vector": [-11.33329, -1.14849, -23.82073] + }, + "1.4167": { + "vector": [-10.66408, -4.02619, -38.55877], + "easing": "easeInSine" + }, + "1.5": { + "vector": [-13.44223, -4.57576, -41.51634] + }, + "1.5833": { + "vector": [-10.27854, -4.93547, -43.49053] + }, + "1.6667": { + "vector": [-9.91402, -5.63696, -47.44539] + }, + "1.7917": { + "vector": [-11.91402, -5.63696, -47.44539] + }, + "1.875": { + "vector": [-17.49684, -6.85391, -51.27861] + }, + "2.125": { + "vector": [-9.53304, 1.46221, -17.39249], + "easing": "easeInSine" + }, + "2.25": { + "vector": [-3.8135, -0.9118, -6.85724] + }, + "2.4167": { + "vector": [0, 0, -2] + }, + "2.5417": { + "vector": [0, 0, 0] + } + }, "position": { - "vector": [0, 0, 0] + "0.0417": { + "vector": [0, 0, 0] + }, + "0.2917": { + "vector": [-1.1, 0.3, 1.9], + "easing": "easeInQuad" + }, + "0.4167": { + "vector": [-1.1, 0, 1.2], + "easing": "easeOutSine" + }, + "0.5417": { + "vector": [-1.1, 0, 1.4] + }, + "0.625": { + "vector": [-1.1, 0, 1.3] + }, + "0.7083": { + "vector": [-0.75494, -0.64671, 0.87721] + }, + "0.7917": { + "vector": [-1.1, 0, 1.3] + }, + "0.9583": { + "vector": [-0.95347, -0.36221, 1.21435] + }, + "1.125": { + "vector": [-0.84854, -0.60732, 1.04107] + }, + "1.2917": { + "vector": [-0.88449, -0.56099, 1.25543] + }, + "1.4167": { + "vector": [-0.89507, -0.06932, 1.3549] + }, + "1.5": { + "vector": [-1.16342, 0.21638, 1.44269] + }, + "1.5833": { + "vector": [-1.03823, 0.0689, 1.38061] + }, + "1.6667": { + "vector": [-0.91462, 0.05514, 1.36807] + }, + "1.7917": { + "vector": [-0.68888, -0.13612, 1.3186] + }, + "1.875": { + "vector": [-1.65765, 0.66955, 1.6243], + "easing": "easeInSine" + }, + "2.0417": { + "vector": [-0.74327, -0.11758, 1.00447], + "easing": "easeInSine" + }, + "2.1667": { + "vector": [-0.47388, 0.04235, 0.71917] + }, + "2.3333": { + "vector": [0, 0, 0.93] + }, + "2.4583": { + "vector": [0, 0, -0.3] + }, + "2.5417": { + "vector": [0, 0, 0] + } } }, "magazine": { @@ -492,90 +800,28 @@ "0.0": { "vector": [0, 0, 0] }, - "0.4": { + "0.6667": { "vector": [0, 0, 0] }, - "1.4": { - "vector": [0, 0, 0] + "0.9167": { + "vector": [0, 0, 0], + "easing": "easeInElastic" }, - "1.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] + "1.1667": { + "vector": [0, 0, 0], + "easing": "easeInElastic" }, - "0.4": { - "vector": [0, 0, 0] + "1.4167": { + "vector": [-21, 0, -11] }, - "0.7": { - "vector": [0, -13, 0] - }, - "1.2": { - "vector": [0, -13, 0], + "1.5833": { + "vector": [-14, 0, -5.83], "easing": "easeInSine" }, - "1.4": { + "1.7917": { "vector": [0, 0, 0] }, - "1.5": { - "vector": [0, 0, 0] - } - } - } - }, - "sound_effects": { - "0.0": { - "effect": "m4reload" - } - } - }, - "animation.m4.reload2": { - "animation_length": 2, - "override_previous_animation": true, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [-7.36643, -0.63834, -10.92412], - "easing": "easeInOutBack" - }, - "0.4": { - "vector": [-7.36643, -0.63834, -10.92412], - "easing": "easeInOutBack" - }, - "0.5": { - "vector": [-5.73105, 0.56832, -2.74459] - }, - "0.6": { - "vector": [-5.74094, 1.82028, -2.37506] - }, - "0.8": { - "vector": [-8.80119, -0.6625, -13.87839] - }, - "0.9": { - "vector": [-9.99781, -1.28863, -15.42107] - }, - "1.2": { - "vector": [-8.05387, -0.21402, -9.97165] - }, - "1.4": { - "vector": [-7.36061, -1.11472, -16.0572] - }, - "1.5": { - "vector": [-8.61369, -0.04771, -16.4108] - }, - "1.7": { - "vector": [-3.15746, 3.15575, -8.04933] - }, - "1.9": { - "vector": [0.32388, 0.39763, -2.15014] - }, - "2.0": { + "1.9167": { "vector": [0, 0, 0] } }, @@ -583,46 +829,33 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [-0.06, 0.49, -1.47] + "0.6667": { + "vector": [0, 0, 0] }, - "0.3": { - "vector": [-0.07, 0.48547, -0.71] + "0.9167": { + "vector": [0, -15, 0], + "easing": "easeInElastic" }, - "0.4": { - "vector": [-0.1, 0.9, -0.98] + "1.1667": { + "vector": [0, -15, 0], + "easing": "easeInElastic" }, - "0.5": { - "vector": [-0.11, 0, -1.03] + "1.4167": { + "vector": [0.21094, -3.16719, -0.98516], + "easing": "easeInSine" }, - "0.6": { - "vector": [-0.12, 0.84, -1.09] + "1.5833": { + "vector": [0.14, -2.94422, -0.47], + "easing": "easeInSine" }, - "0.8": { - "vector": [-0.15, 1.31, -0.2] + "1.7083": { + "vector": [0.07, -3.12625, -0.09719], + "easing": "easeInSine" }, - "1.1": { - "vector": [-0.2, 1.53, -0.11] + "1.7917": { + "vector": [0, 0, 0] }, - "1.2": { - "vector": [-0.18, 1.49, -0.11] - }, - "1.4": { - "vector": [-0.16, 1.44, -0.12] - }, - "1.5": { - "vector": [-0.63, 1.98, -0.12] - }, - "1.6": { - "vector": [-0.11, 1.29, -0.12] - }, - "1.7": { - "vector": [0.34, 1.21, -0.13] - }, - "1.9": { - "vector": [0.16, -0.15, 0.275] - }, - "2.0": { + "1.9167": { "vector": [0, 0, 0] } } @@ -632,88 +865,129 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, 0, 22.5] - }, - "0.2": { - "vector": [0, 0, 15] - }, - "1.6": { - "vector": [0, 0, 15] - }, - "1.8": { - "vector": [0, 0, 22.5] - }, - "1.9": { + "0.375": { "vector": [0, 0, 0] + }, + "0.4583": { + "vector": [-3.81928, -8.59364, -9.17363] + }, + "0.5417": { + "vector": [0, 1.5, 1] + }, + "0.625": { + "vector": [0, 1.5, 1] + }, + "0.9167": { + "vector": [0, 1.5, 1] + }, + "1.0": { + "vector": [-1.80149, -4.34261, -11.56806] + }, + "1.9167": { + "vector": [-1.80149, -4.34261, -11.56806] + }, + "2.0417": { + "vector": [-3.81928, -8.59364, -9.17363] + }, + "2.2917": { + "vector": [0, 0, 0], + "easing": "easeInElastic" } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [0, -4, 5] - }, - "1.6": { - "vector": [0, -4, 5] - }, - "1.9": { + "0.375": { "vector": [0, 0, 0] + }, + "0.4583": { + "vector": [1.89205, -2.68839, 4.36626] + }, + "0.5417": { + "vector": [0, -4, 5] + }, + "0.625": { + "vector": [0, -4, 5] + }, + "0.9167": { + "vector": [0, -4, 5] + }, + "1.0": { + "vector": [-0.3, -3.7, 5.6] + }, + "1.9167": { + "vector": [-0.3, -3.7, 5.6] + }, + "2.0417": { + "vector": [1.89205, -2.68839, 4.36626] + }, + "2.2917": { + "vector": [0, 0, 0], + "easing": "easeInElastic" } } }, - "gun": { - "position": { - "vector": [0, 0, 0] - } - }, - "bolt": { - "position": { - "vector": [0, 0, 0] - } - }, - "magazine": { + "camera": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.4": { - "vector": [0, 0, 0] + "0.2917": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" }, - "1.4": { - "vector": [0, 0, 0] + "0.4167": { + "vector": [0, 0, 1] }, - "1.5": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] + "0.625": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.7": { - "vector": [0, -13, 0] - }, - "1.2": { - "vector": [0, -13, 0], + "0.7083": { + "vector": [1, 1, -1.5], "easing": "easeInSine" }, - "1.4": { - "vector": [0, 0, 0] + "0.7917": { + "vector": [-0.5, -0.5, 1.5] + }, + "1.0": { + "vector": [0.5, 0, 1.2], + "easing": "easeOutSine" + }, + "1.25": { + "vector": [-0.1, 0, 2] }, "1.5": { - "vector": [0, 0, 0] + "vector": [0.5, 0, 2], + "easing": "easeInElastic" + }, + "1.6667": { + "vector": [-0.5, 0, 2.2], + "easing": "linear" + }, + "1.75": { + "vector": [1.5, -0.7, 1.2], + "easing": "easeInSine" + }, + "2.0417": { + "vector": [0, 0, 1.5], + "easing": "linear" + }, + "2.25": { + "vector": [0, 0, -0.75], + "easing": "linear" + }, + "2.4167": { + "vector": [0, 0, 0], + "easing": "linear" } } } }, "sound_effects": { "0.0": { - "effect": "m4reload2" + "effect": "m_4_reload_normal" } } } diff --git a/src/main/resources/assets/target/animations/m79.animation.json b/src/main/resources/assets/target/animations/m79.animation.json index 29de73e27..ceb517e47 100644 --- a/src/main/resources/assets/target/animations/m79.animation.json +++ b/src/main/resources/assets/target/animations/m79.animation.json @@ -112,19 +112,19 @@ "camera": { "rotation": { "0.0": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] }, "0.2": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.4": { - "vector": [-0.5, 0.5, 0.5] + "vector": [-0.3, 0.3, 0.3] }, "0.6": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.8": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] } } } diff --git a/src/main/resources/assets/target/animations/rpg.animation.json b/src/main/resources/assets/target/animations/rpg.animation.json index e246dee25..d2302d986 100644 --- a/src/main/resources/assets/target/animations/rpg.animation.json +++ b/src/main/resources/assets/target/animations/rpg.animation.json @@ -138,19 +138,19 @@ "camera": { "rotation": { "0.0": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] }, "0.2": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.4": { - "vector": [-0.5, 0.5, 0.5] + "vector": [-0.3, 0.3, 0.3] }, "0.6": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.8": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] } } } diff --git a/src/main/resources/assets/target/animations/rpk.animation.json b/src/main/resources/assets/target/animations/rpk.animation.json index ffad76a92..527185881 100644 --- a/src/main/resources/assets/target/animations/rpk.animation.json +++ b/src/main/resources/assets/target/animations/rpk.animation.json @@ -259,19 +259,19 @@ "camera": { "rotation": { "0.0": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] }, "0.2": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.4": { - "vector": [-0.5, 0.5, 0.5] + "vector": [-0.3, 0.3, 0.3] }, "0.6": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.8": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] } } } diff --git a/src/main/resources/assets/target/animations/sks.animation.json b/src/main/resources/assets/target/animations/sks.animation.json index dadc01ba3..a6b37fefa 100644 --- a/src/main/resources/assets/target/animations/sks.animation.json +++ b/src/main/resources/assets/target/animations/sks.animation.json @@ -104,19 +104,19 @@ "camera": { "rotation": { "0.0": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] }, "0.2": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.4": { - "vector": [-0.5, 0.5, 0.5] + "vector": [-0.3, 0.3, 0.3] }, "0.6": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.8": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] } } } diff --git a/src/main/resources/assets/target/animations/svd.animation.json b/src/main/resources/assets/target/animations/svd.animation.json index 3c64fed12..87c155316 100644 --- a/src/main/resources/assets/target/animations/svd.animation.json +++ b/src/main/resources/assets/target/animations/svd.animation.json @@ -110,19 +110,19 @@ "camera": { "rotation": { "0.0": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] }, "0.2": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.4": { - "vector": [-0.5, 0.5, 0.5] + "vector": [-0.3, 0.3, 0.3] }, "0.6": { - "vector": [0.5, 0, -0.5] + "vector": [0.3, 0, -0.3] }, "0.8": { - "vector": [-0.5, -0.5, 0.5] + "vector": [-0.3, -0.3, 0.3] } } } diff --git a/src/main/resources/assets/target/geo/hk416.geo.json b/src/main/resources/assets/target/geo/hk416.geo.json index b6ddfa793..e2fd0da8c 100644 --- a/src/main/resources/assets/target/geo/hk416.geo.json +++ b/src/main/resources/assets/target/geo/hk416.geo.json @@ -9517,6 +9517,10 @@ } } ] + }, + { + "name": "camera", + "pivot": [3.17141, 5.16276, 9.77702] } ] } diff --git a/src/main/resources/assets/target/geo/m4.geo.json b/src/main/resources/assets/target/geo/m4.geo.json index d9db28895..7721cabbc 100644 --- a/src/main/resources/assets/target/geo/m4.geo.json +++ b/src/main/resources/assets/target/geo/m4.geo.json @@ -10973,6 +10973,8 @@ { "origin": [-0.11171, 2.19333, -22.59329], "size": [0.21733, 0.12256, 1.49725], + "pivot": [-0.00305, 1.76437, -18.31002], + "rotation": [0, 0, 0], "uv": { "north": {"uv": [79, 27], "uv_size": [0.25, 0.25]}, "east": {"uv": [63, 19], "uv_size": [1.5, 0.25]}, @@ -11894,6 +11896,10 @@ } } ] + }, + { + "name": "camera", + "pivot": [3.17141, 5.16276, 9.77702] } ] } diff --git a/src/main/resources/assets/target/sounds/hk_416/hk_416_reload_empty.ogg b/src/main/resources/assets/target/sounds/hk_416/hk_416_reload_empty.ogg index 843325b53..60d6e8a8f 100644 Binary files a/src/main/resources/assets/target/sounds/hk_416/hk_416_reload_empty.ogg and b/src/main/resources/assets/target/sounds/hk_416/hk_416_reload_empty.ogg differ diff --git a/src/main/resources/assets/target/sounds/hk_416/hk_416_reload_normal.ogg b/src/main/resources/assets/target/sounds/hk_416/hk_416_reload_normal.ogg index 215a7133a..b58431f72 100644 Binary files a/src/main/resources/assets/target/sounds/hk_416/hk_416_reload_normal.ogg and b/src/main/resources/assets/target/sounds/hk_416/hk_416_reload_normal.ogg differ diff --git a/src/main/resources/assets/target/sounds/m_4/m_4_reload_empty.ogg b/src/main/resources/assets/target/sounds/m_4/m_4_reload_empty.ogg index 843325b53..60d6e8a8f 100644 Binary files a/src/main/resources/assets/target/sounds/m_4/m_4_reload_empty.ogg and b/src/main/resources/assets/target/sounds/m_4/m_4_reload_empty.ogg differ diff --git a/src/main/resources/assets/target/sounds/m_4/m_4_reload_normal.ogg b/src/main/resources/assets/target/sounds/m_4/m_4_reload_normal.ogg index 215a7133a..b58431f72 100644 Binary files a/src/main/resources/assets/target/sounds/m_4/m_4_reload_normal.ogg and b/src/main/resources/assets/target/sounds/m_4/m_4_reload_normal.ogg differ