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 2aed4168a..3d8945228 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 @@ -54,11 +54,11 @@ public class AK47ItemModel extends GeoModel { double zp = player.getPersistentData().getDouble("zoom_pos_z"); - gun.setPosX(1.96f * (float) p); + gun.setPosX(1.97f * (float) p); - gun.setPosY(0.25f * (float) p - (float) (0.6f * zp)); + gun.setPosY(0.011f * (float) p - (float) (0.2f * zp)); - gun.setPosZ(2.5f * (float) p + (float) (0.5f * zp)); + gun.setPosZ(3.8f * (float) p + (float) (0.5f * zp)); gun.setScaleZ(1f - (0.2f * (float) p)); @@ -79,15 +79,15 @@ public class AK47ItemModel extends GeoModel { if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { - shen.setPosZ(0.8f * (float) fp); + shen.setPosZ(0.4f * (float) fp); } else { - shen.setPosZ(1.11f * (float) fp); + shen.setPosZ(1.01f * (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); + shen.setPosY(0.07f * (float) fp); } if ((player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new TargetModVariables.PlayerVariables())).zooming) { 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 b3e72fb4c..5608c19b7 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 @@ -55,11 +55,11 @@ public class SvdItemModel extends GeoModel { double zp = 0; zp = player.getPersistentData().getDouble("zoom_pos_z"); - gun.setPosX(2.52f * (float) p); + gun.setPosX(2.02f * (float) p); - gun.setPosY(0.25f * (float) p - (float) (0.6f * zp)); + gun.setPosY(0.85f * (float) p - (float) (0.6f * zp)); - gun.setPosZ(13.4f * (float) p + (float) (0.5f * zp)); + gun.setPosZ(13.2f * (float) p + (float) (0.5f * zp)); gun.setRotZ((float) (0.05f * zp)); diff --git a/src/main/java/net/mcreator/target/item/gun/SvdItem.java b/src/main/java/net/mcreator/target/item/gun/SvdItem.java index 32fef23df..5fc56b039 100644 --- a/src/main/java/net/mcreator/target/item/gun/SvdItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SvdItem.java @@ -86,12 +86,12 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.fire")); } - if (tag.getBoolean("reloading") && tag.getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload")); + if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload_empty")); } - if (tag.getBoolean("reloading") && !tag.getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload2")); + if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.svd.reload_normal")); } if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { @@ -149,7 +149,7 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { tag.putDouble("reload_time", 0); } if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 66) { + if (tag.getDouble("reload_time") == 67) { entity.getPersistentData().putDouble("id", id); if (entity instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, TargetModSounds.SVD_RELOAD_EMPTY.get(), 100, 1); @@ -172,7 +172,7 @@ public class SvdItem extends GunItem implements GeoItem, AnimatedItem { GunsTool.reload(entity, GunInfo.Type.SNIPER); } } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 55) { + if (tag.getDouble("reload_time") == 53) { entity.getPersistentData().putDouble("id", id); if (entity instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, TargetModSounds.SVD_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 e13c56b7e..9f391f6a9 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -281,12 +281,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", 55); + 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", 66); + tag.putDouble("reload_time", 67); } } if (player.getMainHandItem().getItem() == TargetModItems.M_60.get() diff --git a/src/main/resources/assets/target/animations/ak.animation.json b/src/main/resources/assets/target/animations/ak.animation.json index 2a0ffc8ad..e1e6900a7 100644 --- a/src/main/resources/assets/target/animations/ak.animation.json +++ b/src/main/resources/assets/target/animations/ak.animation.json @@ -3,7 +3,17 @@ "animations": { "animation.ak47.idle": { "loop": true, - "animation_length": 1 + "animation_length": 1, + "bones": { + "Lefthand": { + "rotation": { + "vector": [-27.6003, -27.56966, -16.00843] + }, + "position": { + "vector": [-0.6, -2.7, -3.3] + } + } + } }, "animation.ak47.draw": { "animation_length": 0.9, @@ -58,6 +68,14 @@ "easing": "easeOutSine" } } + }, + "Lefthand": { + "rotation": { + "vector": [-27.6003, -27.56966, -16.00843] + }, + "position": { + "vector": [-0.6, -2.7, -3.3] + } } } }, @@ -135,6 +153,14 @@ "easing": "easeInOutSine" } } + }, + "Lefthand": { + "rotation": { + "vector": [-27.6003, -27.56966, -16.00843] + }, + "position": { + "vector": [-0.6, -2.7, -3.3] + } } } }, @@ -211,6 +237,14 @@ "easing": "easeInOutSine" } } + }, + "Lefthand": { + "rotation": { + "vector": [-27.6003, -27.56966, -16.00843] + }, + "position": { + "vector": [-0.6, -2.7, -3.3] + } } } }, @@ -278,12 +312,30 @@ "vector": [-0.3, -0.3, 0.3] } } + }, + "Lefthand": { + "rotation": { + "vector": [-27.6003, -27.56966, -16.00843] + }, + "position": { + "vector": [-0.6, -2.7, -3.3] + } } } }, "animation.ak47.fire": { "animation_length": 0.05, - "override_previous_animation": true + "override_previous_animation": true, + "bones": { + "Lefthand": { + "rotation": { + "vector": [-27.6003, -27.56966, -16.00843] + }, + "position": { + "vector": [-0.6, -2.7, -3.3] + } + } + } }, "animation.ak47.reload_normal": { "loop": "hold_on_last_frame", @@ -413,7 +465,7 @@ "vector": [0, 0, -1.07] }, "2.3": { - "vector": [0.00031, 0.02116, 0.2598] + "vector": [0.00031, 0.02116, 0.55984] }, "2.3833": { "vector": [0, 0, 0] @@ -423,7 +475,7 @@ "Lefthand": { "rotation": { "0.0333": { - "vector": [0, 0, 0] + "vector": [-27.6003, -27.56966, -16.00843] }, "0.5333": { "vector": [-10.23301, -10.25955, 3.51854], @@ -457,13 +509,12 @@ "easing": "easeOutSine" }, "2.3": { - "vector": [0, 0, 0], - "easing": "easeInOutCubic" + "vector": [-27.6003, -27.56966, -16.00843] } }, "position": { "0.0333": { - "vector": [0, 0, 0] + "vector": [-0.6, -2.7, -3.3] }, "0.5333": { "vector": [3.6298, -9.6674, 10.35934], @@ -501,8 +552,7 @@ "easing": "easeInOutSine" }, "2.3": { - "vector": [0, 0, 0], - "easing": "easeInOutCubic" + "vector": [-0.6, -2.7, -3.3] } } }, @@ -879,7 +929,7 @@ "vector": [0.00274, -0.00904, -0.77015] }, "3.1167": { - "vector": [0.00031, 0.02116, 0.1598] + "vector": [0.00031, 0.02116, 0.55984] }, "3.2": { "vector": [0, 0, 0] @@ -889,7 +939,7 @@ "Lefthand": { "rotation": { "0.0333": { - "vector": [0, 0, 0] + "vector": [-27.6003, -27.56966, -16.00843] }, "0.5667": { "vector": [-19.23301, -10.25955, 3.51854], @@ -950,13 +1000,12 @@ "vector": [28.11259, -27.07767, 82.93501] }, "2.85": { - "vector": [0, 0, 0], - "easing": "easeInSine" + "vector": [-27.6003, -27.56966, -16.00843] } }, "position": { "0.0333": { - "vector": [0, 0, 0] + "vector": [-0.6, -2.7, -3.3] }, "0.5667": { "vector": [2.72479, -12.27935, 8.69539], @@ -1024,8 +1073,7 @@ "easing": "easeInOutCubic" }, "2.85": { - "vector": [0, 0, 0], - "easing": "easeInSine" + "vector": [-0.6, -2.7, -3.3] } } }, diff --git a/src/main/resources/assets/target/animations/rpk.animation.json b/src/main/resources/assets/target/animations/rpk.animation.json index 166d21d99..595bcb657 100644 --- a/src/main/resources/assets/target/animations/rpk.animation.json +++ b/src/main/resources/assets/target/animations/rpk.animation.json @@ -3,7 +3,17 @@ "animations": { "animation.ak47.idle": { "loop": true, - "animation_length": 1 + "animation_length": 1, + "bones": { + "Lefthand": { + "rotation": { + "vector": [-13.63191, -29.3657, -16.88895] + }, + "position": { + "vector": [0.025, -0.11563, -1.60625] + } + } + } }, "animation.ak47.draw": { "animation_length": 0.9, @@ -58,6 +68,14 @@ "easing": "easeOutSine" } } + }, + "Lefthand": { + "rotation": { + "vector": [-13.63191, -29.3657, -16.88895] + }, + "position": { + "vector": [0.025, -0.11563, -1.60625] + } } } }, @@ -131,6 +149,14 @@ "easing": "easeInOutSine" } } + }, + "Lefthand": { + "rotation": { + "vector": [-13.63191, -29.3657, -16.88895] + }, + "position": { + "vector": [0.025, -0.11563, -1.60625] + } } } }, @@ -207,6 +233,14 @@ "easing": "easeInOutSine" } } + }, + "Lefthand": { + "rotation": { + "vector": [-13.63191, -29.3657, -16.88895] + }, + "position": { + "vector": [0.025, -0.11563, -1.60625] + } } } }, @@ -274,12 +308,30 @@ "vector": [-0.3, -0.3, 0.3] } } + }, + "Lefthand": { + "rotation": { + "vector": [-13.63191, -29.3657, -16.88895] + }, + "position": { + "vector": [0.025, -0.11563, -1.60625] + } } } }, "animation.ak47.fire": { "animation_length": 0.05, - "override_previous_animation": true + "override_previous_animation": true, + "bones": { + "Lefthand": { + "rotation": { + "vector": [-13.63191, -29.3657, -16.88895] + }, + "position": { + "vector": [0.025, -0.11563, -1.60625] + } + } + } }, "animation.ak47.reload_empty": { "loop": "hold_on_last_frame", @@ -387,98 +439,98 @@ "vector": [0, 0, 0] }, "0.3167": { - "vector": [-1.1, 0.3, 1.9], + "vector": [-1.1, 0.3, 0.9], "easing": "easeInQuad" }, "0.45": { - "vector": [-1.1, 0, 1.2], + "vector": [-1.1, 0, 0.2], "easing": "easeOutSine" }, "0.5333": { - "vector": [-1.13656, 0.11648, 1.43653] + "vector": [-1.13656, 0.11648, 0.43653] }, "0.65": { - "vector": [-1.11162, 0.03023, 1.28738] + "vector": [-1.11162, 0.03023, 0.28738] }, "0.8167": { - "vector": [-0.96981, -0.32115, 1.20478] + "vector": [-0.96981, -0.32115, 0.20478] }, "0.9": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.75494, -0.64671, -0.12279] }, "0.9833": { - "vector": [-1.1, 0, 1.3] + "vector": [-1.1, 0, 0.3] }, "1.15": { - "vector": [-0.95347, -0.36221, 1.21435] + "vector": [-0.95347, -0.36221, 0.21435] }, "1.3167": { - "vector": [-0.84854, -0.60732, 1.04107] + "vector": [-0.84854, -0.60732, 0.04107] }, "1.4833": { - "vector": [-0.88449, -0.56099, 1.25543] + "vector": [-0.88449, -0.56099, 0.25543] }, "1.7333": { - "vector": [-0.79, -0.44, 1.2] + "vector": [-0.79, -0.44, 0.2] }, "2.05": { - "vector": [-0.89507, -0.06932, 1.3549] + "vector": [-0.89507, -0.06932, 0.3549] }, "2.1333": { - "vector": [-1.16342, 0.21638, 1.44269] + "vector": [-1.16342, 0.21638, 0.44269] }, "2.2167": { - "vector": [-1.03823, 0.0689, 1.38061] + "vector": [-1.03823, 0.0689, 0.38061] }, "2.3": { - "vector": [-1.27235, 0.41208, 1.43655], + "vector": [-1.27235, 0.41208, 0.43655], "easing": "easeInSine" }, "2.4167": { - "vector": [-0.8044, 0.0239, 1.36148], + "vector": [-0.8044, 0.0239, 0.36148], "easing": "easeOutSine" }, "2.5": { - "vector": [-0.55391, 0.01857, 1.28596], + "vector": [-0.55391, 0.01857, 0.28596], "easing": "easeInSine" }, "2.5667": { - "vector": [-0.53, 0.02, 1.27] + "vector": [-0.53, 0.02, 0.27] }, "2.7": { - "vector": [-0.73155, 0.42427, 1.66866] + "vector": [-0.73155, 0.42427, 0.66866] }, "2.85": { - "vector": [-0.07114, -0.36547, 1.29091] + "vector": [-0.07114, -0.36547, 0.29091] }, "3.0": { - "vector": [-0.27874, -0.05921, 1.2782] + "vector": [-0.27874, -0.05921, 0.2782] }, "3.1667": { - "vector": [-0.33, 0.01, 0.64] + "vector": [-0.33, 0.01, -0.36] }, "3.25": { - "vector": [-0.58027, -0.15396, 0.61798] + "vector": [-0.58027, -0.15396, -0.38202] }, "3.4167": { - "vector": [-0.47658, -0.08535, 0.62734] + "vector": [-0.47658, -0.08535, -0.37266] }, "3.5667": { - "vector": [-0.27646, -0.46182, 2.0652], + "vector": [-0.27646, -0.46182, 1.0652], "easing": "easeInQuart" }, "3.6667": { - "vector": [-0.27646, -0.46182, 2.0652], + "vector": [-0.27646, -0.46182, 1.0652], "easing": "easeInQuart" }, "3.8833": { - "vector": [-0.33, 0.01, 0.64] + "vector": [-0.33, 0.01, -0.36] }, "4.0833": { - "vector": [-0.17, 0.21, 0.94] + "vector": [-0.17, 0.21, -0.06] }, "4.2833": { - "vector": [0, 0, 0.18] + "vector": [0, 0, -0.32] }, "4.4167": { "vector": [0, 0, -0.3] @@ -584,13 +636,13 @@ "Lefthand": { "rotation": { "0.0": { - "vector": [0, 0, 0] + "vector": [-13.63191, -29.3657, -16.88895] }, - "0.1667": { - "vector": [0, 0, 0] + "0.1333": { + "vector": [-13.63191, -29.3657, -16.88895] }, "0.2833": { - "vector": [0, 0, 26] + "vector": [-5.59992, -15.19651, 11.81238] }, "0.5833": { "vector": [14.12373, -11.09281, 25.14677] @@ -615,15 +667,15 @@ "vector": [8.3734, -16.00221, -1.42197] }, "3.1167": { - "vector": [0, 0, 0] + "vector": [-13.63191, -29.3657, -16.88895] } }, "position": { "0.0": { - "vector": [0, 0, 0] + "vector": [0.025, -0.11563, -1.60625] }, "0.1667": { - "vector": [0, 0, 0] + "vector": [0.025, -0.11563, -1.60625] }, "0.4167": { "vector": [-0.60795, -2.68839, 4.36626] @@ -647,8 +699,7 @@ "easing": "easeInElastic" }, "3.1167": { - "vector": [0, 0, 0], - "easing": "easeInOutQuad" + "vector": [0.025, -0.11563, -1.60625] } } }, @@ -882,7 +933,7 @@ "vector": [-22.58725, -5.90434, -44.71539] }, "2.7833": { - "vector": [-15.86609, -1.66219, -27.91711] + "vector": [-15.52787, -3.69401, -35.14493] }, "2.9833": { "vector": [-3.8135, -0.9118, -6.85724] @@ -899,75 +950,75 @@ "vector": [0, 0, 0] }, "0.3167": { - "vector": [-1.1, 0.3, 1.9], + "vector": [-1.1, 0.3, 0.9], "easing": "easeInQuad" }, "0.45": { - "vector": [-1.1, 0, 1.2], + "vector": [-1.1, 0, 0.2], "easing": "easeOutSine" }, "0.5333": { - "vector": [-1.13656, 0.11648, 1.43653] + "vector": [-1.13656, 0.11648, 0.43653] }, "0.65": { - "vector": [-1.11162, 0.03023, 1.28738] + "vector": [-1.11162, 0.03023, 0.28738] }, "0.8167": { - "vector": [-0.96981, -0.32115, 1.20478] + "vector": [-0.96981, -0.32115, 0.20478] }, "0.9": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.75494, -0.64671, -0.12279] }, "0.9833": { - "vector": [-1.1, 0, 1.3] + "vector": [-1.1, 0, 0.3] }, "1.15": { - "vector": [-0.95347, -0.36221, 1.21435] + "vector": [-0.95347, -0.36221, 0.21435] }, "1.3167": { - "vector": [-0.84854, -0.60732, 1.04107] + "vector": [-0.84854, -0.60732, 0.04107] }, "1.4833": { - "vector": [-0.88449, -0.56099, 1.25543] + "vector": [-0.88449, -0.56099, 0.25543] }, "1.7333": { - "vector": [-0.79, -0.44, 1.2] + "vector": [-0.79, -0.44, 0.2] }, "2.05": { - "vector": [-0.89507, -0.06932, 1.3549] + "vector": [-0.89507, -0.06932, 0.3549] }, "2.1333": { - "vector": [-1.16342, 0.21638, 1.44269] + "vector": [-1.16342, 0.21638, 0.44269] }, "2.2167": { - "vector": [-1.03823, 0.0689, 1.38061] + "vector": [-1.03823, 0.0689, 0.38061] }, "2.3": { - "vector": [-1.27235, 0.41208, 1.43655], + "vector": [-1.27235, 0.41208, 0.43655], "easing": "easeInSine" }, "2.4167": { - "vector": [-0.8044, 0.0239, 1.36148], + "vector": [-0.8044, 0.0239, 0.36148], "easing": "easeOutSine" }, "2.5": { - "vector": [-0.55391, 0.01857, 1.28596], + "vector": [-0.55391, 0.01857, 0.28596], "easing": "easeInSine" }, "2.5667": { - "vector": [-0.53, 0.02, 1.27] + "vector": [-0.53, 0.02, 0.27] }, "2.7": { - "vector": [-0.73155, 0.42427, 1.66866] + "vector": [-0.73155, 0.42427, 0.66866] }, "2.85": { - "vector": [-0.07114, -0.36547, 1.29091] + "vector": [-0.07114, -0.36547, 0.29091] }, "3.0": { - "vector": [-0.27874, -0.05921, 1.2782] + "vector": [-0.27874, -0.05921, 0.2782] }, "3.15": { - "vector": [0, 0, 0.93] + "vector": [0, 0, 0.43] }, "3.2833": { "vector": [0, 0, -0.3] @@ -1051,10 +1102,10 @@ "Lefthand": { "rotation": { "0.0": { - "vector": [0, 0, 0] + "vector": [-13.63191, -29.3657, -16.88895] }, - "0.1667": { - "vector": [0, 0, 0] + "0.1333": { + "vector": [-13.63191, -29.3657, -16.88895] }, "0.2833": { "vector": [0, 0, 26] @@ -1082,15 +1133,15 @@ "vector": [8.3734, -16.00221, -1.42197] }, "3.1167": { - "vector": [0, 0, 0] + "vector": [-13.63191, -29.3657, -16.88895] } }, "position": { "0.0": { - "vector": [0, 0, 0] + "vector": [0.025, -0.11563, -1.60625] }, "0.1667": { - "vector": [0, 0, 0] + "vector": [0.025, -0.11563, -1.60625] }, "0.4167": { "vector": [-0.60795, -2.68839, 4.36626] @@ -1114,8 +1165,7 @@ "easing": "easeInElastic" }, "3.1167": { - "vector": [0, 0, 0], - "easing": "easeInOutQuad" + "vector": [0.025, -0.11563, -1.60625] } } }, diff --git a/src/main/resources/assets/target/animations/svd.animation.json b/src/main/resources/assets/target/animations/svd.animation.json index 87c155316..5d345e7d1 100644 --- a/src/main/resources/assets/target/animations/svd.animation.json +++ b/src/main/resources/assets/target/animations/svd.animation.json @@ -132,8 +132,9 @@ "animation_length": 0.05, "override_previous_animation": true }, - "animation.svd.reload": { - "animation_length": 3.5, + "animation.svd.reload_empty": { + "loop": "hold_on_last_frame", + "animation_length": 3.4333, "override_previous_animation": true, "bones": { "0": { @@ -141,337 +142,593 @@ "0.0": { "vector": [0, 0, 0] }, + "0.1": { + "vector": [6.22824, 1.18826, 5.97426] + }, + "0.3167": { + "vector": [-14.01, 2.98, -9.37] + }, + "0.4167": { + "vector": [-12.25012, 1.71575, -15.23679] + }, "0.5": { - "vector": [-6.75, 17, 57.5], + "vector": [-13.67625, 0.53753, -20.43357] + }, + "0.5333": { + "vector": [-14.36146, -0.34228, -23.99804] + }, + "0.6333": { + "vector": [-14.36475, 0.09248, -22.30327] + }, + "0.75": { + "vector": [-14.81, -0.41, -24.77] + }, + "0.8333": { + "vector": [-17.57596, -2.10885, -29.925], "easing": "easeInElastic" }, - "0.6": { - "vector": [-8.75, 17, 62.5], - "easing": "easeInElastic" + "0.95": { + "vector": [-15.94266, -0.18118, -25.15393] }, - "0.7": { - "vector": [-3.72, 17, 62.43], - "easing": "easeInElastic" - }, - "0.8": { - "vector": [-8.75, 17, 62.5], - "easing": "easeInElastic" - }, - "1.0": { - "vector": [-6.5, 17, 62.5] + "1.15": { + "vector": [-16.21216, -2.28043, -33.21481] }, "1.5": { - "vector": [-8.25, 17, 62.5], - "easing": "easeInElastic" + "vector": [-19.00098, -2.87117, -36.75727] }, - "1.7": { - "vector": [-11.25, 17, 60] + "1.5667": { + "vector": [-16.00098, -2.87117, -36.75727] }, - "1.8": { - "vector": [-12.25, 17, 58.75] + "1.6333": { + "vector": [-25.64499, -2.46517, -34.94294] + }, + "1.7167": { + "vector": [-16.50098, -2.87117, -36.75727] }, "2.0": { - "vector": [-11.25, 17, 60] + "vector": [-20.30109, -8.2353, -48.49477] }, - "2.1": { - "vector": [-11.25, 17, 60] + "2.2333": { + "vector": [-16.67409, -7.83578, -50.66699] }, - "2.2": { - "vector": [-14.25, 24, 52], + "2.3167": { + "vector": [-19.17566, -13.68506, -59.73468], "easing": "easeInElastic" }, - "2.3": { - "vector": [-11.25, 18, 53] + "2.3333": { + "vector": [-19.17566, -13.68506, -59.73468], + "easing": "easeInElastic" }, - "2.6": { - "vector": [-11.25, 17, 60], - "easing": "easeOutSine" + "2.5": { + "vector": [-12.8145, -2.61693, -45.3695] + }, + "2.65": { + "vector": [-11.75146, -0.36394, -33.34824] + }, + "2.8167": { + "vector": [-6.63855, 2.59206, -16.81115] + }, + "3.05": { + "vector": [-0.38814, -0.04302, 4.50985] + }, + "3.1167": { + "vector": [2, 0, 2] }, "3.2": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "vector": [0, 0, 0] } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.5": { - "vector": [0, 0.18, 0], - "easing": "easeInElastic" + "0.2833": { + "vector": [-1.1, 0.3, -0.1], + "easing": "easeInQuad" }, - "0.6": { - "vector": [0, 0.18, 0], - "easing": "easeInElastic" + "0.4167": { + "vector": [-1.1, 0, -0.8], + "easing": "easeOutSine" + }, + "0.5333": { + "vector": [-1.1, 0, -0.6] }, "0.7": { - "vector": [-0.4, -0.42, 0], + "vector": [-1.13863, 0.08812, -0.6923] + }, + "0.75": { + "vector": [-1.11, 0.09, -0.68] + }, + "0.8333": { + "vector": [-1.32651, 0.6322, -1.60351], "easing": "easeInElastic" }, - "0.9": { - "vector": [0, 0.18, 0], - "easing": "easeInElastic" + "1.0333": { + "vector": [-0.98667, 0.05602, -0.52736] }, - "1.2": { - "vector": [-0.08203, 0.09797, 0], - "easing": "easeInElastic" + "1.25": { + "vector": [-1.02585, 0.23839, -1.22133] }, "1.5": { - "vector": [0, 0.18, 0], + "vector": [-0.88732, 0.11258, -0.78102] + }, + "1.5667": { + "vector": [-0.85209, 0.0351, -0.49198] + }, + "1.6333": { + "vector": [-1.5395, 0.79301, -0.39434] + }, + "1.7167": { + "vector": [-0.85209, 0.0351, -0.49198] + }, + "1.85": { + "vector": [-0.59166, -0.35741, -0.73343], + "easing": "easeInSine" + }, + "2.1167": { + "vector": [-0.50339, -0.1283, -0.63949] + }, + "2.2333": { + "vector": [-0.51, -0.24, -0.53] + }, + "2.3167": { + "vector": [-0.03662, -0.86661, 0.48719], "easing": "easeInElastic" }, - "1.7": { - "vector": [0, 0.18, 0] + "2.3333": { + "vector": [-0.03662, -0.86661, 0.48719], + "easing": "easeInElastic" }, - "1.8": { - "vector": [0.33594, 0.46906, 0] + "2.4333": { + "vector": [-0.60001, 0.02701, -1.38523] }, - "1.9": { - "vector": [-0.3, -0.32, 0], - "easing": "easeInOutSine" + "2.5833": { + "vector": [-0.30111, -0.2912, -0.69679] }, - "2.1": { - "vector": [-0.22, -0.24, 0] + "2.7333": { + "vector": [-0.25313, -0.26698, -1.40007] }, - "2.2": { - "vector": [-0.14, -0.45, 1.3] + "2.85": { + "vector": [-0.09776, -0.12762, -1.05115] }, - "2.4": { - "vector": [-0.14, -0.25, 0] - }, - "2.5": { - "vector": [-0.06, -0.01, 0.3] + "2.9333": { + "vector": [0.00212, 0.18217, -0.76274] }, "3.0": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "vector": [0.00274, -0.00904, -0.77015] + }, + "3.1167": { + "vector": [0.00031, 0.02116, 0.55984] + }, + "3.2": { + "vector": [0, 0, 0] } } }, "Lefthand": { "rotation": { - "0.1": { + "0.0333": { "vector": [0, 0, 0] }, - "0.5": { - "vector": [0, 0, -51], - "easing": "easeInElastic" + "0.5667": { + "vector": [23.76699, -10.25955, 3.51854], + "easing": "easeOutQuad" }, - "0.6": { - "vector": [0, 0, -51], + "0.8333": { + "vector": [7.91868, -26.40156, -38.05763], "easing": "linear" }, - "2.5": { - "vector": [0, 0, -51], - "easing": "easeOutSine" + "0.9667": { + "vector": [1.80318, -46.73371, -21.59127] }, - "2.9": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "1.15": { + "vector": [20.31232, -51.51215, -24.79233] + }, + "1.2333": { + "vector": [10.28121, -44.51965, -13.55683] + }, + "1.3": { + "vector": [14.55032, -23.40856, -0.72828] + }, + "1.3667": { + "vector": [2.81649, -23.73622, -1.68109] + }, + "1.3833": { + "vector": [3.5619, -22.04452, -2.75543] + }, + "1.4167": { + "vector": [4.67363, -23.73622, -1.68109] + }, + "1.45": { + "vector": [4.79544, -22.02191, -2.71842] + }, + "1.5333": { + "vector": [7.72777, -22.9743, -2.14213] + }, + "1.6": { + "vector": [4.67363, -23.73622, -1.68109] + }, + "1.65": { + "vector": [4.67363, -23.73622, -1.68109] + }, + "1.8167": { + "vector": [-6.78199, -4.07081, 10.69071] + }, + "1.9667": { + "vector": [-26.9, 5.84, 25.75] + }, + "2.2": { + "vector": [21.28621, 49.80684, 92.55967], + "easing": "easeInCubic" + }, + "2.3": { + "vector": [18.15836, 54.76869, 89.37164] + }, + "2.35": { + "vector": [18.15836, 54.76869, 89.37164] + }, + "2.75": { + "vector": [16.56356, -9.00013, 11.40462] + }, + "3.05": { + "vector": [0, 0, 0] } }, "position": { - "0.1": { + "0.0333": { "vector": [0, 0, 0] }, - "0.5": { - "vector": [1.5, 7, -0.6], - "easing": "easeInElastic" + "0.5667": { + "vector": [3.32479, -3.87935, 14.59539], + "easing": "easeOutQuad" }, - "0.6": { - "vector": [1.5, 7, -0.6], + "0.8333": { + "vector": [0.05518, -1.4065, 8.74792], "easing": "linear" }, - "2.5": { - "vector": [1.5, 7, -0.6], - "easing": "easeOutSine" + "0.9167": { + "vector": [-1.73, -4.59, 5.04] + }, + "0.9333": { + "vector": [-2.33, -4.39, 2.14] + }, + "0.95": { + "vector": [-2.85, -4.19, -0.83] + }, + "0.9667": { + "vector": [-3.82086, -4.57255, -1.15764], + "easing": "easeInElastic" + }, + "1.15": { + "vector": [-2.73513, -4.33341, 1.34848] + }, + "1.2333": { + "vector": [-3.83304, -4.7625, 3.3434] + }, + "1.2833": { + "vector": [-3.74375, -3.64535, 5.38294] + }, + "1.3": { + "vector": [-3.5138, -3.2645, 5.19182] + }, + "1.3333": { + "vector": [-3.53047, -3.00921, 4.70015] + }, + "1.35": { + "vector": [-3.53568, -2.92705, 4.5724] + }, + "1.3833": { + "vector": [-3.55351, -2.87908, 4.54109] + }, + "1.4167": { + "vector": [-3.50043, -3.36801, 5.34276] + }, + "1.4333": { + "vector": [-3.59041, -2.92228, 4.72952] + }, + "1.45": { + "vector": [-3.62311, -2.88793, 4.80216] + }, + "1.5333": { + "vector": [-4.08368, -2.96727, 5.32945] + }, + "1.6": { + "vector": [-3.71402, -3.26212, 6.601] + }, + "1.65": { + "vector": [-3.71402, -3.26212, 6.601] + }, + "1.8167": { + "vector": [-4.85539, -7.00072, 9.48678] + }, + "2.05": { + "vector": [-7.59261, -4.21333, 0.73397] + }, + "2.2": { + "vector": [-7.5, -4.1, -2.4], + "easing": "easeInOutCubic" + }, + "2.3": { + "vector": [-7.5, -4.1, -0.3], + "easing": "easeInElastic" + }, + "2.35": { + "vector": [-7.5, -4.1, -0.3], + "easing": "easeInElastic" + }, + "2.5833": { + "vector": [-5.67354, -3.59751, 2.20301], + "easing": "easeInOutCubic" }, "2.9": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "vector": [0, 0, 0] } } }, "magazine": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.6": { + "0.85": { "vector": [0, 0, 0] }, "0.9": { - "vector": [37.37235, -2.62403, -53.08221], - "easing": "easeInSine" + "vector": [-22.55, -0.02, -0.03] }, - "1.3": { - "vector": [-12.62765, -2.62403, -2.08221] + "0.9333": { + "vector": [-4.30232, 2.78191, 18.58512] + }, + "1.4333": { + "vector": [228.74022, -22.11907, 369.38637] + }, + "1.5833": { + "vector": [228.74022, -22.11907, 369.38637] }, "1.6": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.7": { - "vector": [3, 0, 0] - }, - "1.8": { "vector": [0, 0, 0], "easing": "easeInOutSine" } }, "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.6": { + "0.85": { "vector": [0, 0, 0] }, "0.9": { - "vector": [6.5, -29.97, -0.9], + "vector": [0.01, 0.14406, -1.16562] + }, + "0.9333": { + "vector": [0.21125, -0.80641, -5.26578], "easing": "easeInSine" }, + "0.95": { + "vector": [0.25713, -1.15637, -7.20754] + }, + "0.9667": { + "vector": [0.29824, -1.52697, -9.13772] + }, + "0.9833": { + "vector": [0.31934, -1.92759, -11.05789] + }, + "1.0": { + "vector": [0.28522, -2.45411, -12.95403] + }, + "1.0167": { + "vector": [0.23827, -2.99974, -14.83544] + }, + "1.0333": { + "vector": [0.17884, -3.57007, -16.71553] + }, + "1.05": { + "vector": [0.08941, -4.19041, -18.58562] + }, + "1.0667": { + "vector": [-0.06493, -4.92729, -20.41298], + "easing": "linear" + }, + "1.0833": { + "vector": [-0.47024, -5.72469, -22.34539] + }, + "1.1": { + "vector": [-0.90552, -6.6095, -24.12792] + }, + "1.1167": { + "vector": [-1.46928, -7.72187, -25.76974] + }, + "1.1333": { + "vector": [-2.06611, -8.93042, -27.41789] + }, + "1.15": { + "vector": [-2.79995, -10.41167, -29.1896] + }, + "1.1667": { + "vector": [-3.64848, -12.10393, -30.92471] + }, + "1.1833": { + "vector": [-4.60438, -14.00373, -32.64536] + }, + "1.2": { + "vector": [-5.73554, -16.19113, -34.28333] + }, + "1.2167": { + "vector": [-6.97172, -18.49773, -35.6964] + }, + "1.2333": { + "vector": [-8.41316, -21.11596, -36.87271] + }, + "1.25": { + "vector": [-10.01644, -23.94699, -37.83754] + }, + "1.2667": { + "vector": [-11.85707, -27.04107, -38.31609] + }, + "1.2833": { + "vector": [-13.83003, -30.22423, -38.39935] + }, "1.3": { - "vector": [0, -9.27, -0.9], - "easing": "easeInSine" + "vector": [-15.81626, -33.31283, -38.01859] }, - "1.5": { - "vector": [0, -2.27, -0.9], - "easing": "easeOutSine" + "1.3167": { + "vector": [-17.77992, -36.24006, -37.49357] }, - "1.7": { - "vector": [0, 0.16406, 0], - "easing": "easeInOutQuad" + "1.3333": { + "vector": [-19.9298, -39.35713, -36.76093] }, - "1.8": { - "vector": [0, 0, 0] - } - } - }, - "Righthand": { - "rotation": { - "0.2": { - "vector": [0, 0, 0] + "1.35": { + "vector": [-22.46831, -42.95055, -35.80139] }, - "0.6": { - "vector": [6, 9, -9.25], - "easing": "easeInElastic" + "1.3667": { + "vector": [-25.17347, -46.7097, -34.75503] }, - "0.9": { - "vector": [6, 9, -9.25], - "easing": "easeInOutSine" + "1.3833": { + "vector": [-28.12852, -50.74428, -33.50483] }, - "1.0": { - "vector": [6, 15, -9.25], - "easing": "easeInOutSine" + "1.4": { + "vector": [-31.35557, -55.07306, -32.13932] }, - "1.9": { - "vector": [6, 15, -9.25], - "easing": "easeInOutSine" + "1.5833": { + "vector": [-78.47428, -129.97255, 141.14732] }, - "2.0": { - "vector": [-1.5, 10.75, -20.46] - }, - "2.1": { - "vector": [-9, 20.5, -1.67] - }, - "2.2": { - "vector": [-9, 20.5, -1.67] - }, - "2.3": { - "vector": [-9, 20.5, -1.67] - }, - "2.4": { - "vector": [-2.92, 6.66, -15.54] - }, - "2.7": { + "1.6": { "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.2": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [1.9, 0.5, -6.1], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [1.9, 0.5, -6.1], "easing": "easeInOutSine" - }, - "1.0": { - "vector": [2.9, -0.6, -4.8], - "easing": "easeInOutSine" - }, - "1.9": { - "vector": [2.9, -0.6, -4.8], - "easing": "easeInOutSine" - }, - "2.1": { - "vector": [0.22484, 0.97688, -4.16], - "easing": "easeInSine" - }, - "2.2": { - "vector": [0.22, 0.98, -2.26] - }, - "2.3": { - "vector": [0.22, 0.98, -2.26] - }, - "2.4": { - "vector": [0.07, -0.78, -1.64] - }, - "2.7": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "bone35": { - "rotation": { - "2.1": { - "vector": [0, 0, 0] - }, - "2.2": { - "vector": [0, 0, 0], - "easing": "easeInSine" - }, - "2.3": { - "vector": [0, 0, 0] - }, - "2.4": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "2.1": { - "vector": [0, 0, 0] - }, - "2.2": { - "vector": [0, 0, 1.5], - "easing": "easeInSine" - }, - "2.3": { - "vector": [0, 0, 1.5] - }, - "2.4": { - "vector": [0, 0, 0], - "easing": "easeInElastic" } } }, "bullet": { "position": { + "0.25": { + "vector": [0, 0, 0] + }, + "0.2667": { + "vector": [0, -0.25, 0] + }, + "1.95": { + "vector": [0, -0.25, 0] + }, + "1.9667": { + "vector": [0, 0, 0] + } + } + }, + "magazine2": { + "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, -1, 0] + "0.5667": { + "vector": [0, 0, 0] }, - "1.0": { - "vector": [0, -1, 0] + "0.8333": { + "vector": [-1.6877, -6.9011, -59.53669] }, - "1.1": { + "0.9667": { + "vector": [-18.5572, -15.25513, -38.47706] + }, + "1.05": { + "vector": [-15.3497, -20.32249, -41.53446], + "easing": "linear" + }, + "1.15": { + "vector": [-9.10984, -37.69607, -35.31059] + }, + "1.2833": { + "vector": [-12.79, -0.76, -17.74] + }, + "1.3667": { + "vector": [-18, 0, -13.25], + "easing": "easeInOutQuad" + }, + "1.4167": { + "vector": [-22.05592, -4.56353, -7.11018] + }, + "1.45": { + "vector": [-21.17748, -2.97195, -4.59202] + }, + "1.5833": { + "vector": [0, 0, 0] + }, + "1.65": { + "vector": [0, 0, 0] + }, + "1.6667": { + "vector": [0, 0, 0] + }, + "1.6833": { + "vector": [0, 0, 0] + }, + "2.7333": { + "vector": [0, 0, 0] + }, + "2.75": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.5667": { + "vector": [-0.86802, -3.30009, -2.89697] + }, + "0.8333": { + "vector": [-5.78259, 0.383, -7.67844] + }, + "0.85": { + "vector": [-5.68405, 0.28551, -8.52647] + }, + "0.9": { + "vector": [-5.39501, -0.2044, -9.90156] + }, + "0.9167": { + "vector": [-5.54707, -0.2642, -10.57894] + }, + "0.9333": { + "vector": [-5.72354, 0.32946, -13.36301] + }, + "0.95": { + "vector": [-5.96357, 0.86804, -15.95022] + }, + "0.9667": { + "vector": [-6.04475, 0.65902, -16.25563], + "easing": "easeInOutCirc" + }, + "1.05": { + "vector": [-4.46993, 0.57809, -16.06172] + }, + "1.15": { + "vector": [-2.64151, 0.11551, -15.02632], + "easing": "linear" + }, + "1.2833": { + "vector": [-5.16589, -0.37183, -11.72992] + }, + "1.3": { + "vector": [-5.53, -0.24, -12.19] + }, + "1.3667": { + "vector": [-6.32342, 1.77873, -11.42235], + "easing": "easeInOutQuad" + }, + "1.4167": { + "vector": [-6.36, 1.49, -11.37] + }, + "1.4833": { + "vector": [-6.4, 1.49, -11.3] + }, + "1.5667": { + "vector": [-6.43, 1.44, -11.24] + }, + "1.65": { + "vector": [-6.49844, 1.71172, -11.11172] + }, + "1.6667": { + "vector": [-6.49844, 1.71172, -11.11172] + }, + "1.6833": { + "vector": [0, 0, 113] + }, + "2.7333": { + "vector": [0, 0, 113] + }, + "2.75": { "vector": [0, 0, 0] } } @@ -481,194 +738,317 @@ "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [0, 0, -1.5], + "0.3": { + "vector": [0, 0, 1.5], "easing": "easeInElastic" }, - "0.6": { - "vector": [1, -1, 1.5], - "easing": "easeInSine" + "0.4167": { + "vector": [0, 0, 1] }, - "0.7": { - "vector": [-0.5, 0.5, -1.5] - }, - "0.9": { - "vector": [0.2, 0, -1.2], + "0.65": { + "vector": [0.5, 0, 1.2], "easing": "easeOutSine" }, - "1.2": { - "vector": [-0.01, 0, -0.2] + "0.7667": { + "vector": [-0.1, 0, 2] }, - "1.6": { - "vector": [-0.5, 0, -1.5], + "0.8833": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "0.9667": { + "vector": [1, 1, -2.5], + "easing": "easeInSine" + }, + "1.05": { + "vector": [-0.5, -0.5, 1.5] + }, + "1.3": { + "vector": [0.5, 0, 1], + "easing": "easeInElastic" + }, + "1.4667": { + "vector": [-0.5, 0, 2.2], "easing": "linear" }, - "1.7": { - "vector": [1.5, 0.7, -0.93], + "1.55": { + "vector": [1.5, -0.7, 0.8], "easing": "easeInSine" }, - "1.9": { - "vector": [-0.4, -0.4, 0.6], - "easing": "easeOutSine" + "2.0167": { + "vector": [0, 0, 1.5], + "easing": "linear" }, - "2.0": { - "vector": [0.2, 0, -1.5] + "2.15": { + "vector": [0.2, 0, 1.5] }, - "2.1": { - "vector": [1, -2, -1.8] + "2.25": { + "vector": [1, 2, 1.8] }, - "2.2": { - "vector": [-1.5, 3, 1.5] + "2.3167": { + "vector": [-1.5, -3, -1.5] }, - "2.4": { - "vector": [0.2, -1.5, -1.5] + "2.45": { + "vector": [0.2, 1.5, 1.5] }, - "2.7": { + "2.6": { "vector": [0, 0, 0], "easing": "easeInElastic" + }, + "2.9667": { + "vector": [0, 0, -0.75], + "easing": "linear" + }, + "3.1333": { + "vector": [0, 0, 0], + "easing": "linear" } } } }, "sound_effects": { "0.0": { - "effect": "svd_reload_empty" + "effect": "ak_47_reload_empty" } } }, - "animation.svd.reload2": { - "animation_length": 2.7, - "override_previous_animation": true, + "animation.svd.reload_normal": { + "loop": "hold_on_last_frame", + "animation_length": 2.75, "bones": { "0": { "rotation": { - "0.0": { + "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": [-6.75, 17, 57.5], - "easing": "easeInElastic" + "vector": [-13.67625, 0.53753, -20.43357] }, - "0.6": { - "vector": [-8.75, 17, 62.5], - "easing": "easeInElastic" + "0.5417": { + "vector": [-14.36146, -0.34228, -23.99804] }, - "0.7": { - "vector": [-3.72, 17, 62.43], - "easing": "easeInElastic" + "0.625": { + "vector": [-15.36586, -0.75486, -21.85957] }, - "0.8": { - "vector": [-8.75, 17, 62.5], - "easing": "easeInElastic" + "0.7083": { + "vector": [-3.42984, -0.39385, -15.87027] }, - "1.0": { - "vector": [-6.5, 17, 62.5] + "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": [-8.25, 17, 62.5], - "easing": "easeInElastic" + "vector": [-13.44223, -4.57576, -41.51634] }, - "1.7": { - "vector": [-11.25, 17, 60] + "1.5833": { + "vector": [-10.27854, -4.93547, -43.49053] }, - "1.8": { - "vector": [-12.25, 17, 58.75] + "1.6667": { + "vector": [-9.91402, -5.63696, -47.44539] }, - "2.0": { - "vector": [-9.25, 10, 44.5], - "easing": "easeInOutSine" + "1.7917": { + "vector": [-11.91402, -5.63696, -47.44539] }, - "2.6": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "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.0": { + "0.0417": { "vector": [0, 0, 0] }, - "0.5": { - "vector": [0, 0.18, 0], - "easing": "easeInElastic" + "0.2917": { + "vector": [-1.1, 0.3, 1.9], + "easing": "easeInQuad" }, - "0.6": { - "vector": [0, 0.18, 0], - "easing": "easeInElastic" + "0.4167": { + "vector": [-1.1, 0, 1.2], + "easing": "easeOutSine" }, - "0.7": { - "vector": [-0.4, -0.42, 0], - "easing": "easeInElastic" + "0.5417": { + "vector": [-1.1, 0, 1.4] }, - "0.9": { - "vector": [0, 0.18, 0], - "easing": "easeInElastic" + "0.625": { + "vector": [-1.1, 0, 1.3] }, - "1.2": { - "vector": [-0.08203, 0.09797, 0], - "easing": "easeInElastic" + "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": [0, 0.18, 0], - "easing": "easeInElastic" + "vector": [-1.16342, 0.21638, 1.44269] }, - "1.7": { - "vector": [0, 0.18, 0] + "1.5833": { + "vector": [-1.03823, 0.0689, 1.38061] }, - "1.8": { - "vector": [0.33594, 0.46906, 0] + "1.6667": { + "vector": [-0.91462, 0.05514, 1.36807] }, - "1.9": { - "vector": [-0.3, -0.32, 0], - "easing": "easeInOutSine" + "1.7917": { + "vector": [-0.68888, -0.13612, 1.3186] }, - "2.4": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "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] } } }, "Lefthand": { "rotation": { - "0.1": { + "0.0": { "vector": [0, 0, 0] }, - "0.5": { - "vector": [0, 0, -51], + "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.6667": { + "vector": [0, 1.5, 1] + }, + "0.9167": { + "vector": [0, 1.5, 1], "easing": "easeInElastic" }, - "0.6": { - "vector": [0, 0, -51], - "easing": "linear" + "1.1667": { + "vector": [1.97176, -8.21825, 9.86653] }, - "2.0": { - "vector": [0, 0, -51], - "easing": "easeOutSine" + "1.4167": { + "vector": [-5.02824, -8.21825, 9.86653] }, - "2.5": { + "1.5833": { + "vector": [-2.02824, -8.21825, 9.86653] + }, + "1.9167": { + "vector": [3.97176, -8.21825, 9.86653] + }, + "2.0417": { + "vector": [-3.81928, -8.59364, -9.17363] + }, + "2.2917": { "vector": [0, 0, 0], "easing": "easeInElastic" } }, "position": { - "0.1": { + "0.0": { "vector": [0, 0, 0] }, - "0.5": { - "vector": [1.5, 7, -0.6], + "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, -2.2, 4.2] + }, + "0.6667": { + "vector": [0, -2.2, 4.2] + }, + "0.9167": { + "vector": [0, -17.2, 4.2], "easing": "easeInElastic" }, - "0.6": { - "vector": [1.5, 7, -0.6], - "easing": "linear" + "1.1667": { + "vector": [-3.1, -18, 4.1] }, - "2.0": { - "vector": [1.5, 7, -0.6], - "easing": "easeOutSine" + "1.2083": { + "vector": [-3.1, -17.45, 3.83] }, - "2.5": { + "1.2917": { + "vector": [-3.1, -14.25, 3.3] + }, + "1.4167": { + "vector": [-3.1, -3.5, 2.5] + }, + "1.5": { + "vector": [-3.1, -3.3, 3.15] + }, + "1.5833": { + "vector": [-3.1, -3.1, 3.2] + }, + "1.75": { + "vector": [-3.15, -2.85, 4.45] + }, + "1.9167": { + "vector": [-3.2, -2.6, 4.5] + }, + "2.0417": { + "vector": [0.79205, -1.58839, 2.26626] + }, + "2.2917": { "vector": [0, 0, 0], "easing": "easeInElastic" } @@ -679,110 +1059,63 @@ "0.0": { "vector": [0, 0, 0] }, - "0.6": { + "0.6667": { "vector": [0, 0, 0] }, - "0.9": { - "vector": [37.37235, -2.62403, -53.08221], + "0.9167": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "1.1667": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + }, + "1.4167": { + "vector": [-21, 0, -11] + }, + "1.5833": { + "vector": [-14, 0, -5.83], "easing": "easeInSine" }, - "1.3": { - "vector": [-12.62765, -2.62403, -2.08221] + "1.7917": { + "vector": [0, 0, 0] }, - "1.6": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.7": { - "vector": [3, 0, 0] - }, - "1.8": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" + "1.9167": { + "vector": [0, 0, 0] } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.6": { + "0.6667": { "vector": [0, 0, 0] }, - "0.9": { - "vector": [6.5, -29.97, -0.9], + "0.9167": { + "vector": [0, -15, 0], + "easing": "easeInElastic" + }, + "1.1667": { + "vector": [0, -15, 0], + "easing": "easeInElastic" + }, + "1.4167": { + "vector": [0.21094, -0.16719, -0.98516], "easing": "easeInSine" }, - "1.3": { - "vector": [0, -9.27, -0.9], + "1.5833": { + "vector": [0.14, -0.19422, -0.47], "easing": "easeInSine" }, - "1.5": { - "vector": [0, -2.27, -0.9], - "easing": "easeOutSine" + "1.7083": { + "vector": [0.07, -0.37625, -0.09719], + "easing": "easeInSine" }, - "1.7": { - "vector": [0, 0.16406, 0], - "easing": "easeInOutQuad" - }, - "1.8": { - "vector": [0, 0, 0] - } - } - }, - "Righthand": { - "rotation": { - "0.2": { + "1.75": { "vector": [0, 0, 0] }, - "0.6": { - "vector": [6, 9, -9.25], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [6, 9, -9.25], - "easing": "easeInOutSine" - }, - "1.0": { - "vector": [6, 15, -9.25], - "easing": "easeInOutSine" - }, - "1.9": { - "vector": [6, 15, -9.25], - "easing": "easeInOutSine" - }, - "2.0": { - "vector": [2, 20.5, -11.67] - }, - "2.4": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - }, - "position": { - "0.2": { + "1.9167": { "vector": [0, 0, 0] - }, - "0.6": { - "vector": [1.9, 0.5, -6.1], - "easing": "easeInElastic" - }, - "0.9": { - "vector": [1.9, 0.5, -6.1], - "easing": "easeInOutSine" - }, - "1.0": { - "vector": [2.9, -0.6, -4.8], - "easing": "easeInOutSine" - }, - "1.9": { - "vector": [2.9, -0.6, -4.8], - "easing": "easeInOutSine" - }, - "2.0": { - "vector": [2.51, -0.52, -0.56] - }, - "2.4": { - "vector": [0, 0, 0], - "easing": "easeInElastic" } } }, @@ -791,51 +1124,61 @@ "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [0, 0, -1.5], + "0.2917": { + "vector": [0, 0, 1.5], "easing": "easeInElastic" }, - "0.6": { - "vector": [1, -1, 1.5], + "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.7": { - "vector": [-0.5, 0.5, -1.5] + "0.7917": { + "vector": [-0.5, -0.5, 1.5] }, - "0.9": { - "vector": [0.2, 0, -1.2], + "1.0": { + "vector": [0.5, 0, 1.2], "easing": "easeOutSine" }, - "1.2": { - "vector": [-0.01, 0, -0.2] + "1.25": { + "vector": [-0.1, 0, 2] }, - "1.6": { - "vector": [-0.5, 0, -1.5], + "1.5": { + "vector": [0.5, 0, 2], + "easing": "easeInElastic" + }, + "1.6667": { + "vector": [-0.5, 0, 2.2], "easing": "linear" }, - "1.7": { - "vector": [1.5, 0.7, -0.93], + "1.75": { + "vector": [1.5, -0.7, 1.2], "easing": "easeInSine" }, - "1.9": { - "vector": [-0.4, -0.4, 0.6], - "easing": "easeOutSine" + "2.0417": { + "vector": [0, 0, 1.5], + "easing": "linear" }, - "2.0": { - "vector": [0.2, 0, -1.5] + "2.25": { + "vector": [0, 0, -0.75], + "easing": "linear" }, - "2.4": { - "vector": [0, 0, 0] + "2.4167": { + "vector": [0, 0, 0], + "easing": "linear" } } } }, "sound_effects": { "0.0": { - "effect": "svd_reload_normal" + "effect": "m_4_reload_normal" } } } diff --git a/src/main/resources/assets/target/geo/svd.geo.json b/src/main/resources/assets/target/geo/svd.geo.json index fe4696d1f..c8f211119 100644 --- a/src/main/resources/assets/target/geo/svd.geo.json +++ b/src/main/resources/assets/target/geo/svd.geo.json @@ -13,7 +13,7 @@ "bones": [ { "name": "camera", - "pivot": [2.57141, 4.96276, 6.77702] + "pivot": [2.27141, 4.46276, 7.67702] }, { "name": "root", @@ -4678,57 +4678,29 @@ ] }, { - "name": "magazine", + "name": "Righthand", "parent": "0", - "pivot": [0, 0, 0] - }, - { - "name": "bullet", - "parent": "magazine", - "pivot": [0.00283, 0.69506, -2.73021], + "pivot": [-3.39609, -3.68672, 12.7], + "rotation": [76.54796, -8.74418, 14.70579], "cubes": [ { - "origin": [-0.19092, 0.50131, -3.70521], - "size": [0.3875, 0.3875, 1.55], + "origin": [-4.39609, -3.68672, 10.7], + "size": [3, 12, 4], "uv": { - "north": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, - "east": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, - "south": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, - "west": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, - "up": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]}, - "down": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]} - } - }, - { - "origin": [-0.14092, 0.55131, -4.50521], - "size": [0.2875, 0.2875, 2.5], - "uv": { - "north": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, - "east": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, - "south": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, - "west": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, - "up": {"uv": [2, 92], "uv_size": [0.75, 3.25]}, - "down": {"uv": [2, 92], "uv_size": [0.75, 3.25]} - } - }, - { - "origin": [-0.19092, 0.50131, -2.05521], - "size": [0.3875, 0.3875, 0.1], - "uv": { - "north": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, - "east": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, - "south": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, - "west": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, - "up": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]}, - "down": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]} + "north": {"uv": [7, 12], "uv_size": [3, 12]}, + "east": {"uv": [8, 0], "uv_size": [4, 12]}, + "south": {"uv": [10, 12], "uv_size": [3, 12]}, + "west": {"uv": [0, 12], "uv_size": [4, 12]}, + "up": {"uv": [15, 4], "uv_size": [3, 4]}, + "down": {"uv": [15, 12], "uv_size": [3, -4]} } } ] }, { - "name": "mag", - "parent": "magazine", - "pivot": [2.81533, 2.81069, -8.17396], + "name": "magazine", + "parent": "0", + "pivot": [0.00283, -0.36216, -3.46774], "cubes": [ { "origin": [-0.39092, 0.05444, -4.85521], @@ -4918,7 +4890,7 @@ }, { "name": "bone46", - "parent": "mag", + "parent": "magazine", "pivot": [0.00283, -0.53994, -2.77021], "cubes": [ { @@ -4985,7 +4957,7 @@ }, { "name": "bone47", - "parent": "mag", + "parent": "magazine", "pivot": [0.00283, -0.53994, -2.77021], "rotation": [-5, 0, 0], "cubes": [ @@ -5063,7 +5035,7 @@ }, { "name": "bone48", - "parent": "mag", + "parent": "magazine", "pivot": [0.00283, -0.53994, -2.77021], "rotation": [-10, 0, 0], "cubes": [ @@ -5154,21 +5126,515 @@ ] }, { - "name": "Righthand", + "name": "bullet", "parent": "magazine", - "pivot": [-2.75, -7.75, 10], - "rotation": [56.87402, -10.51794, 6.79286], + "pivot": [0.00283, 0.69506, -2.73021], "cubes": [ { - "origin": [-3.75, -7.75, 8], - "size": [3, 12, 4], + "origin": [-0.19092, 0.50131, -3.70521], + "size": [0.3875, 0.3875, 1.55], "uv": { - "north": {"uv": [7, 12], "uv_size": [3, 12]}, - "east": {"uv": [8, 0], "uv_size": [4, 12]}, - "south": {"uv": [10, 12], "uv_size": [3, 12]}, - "west": {"uv": [0, 12], "uv_size": [4, 12]}, - "up": {"uv": [15, 4], "uv_size": [3, 4]}, - "down": {"uv": [15, 12], "uv_size": [3, -4]} + "north": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]}, + "down": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]} + } + }, + { + "origin": [-0.14092, 0.55131, -4.50521], + "size": [0.2875, 0.2875, 2.5], + "uv": { + "north": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [2, 92], "uv_size": [0.75, 3.25]}, + "down": {"uv": [2, 92], "uv_size": [0.75, 3.25]} + } + }, + { + "origin": [-0.19092, 0.50131, -2.05521], + "size": [0.3875, 0.3875, 0.1], + "uv": { + "north": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]}, + "down": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]} + } + } + ] + }, + { + "name": "magazine2", + "parent": "0", + "pivot": [6.48095, -2.07544, 7.63226], + "cubes": [ + { + "origin": [6.0872, -1.65884, 6.24479], + "size": [0.7875, 0.61875, 3.15], + "uv": { + "north": {"uv": [32, 64], "uv_size": [0.75, 0.5]}, + "east": {"uv": [46, 40], "uv_size": [3.25, 0.5]}, + "south": {"uv": [64, 32], "uv_size": [0.75, 0.5]}, + "west": {"uv": [47, 3], "uv_size": [3.25, 0.5]}, + "up": {"uv": [22, 33], "uv_size": [0.75, 3.25]}, + "down": {"uv": [23, 36.25], "uv_size": [0.75, -3.25]} + } + }, + { + "origin": [6.17562, -1.21432, 7.48229], + "size": [0.1125, 0.3375, 1.9125], + "pivot": [6.56937, -0.90495, 7.81979], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [79, 11], "uv_size": [0.25, 0.25]}, + "east": {"uv": [62, 40], "uv_size": [2, 0.25]}, + "south": {"uv": [12, 79], "uv_size": [0.25, 0.25]}, + "west": {"uv": [62, 41], "uv_size": [2, 0.25]}, + "up": {"uv": [41, 62], "uv_size": [0.25, 2]}, + "down": {"uv": [52, 64], "uv_size": [0.25, -2]} + } + }, + { + "origin": [6.7019, -1.07446, 7.48229], + "size": [0.1125, 0.3375, 1.9125], + "pivot": [6.75815, -0.90571, 7.81979], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [79, 12], "uv_size": [0.25, 0.25]}, + "east": {"uv": [53, 62], "uv_size": [2, 0.25]}, + "south": {"uv": [13, 79], "uv_size": [0.25, 0.25]}, + "west": {"uv": [62, 54], "uv_size": [2, 0.25]}, + "up": {"uv": [62, 55], "uv_size": [0.25, 2]}, + "down": {"uv": [57, 64], "uv_size": [0.25, -2]} + } + }, + { + "origin": [6.11533, -1.90786, 6.30136], + "size": [0.73125, 0.28125, 0.1125], + "pivot": [6.48095, -1.76724, 6.35761], + "rotation": [22.5, 0, 0], + "uv": { + "north": {"uv": [33, 70], "uv_size": [0.75, 0.25]}, + "east": {"uv": [79, 13], "uv_size": [0.25, 0.25]}, + "south": {"uv": [70, 33], "uv_size": [0.75, 0.25]}, + "west": {"uv": [14, 79], "uv_size": [0.25, 0.25]}, + "up": {"uv": [34, 70], "uv_size": [0.75, 0.25]}, + "down": {"uv": [70, 34.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.00283, -1.71509, 7.45338], + "size": [0.95625, 0.1125, 1.23359], + "uv": { + "north": {"uv": [67, 41], "uv_size": [1, 0.25]}, + "east": {"uv": [66, 22], "uv_size": [1.25, 0.25]}, + "south": {"uv": [67, 42], "uv_size": [1, 0.25]}, + "west": {"uv": [66, 23], "uv_size": [1.25, 0.25]}, + "up": {"uv": [48, 54], "uv_size": [1, 1.25]}, + "down": {"uv": [54, 49.25], "uv_size": [1, -1.25]} + } + }, + { + "origin": [6.00283, -1.71275, 6.69479], + "size": [0.95625, 0.1125, 0.34844], + "uv": { + "north": {"uv": [67, 43], "uv_size": [1, 0.25]}, + "east": {"uv": [79, 14], "uv_size": [0.25, 0.25]}, + "south": {"uv": [44, 67], "uv_size": [1, 0.25]}, + "west": {"uv": [15, 79], "uv_size": [0.25, 0.25]}, + "up": {"uv": [67, 44], "uv_size": [1, 0.25]}, + "down": {"uv": [45, 67.25], "uv_size": [1, -0.25]} + } + }, + { + "origin": [6.00283, -2.66431, 7.46901], + "size": [0.95625, 0.1125, 1.21406], + "pivot": [6.48095, -2.60689, 7.44323], + "rotation": [-5.75, 0, 0], + "uv": { + "north": {"uv": [17, 70], "uv_size": [1, 0.25]}, + "east": {"uv": [4, 67], "uv_size": [1.25, 0.25]}, + "south": {"uv": [70, 17], "uv_size": [1, 0.25]}, + "west": {"uv": [6, 67], "uv_size": [1.25, 0.25]}, + "up": {"uv": [2, 55], "uv_size": [1, 1.25]}, + "down": {"uv": [3, 56.25], "uv_size": [1, -1.25]} + } + }, + { + "origin": [6.00283, -2.66197, 6.58541], + "size": [0.95625, 0.1125, 0.41875], + "pivot": [6.48095, -2.60689, 7.44323], + "rotation": [-5.75, 0, 0], + "uv": { + "north": {"uv": [16, 70], "uv_size": [1, 0.25]}, + "east": {"uv": [77, 69], "uv_size": [0.5, 0.25]}, + "south": {"uv": [70, 16], "uv_size": [1, 0.25]}, + "west": {"uv": [70, 77], "uv_size": [0.5, 0.25]}, + "up": {"uv": [63, 34], "uv_size": [1, 0.5]}, + "down": {"uv": [37, 63.5], "uv_size": [1, -0.5]} + } + }, + { + "origin": [6.00283, -2.55572, 6.72291], + "size": [0.95625, 0.87109, 0.1125], + "uv": { + "north": {"uv": [58, 25], "uv_size": [1, 0.75]}, + "east": {"uv": [35, 70], "uv_size": [0.25, 0.75]}, + "south": {"uv": [58, 26], "uv_size": [1, 0.75]}, + "west": {"uv": [70, 35], "uv_size": [0.25, 0.75]}, + "up": {"uv": [67, 45], "uv_size": [1, 0.25]}, + "down": {"uv": [46, 67.25], "uv_size": [1, -0.25]} + } + }, + { + "origin": [6.00283, -2.63619, 7.79166], + "size": [0.95625, 0.94922, 0.1125], + "uv": { + "north": {"uv": [56, 39], "uv_size": [1, 1]}, + "east": {"uv": [67, 46], "uv_size": [0.25, 1]}, + "south": {"uv": [56, 44], "uv_size": [1, 1]}, + "west": {"uv": [47, 67], "uv_size": [0.25, 1]}, + "up": {"uv": [67, 47], "uv_size": [1, 0.25]}, + "down": {"uv": [48, 67.25], "uv_size": [1, -0.25]} + } + }, + { + "origin": [6.00283, -2.68697, 8.41041], + "size": [0.95625, 1, 0.1125], + "uv": { + "north": {"uv": [56, 49], "uv_size": [1, 1]}, + "east": {"uv": [7, 70], "uv_size": [0.25, 1]}, + "south": {"uv": [56, 50], "uv_size": [1, 1]}, + "west": {"uv": [70, 7], "uv_size": [0.25, 1]}, + "up": {"uv": [8, 70], "uv_size": [1, 0.25]}, + "down": {"uv": [70, 8.25], "uv_size": [1, -0.25]} + } + }, + { + "origin": [6.00283, -3.39316, 6.65596], + "size": [0.95625, 0.72266, 0.1125], + "pivot": [6.48095, -3.03886, 7.55596], + "rotation": [-9, 0, 0], + "uv": { + "north": {"uv": [59, 0], "uv_size": [1, 0.75]}, + "east": {"uv": [1, 72], "uv_size": [0.25, 0.75]}, + "south": {"uv": [1, 59], "uv_size": [1, 0.75]}, + "west": {"uv": [72, 1], "uv_size": [0.25, 0.75]}, + "up": {"uv": [15, 70], "uv_size": [1, 0.25]}, + "down": {"uv": [70, 15.25], "uv_size": [1, -0.25]} + } + }, + { + "origin": [6.00283, -3.46191, 7.72471], + "size": [0.95625, 0.875, 0.1125], + "pivot": [6.48095, -3.03886, 7.55596], + "rotation": [-9, 0, 0], + "uv": { + "north": {"uv": [54, 56], "uv_size": [1, 1]}, + "east": {"uv": [13, 70], "uv_size": [0.25, 1]}, + "south": {"uv": [56, 54], "uv_size": [1, 1]}, + "west": {"uv": [70, 13], "uv_size": [0.25, 1]}, + "up": {"uv": [14, 70], "uv_size": [1, 0.25]}, + "down": {"uv": [70, 14.25], "uv_size": [1, -0.25]} + } + }, + { + "origin": [6.00283, -3.54004, 8.34346], + "size": [0.95625, 1, 0.1125], + "pivot": [6.48095, -3.03886, 7.55596], + "rotation": [-9, 0, 0], + "uv": { + "north": {"uv": [56, 52], "uv_size": [1, 1]}, + "east": {"uv": [11, 70], "uv_size": [0.25, 1]}, + "south": {"uv": [56, 53], "uv_size": [1, 1]}, + "west": {"uv": [70, 11], "uv_size": [0.25, 1]}, + "up": {"uv": [12, 70], "uv_size": [1, 0.25]}, + "down": {"uv": [70, 12.25], "uv_size": [1, -0.25]} + } + } + ] + }, + { + "name": "bone49", + "parent": "magazine2", + "pivot": [6.48095, -2.25322, 8.32979], + "cubes": [ + { + "origin": [6.11533, -2.69087, 6.31354], + "size": [0.73125, 1.03203, 0.8875], + "uv": { + "north": {"uv": [58, 23], "uv_size": [0.75, 1]}, + "east": {"uv": [56, 37], "uv_size": [1, 1]}, + "south": {"uv": [24, 58], "uv_size": [0.75, 1]}, + "west": {"uv": [56, 38], "uv_size": [1, 1]}, + "up": {"uv": [58, 24], "uv_size": [0.75, 1]}, + "down": {"uv": [25, 59], "uv_size": [0.75, -1]} + } + }, + { + "origin": [6.1997, -2.85884, 7.20104], + "size": [0.5625, 1.25625, 1.96875], + "uv": { + "north": {"uv": [52, 59], "uv_size": [0.5, 1.25]}, + "east": {"uv": [6, 33], "uv_size": [2, 1.25]}, + "south": {"uv": [59, 52], "uv_size": [0.5, 1.25]}, + "west": {"uv": [8, 33], "uv_size": [2, 1.25]}, + "up": {"uv": [39, 56], "uv_size": [0.5, 2]}, + "down": {"uv": [40, 58], "uv_size": [0.5, -2]} + } + }, + { + "origin": [6.11533, -2.82369, 7.36979], + "size": [0.73125, 1.16484, 1.55625], + "uv": { + "north": {"uv": [21, 57], "uv_size": [0.75, 1.25]}, + "east": {"uv": [45, 44], "uv_size": [1.5, 1.25]}, + "south": {"uv": [23, 57], "uv_size": [0.75, 1.25]}, + "west": {"uv": [0, 46], "uv_size": [1.5, 1.25]}, + "up": {"uv": [15, 55], "uv_size": [0.75, 1.5]}, + "down": {"uv": [16, 56.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.11533, -2.85494, 9.06979], + "size": [0.73125, 1.19609, 0.25625], + "uv": { + "north": {"uv": [38, 57], "uv_size": [0.75, 1.25]}, + "east": {"uv": [0, 67], "uv_size": [0.25, 1.25]}, + "south": {"uv": [41, 57], "uv_size": [0.75, 1.25]}, + "west": {"uv": [1, 67], "uv_size": [0.25, 1.25]}, + "up": {"uv": [71, 70], "uv_size": [0.75, 0.25]}, + "down": {"uv": [71, 71.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.25595, -2.85884, 9.22604], + "size": [0.45, 1.2, 0.16875], + "uv": { + "north": {"uv": [41, 59], "uv_size": [0.5, 1.25]}, + "east": {"uv": [13, 66], "uv_size": [0.25, 1.25]}, + "south": {"uv": [49, 59], "uv_size": [0.5, 1.25]}, + "west": {"uv": [66, 20], "uv_size": [0.25, 1.25]}, + "up": {"uv": [56, 72], "uv_size": [0.5, 0.25]}, + "down": {"uv": [72, 56.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "bone50", + "parent": "magazine2", + "pivot": [6.48095, -2.25322, 8.32979], + "rotation": [-5, 0, 0], + "cubes": [ + { + "origin": [6.11533, -3.67325, 6.30028], + "size": [0.73125, 0.82656, 0.8875], + "pivot": [6.48095, -3.60485, 8.08365], + "rotation": [-4, 0, 0], + "uv": { + "north": {"uv": [62, 15], "uv_size": [0.75, 0.75]}, + "east": {"uv": [58, 50], "uv_size": [1, 0.75]}, + "south": {"uv": [62, 16], "uv_size": [0.75, 0.75]}, + "west": {"uv": [52, 58], "uv_size": [1, 0.75]}, + "up": {"uv": [54, 58], "uv_size": [0.75, 1]}, + "down": {"uv": [55, 59], "uv_size": [0.75, -1]} + } + }, + { + "origin": [6.1997, -3.97091, 7.18778], + "size": [0.5625, 1.35625, 1.96875], + "pivot": [6.48095, -3.60485, 8.08365], + "rotation": [-4, 0, 0], + "uv": { + "north": {"uv": [4, 60], "uv_size": [0.5, 1.25]}, + "east": {"uv": [33, 14], "uv_size": [2, 1.25]}, + "south": {"uv": [5, 60], "uv_size": [0.5, 1.25]}, + "west": {"uv": [17, 33], "uv_size": [2, 1.25]}, + "up": {"uv": [51, 56], "uv_size": [0.5, 2]}, + "down": {"uv": [52, 58], "uv_size": [0.5, -2]} + } + }, + { + "origin": [6.11533, -3.77091, 7.35653], + "size": [0.73125, 1.06484, 1.55625], + "pivot": [6.48095, -3.60485, 8.08365], + "rotation": [-4, 0, 0], + "uv": { + "north": {"uv": [58, 55], "uv_size": [0.75, 1]}, + "east": {"uv": [54, 17], "uv_size": [1.5, 1]}, + "south": {"uv": [56, 58], "uv_size": [0.75, 1]}, + "west": {"uv": [54, 18], "uv_size": [1.5, 1]}, + "up": {"uv": [55, 49], "uv_size": [0.75, 1.5]}, + "down": {"uv": [55, 55.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.11533, -3.767, 9.05653], + "size": [0.73125, 1.09609, 0.25625], + "pivot": [6.48095, -3.60485, 8.08365], + "rotation": [-4, 0, 0], + "uv": { + "north": {"uv": [57, 58], "uv_size": [0.75, 1]}, + "east": {"uv": [9, 70], "uv_size": [0.25, 1]}, + "south": {"uv": [58, 57], "uv_size": [0.75, 1]}, + "west": {"uv": [70, 9], "uv_size": [0.25, 1]}, + "up": {"uv": [0, 72], "uv_size": [0.75, 0.25]}, + "down": {"uv": [72, 0.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.25595, -3.77091, 9.21278], + "size": [0.45, 1.1, 0.16875], + "pivot": [6.48095, -3.60485, 8.08365], + "rotation": [-4, 0, 0], + "uv": { + "north": {"uv": [63, 33], "uv_size": [0.5, 1]}, + "east": {"uv": [10, 70], "uv_size": [0.25, 1]}, + "south": {"uv": [34, 63], "uv_size": [0.5, 1]}, + "west": {"uv": [70, 10], "uv_size": [0.25, 1]}, + "up": {"uv": [77, 67], "uv_size": [0.5, 0.25]}, + "down": {"uv": [68, 77.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "bone51", + "parent": "magazine2", + "pivot": [6.48095, -2.25322, 8.32979], + "rotation": [-10, 0, 0], + "cubes": [ + { + "origin": [6.11533, -4.79213, 6.36826], + "size": [0.73125, 1.1, 3.02109], + "pivot": [6.48095, -4.24213, 8.65127], + "rotation": [-5, 0, 0], + "uv": { + "north": {"uv": [58, 58], "uv_size": [0.75, 1]}, + "east": {"uv": [15, 30], "uv_size": [3, 1]}, + "south": {"uv": [0, 59], "uv_size": [0.75, 1]}, + "west": {"uv": [30, 15], "uv_size": [3, 1]}, + "up": {"uv": [15, 42], "uv_size": [0.75, 3]}, + "down": {"uv": [16, 45], "uv_size": [0.75, -3]} + } + }, + { + "origin": [6.11533, -4.83413, 6.39646], + "size": [0.73125, 0.21328, 3.01328], + "pivot": [6.48095, -4.28413, 7.907], + "rotation": [-9, 0, 0], + "uv": { + "north": {"uv": [2, 72], "uv_size": [0.75, 0.25]}, + "east": {"uv": [59, 1], "uv_size": [3, 0.25]}, + "south": {"uv": [72, 2], "uv_size": [0.75, 0.25]}, + "west": {"uv": [59, 2], "uv_size": [3, 0.25]}, + "up": {"uv": [42, 16], "uv_size": [0.75, 3]}, + "down": {"uv": [42, 22], "uv_size": [0.75, -3]} + } + }, + { + "origin": [6.06533, -4.85366, 6.37692], + "size": [0.83125, 0.07656, 3.14219], + "pivot": [6.48095, -4.28413, 7.907], + "rotation": [-9, 0, 0], + "uv": { + "north": {"uv": [3, 72], "uv_size": [0.75, 0.25]}, + "east": {"uv": [58, 8], "uv_size": [3.25, 0.25]}, + "south": {"uv": [72, 3], "uv_size": [0.75, 0.25]}, + "west": {"uv": [58, 9], "uv_size": [3.25, 0.25]}, + "up": {"uv": [29, 33], "uv_size": [0.75, 3.25]}, + "down": {"uv": [30, 36.25], "uv_size": [0.75, -3.25]} + } + }, + { + "origin": [6.06533, -4.0771, 6.67692], + "size": [0.83125, 0.1125, 2.84219], + "pivot": [6.48095, -3.48413, 7.907], + "rotation": [-9, 0, 0], + "uv": { + "north": {"uv": [4, 72], "uv_size": [0.75, 0.25]}, + "east": {"uv": [29, 59], "uv_size": [2.75, 0.25]}, + "south": {"uv": [72, 4], "uv_size": [0.75, 0.25]}, + "west": {"uv": [59, 29], "uv_size": [2.75, 0.25]}, + "up": {"uv": [39, 44], "uv_size": [0.75, 2.75]}, + "down": {"uv": [40, 46.75], "uv_size": [0.75, -2.75]} + } + }, + { + "origin": [6.06533, -4.3771, 6.65349], + "size": [0.83125, 0.1125, 2.84219], + "pivot": [6.48095, -3.78413, 7.88357], + "rotation": [-9, 0, 0], + "uv": { + "north": {"uv": [5, 72], "uv_size": [0.75, 0.25]}, + "east": {"uv": [59, 30], "uv_size": [2.75, 0.25]}, + "south": {"uv": [72, 5], "uv_size": [0.75, 0.25]}, + "west": {"uv": [32, 59], "uv_size": [2.75, 0.25]}, + "up": {"uv": [41, 44], "uv_size": [0.75, 2.75]}, + "down": {"uv": [42, 46.75], "uv_size": [0.75, -2.75]} + } + }, + { + "origin": [6.25595, -4.99213, 9.28936], + "size": [0.45, 1.3, 0.16875], + "pivot": [6.48095, -4.24213, 8.65127], + "rotation": [-5, 0, 0], + "uv": { + "north": {"uv": [10, 60], "uv_size": [0.5, 1.25]}, + "east": {"uv": [2, 67], "uv_size": [0.25, 1.25]}, + "south": {"uv": [11, 60], "uv_size": [0.5, 1.25]}, + "west": {"uv": [3, 67], "uv_size": [0.25, 1.25]}, + "up": {"uv": [77, 68], "uv_size": [0.5, 0.25]}, + "down": {"uv": [69, 77.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "bullet2", + "parent": "magazine2", + "pivot": [6.48095, -1.01822, 8.36979], + "cubes": [ + { + "origin": [6.2872, -1.21197, 7.39479], + "size": [0.3875, 0.3875, 1.55], + "uv": { + "north": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]}, + "down": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]} + } + }, + { + "origin": [6.3372, -1.16197, 6.59479], + "size": [0.2875, 0.2875, 2.5], + "uv": { + "north": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [2, 92], "uv_size": [0.75, 3.25]}, + "down": {"uv": [2, 92], "uv_size": [0.75, 3.25]} + } + }, + { + "origin": [6.2872, -1.21197, 9.04479], + "size": [0.3875, 0.3875, 0.1], + "uv": { + "north": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]}, + "down": {"uv": [0, 91.875], "uv_size": [0.75, 3.25]} } } ] diff --git a/src/main/resources/assets/target/models/displaysettings/ak47.item.json b/src/main/resources/assets/target/models/displaysettings/ak47.item.json index 099dbc417..3f3b46bf2 100644 --- a/src/main/resources/assets/target/models/displaysettings/ak47.item.json +++ b/src/main/resources/assets/target/models/displaysettings/ak47.item.json @@ -9,8 +9,8 @@ "firstperson_righthand": { "translation": [ -6.5, - 3.5, - 4.25 + 3.75, + 5 ] }, "firstperson_lefthand": { diff --git a/src/main/resources/assets/target/models/displaysettings/svd.item.json b/src/main/resources/assets/target/models/displaysettings/svd.item.json index c03ac87e0..156b9604c 100644 --- a/src/main/resources/assets/target/models/displaysettings/svd.item.json +++ b/src/main/resources/assets/target/models/displaysettings/svd.item.json @@ -8,14 +8,9 @@ "display": { "firstperson_righthand": { "translation": [ - 1.75, - -8.5, - -20.75 - ], - "scale": [ - 4, - 4, - 4 + -6.75, + 3.5, + 3.5 ] }, "firstperson_lefthand": { diff --git a/src/main/resources/assets/target/sounds/svd/svd_reload_empty.ogg b/src/main/resources/assets/target/sounds/svd/svd_reload_empty.ogg index 043f9fca1..609f81f52 100644 Binary files a/src/main/resources/assets/target/sounds/svd/svd_reload_empty.ogg and b/src/main/resources/assets/target/sounds/svd/svd_reload_empty.ogg differ