diff --git a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java index 5f352a6a4..1e1f356f9 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.putDouble("reloading", 1); tag.putDouble("emptyreload", 0); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reloadtime", 41); + tag.putDouble("reloadtime", 55); } else if (tag.getDouble("ammo") == 0) { tag.putDouble("reloading", 1); tag.putDouble("emptyreload", 1); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reloadtime", 57); + tag.putDouble("reloadtime", 66); } } if (player.getMainHandItem().getItem() == TargetModItems.M_60.get() diff --git a/src/main/java/net/mcreator/target/procedures/SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java b/src/main/java/net/mcreator/target/procedures/SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java index ecc1df3d5..947cf0663 100644 --- a/src/main/java/net/mcreator/target/procedures/SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure.java @@ -21,7 +21,7 @@ public class SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { itemstack.getOrCreateTag().putDouble("reloadtime", 0); } if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") == 0) { - if (itemstack.getOrCreateTag().getDouble("reloadtime") == 57) { + if (itemstack.getOrCreateTag().getDouble("reloadtime") == 66) { entity.getPersistentData().putDouble("id", id); { Entity _ent = entity; @@ -48,7 +48,7 @@ public class SvdWuPinZaiBeiBaoZhongShiMeiKeFaShengProcedure { GunReload.reload(entity, GunInfo.Type.SNIPER); } } else if (itemstack.getOrCreateTag().getDouble("reloading") == 1 && itemstack.getOrCreateTag().getDouble("ammo") > 0) { - if (itemstack.getOrCreateTag().getDouble("reloadtime") == 41) { + if (itemstack.getOrCreateTag().getDouble("reloadtime") == 55) { entity.getPersistentData().putDouble("id", id); { Entity _ent = entity; diff --git a/src/main/resources/assets/target/animations/sks.animation.json b/src/main/resources/assets/target/animations/sks.animation.json index b0dc08529..f7aaee3ae 100644 --- a/src/main/resources/assets/target/animations/sks.animation.json +++ b/src/main/resources/assets/target/animations/sks.animation.json @@ -91,109 +91,6 @@ } } }, - "animation.sks.hit": { - "animation_length": 0.6, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [-147.50541, 34.52809, 101.28078], - "easing": "easeOutSine" - }, - "0.4": { - "vector": [-13.26827, 5.92455, 35.88217], - "easing": "easeInSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [3.36, -2.44, -4.42] - }, - "0.2": { - "vector": [8.55, -0.7, -9.85], - "easing": "easeOutSine" - }, - "0.4": { - "vector": [0.97, 0.75, -3.12], - "easing": "easeInSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, - "Righthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [112.5, 0, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 15, -10], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [135, 0, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [-4.29, 19.16875, -9.15] - }, - "0.3": { - "vector": [-6, 16, -10], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - } - } - }, "animation.sks.fire": { "animation_length": 0.05, "override_previous_animation": true, @@ -255,133 +152,108 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [-0.9962, 0.08715, 3.24924] - }, - "0.2": { - "vector": [-2.5, 0.04, -1.88] - }, "0.3": { - "vector": [-4, 0, -7], - "easing": "easeInOutSine" + "vector": [-7, 0, -17], + "easing": "easeInElastic" + }, + "0.4": { + "vector": [-7, 0, -22] }, "0.5": { - "vector": [-0.00638, -0.05195, -0.49863], - "easing": "easeOutSine" + "vector": [-1.25, 0, -21.58] + }, + "0.6": { + "vector": [-6.41, 0, -21.16] }, "0.8": { - "vector": [-4.49954, -0.05233, -7.99863], - "easing": "easeOutSine" - }, - "1.0": { - "vector": [-5.99652, 0.19166, -5.00897], - "easing": "easeInOutSine" - }, - "1.1": { - "vector": [-5.99954, 0.05237, -5.00046] + "vector": [-10.53, 0, -20.33] }, "1.2": { - "vector": [-3.99898, 0.01587, -5.99698] + "vector": [-8.76, 0, -36.16], + "easing": "easeInElastic" }, "1.3": { - "vector": [-8.9386, -1.01362, -9.4107] + "vector": [-8.32, 0, -31.37] }, "1.4": { - "vector": [-6.99256, -0.1915, -6.99013] - }, - "1.5": { - "vector": [-6.2646, 0.00739, -8.99132] + "vector": [-13.88, 0, -30.08] }, "1.6": { - "vector": [-3.53664, 0.20628, -10.99252] + "vector": [-13, 0, -17], + "easing": "linear" }, "1.8": { - "vector": [-3.92554, 1.21661, -5.01275] + "vector": [-16, 0, -30], + "easing": "easeInElastic" }, - "1.9": { - "vector": [-3.4766, 3.70329, -16.29941] + "2.0": { + "vector": [-20, 0, -30], + "easing": "linear" }, "2.1": { - "vector": [-3.1964, 1.65843, -2.89436] - }, - "2.3": { - "vector": [-2.3794, 2.34664, -6.5116] + "vector": [-16, 4, -21], + "easing": "linear" }, "2.6": { - "vector": [2.61229, 1.20998, 0.97405], - "easing": "easeInQuad" - }, - "2.9": { "vector": [0, 0, 0], - "easing": "easeOutSine" + "easing": "easeInElastic" } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, -0.18, 0.02] - }, - "0.2": { - "vector": [0, 0.21, 0.06] - }, - "0.3": { - "vector": [0, 0.12, 0.15], - "easing": "easeInSine" - }, "0.4": { - "vector": [0, -0.29, 0.22] + "vector": [0, 0.7, 0], + "easing": "easeInElastic" }, "0.5": { - "vector": [0, -0.3, -0.1], - "easing": "easeInOutSine" + "vector": [0.2, -0.05, 0] }, "0.6": { - "vector": [0, -0.15, 0.2], - "easing": "easeOutSine" + "vector": [0.14875, 0.60547, 0] }, - "0.8": { - "vector": [0, -0.2, 0.1], - "easing": "easeInSine" - }, - "0.9": { - "vector": [0, -0.23, 0.32] - }, - "1.2": { - "vector": [0, -0.4, 0.3] + "0.7": { + "vector": [0.23938, 0.45766, 0] }, "1.3": { - "vector": [0, 0.1, 0.3] + "vector": [0.08, 0.62, 0] + }, + "1.4": { + "vector": [-0.14531, 0.95, 0] }, "1.5": { - "vector": [0, -0.3, 0.3], - "easing": "easeInSine" + "vector": [0.23, 0.43, 0] + }, + "1.6": { + "vector": [0, 0.2625, 0.38672], + "easing": "linear" }, "1.8": { - "vector": [0, -0.4, 0.3] + "vector": [0.4, 0.6125, 0.38672], + "easing": "easeInElastic" }, "1.9": { - "vector": [0, -0.5, 1], - "easing": "easeInSine" + "vector": [0.4, 0.6125, 1.48672], + "easing": "linear" + }, + "2.0": { + "vector": [0.4, 0.6125, 1.58672], + "easing": "linear" }, "2.1": { - "vector": [0, -0.2, 0.4], - "easing": "easeInSine" + "vector": [0.4, 0.6125, -0.11328], + "easing": "linear" }, - "2.2": { - "vector": [0, -0.18, 0.57] + "2.3": { + "vector": [0, 0, -0.23] }, - "2.4": { - "vector": [0, -0.13, 0.01] + "2.5": { + "vector": [0, 0, -0.37] }, "2.7": { - "vector": [0, -0.04, 0.3], - "easing": "easeInSine" - }, - "2.9": { "vector": [0, 0, 0], - "easing": "easeOutSine" + "easing": "easeInElastic" } } }, @@ -391,49 +263,33 @@ "vector": [0, 0, 0] }, "0.1": { - "vector": [4.35141, -9.80475, 8.6364] - }, - "0.2": { - "vector": [-4, -4, 0] + "vector": [13, -5, 13] }, "0.3": { - "vector": [0, -4, 0] - }, - "1.3": { - "vector": [0, -4, 0] + "vector": [0, -4, 0], + "easing": "easeInSine" }, "1.4": { "vector": [0, -4, 0] }, "1.5": { - "vector": [-18.71, -9.52, 1.13], - "easing": "easeInOutSine" + "vector": [0, -4, 0] }, "1.7": { - "vector": [-46.97111, -6.37986, -9.46036], - "easing": "easeInOutSine" + "vector": [-19.25, -10.86, -13.58] }, "1.8": { - "vector": [-65.52408, -42.41359, 12.37484], + "vector": [-19.52408, -27.41359, 1.37484], "easing": "easeInSine" }, - "1.9": { - "vector": [-73.52408, -32.41359, 12.37484] - }, - "2.0": { - "vector": [-73.52408, -29.41359, 12.37484] - }, "2.1": { - "vector": [-65.52408, -15.41359, 6.37484] + "vector": [-19.52408, -27.41359, 1.37484], + "easing": "easeInSine" }, "2.3": { - "vector": [-21.19082, -4.60587, -0.5644], - "easing": "easeInOutSine" + "vector": [29.28, 6.97, -22.1] }, "2.5": { - "vector": [-4.3304, -21.45095, 11.22415] - }, - "2.7": { "vector": [0, 0, 0], "easing": "easeOutSine" } @@ -442,44 +298,41 @@ "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [-0.7, -1.6, 4.3] + "0.1": { + "vector": [-1.4, -0.4, 2] }, "0.3": { - "vector": [-0.7, -2.2, 1.7] - }, - "1.3": { - "vector": [-0.7, -2.2, 1.7] + "vector": [-0.7, -1.7, 5.3], + "easing": "easeInSine" }, "1.4": { - "vector": [-0.7, -2.2, 4.5] + "vector": [-0.7, -1.7, 5.3] + }, + "1.5": { + "vector": [-0.7, -1.7, 5.3] }, "1.6": { - "vector": [-3.9, -9.2, 3.55], - "easing": "easeInOutSine" - }, - "1.7": { - "vector": [-4.1, -4.15, 1.13] + "vector": [-1.37, -3.67, 7.4] }, "1.8": { - "vector": [-7.6, -3.7, -2.8], + "vector": [-5.9, -1.3, 6], "easing": "easeInSine" }, "1.9": { - "vector": [-7.35, -3.83, -3.66] - }, - "2.1": { - "vector": [-8, -4.7, -5.1], + "vector": [-5.9, -1.3, 7.1], "easing": "easeInSine" }, - "2.2": { - "vector": [-7.36, -6.5, -4.04], - "easing": "easeInOutSine" + "2.0": { + "vector": [-5.9, -1.3, 7.1] }, - "2.4": { - "vector": [-3.03, -7.17, 2.03] + "2.1": { + "vector": [-5.9, -1.3, 6], + "easing": "easeInSine" }, - "2.7": { + "2.3": { + "vector": [-1.73, 0.32, 2.46] + }, + "2.5": { "vector": [0, 0, 0], "easing": "easeOutSine" } @@ -497,19 +350,20 @@ "vector": [-9, 0, 0] }, "0.6": { - "vector": [-12.62765, -2.62403, -2.08221] + "vector": [19.37235, -2.62403, -2.08221] }, - "1.1": { + "0.9": { "vector": [-12.62765, -2.62403, -2.08221] }, "1.2": { "vector": [-12.62765, -2.62403, -2.08221] }, "1.3": { - "vector": [0, 0, 0] + "vector": [3, 0, 0] }, "1.4": { - "vector": [0, 0, 0] + "vector": [0, 0, 0], + "easing": "easeInOutSine" } }, "position": { @@ -523,16 +377,19 @@ "vector": [0, 0, 0] }, "0.6": { - "vector": [0, -9.27, -0.9] + "vector": [0, -11.07, 3.1] + }, + "0.9": { + "vector": [0, -6.87, -2.9], + "easing": "easeInSine" }, "1.1": { - "vector": [0, -9.27, -0.9] - }, - "1.2": { - "vector": [0, -2.27, -0.9] + "vector": [0, -2.27, -0.9], + "easing": "easeOutSine" }, "1.3": { - "vector": [0, 0, 0] + "vector": [0, 0.16406, 0], + "easing": "easeInOutQuad" }, "1.4": { "vector": [0, 0, 0] @@ -558,6 +415,22 @@ "vector": [0, 0, 0] } } + }, + "bullet": { + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.1": { + "vector": [0, -0.5, 0] + }, + "0.6": { + "vector": [0, -0.5, 0] + }, + "0.7": { + "vector": [0, 0, 0] + } + } } } }, @@ -570,90 +443,71 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [-3.97816, 0.41778, 2.48549], - "easing": "easeInSine" - }, "0.3": { - "vector": [-8, 0, -7], - "easing": "easeInOutSine" + "vector": [-7, 0, -17], + "easing": "easeInElastic" }, "0.4": { - "vector": [-0.00638, -0.05195, -0.49863], - "easing": "easeOutSine" + "vector": [-7, 0, -22] + }, + "0.5": { + "vector": [-1.25, 0, -21.58] }, "0.6": { - "vector": [-4.49954, -0.05233, -7.99863], - "easing": "easeOutSine" + "vector": [-6.41, 0, -21.16] }, - "1.0": { - "vector": [-5.99652, 0.19166, -5.00897], - "easing": "easeInOutSine" - }, - "1.1": { - "vector": [-3.99954, 0.05237, -5.00046] + "0.8": { + "vector": [-10.53, 0, -20.33] }, "1.2": { - "vector": [-3.99898, 0.01587, -5.99698] + "vector": [-8.76, 0, -36.16], + "easing": "easeInElastic" }, "1.3": { - "vector": [-8.9386, -1.01362, -9.4107] + "vector": [-8.32, 0, -31.37] }, "1.4": { - "vector": [-6.99256, -0.1915, -6.99013] + "vector": [-13.88, 0, -30.08] }, - "1.5": { - "vector": [-6.2646, 0.00739, -8.99132] - }, - "1.7": { - "vector": [-0.48525, 0.63548, -4.00548] - }, - "1.8": { - "vector": [0, 0, 0] + "2.0": { + "vector": [0, 0, 0], + "easing": "easeInElastic", + "easingArgs": [1] } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, 0.2, -0.2], - "easing": "easeInSine" - }, - "0.3": { - "vector": [0, 0.42, 0.15], - "easing": "easeInSine" - }, "0.4": { - "vector": [0, -0.3, -0.5], - "easing": "easeOutSine" + "vector": [0, 0.7, 0], + "easing": "easeInElastic" }, "0.5": { - "vector": [0, -0.15, 0.2], - "easing": "easeOutSine" + "vector": [0.2, -0.05, 0] + }, + "0.6": { + "vector": [0.14875, 0.60547, 0] }, "0.7": { - "vector": [0, -0.2, 0.1], - "easing": "easeInSine" - }, - "0.9": { - "vector": [0, -0.23, 0.32] - }, - "1.2": { - "vector": [0, -0.4, 0.3] + "vector": [0.23938, 0.45766, 0] }, "1.3": { - "vector": [0, 0.1, 0.3] + "vector": [0.08, 0.62, 0] + }, + "1.4": { + "vector": [-0.14531, 0.95, 0] }, "1.5": { - "vector": [0, -0.3, 0.3], - "easing": "easeInSine" + "vector": [0.23, 0.18, 0] }, - "1.7": { - "vector": [0, -0.12, 0.12] + "1.6": { + "vector": [0, 0.01172, 0.38672], + "easing": "linear" }, - "1.8": { - "vector": [0, 0, 0] + "2.0": { + "vector": [0, 0, 0], + "easing": "easeInElastic" } } }, @@ -663,44 +517,43 @@ "vector": [0, 0, 0] }, "0.1": { - "vector": [4.35141, -9.80475, 8.6364] - }, - "0.2": { - "vector": [-4, -4, 0] + "vector": [13, -5, 13] }, "0.3": { - "vector": [0, -4, 0] - }, - "1.3": { - "vector": [0, -4, 0] + "vector": [0, -4, 0], + "easing": "easeInSine" }, "1.4": { "vector": [0, -4, 0] }, + "1.5": { + "vector": [13, -5, 13] + }, "1.7": { "vector": [0, 0, 0], - "easing": "easeOutSine" + "easing": "easeInOutSine" } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [-0.7, -1.6, 4.3] + "0.1": { + "vector": [-1.4, -0.4, 2] }, "0.3": { - "vector": [-0.7, -2.2, 1.7] - }, - "1.3": { - "vector": [-0.7, -2.2, 1.7] + "vector": [-0.7, -1.7, 5.3], + "easing": "easeInSine" }, "1.4": { - "vector": [-0.7, -2.2, 4.5] + "vector": [-0.7, -1.7, 5.3] }, - "1.7": { + "1.5": { + "vector": [-1.4, -0.4, 2] + }, + "1.8": { "vector": [0, 0, 0], - "easing": "easeOutSine" + "easing": "easeInOutSine" } } }, @@ -716,19 +569,20 @@ "vector": [-9, 0, 0] }, "0.6": { - "vector": [-12.62765, -2.62403, -2.08221] + "vector": [19.37235, -2.62403, -2.08221] }, - "1.1": { + "0.9": { "vector": [-12.62765, -2.62403, -2.08221] }, "1.2": { "vector": [-12.62765, -2.62403, -2.08221] }, "1.3": { - "vector": [0, 0, 0] + "vector": [3, 0, 0] }, "1.4": { - "vector": [0, 0, 0] + "vector": [0, 0, 0], + "easing": "easeInOutSine" } }, "position": { @@ -742,16 +596,19 @@ "vector": [0, 0, 0] }, "0.6": { - "vector": [0, -9.27, -0.9] + "vector": [0, -11.07, 3.1] + }, + "0.9": { + "vector": [0, -6.87, -2.9], + "easing": "easeInSine" }, "1.1": { - "vector": [0, -9.27, -0.9] - }, - "1.2": { - "vector": [0, -2.27, -0.9] + "vector": [0, -2.27, -0.9], + "easing": "easeOutSine" }, "1.3": { - "vector": [0, 0, 0] + "vector": [0, 0.16406, 0], + "easing": "easeInOutQuad" }, "1.4": { "vector": [0, 0, 0] diff --git a/src/main/resources/assets/target/animations/svd.animation.json b/src/main/resources/assets/target/animations/svd.animation.json index 8548a4755..9814e8f85 100644 --- a/src/main/resources/assets/target/animations/svd.animation.json +++ b/src/main/resources/assets/target/animations/svd.animation.json @@ -91,115 +91,266 @@ } } }, - "animation.svd.hit": { - "animation_length": 0.6, + "animation.svd.fire": { + "animation_length": 0.05, + "override_previous_animation": true + }, + "animation.svd.reload2": { + "animation_length": 2.7, + "override_previous_animation": true, "bones": { "0": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [-147.50541, 34.52809, 101.28078], - "easing": "easeOutSine" - }, - "0.4": { - "vector": [-13.26827, 5.92455, 35.88217], - "easing": "easeInSine" + "0.5": { + "vector": [-6.75, 17, 57.5], + "easing": "easeInElastic" }, "0.6": { + "vector": [-8.75, 17, 62.5], + "easing": "easeInElastic" + }, + "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.5": { + "vector": [-8.25, 17, 62.5], + "easing": "easeInElastic" + }, + "1.7": { + "vector": [-11.25, 17, 60] + }, + "1.8": { + "vector": [-12.25, 17, 58.75] + }, + "2.0": { + "vector": [-9.25, 10, 44.5], + "easing": "easeInOutSine" + }, + "2.6": { "vector": [0, 0, 0], - "easing": "easeOutSine" + "easing": "easeInElastic" } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [3.36, -2.44, -4.42] - }, - "0.2": { - "vector": [8.55, -0.7, -9.85], - "easing": "easeOutSine" - }, - "0.4": { - "vector": [0.97, 0.75, -3.12], - "easing": "easeInSine" + "0.5": { + "vector": [0, 0.18, 0], + "easing": "easeInElastic" }, "0.6": { + "vector": [0, 0.18, 0], + "easing": "easeInElastic" + }, + "0.7": { + "vector": [-0.4, -0.42, 0], + "easing": "easeInElastic" + }, + "0.9": { + "vector": [0, 0.18, 0], + "easing": "easeInElastic" + }, + "1.2": { + "vector": [-0.08203, 0.09797, 0], + "easing": "easeInElastic" + }, + "1.5": { + "vector": [0, 0.18, 0], + "easing": "easeInElastic" + }, + "1.7": { + "vector": [0, 0.18, 0] + }, + "1.8": { + "vector": [0.33594, 0.46906, 0] + }, + "1.9": { + "vector": [-0.3, -0.32, 0], + "easing": "easeInOutSine" + }, + "2.4": { "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + }, + "Lefthand": { + "rotation": { + "0.1": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [0, 0, -51], + "easing": "easeInElastic" + }, + "0.6": { + "vector": [0, 0, -51], + "easing": "linear" + }, + "2.0": { + "vector": [0, 0, -51], "easing": "easeOutSine" + }, + "2.5": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + }, + "position": { + "0.1": { + "vector": [0, 0, 0] + }, + "0.5": { + "vector": [1.5, 7, -0.6], + "easing": "easeInElastic" + }, + "0.6": { + "vector": [1.5, 7, -0.6], + "easing": "linear" + }, + "2.0": { + "vector": [1.5, 7, -0.6], + "easing": "easeOutSine" + }, + "2.5": { + "vector": [0, 0, 0], + "easing": "easeInElastic" + } + } + }, + "magazine": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.6": { + "vector": [0, 0, 0] + }, + "0.9": { + "vector": [37.37235, -2.62403, -53.08221], + "easing": "easeInSine" + }, + "1.3": { + "vector": [-12.62765, -2.62403, -2.08221] + }, + "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": { + "vector": [0, 0, 0] + }, + "0.9": { + "vector": [6.5, -29.97, -0.9], + "easing": "easeInSine" + }, + "1.3": { + "vector": [0, -9.27, -0.9], + "easing": "easeInSine" + }, + "1.5": { + "vector": [0, -2.27, -0.9], + "easing": "easeOutSine" + }, + "1.7": { + "vector": [0, 0.16406, 0], + "easing": "easeInOutQuad" + }, + "1.8": { + "vector": [0, 0, 0] } } }, "Righthand": { "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [112.5, 0, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 15, -10], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [135, 0, 0], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, "0.2": { - "vector": [-4.29, 19.16875, -9.15] - }, - "0.3": { - "vector": [-6, 16, -10], - "easing": "easeOutSine" + "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": "easeOutSine" + "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.0": { + "vector": [2.51, -0.52, -0.56] + }, + "2.4": { + "vector": [0, 0, 0], + "easing": "easeInElastic" } } } + }, + "sound_effects": { + "0.0": { + "effect": "svd_reload_normal" + } } }, - "animation.svd.fire": { - "animation_length": 0.05, - "override_previous_animation": true - }, "animation.svd.reload": { - "animation_length": 2.9, + "animation_length": 3.5, "override_previous_animation": true, "bones": { "0": { @@ -207,225 +358,152 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0.83482, 0.12236, 0.72798] - }, - "0.3": { - "vector": [-3.99454, -0.20917, -6.49271], - "easing": "easeInSine" - }, - "0.4": { - "vector": [-4, 0, -7], - "easing": "easeInOutSine" - }, "0.5": { - "vector": [0.99362, -0.05195, -0.49863], - "easing": "easeOutSine" + "vector": [-6.75, 17, 57.5], + "easing": "easeInElastic" + }, + "0.6": { + "vector": [-8.75, 17, 62.5], + "easing": "easeInElastic" }, "0.7": { - "vector": [-0.49954, -0.05233, -7.99863], - "easing": "easeOutSine" + "vector": [-3.72, 17, 62.43], + "easing": "easeInElastic" }, - "1.1": { - "vector": [-5.99652, 0.19166, -5.00897], - "easing": "easeInOutSine" + "0.8": { + "vector": [-8.75, 17, 62.5], + "easing": "easeInElastic" }, - "1.2": { - "vector": [-3.99898, 0.01587, -5.99698] - }, - "1.3": { - "vector": [-8.9386, -1.01362, -9.4107] - }, - "1.4": { - "vector": [-6.99256, -0.1915, -6.99013] + "1.0": { + "vector": [-6.5, 17, 62.5] }, "1.5": { - "vector": [-1.24031, 0.55228, -4.02102] + "vector": [-8.25, 17, 62.5], + "easing": "easeInElastic" }, - "1.6": { - "vector": [-3.53664, 0.20628, -10.99252] + "1.7": { + "vector": [-11.25, 17, 60] }, "1.8": { - "vector": [-3.92554, 1.21661, -5.01275] + "vector": [-12.25, 17, 58.75] }, - "1.9": { - "vector": [-3.4766, 3.70329, -16.29941] + "2.0": { + "vector": [-11.25, 17, 60] }, "2.1": { - "vector": [-3.1964, 1.65843, -2.89436] + "vector": [-11.25, 17, 60] + }, + "2.2": { + "vector": [-11.25, 21, 56] }, "2.3": { - "vector": [-2.3794, 2.34664, -6.5116] + "vector": [-11.25, 18, 53] }, - "2.6": { - "vector": [2.61229, 1.20998, 0.97405], - "easing": "easeInQuad" + "2.5": { + "vector": [-11.25, 17, 60] }, - "2.9": { + "3.2": { "vector": [0, 0, 0], - "easing": "easeOutSine" + "easing": "easeInElastic" } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, -0.07578, -0.1] - }, - "0.3": { - "vector": [0, 0.2, -0.2], - "easing": "easeInSine" - }, - "0.4": { - "vector": [0, 0.42, 0.15], - "easing": "easeInSine" - }, "0.5": { - "vector": [0, -0.8, -0.7], - "easing": "easeOutSine" + "vector": [0, 0.18, 0], + "easing": "easeInElastic" }, "0.6": { - "vector": [0, -0.25, 0.2], - "easing": "easeOutSine" + "vector": [0, 0.18, 0], + "easing": "easeInElastic" }, - "0.8": { - "vector": [0, -0.2, 0.1], - "easing": "easeInSine" + "0.7": { + "vector": [-0.4, -0.42, 0], + "easing": "easeInElastic" }, - "1.0": { - "vector": [0, -0.23, 0.32] + "0.9": { + "vector": [0, 0.18, 0], + "easing": "easeInElastic" }, "1.2": { - "vector": [0, -0.5, 0.3] - }, - "1.3": { - "vector": [0, 0.3, 0.3] + "vector": [-0.08203, 0.09797, 0], + "easing": "easeInElastic" }, "1.5": { - "vector": [0, -0.2, 0.3], - "easing": "easeInSine" + "vector": [0, 0.18, 0], + "easing": "easeInElastic" + }, + "1.7": { + "vector": [0, 0.18, 0] }, "1.8": { - "vector": [0, -0.4, 0.3] + "vector": [0.33594, 0.46906, 0] }, "1.9": { - "vector": [0, -0.5, 1], - "easing": "easeInSine" + "vector": [-0.3, -0.32, 0], + "easing": "easeInOutSine" }, "2.1": { - "vector": [0, -0.2, 0.4], - "easing": "easeInSine" + "vector": [-0.22, -0.24, 0] }, "2.2": { - "vector": [0, -0.18, 0.57] + "vector": [-0.14, -0.45, 1.1] + }, + "2.3": { + "vector": [-0.14, -0.45, 1.1] }, "2.4": { - "vector": [0, -0.13, 0.01] + "vector": [-0.06, -0.01, -0.4] }, - "2.7": { - "vector": [0, -0.04, 0.3], - "easing": "easeInSine" - }, - "2.9": { + "3.0": { "vector": [0, 0, 0], - "easing": "easeOutSine" + "easing": "easeInElastic" } } }, "Lefthand": { "rotation": { - "0.0": { + "0.1": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [4.35141, -9.80475, 8.6364] + "0.5": { + "vector": [0, 0, -51], + "easing": "easeInElastic" }, - "0.2": { - "vector": [-4.54953, -5.93492, 2.8788] - }, - "0.3": { - "vector": [0, -4, 0] - }, - "1.3": { - "vector": [0, -4, 0] - }, - "1.4": { - "vector": [0, -4, 0] - }, - "1.5": { - "vector": [-18.71, -9.52, 1.13], - "easing": "easeInOutSine" - }, - "1.8": { - "vector": [-65.52408, -15.41359, 12.37484], - "easing": "easeInSine" - }, - "1.9": { - "vector": [-73.52408, -15.41359, 12.37484] - }, - "2.0": { - "vector": [-73.52408, -15.41359, 12.37484] - }, - "2.1": { - "vector": [-65.52408, -15.41359, 12.37484] - }, - "2.3": { - "vector": [-21.19082, -4.60587, -0.5644], - "easing": "easeInOutSine" + "0.6": { + "vector": [0, 0, -51], + "easing": "linear" }, "2.5": { - "vector": [-4.3304, -21.45095, 11.22415] - }, - "2.7": { - "vector": [0, 0, 0], + "vector": [0, 0, -51], "easing": "easeOutSine" + }, + "2.9": { + "vector": [0, 0, 0], + "easing": "easeInElastic" } }, "position": { - "0.0": { + "0.1": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [-0.52, -2.15, 5.78] + "0.5": { + "vector": [1.5, 7, -0.6], + "easing": "easeInElastic" }, - "0.3": { - "vector": [-0.7, -2.2, 3.7] + "0.6": { + "vector": [1.5, 7, -0.6], + "easing": "linear" }, - "0.4": { - "vector": [-0.7, -2.2, 3.7] - }, - "1.3": { - "vector": [-0.7, -2.2, 3.7] - }, - "1.4": { - "vector": [-0.7, -2.2, 4.5] - }, - "1.6": { - "vector": [-3.9, -9.2, 3.55], - "easing": "easeInOutSine" - }, - "1.8": { - "vector": [-6, -5.7, -1.3], - "easing": "easeInSine" - }, - "1.9": { - "vector": [-6, -5.7, -1.06] - }, - "2.0": { - "vector": [-6, -5.7, -2.5], - "easing": "easeInSine" - }, - "2.2": { - "vector": [-5.36, -6.5, -4.04], - "easing": "easeInOutSine" - }, - "2.4": { - "vector": [-3.03, -4.77, -0.97] - }, - "2.7": { - "vector": [0, 0, 0], + "2.5": { + "vector": [1.5, 7, -0.6], "easing": "easeOutSine" + }, + "2.9": { + "vector": [0, 0, 0], + "easing": "easeInElastic" } } }, @@ -434,269 +512,196 @@ "0.0": { "vector": [0, 0, 0] }, - "0.4": { + "0.6": { "vector": [0, 0, 0] }, - "0.7": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.0": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.2": { - "vector": [-12.62765, -2.62403, -2.08221] + "0.9": { + "vector": [37.37235, -2.62403, -53.08221], + "easing": "easeInSine" }, "1.3": { - "vector": [0, 0, 0] + "vector": [-12.62765, -2.62403, -2.08221] }, - "1.4": { - "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" } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.4": { + "0.6": { "vector": [0, 0, 0] }, - "0.7": { - "vector": [0, -9.27, -0.9] - }, - "1.0": { - "vector": [0, -9.27, -0.9] - }, - "1.1": { - "vector": [0, -2.27, -0.9] + "0.9": { + "vector": [6.5, -29.97, -0.9], + "easing": "easeInSine" }, "1.3": { - "vector": [0, 0, 0], + "vector": [0, -9.27, -0.9], + "easing": "easeInSine" + }, + "1.5": { + "vector": [0, -2.27, -0.9], + "easing": "easeOutSine" + }, + "1.7": { + "vector": [0, 0.16406, 0], "easing": "easeInOutQuad" }, - "1.4": { + "1.8": { "vector": [0, 0, 0] } } }, - "bolt": { + "Righthand": { + "rotation": { + "0.2": { + "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": [-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": [-9, 20.5, -1.67] + }, + "2.6": { + "vector": [-2.92, 6.66, -15.54] + }, + "3.0": { + "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.22484, 0.97688, -5.06], + "easing": "linear" + }, + "2.6": { + "vector": [0.07, -0.78, -1.64] + }, + "3.0": { + "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.0": { "vector": [0, 0, 0] }, - "1.8": { - "vector": [0, 0, 0] + "0.1": { + "vector": [0, -1, 0] }, - "1.9": { - "vector": [0, 0, 3.75], - "easing": "easeInQuad" + "1.0": { + "vector": [0, -1, 0] }, - "2.1": { - "vector": [0, 0, 0] - }, - "2.4": { + "1.1": { "vector": [0, 0, 0] } } } - } - }, - "animation.svd.reload2": { - "animation_length": 2, - "override_previous_animation": true, - "bones": { - "0": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [0.83482, 0.12236, 0.72798] - }, - "0.3": { - "vector": [-3.99454, -0.20917, -6.49271], - "easing": "easeInSine" - }, - "0.4": { - "vector": [-4, 0, -7], - "easing": "easeInOutSine" - }, - "0.5": { - "vector": [0.99362, -0.05195, -0.49863], - "easing": "easeOutSine" - }, - "0.7": { - "vector": [-0.49954, -0.05233, -7.99863], - "easing": "easeOutSine" - }, - "1.1": { - "vector": [-5.99652, 0.19166, -5.00897], - "easing": "easeInOutSine" - }, - "1.2": { - "vector": [-3.99898, 0.01587, -5.99698] - }, - "1.3": { - "vector": [-8.9386, -1.01362, -9.4107] - }, - "1.4": { - "vector": [-6.99256, -0.1915, -6.99013] - }, - "1.5": { - "vector": [-1.24031, 0.55228, -4.02102] - }, - "1.7": { - "vector": [-0.48525, 0.63548, -4.00548] - }, - "1.8": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [0, -0.07578, -0.1] - }, - "0.3": { - "vector": [0, 0.2, -0.2], - "easing": "easeInSine" - }, - "0.4": { - "vector": [0, 0.42, 0.15], - "easing": "easeInSine" - }, - "0.5": { - "vector": [0, -0.8, -0.7], - "easing": "easeOutSine" - }, - "0.6": { - "vector": [0, -0.25, 0.2], - "easing": "easeOutSine" - }, - "0.8": { - "vector": [0, -0.2, 0.1], - "easing": "easeInSine" - }, - "1.0": { - "vector": [0, -0.23, 0.32] - }, - "1.2": { - "vector": [0, -0.5, 0.3] - }, - "1.3": { - "vector": [0, 0.3, 0.3] - }, - "1.5": { - "vector": [0, -0.2, 0.3], - "easing": "easeInSine" - }, - "1.7": { - "vector": [0, -0.12, 0.12] - }, - "1.8": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [4.35141, -9.80475, 8.6364] - }, - "0.2": { - "vector": [-4.54953, -5.93492, 2.8788] - }, - "0.3": { - "vector": [0, -4, 0] - }, - "1.3": { - "vector": [0, -4, 0] - }, - "1.4": { - "vector": [0, -4, 0] - }, - "1.7": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.2": { - "vector": [-0.52, -2.15, 5.78] - }, - "0.3": { - "vector": [-0.7, -2.2, 3.7] - }, - "0.4": { - "vector": [-0.7, -2.2, 3.7] - }, - "1.3": { - "vector": [-0.7, -2.2, 3.7] - }, - "1.4": { - "vector": [-0.7, -2.2, 4.5] - }, - "1.7": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - } - }, - "magazine": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.7": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.0": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.2": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.3": { - "vector": [0, 0, 0] - }, - "1.4": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.7": { - "vector": [0, -9.27, -0.9] - }, - "1.0": { - "vector": [0, -9.27, -0.9] - }, - "1.1": { - "vector": [0, -2.27, -0.9] - }, - "1.3": { - "vector": [0, 0, 0], - "easing": "easeInOutQuad" - }, - "1.4": { - "vector": [0, 0, 0] - } - } + }, + "sound_effects": { + "0.0": { + "effect": "svd_reload_empty" } } } diff --git a/src/main/resources/assets/target/geo/sks.geo.json b/src/main/resources/assets/target/geo/sks.geo.json index 1f0971ea1..5198eb46a 100644 --- a/src/main/resources/assets/target/geo/sks.geo.json +++ b/src/main/resources/assets/target/geo/sks.geo.json @@ -7846,11 +7846,11 @@ { "name": "Lefthand", "parent": "magazine", - "pivot": [5.65, -4.6, 1.6], - "rotation": [63.02145, 26.28878, -12.70535], + "pivot": [4.9625, -5.86562, -2.54844], + "rotation": [54.40074, 25.37317, -8.56985], "cubes": [ { - "origin": [4.05, -4.6, -0.15], + "origin": [3.3625, -5.86562, -4.29844], "size": [3, 12, 4], "uv": { "north": {"uv": [12, 0], "uv_size": [3, 12]}, @@ -8415,6 +8415,49 @@ } ] }, + { + "name": "bullet", + "parent": "magazine", + "pivot": [0.00283, 1.91538, -3.10152], + "cubes": [ + { + "origin": [-0.1762, 1.73635, -3.68242], + "size": [0.35805, 0.35805, 0.9922], + "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.13, 1.78255, -4.08162], + "size": [0.26565, 0.26565, 1.53], + "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.1762, 1.73635, -2.59782], + "size": [0.35805, 0.35805, 0.0924], + "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": "Righthand", "parent": "0", diff --git a/src/main/resources/assets/target/geo/svd.geo.json b/src/main/resources/assets/target/geo/svd.geo.json index c267ef46b..14649d6f1 100644 --- a/src/main/resources/assets/target/geo/svd.geo.json +++ b/src/main/resources/assets/target/geo/svd.geo.json @@ -73,26 +73,6 @@ } ] }, - { - "name": "Righthand", - "parent": "0", - "pivot": [-2.75, -7.75, 10], - "rotation": [56.87402, -10.51794, 6.79286], - "cubes": [ - { - "origin": [-3.75, -7.75, 8], - "size": [3, 12, 4], - "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]} - } - } - ] - }, { "name": "pso1", "parent": "0", @@ -4625,14 +4605,9 @@ } ] }, - { - "name": "magazine", - "parent": "0", - "pivot": [0, 0, 0] - }, { "name": "Lefthand", - "parent": "magazine", + "parent": "0", "pivot": [6.15, -4.4, -0.5], "rotation": [54.26155, 16.13646, -17.18389], "cubes": [ @@ -4650,6 +4625,54 @@ } ] }, + { + "name": "magazine", + "parent": "0", + "pivot": [0, 0, 0] + }, + { + "name": "bullet", + "parent": "magazine", + "pivot": [0.00283, 0.69506, -2.73021], + "cubes": [ + { + "origin": [-0.19092, 0.50131, -3.70521], + "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": [-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": "mag", "parent": "magazine", @@ -5078,6 +5101,26 @@ } ] }, + { + "name": "Righthand", + "parent": "magazine", + "pivot": [-2.75, -7.75, 10], + "rotation": [56.87402, -10.51794, 6.79286], + "cubes": [ + { + "origin": [-3.75, -7.75, 8], + "size": [3, 12, 4], + "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]} + } + } + ] + }, { "name": "bolt", "parent": "0", 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 df5485f9a..043f9fca1 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 diff --git a/src/main/resources/assets/target/sounds/svd/svd_reload_normal.ogg b/src/main/resources/assets/target/sounds/svd/svd_reload_normal.ogg index 04459ef4b..44767cf77 100644 Binary files a/src/main/resources/assets/target/sounds/svd/svd_reload_normal.ogg and b/src/main/resources/assets/target/sounds/svd/svd_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 22e45349e..de41bdea6 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