diff --git a/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java b/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java index 43bba3885..2aed4168a 100644 --- a/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/AK47ItemModel.java @@ -79,15 +79,21 @@ public class AK47ItemModel extends GeoModel { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { - shen.setPosZ(0.5f * (float) fp); + shen.setPosZ(0.8f * (float) fp); } else { - shen.setPosZ((float) fp); + shen.setPosZ(1.11f * (float) fp); + } + + if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { + shen.setPosY(0.01f * (float) fp); + } else { + shen.setPosY(0.1f * (float) fp); } if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { shen.setRotX(0.003f * (float) fp); } else { - shen.setRotX(0.02f * (float) fp); + shen.setRotX(0.025f * (float) fp); } if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).recoilHorizon == 1) { diff --git a/src/main/java/net/mcreator/target/client/model/item/MarlinItemModel.java b/src/main/java/net/mcreator/target/client/model/item/MarlinItemModel.java index a461fd0b7..59e60f181 100644 --- a/src/main/java/net/mcreator/target/client/model/item/MarlinItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/MarlinItemModel.java @@ -31,6 +31,7 @@ public class MarlinItemModel extends GeoModel { public void setCustomAnimations(MarlinItem animatable, long instanceId, AnimationState animationState) { CoreGeoBone gun = getAnimationProcessor().getBone("bone"); CoreGeoBone shen = getAnimationProcessor().getBone("shen"); + CoreGeoBone jichui = getAnimationProcessor().getBone("jichui"); Player player = Minecraft.getInstance().player; ItemStack stack = player.getMainHandItem(); @@ -55,9 +56,9 @@ public class MarlinItemModel extends GeoModel { fp = player.getPersistentData().getDouble("fire_pos"); if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { - shen.setPosZ(3f * (float) fp); + shen.setPosZ(1.5f * (float) fp); } else { - shen.setPosZ(4f * (float) fp); + shen.setPosZ(2f * (float) fp); } if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { @@ -80,6 +81,10 @@ public class MarlinItemModel extends GeoModel { CoreGeoBone flare = getAnimationProcessor().getBone("flare"); + if (stack.getOrCreateTag().getInt("fire_animation") > 0) { + jichui.setRotX(-0.52f); + } + if (stack.getOrCreateTag().getDouble("flash_time") > 0) { flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); diff --git a/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java b/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java index a9262b948..b3e72fb4c 100644 --- a/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java +++ b/src/main/java/net/mcreator/target/client/model/item/SvdItemModel.java @@ -37,10 +37,14 @@ public class SvdItemModel extends GeoModel { CoreGeoBone bt1 = getAnimationProcessor().getBone("bullton1"); CoreGeoBone bt2 = getAnimationProcessor().getBone("bullton2"); CoreGeoBone shuan = getAnimationProcessor().getBone("shuan"); + CoreGeoBone glass = getAnimationProcessor().getBone("glass"); Player player = Minecraft.getInstance().player; ItemStack stack = player.getMainHandItem(); + double vy = 0; + vy = player.getPersistentData().getDouble("vy"); + if (stack.getOrCreateTag().getDouble("gj") == 1) { bolt.setPosZ(3.25f); } @@ -80,6 +84,8 @@ public class SvdItemModel extends GeoModel { holo.setScaleY(0); sight.setScaleX(1f); sight.setScaleY(1f); + glass.setScaleX(0); + glass.setScaleY(0); } CoreGeoBone shen = getAnimationProcessor().getBone("shen"); @@ -109,6 +115,10 @@ public class SvdItemModel extends GeoModel { shuan.setPosZ(2.4f * (float) fp); + holo.setPosY(1.1f * (float) fp); + + holo.setRotZ(-0.04f * (float) fp); + if (stack.getOrCreateTag().getDouble("flash_time") > 0) { flare.setScaleX((float) (1.0 + 0.5 * (Math.random() - 0.5))); flare.setScaleY((float) (1.0 + 0.5 * (Math.random() - 0.5))); @@ -148,9 +158,6 @@ public class SvdItemModel extends GeoModel { double pit = 0; pit = player.getPersistentData().getDouble("gun_pitch"); - double vy = 0; - vy = player.getPersistentData().getDouble("vy"); - move.setPosY(-1 * (float) vy); move.setPosX(9.3f * (float) m); @@ -161,6 +168,10 @@ public class SvdItemModel extends GeoModel { move.setRotY(1.9f * (float) yaw - 1.7f * (float) m); + glass.setPosX(0.25f * -PosX); + + glass.setPosY(0.2f * (float) fp + 0.5f * (float) vy + (float) y + PosY); + CoreGeoBone camera = getAnimationProcessor().getBone("camera"); player.getPersistentData().putDouble("camera_rot_x", Mth.RAD_TO_DEG * camera.getRotX()); diff --git a/src/main/java/net/mcreator/target/event/GunEventHandler.java b/src/main/java/net/mcreator/target/event/GunEventHandler.java index 1a803030d..5e4341156 100644 --- a/src/main/java/net/mcreator/target/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/target/event/GunEventHandler.java @@ -87,6 +87,13 @@ public class GunEventHandler { player.getAttribute(TargetModAttributes.SPREAD.get()) .setBaseValue(player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) - 0.125 * Math.pow(index - player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()), 2)); } + + if (player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) > 15) { + player.getAttribute(TargetModAttributes.SPREAD.get()).setBaseValue(15); + } + if (player.getAttributeBaseValue(TargetModAttributes.SPREAD.get()) < 0) { + player.getAttribute(TargetModAttributes.SPREAD.get()).setBaseValue(0); + } } /** @@ -390,8 +397,8 @@ public class GunEventHandler { projectile.beast(); } - projectile.setPos(player.getX() - 0.1 * player.getLookAngle().x, player.getEyeY() - 0.1 - 0.1 * player.getLookAngle().y, player.getZ() + -0.1 * player.getLookAngle().z); - projectile.shoot(player.getLookAngle().x, player.getLookAngle().y, player.getLookAngle().z, 1 * (float) heldItem.getOrCreateTag().getDouble("velocity"), + projectile.setPos(player.getX() - 0.1 * player.getLookAngle().x, player.getEyeY() - 0.2 - 0.1 * player.getLookAngle().y, player.getZ() + -0.1 * player.getLookAngle().z); + projectile.shoot(player.getLookAngle().x, player.getLookAngle().y + 0.003f , player.getLookAngle().z, 1 * (float) heldItem.getOrCreateTag().getDouble("velocity"), (float) player.getAttributeBaseValue(TargetModAttributes.SPREAD.get())); player.level().addFreshEntity(projectile); } diff --git a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java index c7f0d3986..49b43c22f 100644 --- a/src/main/java/net/mcreator/target/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/target/event/PlayerEventHandler.java @@ -333,7 +333,7 @@ public class PlayerEventHandler { sinRes = (-18.34) * Math.pow(recoil, 2) + 8.58 * recoil; } if (0.2 <= recoil && recoil < 1) { - sinRes = 2.6 * Math.pow(recoil, 2) - 5.5 * recoil + 2.167; + sinRes = 2.7 * Math.pow(recoil, 2) - 5.5 * recoil + 2.167; } float newPitch = ((float) (player.getXRot() - 7.5f * recoilY * ry * sinRes)); diff --git a/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java b/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java index dee1b5e5d..f6d77006f 100644 --- a/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java +++ b/src/main/java/net/mcreator/target/item/common/ammo/Rocket.java @@ -37,7 +37,7 @@ public class Rocket extends Item implements GeoItem, AnimatedItem { public static ItemDisplayContext transformType; public Rocket() { - super(new Item.Properties().stacksTo(4).rarity(Rarity.COMMON)); + super(new Item.Properties().stacksTo(16).rarity(Rarity.COMMON)); } @Override diff --git a/src/main/java/net/mcreator/target/item/common/material/component/SteelTrigger.java b/src/main/java/net/mcreator/target/item/common/material/component/SteelTrigger.java index 1f13cca3c..1085f5ea7 100644 --- a/src/main/java/net/mcreator/target/item/common/material/component/SteelTrigger.java +++ b/src/main/java/net/mcreator/target/item/common/material/component/SteelTrigger.java @@ -11,7 +11,7 @@ import java.util.List; public class SteelTrigger extends Item { public SteelTrigger() { - super(new Item.Properties().stacksTo(64).rarity(Rarity.UNCOMMON)); + super(new Item.Properties().stacksTo(64).rarity(Rarity.RARE)); } @Override diff --git a/src/main/java/net/mcreator/target/item/gun/RpkItem.java b/src/main/java/net/mcreator/target/item/gun/RpkItem.java index c134300ed..8e14fa9c5 100644 --- a/src/main/java/net/mcreator/target/item/gun/RpkItem.java +++ b/src/main/java/net/mcreator/target/item/gun/RpkItem.java @@ -87,11 +87,11 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { } if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty")); } if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload2")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal")); } if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) { @@ -179,7 +179,7 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { tag.putDouble("reload_time", 0); } if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 83) { + if (tag.getDouble("reload_time") == 92) { entity.getPersistentData().putDouble("id", id); if (entity instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, TargetModSounds.RPK_RELOAD_EMPTY.get(), 100, 1); @@ -199,7 +199,7 @@ public class RpkItem extends GunItem implements GeoItem, AnimatedItem { GunsTool.reload(entity, GunInfo.Type.RIFLE); } } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 66) { + if (tag.getDouble("reload_time") == 70) { entity.getPersistentData().putDouble("id", id); if (entity instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, TargetModSounds.RPK_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 6096c3080..e13c56b7e 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -247,12 +247,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", 66); + tag.putDouble("reload_time", 70); } 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", 83); + tag.putDouble("reload_time", 92); } } if (player.getMainHandItem().getItem() == TargetModItems.SENTINEL.get() diff --git a/src/main/resources/assets/target/animations/marlin.animation.json b/src/main/resources/assets/target/animations/marlin.animation.json index 8a5526b91..77ec2f4da 100644 --- a/src/main/resources/assets/target/animations/marlin.animation.json +++ b/src/main/resources/assets/target/animations/marlin.animation.json @@ -138,11 +138,6 @@ "position": { "vector": [0, 0, 0] } - }, - "jichui": { - "rotation": { - "vector": [30, 0, 0] - } } } }, @@ -156,11 +151,6 @@ "position": { "vector": [0, 0, 0] } - }, - "jichui": { - "rotation": { - "vector": [30, 0, 0] - } } } }, @@ -174,22 +164,19 @@ "vector": [0, 0, 0] }, "0.0667": { - "vector": [-0.27029, 0.4825, -3.47804], - "easing": "easeInSine" + "vector": [-0.07669, 0.14268, -5.6755] }, - "0.15": { - "vector": [-9.01, -1.57, 12.41] - }, - "0.2333": { - "vector": [-2.97836, -1.55735, 12.38264], - "easing": "linear" - }, - "0.35": { - "vector": [2.48451, 0.93386, 5.21903], + "0.1333": { + "vector": [-0.20051, 0.51542, 4.52219], "easing": "easeInOutSine" }, - "0.4833": { - "vector": [-1, 0, -1] + "0.2167": { + "vector": [-2.16, 0.41, 3.62], + "easing": "easeInSine" + }, + "0.3333": { + "vector": [-0.44, 0.27, 2.41], + "easing": "easeOutSine" }, "0.5667": { "vector": [0, 0, 0] @@ -199,23 +186,21 @@ "0.0": { "vector": [0, 0, 0] }, - "0.0667": { - "vector": [0, -0.2, 0.6], + "0.1": { + "vector": [-0.4, -0.2, 0.6], "easing": "easeInElastic" }, "0.1833": { - "vector": [0, -1.54, -0.55], - "easing": "linear" - }, - "0.2833": { - "vector": [0, -0.7, 0.75], + "vector": [-0.42, -0.46, -0.27], "easing": "easeInElastic" }, - "0.3833": { - "vector": [0, -0.55547, 0.93] + "0.2667": { + "vector": [-0.28, -0.11, -0.18], + "easing": "easeInElastic" }, - "0.45": { - "vector": [0, 0, -0.3] + "0.4167": { + "vector": [-0.14, 0.1, 0.41], + "easing": "easeInElastic" }, "0.5667": { "vector": [0, 0, 0] @@ -302,20 +287,6 @@ } } }, - "jichui": { - "rotation": { - "0.0": { - "vector": [30, 0, 0] - }, - "0.0833": { - "vector": [30, 0, 0] - }, - "0.2": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, "camera": { "rotation": { "0.0": { @@ -349,16 +320,19 @@ "vector": [0, 0, 0] }, "0.05": { - "vector": [-0.27029, 0.4825, -3.47804], + "vector": [-0.07669, 0.14268, -5.6755] + }, + "0.1333": { + "vector": [-0.20051, 0.51542, 4.52219], + "easing": "easeInOutSine" + }, + "0.2": { + "vector": [-2.16, 0.41, 3.62], "easing": "easeInSine" }, - "0.1833": { - "vector": [-5.64874, -1.83006, 2.49618], - "easing": "easeInElastic" - }, "0.2833": { - "vector": [1.4362, 0.58217, 1.2273], - "easing": "easeInOutSine" + "vector": [-0.44, 0.27, 2.41], + "easing": "easeOutSine" }, "0.45": { "vector": [0, 0, 0] @@ -368,15 +342,21 @@ "0.0": { "vector": [0, 0, 0] }, - "0.05": { - "vector": [0, -0.4, 0.9], + "0.1": { + "vector": [-0.4, -0.2, 0.6], "easing": "easeInElastic" }, - "0.1167": { - "vector": [0, 0.08, -0.89] + "0.1667": { + "vector": [-0.42, -0.46, -0.27], + "easing": "easeInElastic" }, - "0.2167": { - "vector": [0, 0.2, 0.33] + "0.2333": { + "vector": [-0.28, -0.11, -0.18], + "easing": "easeInElastic" + }, + "0.3167": { + "vector": [-0.14, 0.1, 0.41], + "easing": "easeInElastic" }, "0.45": { "vector": [0, 0, 0] @@ -463,20 +443,6 @@ } } }, - "jichui": { - "rotation": { - "0.0": { - "vector": [30, 0, 0] - }, - "0.0667": { - "vector": [30, 0, 0] - }, - "0.1167": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, "camera": { "rotation": { "0.0": { @@ -751,13 +717,10 @@ }, "position": { "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [0, 0, 0] + "vector": [0, 0, 1151] }, "0.05": { - "vector": [-76.61742, 60.24156, 169.59954] + "vector": [0, 0, 1151] }, "0.1167": { "vector": [-2.48553, -2.26, 7.48202] @@ -782,11 +745,11 @@ "0.5333": { "vector": [0, -0.9, 1.1919] }, - "0.5583": { + "0.5667": { "vector": [0, -0.9, 1.1919] }, "0.575": { - "vector": [0, 0, 0] + "vector": [0, 0, 1151] } } }, @@ -831,7 +794,6 @@ } }, "animation.marlin.iterativeload2": { - "loop": true, "animation_length": 0.8333, "bones": { "0": { @@ -1002,13 +964,10 @@ }, "position": { "0.0": { - "vector": [0, 0, 0] - }, - "0.0417": { - "vector": [0, 0, 0] + "vector": [0, 0, 1151] }, "0.05": { - "vector": [-76.61742, 60.24156, 169.59954] + "vector": [0, 0, 1151] }, "0.1167": { "vector": [-2.48553, -2.26, 7.48202] @@ -1033,11 +992,11 @@ "0.5333": { "vector": [0, -0.9, 1.1919] }, - "0.5583": { + "0.5667": { "vector": [0, -0.9, 1.1919] }, "0.575": { - "vector": [0, 0, 0] + "vector": [0, 0, 1151] } } }, @@ -1092,26 +1051,23 @@ "easing": "linear" }, "0.075": { - "vector": [-18.51, 20.88, 48.37] + "vector": [-17.67498, 12.32307, 51.28386] }, "0.1833": { - "vector": [-9.60743, 2.0394, 39.96093], + "vector": [-16.60743, 2.0394, 39.96093], "easing": "easeInOutSine" }, "0.3167": { - "vector": [-28.52805, 6.67501, 68.08678], - "easing": "easeInElastic" - }, - "0.4": { - "vector": [-16.86309, 4.92621, 50.64297] + "vector": [-19.12116, 5.55971, 55.71985], + "easing": "easeInBack" }, "0.45": { - "vector": [-7.64732, 3.69466, 37.48223] + "vector": [-7.92819, 1.03543, 32.79611] }, "0.5417": { "vector": [-7.97396, 1.43681, 13.3542] }, - "0.6": { + "0.65": { "vector": [0, 0, -3] }, "0.7": { @@ -1124,26 +1080,26 @@ "easing": "easeInOutSine" }, "0.075": { - "vector": [0.31281, 2.18, 0.46] + "vector": [0.31281, 1.93, 0.46] }, "0.1417": { - "vector": [0.36906, 1.19, -0.07], + "vector": [0.36906, 0.69, -0.07], "easing": "easeInOutSine" }, "0.2333": { - "vector": [0.37, 0.41969, -1.39] + "vector": [0.37, -0.08031, -1.39] }, "0.3417": { - "vector": [0.13, 0.81, -0.21] + "vector": [0.13, 0.31, -0.21] }, "0.4": { - "vector": [0, 0, -0.65] + "vector": [0, 0.25, -0.65] }, "0.5": { - "vector": [0, 0, 0.93] + "vector": [0, 0.25, 0.93] }, "0.6417": { - "vector": [0, 0, -0.45] + "vector": [0, -0.25, -0.45] }, "0.7": { "vector": [0, 0, 0] diff --git a/src/main/resources/assets/target/animations/rpk.animation.json b/src/main/resources/assets/target/animations/rpk.animation.json index 527185881..166d21d99 100644 --- a/src/main/resources/assets/target/animations/rpk.animation.json +++ b/src/main/resources/assets/target/animations/rpk.animation.json @@ -281,78 +281,104 @@ "animation_length": 0.05, "override_previous_animation": true }, - "animation.ak47.reload": { - "animation_length": 4.2, - "override_previous_animation": true, + "animation.ak47.reload_empty": { + "loop": "hold_on_last_frame", + "animation_length": 4.75, "bones": { "0": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.4": { - "vector": [-17.28398, -2.37555, -14.63743], + "0.1": { + "vector": [2.2309, 1.32745, 5.98455] + }, + "0.3667": { + "vector": [-14.01, 2.98, -9.37], "easing": "easeInElastic" }, - "0.5": { - "vector": [-20.19064, -3.0059, -16.54165] + "0.45": { + "vector": [-12.25012, 1.71575, -15.23679] }, - "0.6": { - "vector": [-11.19064, -3.0059, -16.54165] + "0.5333": { + "vector": [-13.67625, 0.53753, -20.43357] }, - "0.8": { - "vector": [-19.01737, -3.98795, -19.38168] + "0.6167": { + "vector": [-17.27359, 1.63911, -16.2464] }, - "1.0": { - "vector": [-23.01737, -3.98795, -19.38168] + "0.7167": { + "vector": [-15.02119, 0.16741, -19.71243] }, - "1.2": { - "vector": [-21.10053, -3.28577, -20.388] + "0.8167": { + "vector": [-12.36586, -0.75486, -21.85957] + }, + "0.9": { + "vector": [-3.42984, -0.39385, -15.87027] + }, + "1.0667": { + "vector": [-12.35117, -0.9689, -22.83651] + }, + "1.2333": { + "vector": [-16.3817, -0.19101, -19.94063] }, "1.4": { - "vector": [-19.67234, -5.99485, -27.70851], - "easing": "easeInElastic" + "vector": [-11.33329, -1.14849, -23.82073] }, - "1.5": { - "vector": [-17.23236, -7.16186, -31.56072] + "1.6167": { + "vector": [-13.24, -1.53, -25.8] }, - "1.6": { - "vector": [-21.10765, -7.85482, -32.38361] + "2.05": { + "vector": [-10.66408, -4.02619, -38.55877], + "easing": "easeInSine" }, - "1.7": { - "vector": [-22.46727, -6.79785, -29.55227] + "2.1333": { + "vector": [-13.44223, -4.57576, -41.51634] }, - "1.9": { - "vector": [-24.6749, -6.03012, -27.69384] - }, - "2.1": { - "vector": [-21.16155, -3.88618, -22.06856] + "2.2167": { + "vector": [-10.27854, -4.93547, -43.49053] }, "2.3": { - "vector": [-20.35191, -7.08161, -30.52207] + "vector": [-18.26205, -7.61546, -53.1428] }, - "2.4": { - "vector": [-25.35191, -7.08161, -30.52207], - "easing": "easeInElastic", - "easingArgs": [1] + "2.45": { + "vector": [-17.01373, -1.99374, -36.83067] }, - "2.9": { - "vector": [-9.48193, -0.91778, 0.31667], - "easing": "easeInElastic" + "2.5667": { + "vector": [-18.47706, -3.15515, -37.51576] }, - "3.2": { - "vector": [-6.50386, 0.57584, 8.3899] + "2.6333": { + "vector": [-22.58725, -5.90434, -44.71539] }, - "3.4": { - "vector": [-6.41457, 1.87406, -2.05028] + "2.7833": { + "vector": [-15.52787, -3.69401, -35.14493] }, - "3.6": { - "vector": [-2.45848, 0.88846, -2.411] + "2.9333": { + "vector": [-19.28692, -1.27625, -26.04936] }, - "3.7": { - "vector": [0, 0, 0] + "3.2167": { + "vector": [-11.33509, 4.42358, -4.47176] + }, + "3.4833": { + "vector": [-8.35505, 5.94946, 0.83424] + }, + "3.6667": { + "vector": [-11.41291, 2.19732, -4.17931], + "easing": "easeInExpo" + }, + "3.8167": { + "vector": [-7.46782, 7.08352, -2.53279], + "easing": "easeInOutSine" }, "4.0": { + "vector": [-5.58174, 2.97982, 0.50489] + }, + "4.2": { + "vector": [-3.87833, -0.57622, -1.86809] + }, + "4.3667": { + "vector": [0, 0, -2] + }, + "4.5": { "vector": [0, 0, 0] } }, @@ -360,169 +386,198 @@ "0.0": { "vector": [0, 0, 0] }, - "0.4": { - "vector": [0, 0.9, 0.3], - "easing": "easeInElastic" + "0.3167": { + "vector": [-1.1, 0.3, 1.9], + "easing": "easeInQuad" }, - "0.5": { - "vector": [0, 1, 0.3] + "0.45": { + "vector": [-1.1, 0, 1.2], + "easing": "easeOutSine" }, - "0.6": { - "vector": [0.5, 0.7, 0.1] + "0.5333": { + "vector": [-1.13656, 0.11648, 1.43653] }, - "0.7": { - "vector": [0.3, 1, 0.2] + "0.65": { + "vector": [-1.11162, 0.03023, 1.28738] + }, + "0.8167": { + "vector": [-0.96981, -0.32115, 1.20478] }, "0.9": { - "vector": [0.4, 0.8, 0.1] + "vector": [-0.75494, -0.64671, 0.87721] }, - "1.1": { - "vector": [0.5, 1.02, 0.2] + "0.9833": { + "vector": [-1.1, 0, 1.3] }, - "1.4": { - "vector": [0.4, 1.2, 0.2], - "easing": "easeInElastic" + "1.15": { + "vector": [-0.95347, -0.36221, 1.21435] }, - "1.5": { - "vector": [0.5, 1.1, 0.2] + "1.3167": { + "vector": [-0.84854, -0.60732, 1.04107] }, - "1.6": { - "vector": [0.5, 1.1, 0.3] + "1.4833": { + "vector": [-0.88449, -0.56099, 1.25543] }, - "1.8": { - "vector": [0.45703, 1.3, 0.3] + "1.7333": { + "vector": [-0.79, -0.44, 1.2] }, - "1.9": { - "vector": [0.5, 1.6, 0.3] + "2.05": { + "vector": [-0.89507, -0.06932, 1.3549] }, - "2.0": { - "vector": [0.6, 1, 0.3] + "2.1333": { + "vector": [-1.16342, 0.21638, 1.44269] + }, + "2.2167": { + "vector": [-1.03823, 0.0689, 1.38061] }, "2.3": { - "vector": [0.7, 0.8, 0.3] + "vector": [-1.27235, 0.41208, 1.43655], + "easing": "easeInSine" }, - "2.4": { - "vector": [0.3, 1.5, 0.3], - "easing": "easeInElastic", - "easingArgs": [1] + "2.4167": { + "vector": [-0.8044, 0.0239, 1.36148], + "easing": "easeOutSine" }, - "2.6": { - "vector": [0.1, 0.74, 0.4], - "easing": "easeInElastic" + "2.5": { + "vector": [-0.55391, 0.01857, 1.28596], + "easing": "easeInSine" }, - "2.9": { - "vector": [0, 0, 0.25], - "easing": "easeInElastic" + "2.5667": { + "vector": [-0.53, 0.02, 1.27] }, - "3.2": { - "vector": [0, 0, -0.05] + "2.7": { + "vector": [-0.73155, 0.42427, 1.66866] }, - "3.3": { - "vector": [-0.2, 0, 0] + "2.85": { + "vector": [-0.07114, -0.36547, 1.29091] }, - "3.4": { - "vector": [-0.2, 0, 1] + "3.0": { + "vector": [-0.27874, -0.05921, 1.2782] }, - "3.5": { - "vector": [0, 0, 0.65] + "3.1667": { + "vector": [-0.33, 0.01, 0.64] }, - "3.6": { - "vector": [0, 0, -0.85] + "3.25": { + "vector": [-0.58027, -0.15396, 0.61798] }, - "3.7": { - "vector": [0, 0, -0.35] + "3.4167": { + "vector": [-0.47658, -0.08535, 0.62734] }, - "3.8": { - "vector": [0, 0, 0.23] + "3.5667": { + "vector": [-0.27646, -0.46182, 2.0652], + "easing": "easeInQuart" }, - "4.0": { + "3.6667": { + "vector": [-0.27646, -0.46182, 2.0652], + "easing": "easeInQuart" + }, + "3.8833": { + "vector": [-0.33, 0.01, 0.64] + }, + "4.0833": { + "vector": [-0.17, 0.21, 0.94] + }, + "4.2833": { + "vector": [0, 0, 0.18] + }, + "4.4167": { + "vector": [0, 0, -0.3] + }, + "4.5": { "vector": [0, 0, 0] } } }, + "bolt": { + "position": { + "3.25": { + "vector": [0, 0, 0] + }, + "3.3167": { + "vector": [0, 0, 0] + }, + "3.5667": { + "vector": [0, 0, 2], + "easing": "easeInCirc" + }, + "3.6667": { + "vector": [0, 0, 2], + "easing": "easeInCirc" + }, + "3.85": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + }, "magazine": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.3": { + "0.8": { "vector": [0, 0, 0] }, - "0.5": { - "vector": [-9, 0, 0], + "0.8667": { + "vector": [0, 0, 0] + }, + "1.2333": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "1.4667": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "1.9667": { + "vector": [-21, 0, -11] + }, + "2.0667": { + "vector": [-14, 0, -5.83], "easing": "easeInSine" }, - "0.7": { - "vector": [39.37235, -2.62403, -2.08221] - }, - "1.2": { - "vector": [29.37235, -2.62403, -2.08221] - }, - "1.4": { - "vector": [20.37235, -2.62403, -2.08221] - }, - "1.6": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.7": { - "vector": [-9, 0, 0] - }, - "1.8": { - "vector": [7, 0, 0], - "easing": "easeInOutSine" - }, - "1.9": { - "vector": [0, 0, 0] - }, - "2.3": { + "2.2667": { "vector": [0, 0, 0] }, "2.4": { - "vector": [0, 0, 0], - "easing": "easeInQuad" + "vector": [0, 0, 0] } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.3": { + "0.8": { "vector": [0, 0, 0] }, - "0.5": { - "vector": [0, 0, 0], + "0.8667": { + "vector": [0, -2.85, 0] + }, + "1.2333": { + "vector": [8, -15, 0], + "easing": "easeInElastic" + }, + "1.4667": { + "vector": [0, -15, 0], + "easing": "easeInElastic" + }, + "1.9667": { + "vector": [0.21094, -0.91719, -0.23516], "easing": "easeInSine" }, - "0.7": { - "vector": [0, -12.67, 2.9] - }, - "1.2": { - "vector": [4, -7.27, 4.1] - }, - "1.4": { - "vector": [1, -4.87, -0.1], + "2.0667": { + "vector": [-0.06, -0.19422, -0.47], "easing": "easeInSine" }, - "1.5": { - "vector": [0, -2.27, -0.9], - "easing": "easeOutSine" + "2.1833": { + "vector": [0.07, -0.42625, -0.09719], + "easing": "easeInSine" }, - "1.7": { - "vector": [0, -0.45625, -0.1], - "easing": "easeInOutQuad" - }, - "1.8": { - "vector": [0, -0.3, 0] - }, - "1.9": { - "vector": [0, -0.1, 0] - }, - "2.3": { - "vector": [0, -0.1, 0] + "2.2667": { + "vector": [0, 0, 0] }, "2.4": { - "vector": [0, 0, 0], - "easing": "easeInQuad" + "vector": [0, 0, 0] } } }, @@ -531,153 +586,126 @@ "0.0": { "vector": [0, 0, 0] }, - "0.3": { - "vector": [11.03847, -21.81212, -4.69866] + "0.1667": { + "vector": [0, 0, 0] }, - "0.6": { - "vector": [11.03847, -21.81212, -4.69866] + "0.2833": { + "vector": [0, 0, 26] }, - "0.7": { - "vector": [21.40451, 5.32565, 33.55057] + "0.5833": { + "vector": [14.12373, -11.09281, 25.14677] }, - "2.0": { - "vector": [21.40451, 5.32565, 33.55057] + "2.3": { + "vector": [14.12373, -11.09281, 25.14677] }, - "2.2": { - "vector": [37.59332, -33.68004, 59.98843], + "2.3833": { + "vector": [26.69687, -23.84553, 18.95298] + }, + "2.5333": { + "vector": [39.4566, -33.52813, 36.0472] + }, + "2.6167": { + "vector": [21.75908, -21.54018, 13.02377], "easing": "easeInElastic" }, - "2.4": { - "vector": [36.94932, -8.97856, 56.05321], - "easing": "easeInElastic" + "2.7167": { + "vector": [21.75908, -21.54018, 13.02377] }, - "2.5": { - "vector": [36.94932, -8.97856, 56.05321], - "easing": "easeInElastic" + "3.0333": { + "vector": [8.3734, -16.00221, -1.42197] }, - "2.9": { - "vector": [0, 0, 0], - "easing": "easeOutSine" + "3.1167": { + "vector": [0, 0, 0] } }, "position": { - "0.1": { + "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [1.03, 0.2, 4.67] + "0.1667": { + "vector": [0, 0, 0] }, - "0.3": { - "vector": [-0.7, 0.3, 5.8] + "0.4167": { + "vector": [-0.60795, -2.68839, 4.36626] }, - "0.6": { - "vector": [-0.7, 0.3, 5.8] + "0.5833": { + "vector": [-2.22489, -1.18104, 6.66082] }, - "0.7": { - "vector": [-0.7, -1.2, 5] + "2.3": { + "vector": [-2.22489, -1.18104, 6.66082] }, - "2.0": { - "vector": [-0.7, -1.2, 5] - }, - "2.2": { - "vector": [-2.96, -1.79, 6.99], + "2.5333": { + "vector": [-2.72279, -0.4342, 9.52345], "easing": "easeInElastic" }, - "2.4": { + "2.6167": { "vector": [-2.86, -1.59, 7.89], "easing": "easeInElastic" }, - "2.5": { + "2.7167": { "vector": [-2.86, -1.59, 7.89], "easing": "easeInElastic" }, - "2.7": { - "vector": [0.03, -2, 3.17] - }, - "2.9": { + "3.1167": { "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, - "holo": { - "position": { - "vector": [0, 0, -251] - } - }, - "bolt": { - "position": { - "3.2": { - "vector": [0, 0, 0] - }, - "3.3": { - "vector": [0, 0, 4], - "easing": "easeInCubic" - }, - "3.4": { - "vector": [0, 0, 4], - "easing": "easeInCubic" - }, - "3.6": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "easing": "easeInOutQuad" } } }, "Righthand": { "rotation": { - "3.0": { + "3.25": { "vector": [0, 0, 0] }, - "3.1": { + "3.35": { "vector": [8.28212, 20.95701, 9.9358] }, - "3.2": { + "3.45": { "vector": [-1.95978, 11.17581, -2.65919] }, - "3.3": { + "3.55": { "vector": [-1.95978, 11.17581, -2.65919] }, - "3.4": { + "3.65": { "vector": [-1.95978, 11.17581, -2.65919] }, - "3.5": { + "3.75": { "vector": [-1.95978, 11.17581, -2.65919] }, - "3.8": { + "4.05": { "vector": [19.28212, 20.95701, 9.9358] }, - "3.9": { + "4.15": { "vector": [0, 0, 0], "easing": "easeInOutSine" } }, "position": { - "3.0": { + "3.25": { "vector": [0, 0, 0] }, - "3.1": { + "3.35": { "vector": [1.6, 2.9, 0] }, - "3.2": { + "3.45": { "vector": [0.5, 1.9, -5.3] }, - "3.3": { + "3.55": { "vector": [0.5, 1.9, -1] }, - "3.4": { + "3.65": { "vector": [0.5, 1.9, -1] }, - "3.5": { + "3.75": { "vector": [0.5, 1.9, -1] }, - "3.7": { + "3.95": { "vector": [0.5, 3.5, -5.1] }, - "3.8": { + "4.05": { "vector": [1.6, 2.9, 0] }, - "3.9": { + "4.15": { "vector": [0, 0, 0], "easing": "easeInOutSine" } @@ -688,133 +716,181 @@ "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.5": { + "0.2167": { "vector": [0, 0, 1.5], "easing": "easeInElastic" }, + "0.4333": { + "vector": [0, 0, -0.5] + }, "0.6": { - "vector": [1, 1, -1.5], + "vector": [0, 0, 1] + }, + "1.0": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "1.05": { + "vector": [2, 1, -2], "easing": "easeInSine" }, - "0.7": { - "vector": [-0.5, -0.5, 1.5] + "1.1667": { + "vector": [-1, -0.5, 1.5] }, - "0.9": { - "vector": [0.2, 0, 1.2], + "1.3": { + "vector": [0.5, 0, 1.2], "easing": "easeOutSine" }, - "1.2": { - "vector": [-0.01, 0, 0.2] + "1.6833": { + "vector": [-0.1, 0, -0.5] }, - "1.9": { - "vector": [-0.5, 0, 1.5], + "2.0167": { + "vector": [0.5, 0, 2], + "easing": "easeInElastic" + }, + "2.1833": { + "vector": [-0.5, 0, 2.2], "easing": "linear" }, - "2.0": { - "vector": [1.5, -0.7, 0.93], + "2.2667": { + "vector": [1.5, -0.7, 1.2], "easing": "easeInSine" }, - "2.2": { - "vector": [-0.4, 0.4, -0.6], + "2.3667": { + "vector": [-0.4, 0.4, -0.2], "easing": "easeOutSine" }, - "2.3": { - "vector": [-1, 0.36, 0.39] + "2.55": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" }, - "2.4": { - "vector": [1, -0.62, -1.5] + "2.6": { + "vector": [2, 1, -2], + "easing": "easeInSine" }, - "2.5": { - "vector": [-0.54, 0.36, 1] + "2.7167": { + "vector": [-1, -0.5, 1.5] }, - "2.7": { - "vector": [0.4, -0.22, -0.5] - }, - "3.2": { - "vector": [0.2, 0, 1.5] - }, - "3.3": { - "vector": [1, 2, 1.8] + "2.85": { + "vector": [0.5, 0, 1.2], + "easing": "easeOutSine" }, "3.4": { + "vector": [0.2, 0, 2] + }, + "3.5167": { + "vector": [1, 2, 1.8] + }, + "3.5667": { "vector": [-1.5, -3, -1.5] }, - "3.6": { + "3.6833": { "vector": [0.2, 1.5, 1.5] }, - "3.9": { - "vector": [0, 0, 0], + "3.8167": { + "vector": [0, 0, -0.5], "easing": "easeInElastic" + }, + "3.9833": { + "vector": [0, 0, 1] + }, + "4.15": { + "vector": [0, 0, 0] + }, + "4.3167": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "4.4833": { + "vector": [0, 0, 0] } } } + }, + "sound_effects": { + "0.0": { + "effect": "devotion_reload_empty" + } } }, - "animation.ak47.reload2": { - "animation_length": 3.3, - "override_previous_animation": true, + "animation.ak47.reload_normal": { + "loop": "hold_on_last_frame", + "animation_length": 3.5, "bones": { "0": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.4": { - "vector": [-17.28398, -2.37555, -14.63743], + "0.1": { + "vector": [2.2309, 1.32745, 5.98455] + }, + "0.3667": { + "vector": [-14.01, 2.98, -9.37], "easing": "easeInElastic" }, - "0.5": { - "vector": [-20.19064, -3.0059, -16.54165] + "0.45": { + "vector": [-12.25012, 1.71575, -15.23679] }, - "0.6": { - "vector": [-11.19064, -3.0059, -16.54165] + "0.5333": { + "vector": [-13.67625, 0.53753, -20.43357] }, - "0.8": { - "vector": [-19.01737, -3.98795, -19.38168] + "0.6167": { + "vector": [-17.27359, 1.63911, -16.2464] }, - "1.0": { - "vector": [-23.01737, -3.98795, -19.38168] + "0.7167": { + "vector": [-15.02119, 0.16741, -19.71243] }, - "1.2": { - "vector": [-21.10053, -3.28577, -20.388] + "0.8167": { + "vector": [-12.36586, -0.75486, -21.85957] + }, + "0.9": { + "vector": [-3.42984, -0.39385, -15.87027] + }, + "1.0667": { + "vector": [-12.35117, -0.9689, -22.83651] + }, + "1.2333": { + "vector": [-16.3817, -0.19101, -19.94063] }, "1.4": { - "vector": [-19.67234, -5.99485, -27.70851], - "easing": "easeInElastic" + "vector": [-11.33329, -1.14849, -23.82073] }, - "1.5": { - "vector": [-17.23236, -7.16186, -31.56072] + "1.6167": { + "vector": [-13.24, -1.53, -25.8] }, - "1.6": { - "vector": [-21.10765, -7.85482, -32.38361] + "2.05": { + "vector": [-10.66408, -4.02619, -38.55877], + "easing": "easeInSine" }, - "1.7": { - "vector": [-22.46727, -6.79785, -29.55227] + "2.1333": { + "vector": [-13.44223, -4.57576, -41.51634] }, - "1.9": { - "vector": [-29.6749, -6.03012, -27.69384] - }, - "2.1": { - "vector": [-21.16155, -3.88618, -22.06856] + "2.2167": { + "vector": [-10.27854, -4.93547, -43.49053] }, "2.3": { - "vector": [-20.35191, -7.08161, -30.52207] + "vector": [-18.26205, -7.61546, -53.1428] }, - "2.4": { - "vector": [-25.35191, -7.08161, -30.52207], - "easing": "easeInElastic", - "easingArgs": [1] + "2.45": { + "vector": [-17.01373, -1.99374, -36.83067] }, - "2.9": { - "vector": [-4.53295, -0.14832, 1.2287] + "2.5667": { + "vector": [-18.47706, -3.15515, -37.51576] }, - "3.1": { - "vector": [0, 0, 0] + "2.6333": { + "vector": [-22.58725, -5.90434, -44.71539] }, - "3.2": { + "2.7833": { + "vector": [-15.86609, -1.66219, -27.91711] + }, + "2.9833": { + "vector": [-3.8135, -0.9118, -6.85724] + }, + "3.2333": { + "vector": [0, 0, -2] + }, + "3.3667": { "vector": [0, 0, 0] } }, @@ -822,63 +898,81 @@ "0.0": { "vector": [0, 0, 0] }, - "0.4": { - "vector": [0, 0.9, 0.3], - "easing": "easeInElastic" + "0.3167": { + "vector": [-1.1, 0.3, 1.9], + "easing": "easeInQuad" }, - "0.5": { - "vector": [0, 1, 0.3] + "0.45": { + "vector": [-1.1, 0, 1.2], + "easing": "easeOutSine" }, - "0.6": { - "vector": [0.5, 0.7, 0.1] + "0.5333": { + "vector": [-1.13656, 0.11648, 1.43653] }, - "0.7": { - "vector": [0.3, 1, 0.2] + "0.65": { + "vector": [-1.11162, 0.03023, 1.28738] + }, + "0.8167": { + "vector": [-0.96981, -0.32115, 1.20478] }, "0.9": { - "vector": [0.4, 0.8, 0.1] + "vector": [-0.75494, -0.64671, 0.87721] }, - "1.1": { - "vector": [0.5, 1.02, 0.2] + "0.9833": { + "vector": [-1.1, 0, 1.3] }, - "1.4": { - "vector": [0.4, 1.2, 0.2], - "easing": "easeInElastic" + "1.15": { + "vector": [-0.95347, -0.36221, 1.21435] }, - "1.5": { - "vector": [0.5, 1.1, 0.2] + "1.3167": { + "vector": [-0.84854, -0.60732, 1.04107] }, - "1.6": { - "vector": [0.5, 1.1, 0.3] + "1.4833": { + "vector": [-0.88449, -0.56099, 1.25543] }, - "1.8": { - "vector": [0.45703, 1.3, 0.3] + "1.7333": { + "vector": [-0.79, -0.44, 1.2] }, - "1.9": { - "vector": [0.5, 1.6, 0.3] + "2.05": { + "vector": [-0.89507, -0.06932, 1.3549] }, - "2.0": { - "vector": [0.6, 1, 0.3] + "2.1333": { + "vector": [-1.16342, 0.21638, 1.44269] + }, + "2.2167": { + "vector": [-1.03823, 0.0689, 1.38061] }, "2.3": { - "vector": [0.7, 0.8, 0.3] + "vector": [-1.27235, 0.41208, 1.43655], + "easing": "easeInSine" }, - "2.4": { - "vector": [0.3, 1.5, 0.3], - "easing": "easeInElastic", - "easingArgs": [1] + "2.4167": { + "vector": [-0.8044, 0.0239, 1.36148], + "easing": "easeOutSine" }, - "2.6": { - "vector": [0.1, 0.74, 0.4], - "easing": "easeInElastic" + "2.5": { + "vector": [-0.55391, 0.01857, 1.28596], + "easing": "easeInSine" }, - "2.9": { - "vector": [0, 0, 0.25] + "2.5667": { + "vector": [-0.53, 0.02, 1.27] + }, + "2.7": { + "vector": [-0.73155, 0.42427, 1.66866] + }, + "2.85": { + "vector": [-0.07114, -0.36547, 1.29091] }, "3.0": { - "vector": [0, 0, 0.63] + "vector": [-0.27874, -0.05921, 1.2782] }, - "3.2": { + "3.15": { + "vector": [0, 0, 0.93] + }, + "3.2833": { + "vector": [0, 0, -0.3] + }, + "3.3667": { "vector": [0, 0, 0] } } @@ -888,84 +982,69 @@ "0.0": { "vector": [0, 0, 0] }, - "0.3": { + "0.8": { "vector": [0, 0, 0] }, - "0.5": { - "vector": [-9, 0, 0], + "0.8667": { + "vector": [0, 0, 0] + }, + "1.2333": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "1.4667": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "1.9667": { + "vector": [-21, 0, -11] + }, + "2.0667": { + "vector": [-14, 0, -5.83], "easing": "easeInSine" }, - "0.7": { - "vector": [39.37235, -2.62403, -2.08221] - }, - "1.2": { - "vector": [29.37235, -2.62403, -2.08221] - }, - "1.4": { - "vector": [20.37235, -2.62403, -2.08221] - }, - "1.6": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.7": { - "vector": [-9, 0, 0] - }, - "1.8": { - "vector": [7, 0, 0], - "easing": "easeInOutSine" - }, - "1.9": { - "vector": [0, 0, 0] - }, - "2.3": { + "2.2667": { "vector": [0, 0, 0] }, "2.4": { - "vector": [0, 0, 0], - "easing": "easeInQuad" + "vector": [0, 0, 0] } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.3": { + "0.8": { "vector": [0, 0, 0] }, - "0.5": { - "vector": [0, 0, 0], + "0.8667": { + "vector": [0, -2.85, 0] + }, + "1.2333": { + "vector": [8, -15, 0], + "easing": "easeInElastic" + }, + "1.4667": { + "vector": [0, -15, 0], + "easing": "easeInElastic" + }, + "1.9667": { + "vector": [0.21094, -0.91719, -0.23516], "easing": "easeInSine" }, - "0.7": { - "vector": [0, -12.67, 2.9] - }, - "1.2": { - "vector": [4, -7.27, 4.1] - }, - "1.4": { - "vector": [1, -4.87, -0.1], + "2.0667": { + "vector": [-0.06, -0.19422, -0.47], "easing": "easeInSine" }, - "1.5": { - "vector": [0, -2.27, -0.9], - "easing": "easeOutSine" + "2.1833": { + "vector": [0.07, -0.42625, -0.09719], + "easing": "easeInSine" }, - "1.7": { - "vector": [0, -0.45625, -0.1], - "easing": "easeInOutQuad" - }, - "1.8": { - "vector": [0, -0.3, 0] - }, - "1.9": { - "vector": [0, -0.1, 0] - }, - "2.3": { - "vector": [0, -0.1, 0] + "2.2667": { + "vector": [0, 0, 0] }, "2.4": { - "vector": [0, 0, 0], - "easing": "easeInQuad" + "vector": [0, 0, 0] } } }, @@ -974,135 +1053,146 @@ "0.0": { "vector": [0, 0, 0] }, - "0.3": { - "vector": [11.03847, -21.81212, -4.69866] + "0.1667": { + "vector": [0, 0, 0] }, - "0.6": { - "vector": [11.03847, -21.81212, -4.69866] + "0.2833": { + "vector": [0, 0, 26] }, - "0.7": { - "vector": [21.40451, 5.32565, 33.55057] - }, - "2.1": { - "vector": [21.40451, 5.32565, 33.55057] + "0.5833": { + "vector": [14.12373, -11.09281, 25.14677] }, "2.3": { - "vector": [37.59332, -33.68004, 59.98843], + "vector": [14.12373, -11.09281, 25.14677] + }, + "2.3833": { + "vector": [26.69687, -23.84553, 18.95298] + }, + "2.5333": { + "vector": [39.4566, -33.52813, 36.0472] + }, + "2.6167": { + "vector": [21.75908, -21.54018, 13.02377], "easing": "easeInElastic" }, - "2.4": { - "vector": [36.94932, -8.97856, 56.05321], - "easing": "easeInElastic" + "2.7167": { + "vector": [21.75908, -21.54018, 13.02377] }, - "2.5": { - "vector": [36.94932, -8.97856, 56.05321], - "easing": "easeInElastic" + "3.0333": { + "vector": [8.3734, -16.00221, -1.42197] }, - "3.0": { - "vector": [0, 0, 0], - "easing": "easeOutSine" + "3.1167": { + "vector": [0, 0, 0] } }, "position": { - "0.1": { + "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [1.03, 0.2, 4.67] + "0.1667": { + "vector": [0, 0, 0] }, - "0.3": { - "vector": [-0.7, 0.3, 5.8] + "0.4167": { + "vector": [-0.60795, -2.68839, 4.36626] }, - "0.6": { - "vector": [-0.7, 0.3, 5.8] - }, - "0.7": { - "vector": [-0.7, -1.2, 5] - }, - "2.1": { - "vector": [-0.7, -1.2, 5] + "0.5833": { + "vector": [-2.22489, -1.18104, 6.66082] }, "2.3": { - "vector": [-2.96, -1.79, 6.99], + "vector": [-2.22489, -1.18104, 6.66082] + }, + "2.5333": { + "vector": [-2.72279, -0.4342, 9.52345], "easing": "easeInElastic" }, - "2.4": { + "2.6167": { "vector": [-2.86, -1.59, 7.89], "easing": "easeInElastic" }, - "2.5": { + "2.7167": { "vector": [-2.86, -1.59, 7.89], "easing": "easeInElastic" }, - "2.7": { - "vector": [0.03, -2, 3.17] - }, - "3.0": { + "3.1167": { "vector": [0, 0, 0], - "easing": "easeOutSine" + "easing": "easeInOutQuad" } } }, - "holo": { - "position": { - "vector": [0, 0, -251] - } - }, "camera": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.5": { + "0.2167": { "vector": [0, 0, 1.5], "easing": "easeInElastic" }, + "0.4333": { + "vector": [0, 0, -0.5] + }, "0.6": { - "vector": [1, 1, -1.5], + "vector": [0, 0, 1] + }, + "1.0": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "1.05": { + "vector": [2, 1, -2], "easing": "easeInSine" }, - "0.7": { - "vector": [-0.5, -0.5, 1.5] + "1.1667": { + "vector": [-1, -0.5, 1.5] }, - "0.9": { - "vector": [0.2, 0, 1.2], + "1.3": { + "vector": [0.5, 0, 1.2], "easing": "easeOutSine" }, - "1.2": { - "vector": [-0.01, 0, 0.2] + "1.6833": { + "vector": [-0.1, 0, -0.5] }, - "1.9": { - "vector": [-0.5, 0, 1.5], + "2.0167": { + "vector": [0.5, 0, 2], + "easing": "easeInElastic" + }, + "2.1833": { + "vector": [-0.5, 0, 2.2], "easing": "linear" }, - "2.0": { - "vector": [1.5, -0.7, 0.93], + "2.2667": { + "vector": [1.5, -0.7, 1.2], "easing": "easeInSine" }, - "2.2": { - "vector": [-0.4, 0.4, -0.6], + "2.3667": { + "vector": [-0.4, 0.4, -0.2], "easing": "easeOutSine" }, - "2.3": { - "vector": [-1, 0.36, 0.39] + "2.55": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" }, - "2.4": { - "vector": [1, -0.62, -1.5] + "2.6": { + "vector": [2, 1, -2], + "easing": "easeInSine" }, - "2.5": { - "vector": [-0.54, 0.36, 1] + "2.7167": { + "vector": [-1, -0.5, 1.5] }, - "2.7": { - "vector": [0.4, -0.22, -0.5] + "2.85": { + "vector": [0.5, 0, 1.2], + "easing": "easeOutSine" }, "3.0": { "vector": [0, 0, 0] } } } + }, + "sound_effects": { + "0.0": { + "effect": "devotion_reload_empty" + } } } }, diff --git a/src/main/resources/assets/target/geo/marlin.geo.json b/src/main/resources/assets/target/geo/marlin.geo.json index 99a5fba2b..33eae2e0e 100644 --- a/src/main/resources/assets/target/geo/marlin.geo.json +++ b/src/main/resources/assets/target/geo/marlin.geo.json @@ -1103,17 +1103,22 @@ { "name": "jichui", "parent": "0", - "pivot": [0.00022, 0.97046, 7.30123], + "pivot": [0.00022, 0.97046, 7.30123] + }, + { + "name": "bone4", + "parent": "jichui", + "pivot": [0.00022, 1.00776, 7.49182], "rotation": [-30, 0, 0] }, { "name": "hammer", - "parent": "jichui", - "pivot": [0.00022, 2.37046, 7.50123], - "rotation": [-11, 0, 0], + "parent": "bone4", + "pivot": [0.00022, 2.00776, 7.49182], + "rotation": [-12, 0, 0], "cubes": [ { - "origin": [-0.14546, 1.70992, 7.1095], + "origin": [-0.14546, 1.70899, 7.14546], "size": [0.29136, 0.91377, 0.37117], "uv": { "north": {"uv": [57, 47], "uv_size": [0.25, 1]}, @@ -1125,7 +1130,7 @@ } }, { - "origin": [-0.14546, 1.91293, 6.9703], + "origin": [-0.14546, 1.91201, 7.00626], "size": [0.29136, 0.69015, 0.141], "uv": { "north": {"uv": [59, 14], "uv_size": [0.25, 0.75]}, @@ -1137,7 +1142,7 @@ } }, { - "origin": [-0.14546, 2.62369, 7.15637], + "origin": [-0.14546, 2.62276, 7.16889], "size": [0.29136, 0.11985, 0.15262], "uv": { "north": {"uv": [3, 66], "uv_size": [0.25, 0.25]}, @@ -1149,10 +1154,10 @@ } }, { - "origin": [-0.14546, 2.52477, 7.37411], + "origin": [-0.14546, 2.68643, 7.21749], "size": [0.29136, 0.2397, 0.15262], - "pivot": [0.00022, 2.90019, 7.48847], - "rotation": [-58, 0, 0], + "pivot": [0.00022, 2.96133, 7.35143], + "rotation": [-39, 0, 0], "uv": { "north": {"uv": [6, 66], "uv_size": [0.25, 0.25]}, "east": {"uv": [66, 6], "uv_size": [0.25, 0.25]}, @@ -1163,10 +1168,10 @@ } }, { - "origin": [-0.14546, 2.46689, 7.16705], + "origin": [-0.14546, 2.51892, 7.12249], "size": [0.29136, 0.2397, 0.15262], - "pivot": [0.00022, 2.84231, 7.28141], - "rotation": [-35.5, 0, 0], + "pivot": [0.00022, 2.96133, 7.35143], + "rotation": [-16.5, 0, 0], "uv": { "north": {"uv": [9, 66], "uv_size": [0.25, 0.25]}, "east": {"uv": [66, 9], "uv_size": [0.25, 0.25]}, @@ -1177,10 +1182,10 @@ } }, { - "origin": [-0.14546, 2.76447, 7.45651], + "origin": [-0.14546, 2.92613, 7.29988], "size": [0.29136, 0.59925, 0.07022], - "pivot": [0.00022, 2.90019, 7.48847], - "rotation": [-58, 0, 0], + "pivot": [0.00022, 2.96133, 7.35143], + "rotation": [-39, 0, 0], "uv": { "north": {"uv": [61, 43], "uv_size": [0.25, 0.5]}, "east": {"uv": [44, 61], "uv_size": [0.25, 0.5]}, @@ -1191,10 +1196,10 @@ } }, { - "origin": [-0.14546, 2.95449, 7.43154], + "origin": [-0.14546, 3.11007, 7.25485], "size": [0.29136, 0.4073, 0.08427], - "pivot": [0.00022, 2.90019, 7.48847], - "rotation": [-69.75, 0, 0], + "pivot": [0.00022, 2.96133, 7.35143], + "rotation": [-50.75, 0, 0], "uv": { "north": {"uv": [61, 45], "uv_size": [0.25, 0.5]}, "east": {"uv": [46, 61], "uv_size": [0.25, 0.5]}, @@ -1205,10 +1210,10 @@ } }, { - "origin": [-0.14546, 2.74083, 7.41034], + "origin": [-0.14546, 2.89478, 7.22998], "size": [0.29136, 0.3661, 0.08427], - "pivot": [0.00022, 2.90019, 7.48847], - "rotation": [-72, 0, 0], + "pivot": [0.00022, 2.96133, 7.35143], + "rotation": [-53, 0, 0], "uv": { "north": {"uv": [14, 66], "uv_size": [0.25, 0.25]}, "east": {"uv": [66, 14], "uv_size": [0.25, 0.25]}, @@ -1219,9 +1224,9 @@ } }, { - "origin": [-0.14546, 1.58215, 7.33053], + "origin": [-0.14546, 1.58123, 7.36649], "size": [0.29136, 0.91377, 0.3324], - "pivot": [0.00022, 1.92555, 7.94535], + "pivot": [0.00022, 1.92463, 7.98131], "rotation": [-13.5, 0, 0], "uv": { "north": {"uv": [57, 49], "uv_size": [0.25, 1]}, @@ -1233,9 +1238,9 @@ } }, { - "origin": [-0.14546, 1.41427, 7.72851], + "origin": [-0.14546, 1.41335, 7.76447], "size": [0.29136, 0.91377, 0.3324], - "pivot": [0.00022, 1.85807, 8.00529], + "pivot": [0.00022, 1.85714, 8.04124], "rotation": [-40.5, 0, 0], "uv": { "north": {"uv": [57, 51], "uv_size": [0.25, 1]}, @@ -1247,9 +1252,9 @@ } }, { - "origin": [-0.14546, 1.41427, 7.94966], + "origin": [-0.14546, 1.41335, 7.98562], "size": [0.29136, 0.91377, 0.3324], - "pivot": [0.00022, 1.85807, 8.00529], + "pivot": [0.00022, 1.85714, 8.04124], "rotation": [-54, 0, 0], "uv": { "north": {"uv": [57, 53], "uv_size": [0.25, 1]}, @@ -1261,9 +1266,9 @@ } }, { - "origin": [-0.14546, 1.5663, 7.53758], + "origin": [-0.14546, 1.56537, 7.57354], "size": [0.29136, 0.91377, 0.3324], - "pivot": [0.00022, 1.95847, 7.80824], + "pivot": [0.00022, 1.95754, 7.8442], "rotation": [-27, 0, 0], "uv": { "north": {"uv": [57, 55], "uv_size": [0.25, 1]}, diff --git a/src/main/resources/assets/target/geo/svd.geo.json b/src/main/resources/assets/target/geo/svd.geo.json index c3a3cb5f9..fe4696d1f 100644 --- a/src/main/resources/assets/target/geo/svd.geo.json +++ b/src/main/resources/assets/target/geo/svd.geo.json @@ -67,7 +67,7 @@ "origin": [-4.09, -2.76439, -28.75], "size": [9.18, 8.82332, 0], "uv": { - "north": {"uv": [124.75, 46.375], "uv_size": [-3.25, 3.375]}, + "north": {"uv": [11.875, 108.625], "uv_size": [-3.25, 3.375]}, "east": {"uv": [0, 0], "uv_size": [0, 8]}, "south": {"uv": [86.25, 91.5], "uv_size": [40.25, 34.875]}, "west": {"uv": [0, 0], "uv_size": [0, 8]}, @@ -85,7 +85,7 @@ { "name": "glass", "parent": "pso1", - "pivot": [0.16719, 3.80781, -5.66641], + "pivot": [0.16719, 4.28437, -5.66641], "cubes": [ { "origin": [-0.31528, 3.31362, -5.66641], @@ -98,6 +98,54 @@ "up": {"uv": [8, 0], "uv_size": [-8, 0]}, "down": {"uv": [8, 0], "uv_size": [-8, 0]} } + }, + { + "origin": [-0.31528, 3.01362, -5.66641], + "size": [0.98838, 0.3, 0], + "uv": { + "north": {"uv": [126.8877, 64.44092], "uv_size": [0, -0.25]}, + "east": {"uv": [0, 0], "uv_size": [0, 8]}, + "south": {"uv": [8.9375, 104.84375], "uv_size": [34.8, -11.98125]}, + "west": {"uv": [0, 0], "uv_size": [0, 8]}, + "up": {"uv": [8, 0], "uv_size": [-8, 0]}, + "down": {"uv": [8, 0], "uv_size": [-8, 0]} + } + }, + { + "origin": [-0.31528, 4.302, -5.66641], + "size": [0.98838, 0.3, 0], + "uv": { + "north": {"uv": [126.8877, 64.44092], "uv_size": [0, -0.25]}, + "east": {"uv": [0, 0], "uv_size": [0, 8]}, + "south": {"uv": [8.9375, 104.84375], "uv_size": [34.8, -11.98125]}, + "west": {"uv": [0, 0], "uv_size": [0, 8]}, + "up": {"uv": [8, 0], "uv_size": [-8, 0]}, + "down": {"uv": [8, 0], "uv_size": [-8, 0]} + } + }, + { + "origin": [0.6731, 3.352, -5.66641], + "size": [0.2, 0.85, 0], + "uv": { + "north": {"uv": [126.8877, 64.44092], "uv_size": [0, -0.25]}, + "east": {"uv": [0, 0], "uv_size": [0, 8]}, + "south": {"uv": [8.9375, 104.84375], "uv_size": [34.8, -11.98125]}, + "west": {"uv": [0, 0], "uv_size": [0, 8]}, + "up": {"uv": [8, 0], "uv_size": [-8, 0]}, + "down": {"uv": [8, 0], "uv_size": [-8, 0]} + } + }, + { + "origin": [-0.51528, 3.352, -5.66641], + "size": [0.2, 0.85, 0], + "uv": { + "north": {"uv": [126.8877, 64.44092], "uv_size": [0, -0.25]}, + "east": {"uv": [0, 0], "uv_size": [0, 8]}, + "south": {"uv": [8.9375, 104.84375], "uv_size": [34.8, -11.98125]}, + "west": {"uv": [0, 0], "uv_size": [0, 8]}, + "up": {"uv": [8, 0], "uv_size": [-8, 0]}, + "down": {"uv": [8, 0], "uv_size": [-8, 0]} + } } ] }, @@ -10149,6 +10197,8 @@ { "origin": [-0.17217, 0.05736, 0.13157], "size": [0.35, 0.05625, 0.34375], + "pivot": [0.00283, 0.08549, 0.42845], + "rotation": [0, 0, 0], "uv": { "north": {"uv": [70, 88], "uv_size": [0.25, 0.25]}, "east": {"uv": [88, 70], "uv_size": [0.25, 0.25]}, diff --git a/src/main/resources/assets/target/models/displaysettings/marlin.item.json b/src/main/resources/assets/target/models/displaysettings/marlin.item.json index 69777f312..be5a4951e 100644 --- a/src/main/resources/assets/target/models/displaysettings/marlin.item.json +++ b/src/main/resources/assets/target/models/displaysettings/marlin.item.json @@ -10,7 +10,7 @@ "translation": [ -7.25, 3.75, - 0.25 + -0.5 ] }, "gui": { @@ -20,14 +20,14 @@ 178.66 ], "translation": [ - -1, - -0.75, + 0, + -0.25, 0 ], "scale": [ - 0.35, - 0.35, - 0.35 + 0.55, + 0.55, + 0.55 ] } } diff --git a/src/main/resources/assets/target/sounds/rpk/rpk_reload_empty.ogg b/src/main/resources/assets/target/sounds/rpk/rpk_reload_empty.ogg index caf054626..5b22f4866 100644 Binary files a/src/main/resources/assets/target/sounds/rpk/rpk_reload_empty.ogg and b/src/main/resources/assets/target/sounds/rpk/rpk_reload_empty.ogg differ diff --git a/src/main/resources/assets/target/sounds/rpk/rpk_reload_normal.ogg b/src/main/resources/assets/target/sounds/rpk/rpk_reload_normal.ogg index 7c56ae352..ea3636a4d 100644 Binary files a/src/main/resources/assets/target/sounds/rpk/rpk_reload_normal.ogg and b/src/main/resources/assets/target/sounds/rpk/rpk_reload_normal.ogg differ diff --git a/src/main/resources/assets/target/textures/item/svd.png b/src/main/resources/assets/target/textures/item/svd.png index 86fae9ddb..418bca6d8 100644 Binary files a/src/main/resources/assets/target/textures/item/svd.png and b/src/main/resources/assets/target/textures/item/svd.png differ