diff --git a/src/main/java/net/mcreator/target/item/gun/SksItem.java b/src/main/java/net/mcreator/target/item/gun/SksItem.java index 8fef3c7f9..72254693b 100644 --- a/src/main/java/net/mcreator/target/item/gun/SksItem.java +++ b/src/main/java/net/mcreator/target/item/gun/SksItem.java @@ -92,11 +92,11 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { } if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload_empty")); } if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload2")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.sks.reload_normal")); } if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0) { @@ -175,7 +175,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { tag.putDouble("reload_time", 0); } if (tag.getBoolean("reloading") && tag.getInt("ammo") == 0) { - if (tag.getDouble("reload_time") == 57) { + if (tag.getDouble("reload_time") == 72) { entity.getPersistentData().putDouble("id", id); if (entity instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, TargetModSounds.SKS_RELOAD_EMPTY.get(), 100, 1); @@ -198,7 +198,7 @@ public class SksItem extends GunItem implements GeoItem, AnimatedItem { GunReload.reload(entity, GunInfo.Type.RIFLE); } } else if (tag.getBoolean("reloading") && tag.getInt("ammo") > 0) { - if (tag.getDouble("reload_time") == 41) { + if (tag.getDouble("reload_time") == 51) { entity.getPersistentData().putDouble("id", id); if (entity instanceof ServerPlayer serverPlayer) { SoundTool.playLocalSound(serverPlayer, TargetModSounds.SKS_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 6323fc0e7..1425ce127 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -161,12 +161,12 @@ public class PlayerReloadProcedure { tag.putBoolean("reloading", true); tag.putBoolean("empty_reload", false); tag.putDouble("id", (Mth.nextDouble(RandomSource.create(), 1, 1919810))); - tag.putDouble("reload_time", 41); + tag.putDouble("reload_time", 51); } 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", 57); + tag.putDouble("reload_time", 72); } } if (player.getMainHandItem().getItem() == TargetModItems.AK_47.get() diff --git a/src/main/resources/assets/target/animations/ak.animation.json b/src/main/resources/assets/target/animations/ak.animation.json index 6e89a793b..2a0ffc8ad 100644 --- a/src/main/resources/assets/target/animations/ak.animation.json +++ b/src/main/resources/assets/target/animations/ak.animation.json @@ -413,7 +413,7 @@ "vector": [0, 0, -1.07] }, "2.3": { - "vector": [0.00031, 0.02116, 0.55984] + "vector": [0.00031, 0.02116, 0.2598] }, "2.3833": { "vector": [0, 0, 0] @@ -879,7 +879,7 @@ "vector": [0.00274, -0.00904, -0.77015] }, "3.1167": { - "vector": [0.00031, 0.02116, 0.55984] + "vector": [0.00031, 0.02116, 0.1598] }, "3.2": { "vector": [0, 0, 0] diff --git a/src/main/resources/assets/target/animations/sks.animation.json b/src/main/resources/assets/target/animations/sks.animation.json index a6b37fefa..2670debe0 100644 --- a/src/main/resources/assets/target/animations/sks.animation.json +++ b/src/main/resources/assets/target/animations/sks.animation.json @@ -154,8 +154,8 @@ } } }, - "animation.sks.reload": { - "animation_length": 2.9, + "animation.sks.reload_empty": { + "animation_length": 3.75, "override_previous_animation": true, "bones": { "0": { @@ -163,282 +163,459 @@ "0.0": { "vector": [0, 0, 0] }, - "0.3": { - "vector": [-7, 0, -17], - "easing": "easeInElastic" + "0.1": { + "vector": [6.22824, 1.18826, 5.97426] }, - "0.4": { - "vector": [-7, 0, -22] + "0.3167": { + "vector": [-14.01, 2.98, -9.37] + }, + "0.4167": { + "vector": [-12.25012, 1.71575, -15.23679] }, "0.5": { - "vector": [-1.25, 0, -21.58] + "vector": [-13.67625, 0.53753, -20.43357] }, - "0.6": { - "vector": [-6.41, 0, -21.16] + "0.5333": { + "vector": [-14.36146, -0.34228, -23.99804] }, - "0.8": { - "vector": [-10.53, 0, -20.33] + "0.6333": { + "vector": [-14.36475, 0.09248, -22.30327] }, - "1.2": { - "vector": [-8.76, 0, -36.16], + "0.9": { + "vector": [-14.36, -0.34, -24] + }, + "1.0167": { + "vector": [-5.36619, 0.22131, -18.02629] + }, + "1.1333": { + "vector": [-11.36, -0.34, -24] + }, + "1.3167": { + "vector": [-17.00098, -2.87117, -36.75727] + }, + "1.4167": { + "vector": [-19.00098, -2.87117, -36.75727] + }, + "1.4833": { + "vector": [-16.00098, -2.87117, -36.75727] + }, + "1.55": { + "vector": [-25.64499, -2.46517, -34.94294] + }, + "1.6333": { + "vector": [-16.50098, -2.87117, -36.75727] + }, + "1.7833": { + "vector": [-21.77738, -1.72597, -31.63962] + }, + "1.95": { + "vector": [-12.53304, 1.46221, -17.39249], + "easing": "easeInSine" + }, + "2.0833": { + "vector": [-3.8135, -0.9118, -6.85724] + }, + "2.2833": { + "vector": [0.52675, -0.20352, 4.54608] + }, + "2.5333": { + "vector": [-5.58943, -0.18313, 4.54148] + }, + "2.6167": { + "vector": [-4.99594, -0.42929, 1.54936], "easing": "easeInElastic" }, - "1.3": { - "vector": [-8.32, 0, -31.37] + "2.75": { + "vector": [-4.01542, -0.77565, -3.84387], + "easing": "easeOutSine" }, - "1.4": { - "vector": [-13.88, 0, -30.08] + "2.9167": { + "vector": [-2.92699, -0.19157, 5.75781], + "easing": "easeInSine" }, - "1.6": { - "vector": [-13, 0, -17], - "easing": "linear" + "3.1333": { + "vector": [-1.41605, -0.20305, 1.02159], + "easing": "easeInOutSine" }, - "1.8": { - "vector": [-16, 0, -30], - "easing": "easeInElastic" + "3.2833": { + "vector": [-0.38814, -0.04302, 1.5098], + "easing": "easeInSine" }, - "2.0": { - "vector": [-20, 0, -30], - "easing": "linear" + "3.35": { + "vector": [2, 0, 1] }, - "2.1": { - "vector": [-16, 4, -21], - "easing": "linear" - }, - "2.6": { - "vector": [0, 0, 0], - "easing": "easeInElastic" + "3.4333": { + "vector": [0, 0, 0] } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.4": { - "vector": [0, 0.7, 0], - "easing": "easeInElastic" + "0.2833": { + "vector": [-1.1, 0.3, -0.1], + "easing": "easeInQuad" }, - "0.5": { - "vector": [0.2, -0.05, 0] + "0.4167": { + "vector": [-1.1, 0, -0.8], + "easing": "easeOutSine" }, - "0.6": { - "vector": [0.14875, 0.60547, 0] + "0.5333": { + "vector": [-1.1, 0, -0.6] }, "0.7": { - "vector": [0.23938, 0.45766, 0] + "vector": [-1.13863, 0.08812, -0.6923] }, - "1.3": { - "vector": [0.08, 0.62, 0] + "0.9": { + "vector": [-1.1, 0, -0.6] }, - "1.4": { - "vector": [-0.14531, 0.95, 0] + "1.0167": { + "vector": [-0.63505, -0.5511, -0.70059] }, - "1.5": { - "vector": [0.23, 0.43, 0] + "1.1333": { + "vector": [-1.04863, 0.13019, -0.57971] }, - "1.6": { - "vector": [0, 0.2625, 0.38672], + "1.25": { + "vector": [-0.85675, 0.06078, -0.58657] + }, + "1.4167": { + "vector": [-0.88732, 0.11258, -0.78102] + }, + "1.4833": { + "vector": [-0.85209, 0.0351, -0.49198] + }, + "1.55": { + "vector": [-1.5395, 0.79301, -0.39434] + }, + "1.6333": { + "vector": [-0.85209, 0.0351, -0.49198] + }, + "1.7": { + "vector": [-0.59166, -0.35741, -0.73343], + "easing": "easeInSine" + }, + "1.8667": { + "vector": [-0.50339, -0.1283, -0.63949] + }, + "1.9833": { + "vector": [-0.51504, -0.2787, -0.4855] + }, + "2.1667": { + "vector": [-0.44, -0.24, -0.57] + }, + "2.3667": { + "vector": [-0.34416, 0.00937, 0.33857] + }, + "2.55": { + "vector": [-0.3, 0.01, 0.29] + }, + "2.6167": { + "vector": [-0.26, 0.01, 1.74], + "easing": "easeInElastic" + }, + "2.75": { + "vector": [-0.26, 0.01, 1.54], + "easing": "easeInOutSine" + }, + "2.8333": { + "vector": [-0.27, 0.01, 0.15] + }, + "2.9": { + "vector": [-0.17, 0.01, -0.66] + }, + "3.15": { + "vector": [-0.11, 0.01, -0.23] + }, + "3.35": { + "vector": [0.00031, 0.02116, 0.4598] + }, + "3.4333": { + "vector": [0, 0, 0] + } + } + }, + "Lefthand": { + "rotation": { + "0.0333": { + "vector": [0, 0, 0] + }, + "0.5333": { + "vector": [-10.23301, -10.25955, 3.51854], + "easing": "easeOutQuad" + }, + "0.9": { + "vector": [-10.23301, -10.25955, 3.51854], + "easing": "easeOutSine" + }, + "1.1333": { + "vector": [-25.86792, -14.68451, 0.99936], + "easing": "easeInOutQuad" + }, + "1.3167": { + "vector": [-26.48047, -21.39686, -3.31204] + }, + "1.4833": { + "vector": [-20.31753, -15.08281, -6.04184], + "easing": "easeOutSine" + }, + "1.5667": { + "vector": [-14.31753, -15.08281, -6.04184], + "easing": "easeOutSine" + }, + "1.6167": { + "vector": [-14.31753, -15.08281, -6.04184], + "easing": "easeOutSine" + }, + "1.7833": { + "vector": [-10.4978, -22.90313, 5.97238] + }, + "2.0167": { + "vector": [0, 0, 0], "easing": "linear" + } + }, + "position": { + "0.0333": { + "vector": [0, 0, 0] + }, + "0.5333": { + "vector": [3.6298, -9.6674, 10.35934], + "easing": "easeOutQuad" + }, + "0.9": { + "vector": [-1.59069, -3.13326, 3.41688], + "easing": "easeOutSine" + }, + "1.1333": { + "vector": [-1.69069, -8.33326, 0.31688], + "easing": "easeInOutQuad" + }, + "1.3167": { + "vector": [-2.44156, -5.77141, 0.42] + }, + "1.4833": { + "vector": [-1.82116, -5.06841, 2.47626], + "easing": "easeOutSine" + }, + "1.5667": { + "vector": [-1.82116, -3.56841, 3.27626], + "easing": "easeOutSine" + }, + "1.6167": { + "vector": [-1.82116, -3.56841, 3.27626], + "easing": "easeOutSine" + }, + "1.8167": { + "vector": [-3.12116, -4.56841, 0.27626], + "easing": "easeOutSine" + }, + "2.05": { + "vector": [0, 0, 0], + "easing": "linear" + } + } + }, + "magazine": { + "rotation": { + "0.9": { + "vector": [0, 0, 0] + }, + "0.9667": { + "vector": [-2.44, -0.21, -0.79] + }, + "1.4167": { + "vector": [174.55748, -9.79803, -303.10512], + "easing": "easeInSine" }, "1.8": { - "vector": [0.4, 0.6125, 0.38672], - "easing": "easeInElastic" + "vector": [-28.54, -6.01, -11.13], + "easing": "easeInOutSine" }, - "1.9": { - "vector": [0.4, 0.6125, 1.48672], - "easing": "linear" + "1.8333": { + "vector": [0, 0, 0] }, - "2.0": { - "vector": [0.4, 0.6125, 1.58672], - "easing": "linear" - }, - "2.1": { - "vector": [0.4, 0.6125, -0.11328], - "easing": "linear" - }, - "2.3": { - "vector": [0, 0, -0.23] - }, - "2.5": { - "vector": [0, 0, -0.37] - }, - "2.7": { + "1.85": { "vector": [0, 0, 0], - "easing": "easeInElastic" + "easing": "easeInOutSine" + } + }, + "position": { + "0.9": { + "vector": [0, 0, 0] + }, + "0.9667": { + "vector": [0, -0.57, -0.16] + }, + "1.1167": { + "vector": [-2.73421, -6.54466, -0.04218], + "easing": "easeInSine" + }, + "1.2": { + "vector": [-6.47567, -11.70155, 0.40835], + "easing": "linear" + }, + "1.2667": { + "vector": [-10.83066, -16.63611, 1.48246] + }, + "1.3": { + "vector": [-13.95441, -19.57235, 2.2025] + }, + "1.4167": { + "vector": [-22.66857, -29.11451, 4.97341] + }, + "1.8": { + "vector": [2.44, -10.5, 5.11], + "easing": "easeInOutSine" + }, + "1.8333": { + "vector": [0, 0, 317] + }, + "1.85": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + } + }, + "magazine2": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.5333": { + "vector": [-28.89091, 15.98616, -5.02589] + }, + "0.9": { + "vector": [-32.57163, 10.15543, -2.42658], + "easing": "easeOutSine" + }, + "1.1333": { + "vector": [-22.5, 0, -1], + "easing": "easeInOutQuad" + }, + "1.3167": { + "vector": [-22.05592, -4.56353, -7.11018] + }, + "1.4833": { + "vector": [-16.75, 0, 0] + }, + "1.5667": { + "vector": [-1.75, 0, 0] + }, + "2.1333": { + "vector": [-1.75, 0, 0] + }, + "2.15": { + "vector": [-1.75, 0, 0] + }, + "2.25": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.5333": { + "vector": [0.02827, -3.34634, -4.77029] + }, + "0.9": { + "vector": [-5.17435, 3.25868, -12.0845], + "easing": "easeOutSine" + }, + "1.1333": { + "vector": [-5.40838, 0.1135, -12.65133], + "easing": "easeInOutQuad" + }, + "1.3167": { + "vector": [-6.395, 2.89641, -12.42] + }, + "1.4833": { + "vector": [-6.49844, 2.78672, -11.71562] + }, + "1.5667": { + "vector": [-6.49844, 3.38672, -11.71562] + }, + "2.1333": { + "vector": [-6.49844, 3.38672, -11.71562] + }, + "2.15": { + "vector": [-6.49844, 3.38672, 603.28437] + }, + "2.25": { + "vector": [0, 0, 0] } } }, "bolt": { "position": { - "0.0": { + "2.45": { "vector": [0, 0, 0] }, - "1.8": { + "2.55": { + "vector": [0, 0, 0.5] + }, + "2.75": { + "vector": [0, 0, 0.5] + }, + "2.8167": { "vector": [0, 0, 0] - }, - "1.9": { - "vector": [0, 0, 3.05], - "easing": "easeInQuad" - }, - "2.1": { - "vector": [0, 0, 0] - }, - "2.4": { - "vector": [0, 0, 0] - } - } - }, - "magazine": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [-9, 0, 0] - }, - "0.6": { - "vector": [19.37235, -2.62403, -2.08221] - }, - "0.9": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.2": { - "vector": [-12.62765, -2.62403, -2.08221] - }, - "1.3": { - "vector": [3, 0, 0] - }, - "1.4": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [0, -11.07, 3.1] - }, - "0.9": { - "vector": [0, -6.87, -2.9], - "easing": "easeInSine" - }, - "1.1": { - "vector": [0, -2.27, -0.9], - "easing": "easeOutSine" - }, - "1.3": { - "vector": [0, 0.16406, 0], - "easing": "easeInOutQuad" - }, - "1.4": { - "vector": [0, 0, 0] - } - } - }, - "Lefthand": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [13, -5, 13] - }, - "0.3": { - "vector": [0, -4, 0], - "easing": "easeInSine" - }, - "1.4": { - "vector": [0, -4, 0] - }, - "1.5": { - "vector": [0, -4, 0] - }, - "1.7": { - "vector": [-19.25, -10.86, -13.58] - }, - "1.8": { - "vector": [-19.52408, -27.41359, 1.37484], - "easing": "easeInSine" - }, - "2.1": { - "vector": [-19.52408, -27.41359, 1.37484], - "easing": "easeInSine" - }, - "2.3": { - "vector": [29.28, 6.97, -22.1] - }, - "2.5": { - "vector": [0, 0, 0], - "easing": "easeOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.1": { - "vector": [-1.4, -0.4, 2] - }, - "0.3": { - "vector": [-0.7, -1.7, 5.3], - "easing": "easeInSine" - }, - "1.4": { - "vector": [-0.7, -1.7, 5.3] - }, - "1.5": { - "vector": [-0.7, -1.7, 5.3] - }, - "1.6": { - "vector": [-1.37, -3.67, 7.4] - }, - "1.8": { - "vector": [-5.9, -1.3, 6], - "easing": "easeInSine" - }, - "1.9": { - "vector": [-5.9, -1.3, 7.1], - "easing": "easeInSine" - }, - "2.0": { - "vector": [-5.9, -1.3, 7.1] - }, - "2.1": { - "vector": [-5.9, -1.3, 6], - "easing": "easeInSine" - }, - "2.3": { - "vector": [-1.73, 0.32, 2.46] - }, - "2.5": { - "vector": [0, 0, 0], - "easing": "easeOutSine" } } }, "bullet": { + "rotation": { + "vector": [0, 0, 0] + }, "position": { - "0.0": { + "0.25": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, -0.5, 0] + "0.3333": { + "vector": [0, -0.2, 0] + } + } + }, + "Righthand": { + "rotation": { + "2.2667": { + "vector": [0, 0, 0] }, - "0.6": { - "vector": [0, -0.5, 0] + "2.35": { + "vector": [1.1949, 18.48864, -2.92622] }, - "0.7": { + "2.45": { + "vector": [4.38543, 15.49955, 7.21206] + }, + "2.7167": { + "vector": [4.38543, 15.49955, 7.21206] + }, + "2.9333": { + "vector": [1.25248, 18.45031, -0.01712] + }, + "3.0833": { + "vector": [0, 0, 0] + } + }, + "position": { + "2.2667": { + "vector": [0, 0, 0] + }, + "2.45": { + "vector": [0.42345, 2.24153, -3.94724] + }, + "2.55": { + "vector": [0.42, 2.24, -3.25], + "easing": "easeInSine" + }, + "2.7167": { + "vector": [0.42, 2.24, -3.25], + "easing": "easeInSine" + }, + "2.8167": { + "vector": [0.42, 2.24, -6.45], + "easing": "easeOutSine" + }, + "3.0833": { "vector": [0, 0, 0] } } @@ -448,55 +625,82 @@ "0.0": { "vector": [0, 0, 0] }, - "0.4": { + "0.3": { "vector": [0, 0, 1.5], "easing": "easeInElastic" }, - "0.5": { + "0.4167": { + "vector": [0, 0, 1] + }, + "0.65": { + "vector": [0.5, 0, 1.2], + "easing": "easeOutSine" + }, + "0.7667": { + "vector": [-0.1, 0, 2] + }, + "0.95": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "1.0333": { "vector": [1, 1, -1.5], "easing": "easeInSine" }, - "0.6": { + "1.1167": { "vector": [-0.5, -0.5, 1.5] }, - "0.8": { - "vector": [0.2, 0, 1.2], - "easing": "easeOutSine" + "1.3": { + "vector": [0.5, 0, 2], + "easing": "easeInElastic" }, - "1.2": { - "vector": [-0.5, 0, 1.5], + "1.4667": { + "vector": [-0.5, 0, 2.2], "easing": "linear" }, - "1.3": { - "vector": [1.5, -0.7, 0.93], + "1.55": { + "vector": [1.5, -0.7, 1.2], "easing": "easeInSine" }, - "1.5": { - "vector": [-0.4, 0.4, -0.6], - "easing": "easeOutSine" + "1.7333": { + "vector": [0, 0, 1.5], + "easing": "linear" }, - "1.8": { + "2.1167": { + "vector": [0, 0, -0.75], + "easing": "easeInElastic" + }, + "2.3167": { + "vector": [0, 0, 1.5], + "easing": "linear" + }, + "2.45": { "vector": [0.2, 0, 1.5] }, - "1.9": { - "vector": [1, 2, 1.8] + "2.55": { + "vector": [1, 2, -0.5] }, - "2.0": { - "vector": [-1.5, -3, -1.5] + "2.6167": { + "vector": [-1.5, -3, 1.5] }, - "2.2": { - "vector": [0.2, 1.5, 1.5] - }, - "2.5": { - "vector": [0, 0, 0], + "2.9": { + "vector": [0, -1, 1], "easing": "easeInElastic" + }, + "3.05": { + "vector": [0, 0, -0.75], + "easing": "linear" + }, + "3.2167": { + "vector": [0, 0, 0], + "easing": "linear" } } } } }, - "animation.sks.reload2": { - "animation_length": 2, + "animation.sks.reload_normal": { + "animation_length": 2.75, "override_previous_animation": true, "bones": { "0": { @@ -504,175 +708,361 @@ "0.0": { "vector": [0, 0, 0] }, - "0.3": { - "vector": [-7, 0, -17], - "easing": "easeInElastic" + "0.1": { + "vector": [6.22824, 1.18826, 5.97426] }, - "0.4": { - "vector": [-7, 0, -22] + "0.3167": { + "vector": [-14.01, 2.98, -9.37] + }, + "0.4167": { + "vector": [-12.25012, 1.71575, -15.23679] }, "0.5": { - "vector": [-1.25, 0, -21.58] + "vector": [-13.67625, 0.53753, -20.43357] }, - "0.6": { - "vector": [-6.41, 0, -21.16] + "0.5333": { + "vector": [-14.36146, -0.34228, -23.99804] }, - "0.8": { - "vector": [-10.53, 0, -20.33] - }, - "1.2": { - "vector": [-8.76, 0, -36.16], - "easing": "easeInElastic" - }, - "1.3": { - "vector": [-8.32, 0, -31.37] - }, - "1.4": { - "vector": [-13.88, 0, -30.08] - }, - "2.0": { - "vector": [0, 0, 0], - "easing": "easeInElastic", - "easingArgs": [1] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0.7, 0], - "easing": "easeInElastic" - }, - "0.5": { - "vector": [0.2, -0.05, 0] - }, - "0.6": { - "vector": [0.14875, 0.60547, 0] - }, - "0.7": { - "vector": [0.23938, 0.45766, 0] - }, - "1.3": { - "vector": [0.08, 0.62, 0] - }, - "1.4": { - "vector": [-0.14531, 0.95, 0] - }, - "1.5": { - "vector": [0.23, 0.18, 0] - }, - "1.6": { - "vector": [0, 0.01172, 0.38672], - "easing": "linear" - }, - "2.0": { - "vector": [0, 0, 0], - "easing": "easeInElastic" - } - } - }, - "magazine": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [-9, 0, 0] - }, - "0.6": { - "vector": [19.37235, -2.62403, -2.08221] + "0.6333": { + "vector": [-14.36475, 0.09248, -22.30327] }, "0.9": { - "vector": [-12.62765, -2.62403, -2.08221] + "vector": [-14.36, -0.34, -24] }, - "1.2": { - "vector": [-12.62765, -2.62403, -2.08221] + "1.0167": { + "vector": [-5.36619, 0.22131, -18.02629] }, - "1.3": { - "vector": [3, 0, 0] + "1.1333": { + "vector": [-11.36, -0.34, -24] }, - "1.4": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] + "1.3167": { + "vector": [-17.00098, -2.87117, -36.75727] }, - "0.3": { - "vector": [0, 0, 0] + "1.4167": { + "vector": [-19.00098, -2.87117, -36.75727] }, - "0.4": { - "vector": [0, 0, 0] + "1.4833": { + "vector": [-16.00098, -2.87117, -36.75727] }, - "0.6": { - "vector": [0, -11.07, 3.1] + "1.55": { + "vector": [-25.64499, -2.46517, -34.94294] }, - "0.9": { - "vector": [0, -6.87, -2.9], + "1.6333": { + "vector": [-16.50098, -2.87117, -36.75727] + }, + "1.7833": { + "vector": [-21.77738, -1.72597, -31.63962] + }, + "1.95": { + "vector": [-12.53304, 1.46221, -17.39249], "easing": "easeInSine" }, - "1.1": { - "vector": [0, -2.27, -0.9], + "2.0833": { + "vector": [-3.8135, -0.9118, -6.85724] + }, + "2.2333": { + "vector": [-0.38814, -0.04302, 4.50985] + }, + "2.3": { + "vector": [2, 0, 2] + }, + "2.3833": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.2833": { + "vector": [-1.1, 0.3, -0.1], + "easing": "easeInQuad" + }, + "0.4167": { + "vector": [-1.1, 0, -0.8], "easing": "easeOutSine" }, - "1.3": { - "vector": [0, 0.16406, 0], - "easing": "easeInOutQuad" + "0.5333": { + "vector": [-1.1, 0, -0.6] }, - "1.4": { + "0.7": { + "vector": [-1.13863, 0.08812, -0.6923] + }, + "0.9": { + "vector": [-1.1, 0, -0.6] + }, + "1.0167": { + "vector": [-0.63505, -0.5511, -0.70059] + }, + "1.1333": { + "vector": [-1.04863, 0.13019, -0.57971] + }, + "1.25": { + "vector": [-0.85675, 0.06078, -0.58657] + }, + "1.4167": { + "vector": [-0.88732, 0.11258, -0.78102] + }, + "1.4833": { + "vector": [-0.85209, 0.0351, -0.49198] + }, + "1.55": { + "vector": [-1.5395, 0.79301, -0.39434] + }, + "1.6333": { + "vector": [-0.85209, 0.0351, -0.49198] + }, + "1.7": { + "vector": [-0.59166, -0.35741, -0.73343], + "easing": "easeInSine" + }, + "1.8667": { + "vector": [-0.50339, -0.1283, -0.63949] + }, + "1.9833": { + "vector": [-0.51504, -0.2787, -0.4855] + }, + "2.1833": { + "vector": [0, 0, -1.07] + }, + "2.3": { + "vector": [0.00031, 0.02116, 0.2598] + }, + "2.3833": { "vector": [0, 0, 0] } } }, "Lefthand": { + "rotation": { + "0.0333": { + "vector": [0, 0, 0] + }, + "0.5333": { + "vector": [-10.23301, -10.25955, 3.51854], + "easing": "easeOutQuad" + }, + "0.9": { + "vector": [-10.23301, -10.25955, 3.51854], + "easing": "easeOutSine" + }, + "1.1333": { + "vector": [-25.86792, -14.68451, 0.99936], + "easing": "easeInOutQuad" + }, + "1.3167": { + "vector": [-26.48047, -21.39686, -3.31204] + }, + "1.4833": { + "vector": [-20.31753, -15.08281, -6.04184], + "easing": "easeOutSine" + }, + "1.5667": { + "vector": [-14.31753, -15.08281, -6.04184], + "easing": "easeOutSine" + }, + "1.7333": { + "vector": [-21.16455, -11.71775, -9.83624], + "easing": "easeOutSine" + }, + "2.05": { + "vector": [-21.16455, -11.71775, -9.83624], + "easing": "easeOutSine" + }, + "2.3": { + "vector": [0, 0, 0], + "easing": "easeInOutCubic" + } + }, + "position": { + "0.0333": { + "vector": [0, 0, 0] + }, + "0.5333": { + "vector": [3.6298, -9.6674, 10.35934], + "easing": "easeOutQuad" + }, + "0.9": { + "vector": [-1.59069, -3.13326, 3.41688], + "easing": "easeOutSine" + }, + "1.1333": { + "vector": [-1.69069, -8.33326, 0.31688], + "easing": "easeInOutQuad" + }, + "1.3167": { + "vector": [-2.44156, -5.77141, 0.42] + }, + "1.4833": { + "vector": [-1.82116, -5.06841, 2.47626], + "easing": "easeOutSine" + }, + "1.5667": { + "vector": [-1.82116, -3.56841, 3.27626], + "easing": "easeOutSine" + }, + "1.7333": { + "vector": [-0.52116, -7.96841, -1.82374], + "easing": "easeOutSine" + }, + "1.8833": { + "vector": [2.48, -11.97, 0.18], + "easing": "easeInOutSine" + }, + "2.05": { + "vector": [2.48, -13.97, 7.18], + "easing": "easeInOutSine" + }, + "2.3": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + } + }, + "magazine": { + "rotation": { + "0.9": { + "vector": [0, 0, 0] + }, + "1.1333": { + "vector": [-14.94548, -1.29256, -4.83045], + "easing": "easeInOutQuad" + }, + "1.3167": { + "vector": [-19.13843, -5.6156, -7.36216] + }, + "1.5167": { + "vector": [-17.61544, 13.20666, -14.8872] + }, + "1.5667": { + "vector": [-17.61544, 13.20666, -14.8872] + }, + "1.7333": { + "vector": [-18.9503, 6.8669, -18.83787] + }, + "1.8833": { + "vector": [-18.49011, 4.54769, -15.0214], + "easing": "easeInOutSine" + }, + "2.05": { + "vector": [-28.54, -6.01, -11.13], + "easing": "easeInOutSine" + }, + "2.0833": { + "vector": [0, 0, 0] + }, + "2.1": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + }, + "position": { + "0.9": { + "vector": [0, 0, 0] + }, + "1.1333": { + "vector": [0, -3.5, -1], + "easing": "easeInOutQuad" + }, + "1.3167": { + "vector": [-0.94062, -0.55391, -1.16875] + }, + "1.4167": { + "vector": [-0.68, -1.51156, -0.72141] + }, + "1.5167": { + "vector": [-1.21703, -0.18281, -0.31156] + }, + "1.5667": { + "vector": [-1.21703, -0.18281, -0.31156] + }, + "1.7333": { + "vector": [-0.56, -3.87891, -3.60484] + }, + "1.8833": { + "vector": [2.74469, -8.21484, -1.15172], + "easing": "easeInOutSine" + }, + "2.05": { + "vector": [2.44, -10.5, 5.11], + "easing": "easeInOutSine" + }, + "2.0833": { + "vector": [0, 0, 317] + }, + "2.1": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + } + }, + "magazine2": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [13, -5, 13] + "0.5333": { + "vector": [-28.89091, 15.98616, -5.02589] }, - "0.3": { - "vector": [0, -4, 0], - "easing": "easeInSine" + "0.9": { + "vector": [-32.57163, 10.15543, -2.42658], + "easing": "easeOutSine" }, - "1.4": { - "vector": [0, -4, 0] + "1.1333": { + "vector": [-22.5, 0, -1], + "easing": "easeInOutQuad" }, - "1.5": { - "vector": [13, -5, 13] + "1.3167": { + "vector": [-22.05592, -4.56353, -7.11018] }, - "1.7": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" + "1.4833": { + "vector": [-16.75, 0, 0] + }, + "1.5667": { + "vector": [-1.75, 0, 0] + }, + "2.1333": { + "vector": [-1.75, 0, 0] + }, + "2.15": { + "vector": [-1.75, 0, 0] + }, + "2.25": { + "vector": [0, 0, 0] } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [-1.4, -0.4, 2] + "0.5333": { + "vector": [0.02827, -3.34634, -4.77029] }, - "0.3": { - "vector": [-0.7, -1.7, 5.3], - "easing": "easeInSine" + "0.9": { + "vector": [-5.17435, 3.25868, -12.0845], + "easing": "easeOutSine" }, - "1.4": { - "vector": [-0.7, -1.7, 5.3] + "1.1333": { + "vector": [-5.40838, 0.1135, -12.65133], + "easing": "easeInOutQuad" }, - "1.5": { - "vector": [-1.4, -0.4, 2] + "1.3167": { + "vector": [-6.395, 2.89641, -12.42] }, - "1.8": { - "vector": [0, 0, 0], - "easing": "easeInOutSine" + "1.4833": { + "vector": [-6.49844, 2.78672, -11.71562] + }, + "1.5667": { + "vector": [-6.49844, 3.38672, -11.71562] + }, + "2.1333": { + "vector": [-6.49844, 3.38672, -11.71562] + }, + "2.15": { + "vector": [-6.49844, 3.38672, 603.28437] + }, + "2.25": { + "vector": [0, 0, 0] } } }, @@ -681,36 +1071,54 @@ "0.0": { "vector": [0, 0, 0] }, - "0.4": { + "0.3": { "vector": [0, 0, 1.5], "easing": "easeInElastic" }, - "0.5": { + "0.4167": { + "vector": [0, 0, 1] + }, + "0.65": { + "vector": [0.5, 0, 1.2], + "easing": "easeOutSine" + }, + "0.7667": { + "vector": [-0.1, 0, 2] + }, + "0.95": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "1.0333": { "vector": [1, 1, -1.5], "easing": "easeInSine" }, - "0.6": { + "1.1167": { "vector": [-0.5, -0.5, 1.5] }, - "0.8": { - "vector": [0.2, 0, 1.2], - "easing": "easeOutSine" + "1.3": { + "vector": [0.5, 0, 2], + "easing": "easeInElastic" }, - "1.2": { - "vector": [-0.5, 0, 1.5], + "1.4667": { + "vector": [-0.5, 0, 2.2], "easing": "linear" }, - "1.3": { - "vector": [1.5, -0.7, 0.93], + "1.55": { + "vector": [1.5, -0.7, 1.2], "easing": "easeInSine" }, - "1.5": { - "vector": [-0.4, 0.4, -0.6], - "easing": "easeOutSine" + "1.7333": { + "vector": [0, 0, 1.5], + "easing": "linear" }, - "1.8": { + "2.0": { + "vector": [0, 0, -0.75], + "easing": "linear" + }, + "2.1667": { "vector": [0, 0, 0], - "easing": "easeInElastic" + "easing": "linear" } } } diff --git a/src/main/resources/assets/target/geo/sks.geo.json b/src/main/resources/assets/target/geo/sks.geo.json index fa0999c2f..649c0a569 100644 --- a/src/main/resources/assets/target/geo/sks.geo.json +++ b/src/main/resources/assets/target/geo/sks.geo.json @@ -7842,14 +7842,9 @@ "parent": "rail", "pivot": [0.61533, -3.78931, -16.49818] }, - { - "name": "magazine", - "parent": "0", - "pivot": [0.5, 1, -3.5] - }, { "name": "Lefthand", - "parent": "magazine", + "parent": "0", "pivot": [4.9625, -5.86562, -2.54844], "rotation": [54.40074, 25.37317, -8.56985], "cubes": [ @@ -7868,13 +7863,13 @@ ] }, { - "name": "magazine2", - "parent": "magazine", - "pivot": [0, 0.09383, -4.47783], + "name": "magazine", + "parent": "0", + "pivot": [0.00009, -0.28529, -3.96593], "rotation": [-1.75, 0, 0], "cubes": [ { - "origin": [-0.39138, 0.32208, -3.30939], + "origin": [-0.39138, 0.30627, -3.32073], "size": [0.78281, 1.24937, 0.08985], "uv": { "north": {"uv": [14, 46], "uv_size": [0.75, 1.25]}, @@ -7886,9 +7881,9 @@ } }, { - "origin": [-0.39087, -0.62795, -3.52344], + "origin": [-0.39087, -0.64376, -3.53478], "size": [0.7823, 1.0673, 0.08933], - "pivot": [0.00015, -0.59887, -3.86225], + "pivot": [0.00015, -0.61468, -3.87359], "rotation": [-12.5, 0, 0], "uv": { "north": {"uv": [48, 23], "uv_size": [0.75, 1]}, @@ -7900,9 +7895,9 @@ } }, { - "origin": [-0.39087, -1.49475, -3.48432], + "origin": [-0.39087, -1.51056, -3.49566], "size": [0.7823, 0.9673, 0.08933], - "pivot": [0.00015, -0.51017, -3.81608], + "pivot": [0.00015, -0.52598, -3.82742], "rotation": [-27.5, 0, 0], "uv": { "north": {"uv": [48, 21], "uv_size": [0.75, 1]}, @@ -7914,9 +7909,9 @@ } }, { - "origin": [-0.39087, -1.94452, -3.24384], + "origin": [-0.39087, -1.96033, -3.25518], "size": [0.7823, 0.5923, 0.08933], - "pivot": [0.00015, -0.51017, -3.81608], + "pivot": [0.00015, -0.52598, -3.82742], "rotation": [-42.5, 0, 0], "uv": { "north": {"uv": [53, 50], "uv_size": [0.75, 0.5]}, @@ -7928,7 +7923,7 @@ } }, { - "origin": [-0.39971, 0.5257, -3.86886], + "origin": [-0.39971, 0.50989, -3.8802], "size": [0.79955, 1.03071, 0.08231], "uv": { "north": {"uv": [48, 36], "uv_size": [0.75, 1]}, @@ -7940,9 +7935,9 @@ } }, { - "origin": [-0.39935, -0.34408, -4.06412], + "origin": [-0.39935, -0.35989, -4.07546], "size": [0.79918, 0.95778, 0.08194], - "pivot": [0.00015, -0.32343, -4.28616], + "pivot": [0.00015, -0.33924, -4.2975], "rotation": [-12.5, 0, 0], "uv": { "north": {"uv": [48, 29], "uv_size": [0.75, 1]}, @@ -7954,9 +7949,9 @@ } }, { - "origin": [-0.39935, -1.22248, -4.06913], + "origin": [-0.39935, -1.23829, -4.08047], "size": [0.79918, 0.95778, 0.08194], - "pivot": [0.00015, -0.32343, -4.28616], + "pivot": [0.00015, -0.33924, -4.2975], "rotation": [-27.5, 0, 0], "uv": { "north": {"uv": [48, 27], "uv_size": [0.75, 1]}, @@ -7968,9 +7963,9 @@ } }, { - "origin": [-0.39935, -2.40041, -3.99074], + "origin": [-0.39935, -2.41622, -4.00208], "size": [0.79918, 1.30172, 0.08194], - "pivot": [0.00015, -0.50083, -4.37851], + "pivot": [0.00015, -0.51664, -4.38985], "rotation": [-42.5, 0, 0], "uv": { "north": {"uv": [46, 15], "uv_size": [0.75, 1.25]}, @@ -7982,9 +7977,9 @@ } }, { - "origin": [-0.3744, -1.4263, -4.79078], + "origin": [-0.3744, -1.44211, -4.80212], "size": [0.7494, 1.25565, 1.57752], - "pivot": [0.0003, -1.44926, -4.48703], + "pivot": [0.0003, -1.46507, -4.49837], "rotation": [-27.5, 0, 0], "uv": { "north": {"uv": [44, 6], "uv_size": [0.75, 1.25]}, @@ -7996,9 +7991,9 @@ } }, { - "origin": [0.275, -1.35958, -4.70596], + "origin": [0.275, -1.37539, -4.7173], "size": [0.1, 1.25565, 0.25], - "pivot": [0.375, -0.73175, -4.45596], + "pivot": [0.375, -0.74756, -4.4673], "rotation": [-29.39942, 19.84302, -10.82777], "uv": { "north": {"uv": [54, 41], "uv_size": [0.25, 1.25]}, @@ -8010,9 +8005,9 @@ } }, { - "origin": [-0.28065, -1.4263, -5.3064], + "origin": [-0.28065, -1.44211, -5.31774], "size": [0.5619, 1.25565, 0.51502], - "pivot": [0.0003, -1.44926, -4.48703], + "pivot": [0.0003, -1.46507, -4.49837], "rotation": [-27.5, 0, 0], "uv": { "north": {"uv": [49, 11], "uv_size": [0.5, 1.25]}, @@ -8024,9 +8019,9 @@ } }, { - "origin": [-0.3744, -2.57624, -5.45327], + "origin": [-0.3744, -2.59205, -5.46461], "size": [0.7494, 1.75565, 1.57752], - "pivot": [0.0003, -2.0992, -5.14952], + "pivot": [0.0003, -2.11501, -5.16086], "rotation": [-42.5, 0, 0], "uv": { "north": {"uv": [39, 18], "uv_size": [0.75, 1.75]}, @@ -8038,9 +8033,9 @@ } }, { - "origin": [0.23097, -2.41123, -5.29873], + "origin": [0.23097, -2.42704, -5.31007], "size": [0.1, 1.75565, 0.25], - "pivot": [0.28097, -1.53341, -5.17373], + "pivot": [0.28097, -1.54922, -5.18507], "rotation": [-44.76498, 16.3882, -15.63367], "uv": { "north": {"uv": [52, 4], "uv_size": [0.25, 1.75]}, @@ -8052,9 +8047,9 @@ } }, { - "origin": [-0.28065, -2.57624, -5.96889], + "origin": [-0.28065, -2.59205, -5.98023], "size": [0.5619, 1.75565, 0.51502], - "pivot": [0.0003, -2.0992, -5.14952], + "pivot": [0.0003, -2.11501, -5.16086], "rotation": [-42.5, 0, 0], "uv": { "north": {"uv": [11, 47], "uv_size": [0.5, 1.75]}, @@ -8066,9 +8061,9 @@ } }, { - "origin": [-0.3744, -0.74744, -4.18972], + "origin": [-0.3744, -0.76325, -4.20106], "size": [0.7494, 1.25565, 1.57752], - "pivot": [0.0003, -0.11962, -3.40096], + "pivot": [0.0003, -0.13543, -3.4123], "rotation": [-12.5, 0, 0], "uv": { "north": {"uv": [12, 46], "uv_size": [0.75, 1.25]}, @@ -8080,9 +8075,9 @@ } }, { - "origin": [-0.40096, -0.05937, -4.13476], + "origin": [-0.40096, -0.07518, -4.1461], "size": [0.80253, 0.15565, 1.53143], - "pivot": [0.0003, 0.01846, -3.3417], + "pivot": [0.0003, 0.00265, -3.35304], "rotation": [-12.5, 0, 0], "uv": { "north": {"uv": [59, 39], "uv_size": [0.75, 0.25]}, @@ -8094,7 +8089,7 @@ } }, { - "origin": [-0.40269, 1.5525, -4.02901], + "origin": [-0.40269, 1.53669, -4.04035], "size": [0.80253, 0.10487, 1.5119], "uv": { "north": {"uv": [59, 54], "uv_size": [0.75, 0.25]}, @@ -8106,9 +8101,9 @@ } }, { - "origin": [-0.40096, -1.03046, -4.44257], + "origin": [-0.40096, -1.04627, -4.45391], "size": [0.80253, 0.15565, 1.53924], - "pivot": [0.0003, -0.95264, -3.6417], + "pivot": [0.0003, -0.96845, -3.65304], "rotation": [-27.5, 0, 0], "uv": { "north": {"uv": [59, 40], "uv_size": [0.75, 0.25]}, @@ -8120,9 +8115,9 @@ } }, { - "origin": [-0.40096, -2.73046, -5.74257], + "origin": [-0.40096, -2.74627, -5.75391], "size": [0.80253, 0.15565, 1.53924], - "pivot": [0.0003, -2.65264, -4.9417], + "pivot": [0.0003, -2.66845, -4.95304], "rotation": [-42.5, 0, 0], "uv": { "north": {"uv": [59, 49], "uv_size": [0.75, 0.25]}, @@ -8134,9 +8129,9 @@ } }, { - "origin": [0.23097, -0.55587, -4.39009], + "origin": [0.23097, -0.57168, -4.40143], "size": [0.1, 1.25565, 0.25], - "pivot": [0.28097, 0.07195, -4.26509], + "pivot": [0.28097, 0.05614, -4.27643], "rotation": [-13.4936, 21.93857, -5.123], "uv": { "north": {"uv": [54, 37], "uv_size": [0.25, 1.25]}, @@ -8148,9 +8143,9 @@ } }, { - "origin": [-0.28065, -0.62704, -4.8347], + "origin": [-0.28065, -0.64285, -4.84604], "size": [0.5619, 1.25565, 0.51502], - "pivot": [0.0003, -0.65, -4.01533], + "pivot": [0.0003, -0.66581, -4.02667], "rotation": [-12.5, 0, 0], "uv": { "north": {"uv": [32, 50], "uv_size": [0.5, 1.25]}, @@ -8162,7 +8157,7 @@ } }, { - "origin": [-0.375, 0.32261, -4.07314], + "origin": [-0.375, 0.3068, -4.08448], "size": [0.75, 1.5875, 1.57813], "uv": { "north": {"uv": [31, 41], "uv_size": [0.75, 1.5]}, @@ -8174,7 +8169,7 @@ } }, { - "origin": [-0.39492, 0.26759, -2.71364], + "origin": [-0.39492, 0.25178, -2.72498], "size": [0.78987, 1.38747, 0.08241], "uv": { "north": {"uv": [40, 41], "uv_size": [0.75, 1.5]}, @@ -8186,9 +8181,9 @@ } }, { - "origin": [-0.39439, -0.66764, -2.81553], + "origin": [-0.39439, -0.68345, -2.82687], "size": [0.78935, 1.09744, 0.08188], - "pivot": [0.00028, -0.11892, -3.42303], + "pivot": [0.00028, -0.13473, -3.43437], "rotation": [-12.5, 0, 0], "uv": { "north": {"uv": [48, 39], "uv_size": [0.75, 1]}, @@ -8200,9 +8195,9 @@ } }, { - "origin": [-0.39439, -1.26096, -3.34085], + "origin": [-0.39439, -1.27677, -3.35219], "size": [0.78935, 1.09744, 0.08188], - "pivot": [0.00028, -1.28103, -4.37225], + "pivot": [0.00028, -1.29684, -4.38359], "rotation": [-27.5, 0, 0], "uv": { "north": {"uv": [48, 37], "uv_size": [0.75, 1]}, @@ -8214,9 +8209,9 @@ } }, { - "origin": [-0.39439, -2.37147, -3.91987], + "origin": [-0.39439, -2.38728, -3.93121], "size": [0.78935, 1.63991, 0.08188], - "pivot": [0.00028, -1.84907, -4.95126], + "pivot": [0.00028, -1.86488, -4.9626], "rotation": [-42.5, 0, 0], "uv": { "north": {"uv": [23, 39], "uv_size": [0.75, 1.75]}, @@ -8228,9 +8223,9 @@ } }, { - "origin": [0.00159, 0.32261, -4.11957], + "origin": [0.00159, 0.3068, -4.13091], "size": [0.1, 1.5875, 0.25], - "pivot": [-0.27341, 1.11636, -4.65863], + "pivot": [-0.27341, 1.10055, -4.66997], "rotation": [0, 22.5, 0], "uv": { "north": {"uv": [53, 39], "uv_size": [0.25, 1.5]}, @@ -8242,9 +8237,9 @@ } }, { - "origin": [-0.33097, -2.41123, -5.29873], + "origin": [-0.33097, -2.42704, -5.31007], "size": [0.1, 1.75565, 0.25], - "pivot": [-0.28097, -1.53341, -5.17373], + "pivot": [-0.28097, -1.54922, -5.18507], "rotation": [-44.76498, -16.3882, 15.63367], "uv": { "north": {"uv": [8, 52], "uv_size": [0.25, 1.75]}, @@ -8256,9 +8251,9 @@ } }, { - "origin": [-0.375, -1.35958, -4.70596], + "origin": [-0.375, -1.37539, -4.7173], "size": [0.1, 1.25565, 0.25], - "pivot": [-0.375, -0.73175, -4.45596], + "pivot": [-0.375, -0.74756, -4.4673], "rotation": [-29.39942, -19.84302, 10.82777], "uv": { "north": {"uv": [54, 50], "uv_size": [0.25, 1.25]}, @@ -8270,9 +8265,9 @@ } }, { - "origin": [-0.33097, -0.55587, -4.39009], + "origin": [-0.33097, -0.57168, -4.40143], "size": [0.1, 1.25565, 0.25], - "pivot": [-0.28097, 0.07195, -4.26509], + "pivot": [-0.28097, 0.05614, -4.27643], "rotation": [-13.4936, -21.93857, 5.123], "uv": { "north": {"uv": [47, 54], "uv_size": [0.25, 1.25]}, @@ -8284,9 +8279,9 @@ } }, { - "origin": [-0.10159, 0.32261, -4.11957], + "origin": [-0.10159, 0.3068, -4.13091], "size": [0.1, 1.5875, 0.25], - "pivot": [0.27341, 1.11636, -4.65863], + "pivot": [0.27341, 1.10055, -4.66997], "rotation": [0, -22.5, 0], "uv": { "north": {"uv": [53, 43], "uv_size": [0.25, 1.5]}, @@ -8298,7 +8293,7 @@ } }, { - "origin": [-0.175, 0.28823, -2.49501], + "origin": [-0.175, 0.27242, -2.50635], "size": [0.35, 1.62188, 0.15], "uv": { "north": {"uv": [36, 53], "uv_size": [0.25, 1.5]}, @@ -8310,9 +8305,9 @@ } }, { - "origin": [-0.175, -0.9406, -2.58947], + "origin": [-0.175, -0.95641, -2.60081], "size": [0.35, 1.2556, 0.15], - "pivot": [0, -0.12966, -2.51447], + "pivot": [0, -0.14547, -2.52581], "rotation": [-12.5, 0, 0], "uv": { "north": {"uv": [28, 54], "uv_size": [0.25, 1.25]}, @@ -8324,9 +8319,9 @@ } }, { - "origin": [-0.175, -2.10833, -2.96362], + "origin": [-0.175, -2.12414, -2.97496], "size": [0.35, 1.2556, 0.15], - "pivot": [0, -1.2974, -2.88862], + "pivot": [0, -1.31321, -2.89996], "rotation": [-27.5, 0, 0], "uv": { "north": {"uv": [31, 54], "uv_size": [0.25, 1.25]}, @@ -8338,9 +8333,9 @@ } }, { - "origin": [-0.175, -3.71366, -3.62725], + "origin": [-0.175, -3.72947, -3.63859], "size": [0.35, 1.82982, 0.15], - "pivot": [0, -2.32851, -3.55225], + "pivot": [0, -2.34432, -3.56359], "rotation": [-42.5, 0, 0], "uv": { "north": {"uv": [2, 52], "uv_size": [0.25, 1.75]}, @@ -8352,9 +8347,9 @@ } }, { - "origin": [0.22189, 1.8896, -4.07314], + "origin": [0.22189, 1.87379, -4.08448], "size": [0.1, 0.2875, 1.52813], - "pivot": [0.29689, 2.03335, -3.15907], + "pivot": [0.29689, 2.01754, -3.17041], "rotation": [0, 0, -22.5], "uv": { "north": {"uv": [75, 24], "uv_size": [0.25, 0.25]}, @@ -8366,9 +8361,9 @@ } }, { - "origin": [-0.32189, 1.8896, -4.07314], + "origin": [-0.32189, 1.87379, -4.08448], "size": [0.1, 0.2875, 1.52813], - "pivot": [-0.29689, 2.03335, -3.15908], + "pivot": [-0.29689, 2.01754, -3.17042], "rotation": [0, 0, 22.5], "uv": { "north": {"uv": [75, 25], "uv_size": [0.25, 0.25]}, @@ -8380,7 +8375,7 @@ } }, { - "origin": [-0.28125, 0.32261, -4.58876], + "origin": [-0.28125, 0.3068, -4.6001], "size": [0.5625, 1.58906, 0.51563], "uv": { "north": {"uv": [43, 47], "uv_size": [0.5, 1.5]}, @@ -8392,7 +8387,7 @@ } }, { - "origin": [-0.23438, 0.8557, -6.24367], + "origin": [-0.23438, 0.83989, -6.25501], "size": [0.46875, 0.67941, 1.65491], "uv": { "north": {"uv": [52, 15], "uv_size": [0.5, 0.75]}, @@ -8404,9 +8399,9 @@ } }, { - "origin": [-0.23408, 0.72307, -5.69311], + "origin": [-0.23408, 0.70726, -5.70445], "size": [0.46815, 0.42127, 1.2244], - "pivot": [0, 0.88899, -5.29262], + "pivot": [0, 0.87318, -5.30396], "rotation": [-22.5, 0, 0], "uv": { "north": {"uv": [23, 55], "uv_size": [0.5, 0.5]}, @@ -8422,10 +8417,10 @@ { "name": "bullet", "parent": "magazine", - "pivot": [0.00283, 1.91538, -3.10152], + "pivot": [0.00283, 1.89957, -3.11286], "cubes": [ { - "origin": [-0.1762, 1.73635, -3.68242], + "origin": [-0.1762, 1.72054, -3.69376], "size": [0.35805, 0.35805, 0.9922], "uv": { "north": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, @@ -8437,7 +8432,7 @@ } }, { - "origin": [-0.13, 1.78255, -4.08162], + "origin": [-0.13, 1.76674, -4.09296], "size": [0.26565, 0.26565, 1.53], "uv": { "north": {"uv": [2.75, 95.25], "uv_size": [-0.75, -3.25]}, @@ -8449,7 +8444,601 @@ } }, { - "origin": [-0.1762, 1.73635, -2.59782], + "origin": [-0.1762, 1.72054, -2.60916], + "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": "magazine2", + "parent": "0", + "pivot": [6.50009, -3.66948, 7.74541], + "cubes": [ + { + "origin": [6.26592, -2.67693, 6.00689], + "size": [0.46815, 0.42127, 1.2244], + "pivot": [6.5, -2.51101, 6.40738], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [23, 55], "uv_size": [0.5, 0.5]}, + "east": {"uv": [49, 14], "uv_size": [1.25, 0.5]}, + "south": {"uv": [55, 23], "uv_size": [0.5, 0.5]}, + "west": {"uv": [17, 49], "uv_size": [1.25, 0.5]}, + "up": {"uv": [49, 18], "uv_size": [0.5, 1.25]}, + "down": {"uv": [19, 50.25], "uv_size": [0.5, -1.25]} + } + }, + { + "origin": [6.10862, -3.07792, 8.39061], + "size": [0.78281, 1.24937, 0.08985], + "uv": { + "north": {"uv": [14, 46], "uv_size": [0.75, 1.25]}, + "east": {"uv": [54, 54], "uv_size": [0.25, 1.25]}, + "south": {"uv": [15, 46], "uv_size": [0.75, 1.25]}, + "west": {"uv": [0, 55], "uv_size": [0.25, 1.25]}, + "up": {"uv": [59, 44], "uv_size": [0.75, 0.25]}, + "down": {"uv": [45, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10913, -4.02795, 8.17656], + "size": [0.7823, 1.0673, 0.08933], + "pivot": [6.50015, -3.99887, 7.83775], + "rotation": [-12.5, 0, 0], + "uv": { + "north": {"uv": [48, 23], "uv_size": [0.75, 1]}, + "east": {"uv": [27, 56], "uv_size": [0.25, 1]}, + "south": {"uv": [48, 25], "uv_size": [0.75, 1]}, + "west": {"uv": [56, 27], "uv_size": [0.25, 1]}, + "up": {"uv": [59, 43], "uv_size": [0.75, 0.25]}, + "down": {"uv": [44, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10913, -4.89475, 8.21568], + "size": [0.7823, 0.9673, 0.08933], + "pivot": [6.50015, -3.91017, 7.88392], + "rotation": [-27.5, 0, 0], + "uv": { + "north": {"uv": [48, 21], "uv_size": [0.75, 1]}, + "east": {"uv": [26, 56], "uv_size": [0.25, 1]}, + "south": {"uv": [48, 22], "uv_size": [0.75, 1]}, + "west": {"uv": [56, 26], "uv_size": [0.25, 1]}, + "up": {"uv": [59, 42], "uv_size": [0.75, 0.25]}, + "down": {"uv": [43, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10913, -5.34452, 8.45616], + "size": [0.7823, 0.5923, 0.08933], + "pivot": [6.50015, -3.91017, 7.88392], + "rotation": [-42.5, 0, 0], + "uv": { + "north": {"uv": [53, 50], "uv_size": [0.75, 0.5]}, + "east": {"uv": [63, 12], "uv_size": [0.25, 0.5]}, + "south": {"uv": [51, 53], "uv_size": [0.75, 0.5]}, + "west": {"uv": [13, 63], "uv_size": [0.25, 0.5]}, + "up": {"uv": [59, 41], "uv_size": [0.75, 0.25]}, + "down": {"uv": [42, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10029, -2.8743, 7.83114], + "size": [0.79955, 1.03071, 0.08231], + "uv": { + "north": {"uv": [48, 36], "uv_size": [0.75, 1]}, + "east": {"uv": [30, 56], "uv_size": [0.25, 1]}, + "south": {"uv": [37, 48], "uv_size": [0.75, 1]}, + "west": {"uv": [56, 30], "uv_size": [0.25, 1]}, + "up": {"uv": [59, 48], "uv_size": [0.75, 0.25]}, + "down": {"uv": [49, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10065, -3.74408, 7.63588], + "size": [0.79918, 0.95778, 0.08194], + "pivot": [6.50015, -3.72343, 7.41384], + "rotation": [-12.5, 0, 0], + "uv": { + "north": {"uv": [48, 29], "uv_size": [0.75, 1]}, + "east": {"uv": [29, 56], "uv_size": [0.25, 1]}, + "south": {"uv": [48, 35], "uv_size": [0.75, 1]}, + "west": {"uv": [56, 29], "uv_size": [0.25, 1]}, + "up": {"uv": [59, 47], "uv_size": [0.75, 0.25]}, + "down": {"uv": [48, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10065, -4.62248, 7.63087], + "size": [0.79918, 0.95778, 0.08194], + "pivot": [6.50015, -3.72343, 7.41384], + "rotation": [-27.5, 0, 0], + "uv": { + "north": {"uv": [48, 27], "uv_size": [0.75, 1]}, + "east": {"uv": [28, 56], "uv_size": [0.25, 1]}, + "south": {"uv": [48, 28], "uv_size": [0.75, 1]}, + "west": {"uv": [56, 28], "uv_size": [0.25, 1]}, + "up": {"uv": [59, 46], "uv_size": [0.75, 0.25]}, + "down": {"uv": [47, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10065, -5.80041, 7.70926], + "size": [0.79918, 1.30172, 0.08194], + "pivot": [6.50015, -3.90083, 7.32149], + "rotation": [-42.5, 0, 0], + "uv": { + "north": {"uv": [46, 15], "uv_size": [0.75, 1.25]}, + "east": {"uv": [55, 0], "uv_size": [0.25, 1.25]}, + "south": {"uv": [16, 46], "uv_size": [0.75, 1.25]}, + "west": {"uv": [2, 55], "uv_size": [0.25, 1.25]}, + "up": {"uv": [59, 45], "uv_size": [0.75, 0.25]}, + "down": {"uv": [46, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.1256, -4.8263, 6.90922], + "size": [0.7494, 1.25565, 1.57752], + "pivot": [6.5003, -4.84926, 7.21297], + "rotation": [-27.5, 0, 0], + "uv": { + "north": {"uv": [44, 6], "uv_size": [0.75, 1.25]}, + "east": {"uv": [30, 20], "uv_size": [1.5, 1.25]}, + "south": {"uv": [12, 44], "uv_size": [0.75, 1.25]}, + "west": {"uv": [28, 30], "uv_size": [1.5, 1.25]}, + "up": {"uv": [16, 40], "uv_size": [0.75, 1.5]}, + "down": {"uv": [18, 41.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.775, -4.75958, 6.99404], + "size": [0.1, 1.25565, 0.25], + "pivot": [6.875, -4.13175, 7.24404], + "rotation": [-29.39942, 19.84302, -10.82777], + "uv": { + "north": {"uv": [54, 41], "uv_size": [0.25, 1.25]}, + "east": {"uv": [54, 43], "uv_size": [0.25, 1.25]}, + "south": {"uv": [54, 45], "uv_size": [0.25, 1.25]}, + "west": {"uv": [46, 54], "uv_size": [0.25, 1.25]}, + "up": {"uv": [75, 32], "uv_size": [0.25, 0.25]}, + "down": {"uv": [33, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.21935, -4.8263, 6.3936], + "size": [0.5619, 1.25565, 0.51502], + "pivot": [6.5003, -4.84926, 7.21297], + "rotation": [-27.5, 0, 0], + "uv": { + "north": {"uv": [49, 11], "uv_size": [0.5, 1.25]}, + "east": {"uv": [14, 49], "uv_size": [0.5, 1.25]}, + "south": {"uv": [15, 49], "uv_size": [0.5, 1.25]}, + "west": {"uv": [16, 49], "uv_size": [0.5, 1.25]}, + "up": {"uv": [20, 55], "uv_size": [0.5, 0.5]}, + "down": {"uv": [55, 20.5], "uv_size": [0.5, -0.5]} + } + }, + { + "origin": [6.1256, -5.97624, 6.24673], + "size": [0.7494, 1.75565, 1.57752], + "pivot": [6.5003, -5.4992, 6.55048], + "rotation": [-42.5, 0, 0], + "uv": { + "north": {"uv": [39, 18], "uv_size": [0.75, 1.75]}, + "east": {"uv": [27, 22], "uv_size": [1.5, 1.75]}, + "south": {"uv": [22, 39], "uv_size": [0.75, 1.75]}, + "west": {"uv": [27, 27], "uv_size": [1.5, 1.75]}, + "up": {"uv": [14, 41], "uv_size": [0.75, 1.5]}, + "down": {"uv": [15, 42.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.73097, -5.81123, 6.40127], + "size": [0.1, 1.75565, 0.25], + "pivot": [6.78097, -4.93341, 6.52627], + "rotation": [-44.76498, 16.3882, -15.63367], + "uv": { + "north": {"uv": [52, 4], "uv_size": [0.25, 1.75]}, + "east": {"uv": [5, 52], "uv_size": [0.25, 1.75]}, + "south": {"uv": [6, 52], "uv_size": [0.25, 1.75]}, + "west": {"uv": [7, 52], "uv_size": [0.25, 1.75]}, + "up": {"uv": [75, 33], "uv_size": [0.25, 0.25]}, + "down": {"uv": [34, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.21935, -5.97624, 5.73111], + "size": [0.5619, 1.75565, 0.51502], + "pivot": [6.5003, -5.4992, 6.55048], + "rotation": [-42.5, 0, 0], + "uv": { + "north": {"uv": [11, 47], "uv_size": [0.5, 1.75]}, + "east": {"uv": [47, 21], "uv_size": [0.5, 1.75]}, + "south": {"uv": [22, 47], "uv_size": [0.5, 1.75]}, + "west": {"uv": [23, 47], "uv_size": [0.5, 1.75]}, + "up": {"uv": [25, 56], "uv_size": [0.5, 0.5]}, + "down": {"uv": [56, 25.5], "uv_size": [0.5, -0.5]} + } + }, + { + "origin": [6.1256, -4.14744, 7.51028], + "size": [0.7494, 1.25565, 1.57752], + "pivot": [6.5003, -3.51962, 8.29904], + "rotation": [-12.5, 0, 0], + "uv": { + "north": {"uv": [12, 46], "uv_size": [0.75, 1.25]}, + "east": {"uv": [32, 20], "uv_size": [1.5, 1.25]}, + "south": {"uv": [13, 46], "uv_size": [0.75, 1.25]}, + "west": {"uv": [30, 32], "uv_size": [1.5, 1.25]}, + "up": {"uv": [12, 41], "uv_size": [0.75, 1.5]}, + "down": {"uv": [13, 42.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.09904, -3.45937, 7.56524], + "size": [0.80253, 0.15565, 1.53143], + "pivot": [6.5003, -3.38154, 8.3583], + "rotation": [-12.5, 0, 0], + "uv": { + "north": {"uv": [59, 39], "uv_size": [0.75, 0.25]}, + "east": {"uv": [47, 53], "uv_size": [1.5, 0.25]}, + "south": {"uv": [40, 59], "uv_size": [0.75, 0.25]}, + "west": {"uv": [53, 48], "uv_size": [1.5, 0.25]}, + "up": {"uv": [41, 20], "uv_size": [0.75, 1.5]}, + "down": {"uv": [22, 42.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.09731, -1.8475, 7.67099], + "size": [0.80253, 0.10487, 1.5119], + "uv": { + "north": {"uv": [59, 54], "uv_size": [0.75, 0.25]}, + "east": {"uv": [2, 54], "uv_size": [1.5, 0.25]}, + "south": {"uv": [55, 59], "uv_size": [0.75, 0.25]}, + "west": {"uv": [54, 2], "uv_size": [1.5, 0.25]}, + "up": {"uv": [0, 42], "uv_size": [0.75, 1.5]}, + "down": {"uv": [42, 1.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.09904, -4.43046, 7.25743], + "size": [0.80253, 0.15565, 1.53924], + "pivot": [6.5003, -4.35264, 8.0583], + "rotation": [-27.5, 0, 0], + "uv": { + "north": {"uv": [59, 40], "uv_size": [0.75, 0.25]}, + "east": {"uv": [49, 53], "uv_size": [1.5, 0.25]}, + "south": {"uv": [41, 59], "uv_size": [0.75, 0.25]}, + "west": {"uv": [53, 49], "uv_size": [1.5, 0.25]}, + "up": {"uv": [23, 41], "uv_size": [0.75, 1.5]}, + "down": {"uv": [26, 42.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.09904, -6.13046, 5.95743], + "size": [0.80253, 0.15565, 1.53924], + "pivot": [6.5003, -6.05264, 6.7583], + "rotation": [-42.5, 0, 0], + "uv": { + "north": {"uv": [59, 49], "uv_size": [0.75, 0.25]}, + "east": {"uv": [53, 52], "uv_size": [1.5, 0.25]}, + "south": {"uv": [50, 59], "uv_size": [0.75, 0.25]}, + "west": {"uv": [53, 53], "uv_size": [1.5, 0.25]}, + "up": {"uv": [30, 41], "uv_size": [0.75, 1.5]}, + "down": {"uv": [41, 31.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.73097, -3.95587, 7.30991], + "size": [0.1, 1.25565, 0.25], + "pivot": [6.78097, -3.32805, 7.43491], + "rotation": [-13.4936, 21.93857, -5.123], + "uv": { + "north": {"uv": [54, 37], "uv_size": [0.25, 1.25]}, + "east": {"uv": [39, 54], "uv_size": [0.25, 1.25]}, + "south": {"uv": [54, 39], "uv_size": [0.25, 1.25]}, + "west": {"uv": [40, 54], "uv_size": [0.25, 1.25]}, + "up": {"uv": [75, 31], "uv_size": [0.25, 0.25]}, + "down": {"uv": [32, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.21935, -4.02704, 6.8653], + "size": [0.5619, 1.25565, 0.51502], + "pivot": [6.5003, -4.05, 7.68467], + "rotation": [-12.5, 0, 0], + "uv": { + "north": {"uv": [32, 50], "uv_size": [0.5, 1.25]}, + "east": {"uv": [34, 50], "uv_size": [0.5, 1.25]}, + "south": {"uv": [38, 50], "uv_size": [0.5, 1.25]}, + "west": {"uv": [39, 50], "uv_size": [0.5, 1.25]}, + "up": {"uv": [24, 56], "uv_size": [0.5, 0.5]}, + "down": {"uv": [56, 24.5], "uv_size": [0.5, -0.5]} + } + }, + { + "origin": [6.125, -3.07739, 7.62686], + "size": [0.75, 1.5875, 1.57813], + "uv": { + "north": {"uv": [31, 41], "uv_size": [0.75, 1.5]}, + "east": {"uv": [30, 2], "uv_size": [1.5, 1.5]}, + "south": {"uv": [35, 41], "uv_size": [0.75, 1.5]}, + "west": {"uv": [6, 30], "uv_size": [1.5, 1.5]}, + "up": {"uv": [36, 41], "uv_size": [0.75, 1.5]}, + "down": {"uv": [37, 42.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.10508, -3.13241, 8.98636], + "size": [0.78987, 1.38747, 0.08241], + "uv": { + "north": {"uv": [40, 41], "uv_size": [0.75, 1.5]}, + "east": {"uv": [54, 0], "uv_size": [0.25, 1.5]}, + "south": {"uv": [41, 41], "uv_size": [0.75, 1.5]}, + "west": {"uv": [1, 54], "uv_size": [0.25, 1.5]}, + "up": {"uv": [59, 53], "uv_size": [0.75, 0.25]}, + "down": {"uv": [54, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10561, -4.06764, 8.88447], + "size": [0.78935, 1.09744, 0.08188], + "pivot": [6.50028, -3.51892, 8.27697], + "rotation": [-12.5, 0, 0], + "uv": { + "north": {"uv": [48, 39], "uv_size": [0.75, 1]}, + "east": {"uv": [32, 56], "uv_size": [0.25, 1]}, + "south": {"uv": [40, 48], "uv_size": [0.75, 1]}, + "west": {"uv": [56, 32], "uv_size": [0.25, 1]}, + "up": {"uv": [59, 52], "uv_size": [0.75, 0.25]}, + "down": {"uv": [53, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10561, -4.66096, 8.35915], + "size": [0.78935, 1.09744, 0.08188], + "pivot": [6.50028, -4.68103, 7.32775], + "rotation": [-27.5, 0, 0], + "uv": { + "north": {"uv": [48, 37], "uv_size": [0.75, 1]}, + "east": {"uv": [31, 56], "uv_size": [0.25, 1]}, + "south": {"uv": [48, 38], "uv_size": [0.75, 1]}, + "west": {"uv": [56, 31], "uv_size": [0.25, 1]}, + "up": {"uv": [59, 51], "uv_size": [0.75, 0.25]}, + "down": {"uv": [52, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10561, -5.77147, 7.78013], + "size": [0.78935, 1.63991, 0.08188], + "pivot": [6.50028, -5.24907, 6.74874], + "rotation": [-42.5, 0, 0], + "uv": { + "north": {"uv": [23, 39], "uv_size": [0.75, 1.75]}, + "east": {"uv": [11, 52], "uv_size": [0.25, 1.75]}, + "south": {"uv": [26, 39], "uv_size": [0.75, 1.75]}, + "west": {"uv": [12, 52], "uv_size": [0.25, 1.75]}, + "up": {"uv": [59, 50], "uv_size": [0.75, 0.25]}, + "down": {"uv": [51, 59.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.50159, -3.07739, 7.58043], + "size": [0.1, 1.5875, 0.25], + "pivot": [6.22659, -2.28364, 7.04137], + "rotation": [0, 22.5, 0], + "uv": { + "north": {"uv": [53, 39], "uv_size": [0.25, 1.5]}, + "east": {"uv": [41, 53], "uv_size": [0.25, 1.5]}, + "south": {"uv": [42, 53], "uv_size": [0.25, 1.5]}, + "west": {"uv": [43, 53], "uv_size": [0.25, 1.5]}, + "up": {"uv": [75, 30], "uv_size": [0.25, 0.25]}, + "down": {"uv": [31, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.16903, -5.81123, 6.40127], + "size": [0.1, 1.75565, 0.25], + "pivot": [6.21903, -4.93341, 6.52627], + "rotation": [-44.76498, -16.3882, 15.63367], + "uv": { + "north": {"uv": [8, 52], "uv_size": [0.25, 1.75]}, + "east": {"uv": [52, 8], "uv_size": [0.25, 1.75]}, + "south": {"uv": [9, 52], "uv_size": [0.25, 1.75]}, + "west": {"uv": [10, 52], "uv_size": [0.25, 1.75]}, + "up": {"uv": [75, 37], "uv_size": [0.25, 0.25]}, + "down": {"uv": [38, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.125, -4.75958, 6.99404], + "size": [0.1, 1.25565, 0.25], + "pivot": [6.125, -4.13175, 7.24404], + "rotation": [-29.39942, -19.84302, 10.82777], + "uv": { + "north": {"uv": [54, 50], "uv_size": [0.25, 1.25]}, + "east": {"uv": [51, 54], "uv_size": [0.25, 1.25]}, + "south": {"uv": [52, 54], "uv_size": [0.25, 1.25]}, + "west": {"uv": [53, 54], "uv_size": [0.25, 1.25]}, + "up": {"uv": [75, 36], "uv_size": [0.25, 0.25]}, + "down": {"uv": [37, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.16903, -3.95587, 7.30991], + "size": [0.1, 1.25565, 0.25], + "pivot": [6.21903, -3.32805, 7.43491], + "rotation": [-13.4936, -21.93857, 5.123], + "uv": { + "north": {"uv": [47, 54], "uv_size": [0.25, 1.25]}, + "east": {"uv": [48, 54], "uv_size": [0.25, 1.25]}, + "south": {"uv": [49, 54], "uv_size": [0.25, 1.25]}, + "west": {"uv": [50, 54], "uv_size": [0.25, 1.25]}, + "up": {"uv": [75, 35], "uv_size": [0.25, 0.25]}, + "down": {"uv": [36, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.39841, -3.07739, 7.58043], + "size": [0.1, 1.5875, 0.25], + "pivot": [6.77341, -2.28364, 7.04137], + "rotation": [0, -22.5, 0], + "uv": { + "north": {"uv": [53, 43], "uv_size": [0.25, 1.5]}, + "east": {"uv": [44, 53], "uv_size": [0.25, 1.5]}, + "south": {"uv": [45, 53], "uv_size": [0.25, 1.5]}, + "west": {"uv": [53, 45], "uv_size": [0.25, 1.5]}, + "up": {"uv": [75, 34], "uv_size": [0.25, 0.25]}, + "down": {"uv": [35, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.325, -3.11177, 9.20499], + "size": [0.35, 1.62188, 0.15], + "uv": { + "north": {"uv": [36, 53], "uv_size": [0.25, 1.5]}, + "east": {"uv": [37, 53], "uv_size": [0.25, 1.5]}, + "south": {"uv": [53, 37], "uv_size": [0.25, 1.5]}, + "west": {"uv": [38, 53], "uv_size": [0.25, 1.5]}, + "up": {"uv": [75, 26], "uv_size": [0.25, 0.25]}, + "down": {"uv": [27, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.325, -4.3406, 9.11053], + "size": [0.35, 1.2556, 0.15], + "pivot": [6.5, -3.52966, 9.18553], + "rotation": [-12.5, 0, 0], + "uv": { + "north": {"uv": [28, 54], "uv_size": [0.25, 1.25]}, + "east": {"uv": [29, 54], "uv_size": [0.25, 1.25]}, + "south": {"uv": [30, 54], "uv_size": [0.25, 1.25]}, + "west": {"uv": [54, 30], "uv_size": [0.25, 1.25]}, + "up": {"uv": [75, 27], "uv_size": [0.25, 0.25]}, + "down": {"uv": [28, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.325, -5.50833, 8.73638], + "size": [0.35, 1.2556, 0.15], + "pivot": [6.5, -4.6974, 8.81138], + "rotation": [-27.5, 0, 0], + "uv": { + "north": {"uv": [31, 54], "uv_size": [0.25, 1.25]}, + "east": {"uv": [32, 54], "uv_size": [0.25, 1.25]}, + "south": {"uv": [34, 54], "uv_size": [0.25, 1.25]}, + "west": {"uv": [54, 35], "uv_size": [0.25, 1.25]}, + "up": {"uv": [75, 28], "uv_size": [0.25, 0.25]}, + "down": {"uv": [29, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.325, -7.11366, 8.07275], + "size": [0.35, 1.82982, 0.15], + "pivot": [6.5, -5.72851, 8.14775], + "rotation": [-42.5, 0, 0], + "uv": { + "north": {"uv": [2, 52], "uv_size": [0.25, 1.75]}, + "east": {"uv": [52, 2], "uv_size": [0.25, 1.75]}, + "south": {"uv": [3, 52], "uv_size": [0.25, 1.75]}, + "west": {"uv": [4, 52], "uv_size": [0.25, 1.75]}, + "up": {"uv": [75, 29], "uv_size": [0.25, 0.25]}, + "down": {"uv": [30, 75.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.72189, -1.5104, 7.62686], + "size": [0.1, 0.2875, 1.52813], + "pivot": [6.79689, -1.36665, 8.54093], + "rotation": [0, 0, -22.5], + "uv": { + "north": {"uv": [75, 24], "uv_size": [0.25, 0.25]}, + "east": {"uv": [29, 53], "uv_size": [1.5, 0.25]}, + "south": {"uv": [25, 75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [53, 29], "uv_size": [1.5, 0.25]}, + "up": {"uv": [53, 30], "uv_size": [0.25, 1.5]}, + "down": {"uv": [33, 54.5], "uv_size": [0.25, -1.5]} + } + }, + { + "origin": [6.17811, -1.5104, 7.62686], + "size": [0.1, 0.2875, 1.52813], + "pivot": [6.20311, -1.36665, 8.54092], + "rotation": [0, 0, 22.5], + "uv": { + "north": {"uv": [75, 25], "uv_size": [0.25, 0.25]}, + "east": {"uv": [53, 32], "uv_size": [1.5, 0.25]}, + "south": {"uv": [26, 75], "uv_size": [0.25, 0.25]}, + "west": {"uv": [53, 34], "uv_size": [1.5, 0.25]}, + "up": {"uv": [35, 53], "uv_size": [0.25, 1.5]}, + "down": {"uv": [53, 36.5], "uv_size": [0.25, -1.5]} + } + }, + { + "origin": [6.21875, -3.07739, 7.11124], + "size": [0.5625, 1.58906, 0.51563], + "uv": { + "north": {"uv": [43, 47], "uv_size": [0.5, 1.5]}, + "east": {"uv": [44, 47], "uv_size": [0.5, 1.5]}, + "south": {"uv": [45, 47], "uv_size": [0.5, 1.5]}, + "west": {"uv": [46, 47], "uv_size": [0.5, 1.5]}, + "up": {"uv": [21, 55], "uv_size": [0.5, 0.5]}, + "down": {"uv": [22, 55.5], "uv_size": [0.5, -0.5]} + } + }, + { + "origin": [6.26562, -2.5443, 5.45633], + "size": [0.46875, 0.67941, 1.65491], + "uv": { + "north": {"uv": [52, 15], "uv_size": [0.5, 0.75]}, + "east": {"uv": [38, 38], "uv_size": [1.75, 0.75]}, + "south": {"uv": [52, 16], "uv_size": [0.5, 0.75]}, + "west": {"uv": [8, 39], "uv_size": [1.75, 0.75]}, + "up": {"uv": [17, 46], "uv_size": [0.5, 1.75]}, + "down": {"uv": [18, 47.75], "uv_size": [0.5, -1.75]} + } + } + ] + }, + { + "name": "bullet2", + "parent": "magazine2", + "pivot": [6.50282, -1.50043, 8.66969], + "cubes": [ + { + "origin": [6.3238, -1.67946, 8.00546], + "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": [6.37, -1.63326, 7.60626], + "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": [6.3238, -1.67946, 9.09006], "size": [0.35805, 0.35805, 0.0924], "uv": { "north": {"uv": [0.75, 95.125], "uv_size": [-0.75, -3.25]}, diff --git a/src/main/resources/assets/target/sounds/ak_47/ak_47_fire_1p.ogg b/src/main/resources/assets/target/sounds/ak_47/ak_47_fire_1p.ogg index 7f3551f5b..667876142 100644 Binary files a/src/main/resources/assets/target/sounds/ak_47/ak_47_fire_1p.ogg and b/src/main/resources/assets/target/sounds/ak_47/ak_47_fire_1p.ogg differ diff --git a/src/main/resources/assets/target/sounds/headshot.ogg b/src/main/resources/assets/target/sounds/headshot.ogg index 99570663e..9f3f1d59e 100644 Binary files a/src/main/resources/assets/target/sounds/headshot.ogg and b/src/main/resources/assets/target/sounds/headshot.ogg differ diff --git a/src/main/resources/assets/target/sounds/indication.ogg b/src/main/resources/assets/target/sounds/indication.ogg index b3f7910f8..c594a84d9 100644 Binary files a/src/main/resources/assets/target/sounds/indication.ogg and b/src/main/resources/assets/target/sounds/indication.ogg differ diff --git a/src/main/resources/assets/target/sounds/sks/sks_reload_empty.ogg b/src/main/resources/assets/target/sounds/sks/sks_reload_empty.ogg index df5485f9a..efa86a5ff 100644 Binary files a/src/main/resources/assets/target/sounds/sks/sks_reload_empty.ogg and b/src/main/resources/assets/target/sounds/sks/sks_reload_empty.ogg differ diff --git a/src/main/resources/assets/target/sounds/sks/sks_reload_normal.ogg b/src/main/resources/assets/target/sounds/sks/sks_reload_normal.ogg index 04459ef4b..a0ec09f6d 100644 Binary files a/src/main/resources/assets/target/sounds/sks/sks_reload_normal.ogg and b/src/main/resources/assets/target/sounds/sks/sks_reload_normal.ogg differ diff --git a/src/main/resources/assets/target/sounds/targetdown.ogg b/src/main/resources/assets/target/sounds/targetdown.ogg index ac748ee99..21c99a040 100644 Binary files a/src/main/resources/assets/target/sounds/targetdown.ogg and b/src/main/resources/assets/target/sounds/targetdown.ogg differ