diff --git a/src/main/java/net/mcreator/target/client/gui/MortarGUIScreen.java b/src/main/java/net/mcreator/target/client/gui/MortarGUIScreen.java index 297ddb975..f30bad934 100644 --- a/src/main/java/net/mcreator/target/client/gui/MortarGUIScreen.java +++ b/src/main/java/net/mcreator/target/client/gui/MortarGUIScreen.java @@ -99,37 +99,37 @@ public class MortarGUIScreen extends AbstractContainerScreen { super.init(); button_zeng_da_yang_jiao = Button.builder(Component.translatable("gui.target.mortar_gui.button_zeng_da_yang_jiao"), e -> { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(0, x, y, z)); - MortarGUIButtonMessage.handleButtonAction(entity, 0, x, y, z); + MortarGUIButtonMessage.handleButtonAction(entity, 0); }).bounds(this.leftPos + 42, this.topPos + 124, 29, 20).build(); GUI_STATE.put("button:button_zeng_da_yang_jiao", button_zeng_da_yang_jiao); this.addRenderableWidget(button_zeng_da_yang_jiao); button_empty = Button.builder(Component.translatable("gui.target.mortar_gui.button_empty"), e -> { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(1, x, y, z)); - MortarGUIButtonMessage.handleButtonAction(entity, 1, x, y, z); + MortarGUIButtonMessage.handleButtonAction(entity, 1); }).bounds(this.leftPos - 73, this.topPos + 124, 30, 20).build(); GUI_STATE.put("button:button_empty", button_empty); this.addRenderableWidget(button_empty); button_10 = Button.builder(Component.translatable("gui.target.mortar_gui.button_10"), e -> { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(2, x, y, z)); - MortarGUIButtonMessage.handleButtonAction(entity, 2, x, y, z); + MortarGUIButtonMessage.handleButtonAction(entity, 2); }).bounds(this.leftPos + 43, this.topPos + 151, 28, 20).build(); GUI_STATE.put("button:button_10", button_10); this.addRenderableWidget(button_10); button_101 = Button.builder(Component.translatable("gui.target.mortar_gui.button_101"), e -> { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(3, x, y, z)); - MortarGUIButtonMessage.handleButtonAction(entity, 3, x, y, z); + MortarGUIButtonMessage.handleButtonAction(entity, 3); }).bounds(this.leftPos - 73, this.topPos + 151, 30, 20).build(); GUI_STATE.put("button:button_101", button_101); this.addRenderableWidget(button_101); button_05 = Button.builder(Component.translatable("gui.target.mortar_gui.button_05"), e -> { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(4, x, y, z)); - MortarGUIButtonMessage.handleButtonAction(entity, 4, x, y, z); + MortarGUIButtonMessage.handleButtonAction(entity, 4); }).bounds(this.leftPos - 73, this.topPos + 97, 30, 20).build(); GUI_STATE.put("button:button_05", button_05); this.addRenderableWidget(button_05); button_051 = Button.builder(Component.translatable("gui.target.mortar_gui.button_051"), e -> { TargetMod.PACKET_HANDLER.sendToServer(new MortarGUIButtonMessage(5, x, y, z)); - MortarGUIButtonMessage.handleButtonAction(entity, 5, x, y, z); + MortarGUIButtonMessage.handleButtonAction(entity, 5); }).bounds(this.leftPos + 42, this.topPos + 97, 29, 20).build(); GUI_STATE.put("button:button_051", button_051); this.addRenderableWidget(button_051); diff --git a/src/main/java/net/mcreator/target/item/gun/AK47Item.java b/src/main/java/net/mcreator/target/item/gun/AK47Item.java index 539c989e3..b9e35996e 100644 --- a/src/main/java/net/mcreator/target/item/gun/AK47Item.java +++ b/src/main/java/net/mcreator/target/item/gun/AK47Item.java @@ -91,11 +91,11 @@ public class AK47Item extends GunItem implements GeoItem, AnimatedItem { } if (stack.getOrCreateTag().getBoolean("reloading") && stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_empty")); } if (stack.getOrCreateTag().getBoolean("reloading") && !stack.getOrCreateTag().getBoolean("empty_reload")) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload2")); + return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ak47.reload_normal")); } if (stack.getOrCreateTag().getInt("fire_mode") == 0 && stack.getOrCreateTag().getDouble("cg") > 0) { @@ -183,7 +183,7 @@ public class AK47Item 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") == 66) { entity.getPersistentData().putDouble("id", id); if (!entity.level().isClientSide()) { SoundTool.playLocalSound(player, TargetModSounds.AK_47_RELOAD_EMPTY.get(), 100, 1); @@ -203,7 +203,7 @@ public class AK47Item 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.level().isClientSide()) { SoundTool.playLocalSound(player, TargetModSounds.AK_47_RELOAD_NORMAL.get(), 100, 1); diff --git a/src/main/java/net/mcreator/target/network/message/MortarGUIButtonMessage.java b/src/main/java/net/mcreator/target/network/message/MortarGUIButtonMessage.java index 6e9975102..9d6f296c5 100644 --- a/src/main/java/net/mcreator/target/network/message/MortarGUIButtonMessage.java +++ b/src/main/java/net/mcreator/target/network/message/MortarGUIButtonMessage.java @@ -54,7 +54,7 @@ public class MortarGUIButtonMessage { context.setPacketHandled(true); } - private static void handleButtonAction(Player player, int buttonID) { + public static void handleButtonAction(Player player, int buttonID) { Entity looking = TraceTool.findLookingEntity(player, 6); if (looking == null) return; if (looking instanceof LivingEntity living) { diff --git a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java index cc17df3d1..6323fc0e7 100644 --- a/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java +++ b/src/main/java/net/mcreator/target/procedures/PlayerReloadProcedure.java @@ -178,12 +178,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", 66); } } if ((player.getMainHandItem().getItem() == TargetModItems.M_4.get() diff --git a/src/main/resources/assets/target/animations/ak.animation.json b/src/main/resources/assets/target/animations/ak.animation.json index 1b438aa63..6e89a793b 100644 --- a/src/main/resources/assets/target/animations/ak.animation.json +++ b/src/main/resources/assets/target/animations/ak.animation.json @@ -285,9 +285,9 @@ "animation_length": 0.05, "override_previous_animation": true }, - "animation.ak47.reload": { + "animation.ak47.reload_normal": { "loop": "hold_on_last_frame", - "animation_length": 2.9, + "animation_length": 2.75, "override_previous_animation": true, "bones": { "0": { @@ -296,314 +296,213 @@ "vector": [0, 0, 0] }, "0.1": { - "vector": [-0.9962, 0.08715, 3.24924] + "vector": [6.22824, 1.18826, 5.97426] }, - "0.2": { - "vector": [-2.5, 0.04, -1.88] + "0.3167": { + "vector": [-14.01, 2.98, -9.37] }, - "0.3": { - "vector": [-4, 0, -7], - "easing": "easeInOutSine" + "0.4167": { + "vector": [-12.25012, 1.71575, -15.23679] }, - "0.4": { - "vector": [3.99362, -0.05195, -0.49863], - "easing": "easeOutSine" + "0.5": { + "vector": [-13.67625, 0.53753, -20.43357] }, - "0.6": { - "vector": [-4.49954, -0.05233, -7.99863], - "easing": "easeOutSine" + "0.5333": { + "vector": [-14.36146, -0.34228, -23.99804] }, - "1.0": { - "vector": [-5.99652, 0.19166, -5.00897], - "easing": "easeInOutSine" + "0.6333": { + "vector": [-14.36475, 0.09248, -22.30327] }, - "1.1": { - "vector": [-5.99954, 0.05237, -5.00046] + "0.9": { + "vector": [-14.36, -0.34, -24] }, - "1.2": { - "vector": [-3.99898, 0.01587, -5.99698] + "1.0167": { + "vector": [-5.36619, 0.22131, -18.02629] }, - "1.3": { - "vector": [-8.9386, -1.01362, -9.4107] + "1.1333": { + "vector": [-11.36, -0.34, -24] }, - "1.4": { - "vector": [-6.99256, -0.1915, -6.99013] + "1.3167": { + "vector": [-17.00098, -2.87117, -36.75727] }, - "1.5": { - "vector": [-6.2646, 0.00739, -8.99132] + "1.4167": { + "vector": [-19.00098, -2.87117, -36.75727] }, - "1.6": { - "vector": [-3.53664, 0.20628, -10.99252] + "1.4833": { + "vector": [-16.00098, -2.87117, -36.75727] }, - "1.8": { - "vector": [-3.92554, 1.21661, -5.01275] + "1.55": { + "vector": [-25.64499, -2.46517, -34.94294] }, - "1.9": { - "vector": [-3.4766, 3.70329, -16.29941] + "1.6333": { + "vector": [-16.50098, -2.87117, -36.75727] }, - "2.1": { - "vector": [-3.1964, 1.65843, -2.89436] + "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.2333": { + "vector": [-0.38814, -0.04302, 4.50985] }, "2.3": { - "vector": [-2.3794, 2.34664, -6.5116] + "vector": [2, 0, 2] }, - "2.6": { - "vector": [2.61229, 1.20998, 0.97405], - "easing": "easeInQuad" - }, - "2.9": { - "vector": [0, 0, 0], - "easing": "easeOutSine" + "2.3833": { + "vector": [0, 0, 0] } }, "position": { "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, -0.18, 0.02] + "0.2833": { + "vector": [-1.1, 0.3, -0.1], + "easing": "easeInQuad" }, - "0.2": { - "vector": [0, 0.21, 0.06] - }, - "0.3": { - "vector": [0, 0.12, 0.15], - "easing": "easeInSine" - }, - "0.4": { - "vector": [0, -0.59, 0.22] - }, - "0.5": { - "vector": [0, 0, -0.1], - "easing": "easeInOutSine" - }, - "0.6": { - "vector": [0, 0.05, 0.2], + "0.4167": { + "vector": [-1.1, 0, -0.8], "easing": "easeOutSine" }, - "0.8": { - "vector": [0, -0.2, 0.1], - "easing": "easeInSine" + "0.5333": { + "vector": [-1.1, 0, -0.6] + }, + "0.7": { + "vector": [-1.13863, 0.08812, -0.6923] }, "0.9": { - "vector": [0, -0.23, 0.32] + "vector": [-1.1, 0, -0.6] }, - "1.2": { - "vector": [0, -0.4, 0.3] + "1.0167": { + "vector": [-0.63505, -0.5511, -0.70059] }, - "1.3": { - "vector": [0, 0.3, 0.3] + "1.1333": { + "vector": [-1.04863, 0.13019, -0.57971] }, - "1.5": { - "vector": [0, -0.3, 0.3], + "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.8": { - "vector": [0, -0.4, 0.3] + "1.8667": { + "vector": [-0.50339, -0.1283, -0.63949] }, - "1.9": { - "vector": [0, -0.5, 1], - "easing": "easeInSine" + "1.9833": { + "vector": [-0.51504, -0.2787, -0.4855] }, - "2.1": { - "vector": [0, -0.2, 0.4], - "easing": "easeInSine" + "2.1833": { + "vector": [0, 0, -1.07] }, - "2.2": { - "vector": [0, -0.18, 0.57] + "2.3": { + "vector": [0.00031, 0.02116, 0.55984] }, - "2.4": { - "vector": [0, -0.13, 0.01] - }, - "2.7": { - "vector": [0, -0.04, 0.3], - "easing": "easeInSine" - }, - "2.9": { - "vector": [0, 0, 0], - "easing": "easeOutSine" + "2.3833": { + "vector": [0, 0, 0] } } }, "Lefthand": { "rotation": { - "0.0": { + "0.0333": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [4.35141, -9.80475, 8.6364] + "0.5333": { + "vector": [-10.23301, -10.25955, 3.51854], + "easing": "easeOutQuad" }, - "0.2": { - "vector": [-4, -4, 0] - }, - "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.7": { - "vector": [-31.97111, -6.37986, -9.46036], - "easing": "easeInOutSine" - }, - "1.8": { - "vector": [-36.87687, -19.8462, 12.28249], + "0.9": { + "vector": [-10.23301, -10.25955, 3.51854], "easing": "easeOutSine" }, - "1.9": { - "vector": [-65.52408, -15.41359, 12.37484], - "easing": "easeInSine" + "1.1333": { + "vector": [-25.86792, -14.68451, 0.99936], + "easing": "easeInOutQuad" }, - "2.0": { - "vector": [-65.52408, -15.41359, 12.37484], - "easing": "easeInSine" + "1.3167": { + "vector": [-32.48047, -21.39686, -3.31204] }, - "2.1": { - "vector": [-80.52408, -15.41359, 12.37484], - "easing": "easeInSine" + "1.5167": { + "vector": [-20.31753, -15.08281, -6.04184], + "easing": "easeOutSine" + }, + "1.5667": { + "vector": [-20.31753, -15.08281, -6.04184], + "easing": "easeOutSine" + }, + "1.7333": { + "vector": [-21.16455, -11.71775, -9.83624], + "easing": "easeOutSine" + }, + "2.0667": { + "vector": [-21.16455, -11.71775, -9.83624], + "easing": "easeOutSine" }, "2.3": { - "vector": [-1.19082, -4.60587, -0.5644], - "easing": "easeInOutSine" - }, - "2.5": { - "vector": [-4.3304, -21.45095, 11.22415] - }, - "2.7": { "vector": [0, 0, 0], - "easing": "easeOutSine" + "easing": "easeInOutCubic" } }, "position": { - "0.0": { + "0.0333": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [-0.7, -1.6, 4.3] + "0.5333": { + "vector": [3.6298, -9.6674, 10.35934], + "easing": "easeOutQuad" }, - "0.3": { - "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.7": { - "vector": [-4.1, -4.15, 1.13] - }, - "1.8": { - "vector": [-7.1, -3.7, -1.3], - "easing": "easeInOutSine" - }, - "1.9": { - "vector": [-8, -4.7, -2.5], - "easing": "easeInSine" - }, - "2.0": { - "vector": [-8, -4.7, -2.5], - "easing": "easeInSine" - }, - "2.1": { - "vector": [-8, -9.3, -4], - "easing": "easeInSine" - }, - "2.2": { - "vector": [-7.36, -9.3, -4.04], - "easing": "easeInOutSine" - }, - "2.4": { - "vector": [-3.03, -7.17, 2.03] - }, - "2.7": { - "vector": [0, 0, 0], + "0.9": { + "vector": [-1.09069, -3.13326, 3.41688], "easing": "easeOutSine" - } - } - }, - "magazine": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] }, - "0.3": { - "vector": [0, 0, 0] + "1.1333": { + "vector": [-1.69069, -8.33326, 0.31688], + "easing": "easeInOutQuad" }, - "0.4": { - "vector": [-9, 0, 0] + "1.3167": { + "vector": [-1.74156, -6.97141, -2.78] }, - "0.6": { - "vector": [19.37235, -2.62403, -2.08221] + "1.5167": { + "vector": [-1.82116, -5.66841, 1.27626], + "easing": "easeOutSine" }, - "1.1": { - "vector": [-12.62765, -2.62403, -2.08221] + "1.5667": { + "vector": [-1.82116, -5.66841, 1.27626], + "easing": "easeOutSine" }, - "1.2": { - "vector": [-12.62765, -2.62403, -2.08221] + "1.7333": { + "vector": [-0.52116, -7.96841, -1.82374], + "easing": "easeOutSine" }, - "1.3": { - "vector": [0, 0, 0] + "1.9333": { + "vector": [2.48, -11.97, 0.18], + "easing": "easeInOutSine" }, - "1.4": { - "vector": [0, 0, 0] - } - }, - "position": { - "0.0": { - "vector": [0, 0, 0] + "2.0667": { + "vector": [2.48, -11.97, 0.18], + "easing": "easeInOutSine" }, - "0.3": { - "vector": [0, 0, 0] - }, - "0.4": { - "vector": [0, 0, 0] - }, - "0.6": { - "vector": [0, -11.07, 3.1] - }, - "1.1": { - "vector": [0, -9.27, -0.9] - }, - "1.2": { - "vector": [0, -2.27, -0.9] - }, - "1.3": { - "vector": [0, 0, 0] - }, - "1.4": { - "vector": [0, 0, 0] - } - } - }, - "bolt": { - "position": { - "0.0": { - "vector": [0, 0, 0] - }, - "1.8": { - "vector": [0, 0, 0] - }, - "1.9": { - "vector": [0, 0, 3.75], - "easing": "easeInQuad" - }, - "2.1": { - "vector": [0, 0, 0] - }, - "2.8": { - "vector": [0, 0, 0] + "2.3": { + "vector": [0, 0, 0], + "easing": "easeInOutCubic" } } }, @@ -612,55 +511,211 @@ "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.8": { - "vector": [0.2, 0, 1.5] - }, - "1.9": { - "vector": [1, 2, 1.8] + "1.7333": { + "vector": [0, 0, 1.5], + "easing": "linear" }, "2.0": { - "vector": [-1.5, -3, -1.5] + "vector": [0, 0, -0.75], + "easing": "linear" }, - "2.2": { - "vector": [0.2, 1.5, 1.5] - }, - "2.5": { + "2.1667": { "vector": [0, 0, 0], - "easing": "easeInElastic" + "easing": "linear" + } + } + }, + "magazine": { + "rotation": { + "0.9": { + "vector": [0, 0, 0] + }, + "1.1333": { + "vector": [-14.94548, -1.29256, -4.83045], + "easing": "easeInOutQuad" + }, + "1.3167": { + "vector": [-37.13843, -5.6156, -7.36216] + }, + "1.5167": { + "vector": [-14.56187, -2.03972, -0.09323] + }, + "1.5667": { + "vector": [-14.56187, -2.03972, -0.09323] + }, + "1.7333": { + "vector": [-18.53612, -6.00896, -11.12925] + }, + "1.9333": { + "vector": [-18.54, -6.01, -11.13], + "easing": "easeInOutSine" + }, + "2.2167": { + "vector": [-18.54, -6.01, -11.13], + "easing": "easeInOutSine" + }, + "2.2333": { + "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.6, -1.24922, -3.36875] + }, + "1.4167": { + "vector": [-0.68, -1.01156, -1.82141] + }, + "1.5167": { + "vector": [-0.76, -0.89687, -0.79203] + }, + "1.5667": { + "vector": [-0.76, -0.89687, -0.79203] + }, + "1.7333": { + "vector": [-0.56, -3.5, -2.89] + }, + "1.9333": { + "vector": [2.44, -7.5, -0.89], + "easing": "easeInOutSine" + }, + "2.2167": { + "vector": [2.44, -7.5, -0.89], + "easing": "easeInOutSine" + }, + "2.2333": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + } + }, + "magazine2": { + "rotation": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.5333": { + "vector": [0, 0, 0] + }, + "0.9": { + "vector": [15, 0, 4], + "easing": "easeOutSine" + }, + "1.1333": { + "vector": [0, 0, -1], + "easing": "easeInOutQuad" + }, + "1.3167": { + "vector": [-22.05592, -4.56353, -7.11018] + }, + "1.35": { + "vector": [-21.17748, -2.97195, -4.59202] + }, + "1.5": { + "vector": [0, 0, 0] + }, + "1.5667": { + "vector": [0, 0, 0] + }, + "2.2167": { + "vector": [0, 0, 0] + }, + "2.2333": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.0": { + "vector": [0, 0, 0] + }, + "0.5333": { + "vector": [-0.86802, -3.30009, -2.89697] + }, + "0.9": { + "vector": [-5.12342, 4.47795, -9.02235], + "easing": "easeOutSine" + }, + "1.1333": { + "vector": [-5.12342, 0.97795, -10.02235], + "easing": "easeInOutQuad" + }, + "1.3167": { + "vector": [-5.74422, 2.89641, -11.82] + }, + "1.35": { + "vector": [-5.86422, 2.65484, -11.5] + }, + "1.4167": { + "vector": [-5.79109, 2.99891, -10.69375] + }, + "1.5": { + "vector": [-5.99844, 3.01172, -10.01172] + }, + "1.5667": { + "vector": [-5.99844, 3.01172, -10.01172] + }, + "2.2167": { + "vector": [-5.99844, 3.01172, -10.01172] + }, + "2.2333": { + "vector": [0, 0, 0] } } } + }, + "sound_effects": { + "0.0": { + "effect": "m_4_reload_normal" + } } }, - "animation.ak47.reload2": { - "animation_length": 2, + "animation.ak47.reload_empty": { + "loop": "hold_on_last_frame", + "animation_length": 3.4333, "override_previous_animation": true, "bones": { "0": { @@ -669,46 +724,78 @@ "vector": [0, 0, 0] }, "0.1": { - "vector": [-0.9962, 0.08715, 3.24924] + "vector": [6.22824, 1.18826, 5.97426] }, - "0.2": { - "vector": [-2.5, 0.04, -1.88] + "0.3167": { + "vector": [-14.01, 2.98, -9.37] }, - "0.3": { - "vector": [-4, 0, -7], - "easing": "easeInOutSine" + "0.4167": { + "vector": [-12.25012, 1.71575, -15.23679] }, "0.5": { - "vector": [-0.00638, -0.05195, -0.49863], - "easing": "easeOutSine" + "vector": [-13.67625, 0.53753, -20.43357] }, - "0.8": { - "vector": [-4.49954, -0.05233, -7.99863], - "easing": "easeOutSine" + "0.5333": { + "vector": [-14.36146, -0.34228, -23.99804] }, - "1.0": { - "vector": [-5.99652, 0.19166, -5.00897], - "easing": "easeInOutSine" + "0.6333": { + "vector": [-14.36475, 0.09248, -22.30327] }, - "1.1": { - "vector": [-5.99954, 0.05237, -5.00046] + "0.75": { + "vector": [-14.81, -0.41, -24.77] }, - "1.2": { - "vector": [-3.99898, 0.01587, -5.99698] + "0.8333": { + "vector": [-17.57596, -2.10885, -29.925], + "easing": "easeInElastic" }, - "1.3": { - "vector": [-8.9386, -1.01362, -9.4107] + "0.95": { + "vector": [-15.94266, -0.18118, -25.15393] }, - "1.4": { - "vector": [-6.99256, -0.1915, -6.99013] + "1.15": { + "vector": [-16.21216, -2.28043, -33.21481] }, "1.5": { - "vector": [-6.2646, 0.00739, -8.99132] + "vector": [-19.00098, -2.87117, -36.75727] }, - "1.7": { - "vector": [-0.48525, 0.63548, -4.00548] + "1.5667": { + "vector": [-16.00098, -2.87117, -36.75727] }, - "1.8": { + "1.6333": { + "vector": [-25.64499, -2.46517, -34.94294] + }, + "1.7167": { + "vector": [-16.50098, -2.87117, -36.75727] + }, + "2.0": { + "vector": [-20.30109, -8.2353, -48.49477] + }, + "2.2333": { + "vector": [-16.67409, -7.83578, -50.66699] + }, + "2.3167": { + "vector": [-19.17566, -13.68506, -59.73468], + "easing": "easeInElastic" + }, + "2.3333": { + "vector": [-19.17566, -13.68506, -59.73468], + "easing": "easeInElastic" + }, + "2.5": { + "vector": [-12.8145, -2.61693, -45.3695] + }, + "2.65": { + "vector": [-11.75146, -0.36394, -33.34824] + }, + "2.8167": { + "vector": [-6.63855, 2.59206, -16.81115] + }, + "3.05": { + "vector": [-0.38814, -0.04302, 4.50985] + }, + "3.1167": { + "vector": [2, 0, 2] + }, + "3.2": { "vector": [0, 0, 0] } }, @@ -716,123 +803,413 @@ "0.0": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [0, -0.18, 0.02] + "0.2833": { + "vector": [-1.1, 0.3, -0.1], + "easing": "easeInQuad" }, - "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] - }, - "0.5": { - "vector": [0, -0.3, -0.1], - "easing": "easeInOutSine" - }, - "0.6": { - "vector": [0, -0.15, 0.2], + "0.4167": { + "vector": [-1.1, 0, -0.8], "easing": "easeOutSine" }, - "0.8": { - "vector": [0, -0.2, 0.1], - "easing": "easeInSine" + "0.5333": { + "vector": [-1.1, 0, -0.6] }, - "0.9": { - "vector": [0, -0.23, 0.32] + "0.7": { + "vector": [-1.13863, 0.08812, -0.6923] }, - "1.2": { - "vector": [0, -0.4, 0.3] + "0.75": { + "vector": [-1.11, 0.09, -0.68] }, - "1.3": { - "vector": [0, 0.1, 0.3] + "0.8333": { + "vector": [-1.32651, 0.6322, -1.60351], + "easing": "easeInElastic" + }, + "1.0333": { + "vector": [-0.98667, 0.05602, -0.52736] + }, + "1.25": { + "vector": [-1.02585, 0.23839, -1.22133] }, "1.5": { - "vector": [0, -0.3, 0.3], + "vector": [-0.88732, 0.11258, -0.78102] + }, + "1.5667": { + "vector": [-0.85209, 0.0351, -0.49198] + }, + "1.6333": { + "vector": [-1.5395, 0.79301, -0.39434] + }, + "1.7167": { + "vector": [-0.85209, 0.0351, -0.49198] + }, + "1.85": { + "vector": [-0.59166, -0.35741, -0.73343], "easing": "easeInSine" }, - "1.7": { - "vector": [0, -0.12, 0.12] + "2.1167": { + "vector": [-0.50339, -0.1283, -0.63949] }, - "1.8": { + "2.2333": { + "vector": [-0.51, -0.24, -0.53] + }, + "2.3167": { + "vector": [-0.03662, -0.86661, 0.48719], + "easing": "easeInElastic" + }, + "2.3333": { + "vector": [-0.03662, -0.86661, 0.48719], + "easing": "easeInElastic" + }, + "2.4333": { + "vector": [-0.60001, 0.02701, -1.38523] + }, + "2.5833": { + "vector": [-0.30111, -0.2912, -0.69679] + }, + "2.7333": { + "vector": [-0.25313, -0.26698, -1.40007] + }, + "2.85": { + "vector": [-0.09776, -0.12762, -1.05115] + }, + "2.9333": { + "vector": [0.00212, 0.18217, -0.76274] + }, + "3.0": { + "vector": [0.00274, -0.00904, -0.77015] + }, + "3.1167": { + "vector": [0.00031, 0.02116, 0.55984] + }, + "3.2": { "vector": [0, 0, 0] } } }, "Lefthand": { "rotation": { - "0.0": { + "0.0333": { "vector": [0, 0, 0] }, - "0.1": { - "vector": [4.35141, -9.80475, 8.6364] + "0.5667": { + "vector": [-19.23301, -10.25955, 3.51854], + "easing": "easeOutQuad" }, - "0.2": { - "vector": [-4, -4, 0] + "0.8333": { + "vector": [-21.30345, -34.94902, -25.30751], + "easing": "linear" }, - "0.3": { - "vector": [0, -4, 0] + "0.85": { + "vector": [-21.30345, -34.94902, -25.30751], + "easing": "linear" + }, + "0.9667": { + "vector": [2.38, -42.06, -24.89] + }, + "1.15": { + "vector": [12.31232, -51.51215, -24.79233] + }, + "1.2333": { + "vector": [1.22466, -38.81661, -18.05842] }, "1.3": { - "vector": [0, -4, 0] + "vector": [-12.15546, -22.32142, -3.10505] }, - "1.4": { - "vector": [0, -4, 0] + "1.3667": { + "vector": [-25.86792, -14.68451, 0.99936], + "easing": "linear" }, - "1.7": { - "vector": [0, 0, 0], + "1.4167": { + "vector": [-32.48047, -21.39686, -6.81204] + }, + "1.6": { + "vector": [-20.31753, -15.08281, -6.04184], "easing": "easeOutSine" + }, + "1.65": { + "vector": [-20.31753, -15.08281, -6.04184], + "easing": "easeOutSine" + }, + "1.8167": { + "vector": [-6.78199, -4.07081, 10.69071] + }, + "1.9667": { + "vector": [-26.9, 5.84, 25.75] + }, + "2.2": { + "vector": [21.28621, 49.80684, 92.55967], + "easing": "easeInCubic" + }, + "2.3": { + "vector": [18.15836, 54.76869, 89.37164] + }, + "2.35": { + "vector": [18.15836, 54.76869, 89.37164] + }, + "2.6667": { + "vector": [28.11259, -27.07767, 82.93501] + }, + "2.85": { + "vector": [0, 0, 0], + "easing": "easeInSine" } }, "position": { - "0.0": { + "0.0333": { "vector": [0, 0, 0] }, - "0.2": { - "vector": [-0.7, -1.6, 4.3] + "0.5667": { + "vector": [2.72479, -12.27935, 8.69539], + "easing": "easeOutQuad" }, - "0.3": { - "vector": [-0.7, -2.2, 3.7] + "0.8333": { + "vector": [0.75518, -4.9065, 4.24792], + "easing": "linear" + }, + "0.85": { + "vector": [0.75518, -4.9065, 3.74792], + "easing": "linear" + }, + "0.9": { + "vector": [-0.45, -4.69, 3.46219] + }, + "0.9667": { + "vector": [-1.01656, -4.57634, 2.25498], + "easing": "easeInElastic" + }, + "1.15": { + "vector": [-1.98229, -5.57421, -0.34374] + }, + "1.2333": { + "vector": [-2.91384, -4.62958, 0.97427] }, "1.3": { - "vector": [-0.7, -2.2, 3.7] + "vector": [-1.76405, -7.13707, 1.63757] }, - "1.4": { - "vector": [-0.7, -2.2, 4.5] + "1.3667": { + "vector": [-1.69069, -8.33326, 0.31688], + "easing": "linear" }, - "1.7": { - "vector": [0, 0, 0], + "1.4167": { + "vector": [-1.74156, -6.97141, -2.78] + }, + "1.6": { + "vector": [-1.82116, -5.66841, 1.27626], "easing": "easeOutSine" + }, + "1.65": { + "vector": [-1.82116, -5.66841, 1.27626], + "easing": "easeOutSine" + }, + "1.8167": { + "vector": [-4.85539, -7.00072, 9.48678] + }, + "2.05": { + "vector": [-7.59261, -4.21333, 0.73397] + }, + "2.2": { + "vector": [-7.5, -4.1, -2.4], + "easing": "easeInOutCubic" + }, + "2.3": { + "vector": [-7.5, -4.1, -0.3], + "easing": "easeInElastic" + }, + "2.35": { + "vector": [-7.5, -4.1, -0.3], + "easing": "easeInElastic" + }, + "2.5833": { + "vector": [-7.5, -3.1, -2.2], + "easing": "easeInOutCubic" + }, + "2.85": { + "vector": [0, 0, 0], + "easing": "easeInSine" } } }, "magazine": { + "rotation": { + "0.85": { + "vector": [0, 0, 0] + }, + "0.9": { + "vector": [-22.55, -0.02, -0.03] + }, + "0.9333": { + "vector": [-4.30232, 2.78191, 18.58512] + }, + "1.3333": { + "vector": [225.02116, -10.10151, 22.66036] + }, + "1.4": { + "vector": [225.02, -10.1, 22.66] + }, + "1.5833": { + "vector": [225.02116, -10.10151, 22.66036] + }, + "1.6": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + }, + "position": { + "0.85": { + "vector": [0, 0, 0] + }, + "0.9": { + "vector": [0.01, 0.14406, -1.16562] + }, + "0.9333": { + "vector": [0.21125, -0.80641, -5.26578], + "easing": "easeInSine" + }, + "0.95": { + "vector": [0.25713, -1.15637, -7.20754] + }, + "0.9667": { + "vector": [0.29824, -1.52697, -9.13772] + }, + "0.9833": { + "vector": [0.31934, -1.92759, -11.05789] + }, + "1.0": { + "vector": [0.28522, -2.45411, -12.95403] + }, + "1.0167": { + "vector": [0.23827, -2.99974, -14.83544] + }, + "1.0333": { + "vector": [0.17884, -3.57007, -16.71553] + }, + "1.05": { + "vector": [0.08941, -4.19041, -18.58562] + }, + "1.0667": { + "vector": [-0.06493, -4.92729, -20.41298], + "easing": "linear" + }, + "1.0833": { + "vector": [-0.47024, -5.72469, -22.34539] + }, + "1.1": { + "vector": [-0.90552, -6.6095, -24.12792] + }, + "1.1167": { + "vector": [-1.46928, -7.72187, -25.76974] + }, + "1.1333": { + "vector": [-2.06611, -8.93042, -27.41789] + }, + "1.15": { + "vector": [-2.79995, -10.41167, -29.1896] + }, + "1.1667": { + "vector": [-3.64848, -12.10393, -30.92471] + }, + "1.1833": { + "vector": [-4.60438, -14.00373, -32.64536] + }, + "1.2": { + "vector": [-5.73554, -16.19113, -34.28333] + }, + "1.2167": { + "vector": [-6.97172, -18.49773, -35.6964] + }, + "1.2333": { + "vector": [-8.41316, -21.11596, -36.87271] + }, + "1.25": { + "vector": [-10.01644, -23.94699, -37.83754] + }, + "1.2667": { + "vector": [-11.85707, -27.04107, -38.31609] + }, + "1.2833": { + "vector": [-13.83003, -30.22423, -38.39935] + }, + "1.3": { + "vector": [-15.81626, -33.31283, -38.01859] + }, + "1.3167": { + "vector": [-17.77992, -36.24006, -37.49357] + }, + "1.3333": { + "vector": [-19.9298, -39.35713, -36.76093] + }, + "1.35": { + "vector": [-22.46831, -42.95055, -35.80139] + }, + "1.3667": { + "vector": [-25.17347, -46.7097, -34.75503] + }, + "1.3833": { + "vector": [-28.12852, -50.74428, -33.50483] + }, + "1.4": { + "vector": [-31.35557, -55.07306, -32.13932] + }, + "1.5833": { + "vector": [-78.47428, -129.97255, 141.14732] + }, + "1.6": { + "vector": [0, 0, 0], + "easing": "easeInOutSine" + } + } + }, + "magazine2": { "rotation": { "0.0": { "vector": [0, 0, 0] }, - "0.3": { + "0.5667": { "vector": [0, 0, 0] }, - "0.4": { - "vector": [-9, 0, 0] + "0.8333": { + "vector": [-7.5572, -15.25513, -38.47706] }, - "0.6": { - "vector": [-12.62765, -2.62403, -2.08221] + "0.85": { + "vector": [-7.5572, -15.25513, -38.47706] }, - "1.1": { - "vector": [-12.62765, -2.62403, -2.08221] + "0.9667": { + "vector": [22.22, -9.34, -39.27], + "easing": "easeInElastic" }, - "1.2": { - "vector": [-12.62765, -2.62403, -2.08221] + "1.15": { + "vector": [44.6503, -20.32249, -41.53446], + "easing": "linear" }, - "1.3": { + "1.2833": { + "vector": [13.21, -0.76, -17.74] + }, + "1.3667": { + "vector": [0, 0, -13.25], + "easing": "easeInOutQuad" + }, + "1.4167": { + "vector": [-22.05592, -4.56353, -7.11018] + }, + "1.45": { + "vector": [-21.17748, -2.97195, -4.59202] + }, + "1.5833": { "vector": [0, 0, 0] }, - "1.4": { + "1.65": { + "vector": [0, 0, 0] + }, + "1.6667": { + "vector": [0, 0, 0] + }, + "1.6833": { + "vector": [0, 0, 0] + }, + "2.7333": { + "vector": [0, 0, 0] + }, + "2.75": { "vector": [0, 0, 0] } }, @@ -840,25 +1217,110 @@ "0.0": { "vector": [0, 0, 0] }, - "0.3": { - "vector": [0, 0, 0] + "0.5667": { + "vector": [-0.86802, -3.30009, -2.89697] }, - "0.4": { - "vector": [0, 0, 0] + "0.8333": { + "vector": [-4.58259, 2.583, -7.57844] }, - "0.6": { - "vector": [0, -9.27, -0.9] + "0.85": { + "vector": [-4.58259, 2.583, -8.07844] }, - "1.1": { - "vector": [0, -9.27, -0.9] + "0.9": { + "vector": [-4.58, 2.58, -8.82] + }, + "0.9667": { + "vector": [-3.67989, 2.15963, -12.12556], + "easing": "easeInElastic" + }, + "1.15": { + "vector": [-2.12686, 0.63526, -15.46791], + "easing": "linear" }, "1.2": { - "vector": [0, -2.27, -0.9] + "vector": [-3.87277, 1.44859, -14.31574] }, - "1.3": { + "1.25": { + "vector": [-4.88627, 1.94587, -13.08148] + }, + "1.2833": { + "vector": [-5.06098, 1.6977, -11.83207] + }, + "1.3667": { + "vector": [-5.12342, 1.77873, -10.02235], + "easing": "easeInOutQuad" + }, + "1.4167": { + "vector": [-5.74422, 2.89641, -11.82] + }, + "1.45": { + "vector": [-5.86422, 3.05484, -11.1] + }, + "1.5167": { + "vector": [-5.79109, 2.99891, -10.69375] + }, + "1.5833": { + "vector": [-5.99844, 3.01172, -10.01172] + }, + "1.65": { + "vector": [-5.99844, 3.01172, -10.01172] + }, + "1.6667": { + "vector": [-5.99844, 3.01172, -10.01172] + }, + "1.6833": { + "vector": [0, 0, 113] + }, + "2.7333": { + "vector": [0, 0, 113] + }, + "2.75": { + "vector": [0, 0, 0] + } + } + }, + "Righthand": { + "rotation": { + "0.3833": { "vector": [0, 0, 0] }, - "1.4": { + "0.5333": { + "vector": [14, 0, 0] + }, + "2.1": { + "vector": [14, 0, 0] + }, + "2.2833": { + "vector": [0, 0, 0] + } + }, + "position": { + "0.3833": { + "vector": [0, 0, 0] + }, + "0.5333": { + "vector": [-0.1458, 3.06247, 1.45331] + }, + "2.1": { + "vector": [-0.1458, 3.06247, 1.45331] + }, + "2.2833": { + "vector": [0, 0, 0] + } + } + }, + "bullet": { + "position": { + "0.25": { + "vector": [0, 0, 0] + }, + "0.2667": { + "vector": [0, -0.25, 0] + }, + "1.95": { + "vector": [0, -0.25, 0] + }, + "1.9667": { "vector": [0, 0, 0] } } @@ -868,39 +1330,78 @@ "0.0": { "vector": [0, 0, 0] }, - "0.4": { + "0.3": { "vector": [0, 0, 1.5], "easing": "easeInElastic" }, - "0.5": { - "vector": [1, 1, -1.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.8833": { + "vector": [0, 0, 1.5], + "easing": "easeInElastic" + }, + "0.9667": { + "vector": [1, 1, -2.5], "easing": "easeInSine" }, - "0.6": { + "1.05": { "vector": [-0.5, -0.5, 1.5] }, - "0.8": { - "vector": [0.2, 0, 1.2], - "easing": "easeOutSine" + "1.3": { + "vector": [0.5, 0, 1], + "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, 0.8], "easing": "easeInSine" }, - "1.5": { - "vector": [-0.4, 0.4, -0.6], - "easing": "easeOutSine" + "2.0167": { + "vector": [0, 0, 1.5], + "easing": "linear" }, - "1.8": { + "2.15": { + "vector": [0.2, 0, 1.5] + }, + "2.25": { + "vector": [1, 2, 1.8] + }, + "2.3167": { + "vector": [-1.5, -3, -1.5] + }, + "2.45": { + "vector": [0.2, 1.5, 1.5] + }, + "2.6": { "vector": [0, 0, 0], "easing": "easeInElastic" + }, + "2.9667": { + "vector": [0, 0, -0.75], + "easing": "linear" + }, + "3.1333": { + "vector": [0, 0, 0], + "easing": "linear" } } } + }, + "sound_effects": { + "0.0": { + "effect": "ak_47_reload_empty" + } } } }, diff --git a/src/main/resources/assets/target/geo/ak.geo.json b/src/main/resources/assets/target/geo/ak.geo.json index b159faf15..d3c91888b 100644 --- a/src/main/resources/assets/target/geo/ak.geo.json +++ b/src/main/resources/assets/target/geo/ak.geo.json @@ -13,7 +13,7 @@ "bones": [ { "name": "camera", - "pivot": [2.57141, 4.96276, 6.77702] + "pivot": [2.57141, 4.76276, 7.27702] }, { "name": "root", @@ -7737,32 +7737,7 @@ { "name": "magazine", "parent": "0", - "pivot": [0.5, 1, -3.5] - }, - { - "name": "Lefthand", - "parent": "magazine", - "pivot": [5.9, -4.6, 1.6], - "rotation": [63.02145, 26.28878, -12.70535], - "cubes": [ - { - "origin": [4.3, -4.6, -0.15], - "size": [3, 12, 4], - "uv": { - "north": {"uv": [12, 0], "uv_size": [3, 12]}, - "east": {"uv": [0, 0], "uv_size": [4, 12]}, - "south": {"uv": [4, 12], "uv_size": [3, 12]}, - "west": {"uv": [4, 0], "uv_size": [4, 12]}, - "up": {"uv": [13, 12], "uv_size": [3, 4]}, - "down": {"uv": [15, 4], "uv_size": [3, -4]} - } - } - ] - }, - { - "name": "megazing2", - "parent": "magazine", - "pivot": [6.05277, -4.30277, -7.80277], + "pivot": [0.5, -1.3922, -2.72863], "cubes": [ { "origin": [0.32123, -0.14318, -2.80179], @@ -8022,9 +7997,52 @@ } ] }, + { + "name": "bullet", + "parent": "magazine", + "pivot": [0.50283, 1.51538, -1.50152], + "cubes": [ + { + "origin": [0.3238, 1.33635, -2.08242], + "size": [0.35805, 0.35805, 0.9922], + "uv": { + "north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}, + "down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]} + } + }, + { + "origin": [0.37, 1.38255, -2.48162], + "size": [0.26565, 0.26565, 1.53], + "uv": { + "north": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]}, + "down": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]} + } + }, + { + "origin": [0.3238, 1.33635, -0.99782], + "size": [0.35805, 0.35805, 0.0924], + "uv": { + "north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}, + "down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]} + } + } + ] + }, { "name": "bone20", - "parent": "megazing2", + "parent": "magazine", "pivot": [0.25733, -5.62718, -2.14124], "cubes": [ { @@ -8277,7 +8295,7 @@ }, { "name": "bone19", - "parent": "megazing2", + "parent": "magazine", "pivot": [1.04904, -2.51341, -5.66438], "cubes": [ { @@ -8391,13 +8409,687 @@ ] }, { - "name": "Righthand", + "name": "magazine2", "parent": "0", - "pivot": [-3.2, -5.7, 11.9], - "rotation": [67.68798, -14.81107, 2.40023], + "pivot": [6.5, -4.3922, 7.27137], "cubes": [ { - "origin": [-4.2, -4.7, 9.9], + "origin": [6.32123, -3.14318, 7.19821], + "size": [0.35753, 0.81422, 0.32139], + "pivot": [7.04904, -2.67704, 6.97055], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [47, 49], "uv_size": [0.25, 0.75]}, + "east": {"uv": [49, 47], "uv_size": [0.25, 0.75]}, + "south": {"uv": [48, 49], "uv_size": [0.25, 0.75]}, + "west": {"uv": [49, 48], "uv_size": [0.25, 0.75]}, + "up": {"uv": [70, 8], "uv_size": [0.25, 0.25]}, + "down": {"uv": [9, 70.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.32123, -2.44276, 7.25556], + "size": [0.35753, 0.96656, 0.32139], + "uv": { + "north": {"uv": [23, 47], "uv_size": [0.25, 1]}, + "east": {"uv": [47, 23], "uv_size": [0.25, 1]}, + "south": {"uv": [24, 47], "uv_size": [0.25, 1]}, + "west": {"uv": [47, 24], "uv_size": [0.25, 1]}, + "up": {"uv": [70, 9], "uv_size": [0.25, 0.25]}, + "down": {"uv": [10, 70.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.22123, -2.00526, 7.204], + "size": [0.55753, 0.53687, 0.32608], + "uv": { + "north": {"uv": [25, 47], "uv_size": [0.5, 0.5]}, + "east": {"uv": [53, 10], "uv_size": [0.25, 0.5]}, + "south": {"uv": [47, 25], "uv_size": [0.5, 0.5]}, + "west": {"uv": [11, 53], "uv_size": [0.25, 0.5]}, + "up": {"uv": [53, 11], "uv_size": [0.5, 0.25]}, + "down": {"uv": [12, 53.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [6.32123, -3.81895, 7.00531], + "size": [0.35753, 0.81422, 0.32139], + "pivot": [7.04904, -3.35281, 6.77765], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [49, 49], "uv_size": [0.25, 0.75]}, + "east": {"uv": [0, 50], "uv_size": [0.25, 0.75]}, + "south": {"uv": [50, 0], "uv_size": [0.25, 0.75]}, + "west": {"uv": [1, 50], "uv_size": [0.25, 0.75]}, + "up": {"uv": [70, 10], "uv_size": [0.25, 0.25]}, + "down": {"uv": [11, 70.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.32123, -4.99967, 6.51575], + "size": [0.35753, 0.81422, 0.32139], + "pivot": [7.04904, -4.53353, 7.28809], + "rotation": [-33.75, 0, 0], + "uv": { + "north": {"uv": [50, 1], "uv_size": [0.25, 0.75]}, + "east": {"uv": [2, 50], "uv_size": [0.25, 0.75]}, + "south": {"uv": [50, 2], "uv_size": [0.25, 0.75]}, + "west": {"uv": [3, 50], "uv_size": [0.25, 0.75]}, + "up": {"uv": [70, 11], "uv_size": [0.25, 0.25]}, + "down": {"uv": [12, 70.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.32123, -4.99461, 6.24745], + "size": [0.35753, 0.81422, 0.32139], + "pivot": [7.04904, -4.52847, 6.0198], + "rotation": [-45, 0, 0], + "uv": { + "north": {"uv": [50, 3], "uv_size": [0.25, 0.75]}, + "east": {"uv": [4, 50], "uv_size": [0.25, 0.75]}, + "south": {"uv": [50, 4], "uv_size": [0.25, 0.75]}, + "west": {"uv": [5, 50], "uv_size": [0.25, 0.75]}, + "up": {"uv": [70, 12], "uv_size": [0.25, 0.25]}, + "down": {"uv": [13, 70.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.32123, -5.88842, 5.09738], + "size": [0.35753, 0.91187, 0.32139], + "pivot": [7.04904, -5.32462, 4.86973], + "rotation": [-67.5, 0, 0], + "uv": { + "north": {"uv": [26, 47], "uv_size": [0.25, 1]}, + "east": {"uv": [47, 26], "uv_size": [0.25, 1]}, + "south": {"uv": [27, 47], "uv_size": [0.25, 1]}, + "west": {"uv": [47, 27], "uv_size": [0.25, 1]}, + "up": {"uv": [70, 13], "uv_size": [0.25, 0.25]}, + "down": {"uv": [14, 70.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.32123, -7.528, 4.60055], + "size": [0.35753, 0.81422, 0.32139], + "pivot": [7.04904, -7.06186, 6.8729], + "rotation": [-56.25, 0, 0], + "uv": { + "north": {"uv": [50, 5], "uv_size": [0.25, 0.75]}, + "east": {"uv": [6, 50], "uv_size": [0.25, 0.75]}, + "south": {"uv": [50, 6], "uv_size": [0.25, 0.75]}, + "west": {"uv": [7, 50], "uv_size": [0.25, 0.75]}, + "up": {"uv": [70, 14], "uv_size": [0.25, 0.25]}, + "down": {"uv": [15, 70.25], "uv_size": [0.25, -0.25]} + } + }, + { + "origin": [6.24472, -7.86087, 9.23539], + "size": [0.51056, 1.16153, 0.20113], + "pivot": [6.5, -4.67411, 7.40576], + "rotation": [-67.5, 0, 0], + "uv": { + "north": {"uv": [6, 41], "uv_size": [0.5, 1.25]}, + "east": {"uv": [14, 45], "uv_size": [0.25, 1.25]}, + "south": {"uv": [41, 6], "uv_size": [0.5, 1.25]}, + "west": {"uv": [45, 14], "uv_size": [0.25, 1.25]}, + "up": {"uv": [53, 12], "uv_size": [0.5, 0.25]}, + "down": {"uv": [13, 53.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [6.24472, -7.05661, 8.80127], + "size": [0.51056, 1.1627, 0.20113], + "pivot": [6.5, -4.67411, 7.40576], + "rotation": [-56.25, 0, 0], + "uv": { + "north": {"uv": [7, 41], "uv_size": [0.5, 1.25]}, + "east": {"uv": [15, 45], "uv_size": [0.25, 1.25]}, + "south": {"uv": [41, 8], "uv_size": [0.5, 1.25]}, + "west": {"uv": [16, 45], "uv_size": [0.25, 1.25]}, + "up": {"uv": [53, 13], "uv_size": [0.5, 0.25]}, + "down": {"uv": [14, 53.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [6.24472, -6.18196, 8.53262], + "size": [0.51056, 1.1627, 0.20113], + "pivot": [6.5, -4.67411, 7.40576], + "rotation": [-45, 0, 0], + "uv": { + "north": {"uv": [41, 10], "uv_size": [0.5, 1.25]}, + "east": {"uv": [45, 16], "uv_size": [0.25, 1.25]}, + "south": {"uv": [12, 41], "uv_size": [0.5, 1.25]}, + "west": {"uv": [17, 45], "uv_size": [0.25, 1.25]}, + "up": {"uv": [53, 14], "uv_size": [0.5, 0.25]}, + "down": {"uv": [15, 53.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [6.24472, -5.2717, 8.43977], + "size": [0.51056, 1.1627, 0.20113], + "pivot": [6.5, -4.67411, 7.40576], + "rotation": [-33.75, 0, 0], + "uv": { + "north": {"uv": [13, 41], "uv_size": [0.5, 1.25]}, + "east": {"uv": [18, 45], "uv_size": [0.25, 1.25]}, + "south": {"uv": [41, 13], "uv_size": [0.5, 1.25]}, + "west": {"uv": [19, 45], "uv_size": [0.25, 1.25]}, + "up": {"uv": [53, 15], "uv_size": [0.5, 0.25]}, + "down": {"uv": [16, 53.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [6.24472, -4.36082, 8.52629], + "size": [0.51056, 1.1627, 0.20113], + "pivot": [6.5, -4.67411, 7.40576], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [15, 41], "uv_size": [0.5, 1.25]}, + "east": {"uv": [20, 45], "uv_size": [0.25, 1.25]}, + "south": {"uv": [17, 41], "uv_size": [0.5, 1.25]}, + "west": {"uv": [45, 20], "uv_size": [0.25, 1.25]}, + "up": {"uv": [53, 16], "uv_size": [0.5, 0.25]}, + "down": {"uv": [17, 53.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [6.24472, -3.48432, 8.78885], + "size": [0.51056, 1.1627, 0.20113], + "pivot": [6.5, -4.67411, 7.40576], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [21, 41], "uv_size": [0.5, 1.25]}, + "east": {"uv": [21, 45], "uv_size": [0.25, 1.25]}, + "south": {"uv": [41, 21], "uv_size": [0.5, 1.25]}, + "west": {"uv": [45, 22], "uv_size": [0.25, 1.25]}, + "up": {"uv": [53, 17], "uv_size": [0.5, 0.25]}, + "down": {"uv": [18, 53.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [6.24472, -2.67588, 9.21736], + "size": [0.51056, 0.09119, 0.20113], + "uv": { + "north": {"uv": [53, 18], "uv_size": [0.5, 0.25]}, + "east": {"uv": [70, 15], "uv_size": [0.25, 0.25]}, + "south": {"uv": [19, 53], "uv_size": [0.5, 0.25]}, + "west": {"uv": [16, 70], "uv_size": [0.25, 0.25]}, + "up": {"uv": [53, 19], "uv_size": [0.5, 0.25]}, + "down": {"uv": [20, 53.25], "uv_size": [0.5, -0.25]} + } + }, + { + "origin": [6.10306, -5.27904, 4.81044], + "size": [0.79387, 0.1645, 1.38174], + "pivot": [7.04904, -5.51341, 4.33562], + "rotation": [-67.5, 0, 0], + "uv": { + "north": {"uv": [50, 7], "uv_size": [0.75, 0.25]}, + "east": {"uv": [26, 44], "uv_size": [1.5, 0.25]}, + "south": {"uv": [8, 50], "uv_size": [0.75, 0.25]}, + "west": {"uv": [44, 26], "uv_size": [1.5, 0.25]}, + "up": {"uv": [30, 36], "uv_size": [0.75, 1.5]}, + "down": {"uv": [31, 37.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.10306, -4.85326, 4.81044], + "size": [0.79387, 0.1645, 1.38174], + "pivot": [7.04904, -5.51341, 4.33562], + "rotation": [-67.5, 0, 0], + "uv": { + "north": {"uv": [50, 8], "uv_size": [0.75, 0.25]}, + "east": {"uv": [44, 27], "uv_size": [1.5, 0.25]}, + "south": {"uv": [9, 50], "uv_size": [0.75, 0.25]}, + "west": {"uv": [28, 44], "uv_size": [1.5, 0.25]}, + "up": {"uv": [32, 36], "uv_size": [0.75, 1.5]}, + "down": {"uv": [33, 37.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.22253, -2.63458, 9.16338], + "size": [0.55493, 0.61697, 0.39754], + "uv": { + "north": {"uv": [28, 47], "uv_size": [0.5, 0.5]}, + "east": {"uv": [47, 28], "uv_size": [0.5, 0.5]}, + "south": {"uv": [29, 47], "uv_size": [0.5, 0.5]}, + "west": {"uv": [47, 29], "uv_size": [0.5, 0.5]}, + "up": {"uv": [30, 47], "uv_size": [0.5, 0.5]}, + "down": {"uv": [47, 30.5], "uv_size": [0.5, -0.5]} + } + }, + { + "origin": [6.22253, -2.13458, 9.56093], + "size": [0.55493, 0.11697, 0.1], + "uv": { + "north": {"uv": [53, 20], "uv_size": [0.5, 0.25]}, + "east": {"uv": [70, 16], "uv_size": [0.25, 0.25]}, + "south": {"uv": [21, 53], "uv_size": [0.5, 0.25]}, + "west": {"uv": [17, 70], "uv_size": [0.25, 0.25]}, + "up": {"uv": [53, 21], "uv_size": [0.5, 0.25]}, + "down": {"uv": [22, 53.25], "uv_size": [0.5, -0.25]} + } + } + ] + }, + { + "name": "bone23", + "parent": "magazine2", + "pivot": [6.25733, -8.62718, 7.85876], + "cubes": [ + { + "origin": [6.10547, -2.65707, 7.7445], + "size": [0.78906, 0.52167, 0.12817], + "uv": { + "north": {"uv": [44, 28], "uv_size": [0.75, 0.5]}, + "east": {"uv": [53, 22], "uv_size": [0.25, 0.5]}, + "south": {"uv": [44, 29], "uv_size": [0.75, 0.5]}, + "west": {"uv": [23, 53], "uv_size": [0.25, 0.5]}, + "up": {"uv": [50, 9], "uv_size": [0.75, 0.25]}, + "down": {"uv": [10, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -3.36911, 7.68619], + "size": [0.78906, 0.82773, 0.12817], + "pivot": [6.22774, -2.89523, 7.2562], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [37, 41], "uv_size": [0.75, 0.75]}, + "east": {"uv": [50, 10], "uv_size": [0.25, 0.75]}, + "south": {"uv": [38, 41], "uv_size": [0.75, 0.75]}, + "west": {"uv": [11, 50], "uv_size": [0.25, 0.75]}, + "up": {"uv": [50, 11], "uv_size": [0.75, 0.25]}, + "down": {"uv": [12, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -4.0561, 7.49008], + "size": [0.78906, 0.82773, 0.12817], + "pivot": [6.22774, -3.58222, 7.0601], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [39, 41], "uv_size": [0.75, 0.75]}, + "east": {"uv": [50, 12], "uv_size": [0.25, 0.75]}, + "south": {"uv": [41, 39], "uv_size": [0.75, 0.75]}, + "west": {"uv": [13, 50], "uv_size": [0.25, 0.75]}, + "up": {"uv": [50, 13], "uv_size": [0.75, 0.25]}, + "down": {"uv": [14, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -5.25642, 6.9924], + "size": [0.78906, 0.82773, 0.12817], + "pivot": [6.22774, -4.78254, 7.57901], + "rotation": [-33.75, 0, 0], + "uv": { + "north": {"uv": [41, 40], "uv_size": [0.75, 0.75]}, + "east": {"uv": [50, 14], "uv_size": [0.25, 0.75]}, + "south": {"uv": [41, 41], "uv_size": [0.75, 0.75]}, + "west": {"uv": [15, 50], "uv_size": [0.25, 0.75]}, + "up": {"uv": [50, 15], "uv_size": [0.75, 0.25]}, + "down": {"uv": [16, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -7.82671, 5.04541], + "size": [0.78906, 0.82773, 0.12817], + "pivot": [6.22774, -7.35284, 7.15693], + "rotation": [-56.25, 0, 0], + "uv": { + "north": {"uv": [1, 42], "uv_size": [0.75, 0.75]}, + "east": {"uv": [50, 16], "uv_size": [0.25, 0.75]}, + "south": {"uv": [42, 2], "uv_size": [0.75, 0.75]}, + "west": {"uv": [17, 50], "uv_size": [0.25, 0.75]}, + "up": {"uv": [50, 17], "uv_size": [0.75, 0.25]}, + "down": {"uv": [18, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -5.25127, 6.71965], + "size": [0.78906, 0.82773, 0.12817], + "pivot": [6.22774, -4.7774, 6.28967], + "rotation": [-45, 0, 0], + "uv": { + "north": {"uv": [42, 3], "uv_size": [0.75, 0.75]}, + "east": {"uv": [50, 18], "uv_size": [0.25, 0.75]}, + "south": {"uv": [42, 4], "uv_size": [0.75, 0.75]}, + "west": {"uv": [19, 50], "uv_size": [0.25, 0.75]}, + "up": {"uv": [50, 19], "uv_size": [0.75, 0.25]}, + "down": {"uv": [20, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -8.04288, 5.14607], + "size": [0.78906, 0.44742, 0.12884], + "pivot": [6.24254, -7.99213, 7.49823], + "rotation": [-56.25, 0, 0], + "uv": { + "north": {"uv": [30, 44], "uv_size": [0.75, 0.5]}, + "east": {"uv": [53, 23], "uv_size": [0.25, 0.5]}, + "south": {"uv": [44, 30], "uv_size": [0.75, 0.5]}, + "west": {"uv": [24, 53], "uv_size": [0.25, 0.5]}, + "up": {"uv": [50, 20], "uv_size": [0.75, 0.25]}, + "down": {"uv": [21, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -5.63628, 7.0229], + "size": [0.78906, 0.92789, 0.12884], + "pivot": [6.24254, -5.10506, 6.52604], + "rotation": [-45, 0, 0], + "uv": { + "north": {"uv": [16, 39], "uv_size": [0.75, 1]}, + "east": {"uv": [31, 47], "uv_size": [0.25, 1]}, + "south": {"uv": [39, 16], "uv_size": [0.75, 1]}, + "west": {"uv": [47, 31], "uv_size": [0.25, 1]}, + "up": {"uv": [50, 21], "uv_size": [0.75, 0.25]}, + "down": {"uv": [22, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -5.64205, 7.32864], + "size": [0.78906, 0.92789, 0.12884], + "pivot": [6.24254, -5.11083, 7.97139], + "rotation": [-33.75, 0, 0], + "uv": { + "north": {"uv": [39, 17], "uv_size": [0.75, 1]}, + "east": {"uv": [32, 47], "uv_size": [0.25, 1]}, + "south": {"uv": [18, 39], "uv_size": [0.75, 1]}, + "west": {"uv": [47, 32], "uv_size": [0.25, 1]}, + "up": {"uv": [50, 22], "uv_size": [0.75, 0.25]}, + "down": {"uv": [23, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -3.52637, 8.10638], + "size": [0.78906, 0.92789, 0.12884], + "pivot": [6.24254, -2.99516, 7.60952], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [19, 39], "uv_size": [0.75, 1]}, + "east": {"uv": [33, 47], "uv_size": [0.25, 1]}, + "south": {"uv": [39, 19], "uv_size": [0.75, 1]}, + "west": {"uv": [47, 33], "uv_size": [0.25, 1]}, + "up": {"uv": [50, 23], "uv_size": [0.75, 0.25]}, + "down": {"uv": [24, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -4.29649, 7.88655], + "size": [0.78906, 0.92789, 0.12884], + "pivot": [6.24254, -3.76527, 7.38969], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [20, 39], "uv_size": [0.75, 1]}, + "east": {"uv": [34, 47], "uv_size": [0.25, 1]}, + "south": {"uv": [39, 20], "uv_size": [0.75, 1]}, + "west": {"uv": [47, 34], "uv_size": [0.25, 1]}, + "up": {"uv": [50, 24], "uv_size": [0.75, 0.25]}, + "down": {"uv": [25, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -2.72817, 8.17175], + "size": [0.78906, 0.58479, 0.12884], + "uv": { + "north": {"uv": [31, 44], "uv_size": [0.75, 0.5]}, + "east": {"uv": [53, 24], "uv_size": [0.25, 0.5]}, + "south": {"uv": [32, 44], "uv_size": [0.75, 0.5]}, + "west": {"uv": [25, 53], "uv_size": [0.25, 0.5]}, + "up": {"uv": [50, 25], "uv_size": [0.75, 0.25]}, + "down": {"uv": [26, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -2.79529, 8.62676], + "size": [0.78906, 0.64788, 0.12091], + "uv": { + "north": {"uv": [5, 42], "uv_size": [0.75, 0.75]}, + "east": {"uv": [50, 26], "uv_size": [0.25, 0.75]}, + "south": {"uv": [42, 5], "uv_size": [0.75, 0.75]}, + "west": {"uv": [27, 50], "uv_size": [0.25, 0.75]}, + "up": {"uv": [50, 27], "uv_size": [0.75, 0.25]}, + "down": {"uv": [28, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -4.53281, 8.31079], + "size": [0.78906, 1.028, 0.12091], + "pivot": [6.25733, -3.94428, 7.73851], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [23, 39], "uv_size": [0.75, 1]}, + "east": {"uv": [35, 47], "uv_size": [0.25, 1]}, + "south": {"uv": [24, 39], "uv_size": [0.75, 1]}, + "west": {"uv": [47, 35], "uv_size": [0.25, 1]}, + "up": {"uv": [50, 28], "uv_size": [0.75, 0.25]}, + "down": {"uv": [29, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -3.67961, 8.55434], + "size": [0.78906, 1.028, 0.12091], + "pivot": [6.25733, -3.09108, 7.98206], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [39, 26], "uv_size": [0.75, 1]}, + "east": {"uv": [36, 47], "uv_size": [0.25, 1]}, + "south": {"uv": [29, 39], "uv_size": [0.75, 1]}, + "west": {"uv": [47, 36], "uv_size": [0.25, 1]}, + "up": {"uv": [50, 29], "uv_size": [0.75, 0.25]}, + "down": {"uv": [30, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -6.02354, 7.69269], + "size": [0.78906, 1.028, 0.12091], + "pivot": [6.25733, -5.43501, 8.38297], + "rotation": [-33.75, 0, 0], + "uv": { + "north": {"uv": [30, 39], "uv_size": [0.75, 1]}, + "east": {"uv": [37, 47], "uv_size": [0.25, 1]}, + "south": {"uv": [39, 30], "uv_size": [0.75, 1]}, + "west": {"uv": [47, 37], "uv_size": [0.25, 1]}, + "up": {"uv": [50, 30], "uv_size": [0.75, 0.25]}, + "down": {"uv": [31, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -6.01715, 7.35396], + "size": [0.78906, 1.028, 0.12091], + "pivot": [6.25733, -5.42863, 6.78167], + "rotation": [-45, 0, 0], + "uv": { + "north": {"uv": [31, 39], "uv_size": [0.75, 1]}, + "east": {"uv": [38, 47], "uv_size": [0.25, 1]}, + "south": {"uv": [32, 39], "uv_size": [0.75, 1]}, + "west": {"uv": [47, 38], "uv_size": [0.25, 1]}, + "up": {"uv": [50, 31], "uv_size": [0.75, 0.25]}, + "down": {"uv": [32, 50.25], "uv_size": [0.75, -0.25]} + } + }, + { + "origin": [6.10547, -9.21571, 5.27465], + "size": [0.78906, 1.028, 0.12091], + "pivot": [6.25733, -8.62718, 7.85876], + "rotation": [-56.25, 0, 0], + "uv": { + "north": {"uv": [33, 39], "uv_size": [0.75, 1]}, + "east": {"uv": [39, 47], "uv_size": [0.25, 1]}, + "south": {"uv": [34, 39], "uv_size": [0.75, 1]}, + "west": {"uv": [47, 39], "uv_size": [0.25, 1]}, + "up": {"uv": [50, 32], "uv_size": [0.75, 0.25]}, + "down": {"uv": [33, 50.25], "uv_size": [0.75, -0.25]} + } + } + ] + }, + { + "name": "bone24", + "parent": "magazine2", + "pivot": [7.04904, -5.51341, 4.33562], + "cubes": [ + { + "origin": [6.13822, -6.72286, 5.35903], + "size": [0.72356, 1.14106, 1.70987], + "pivot": [6.5, -6.15233, 6.21396], + "rotation": [-56.25, 0, 0], + "uv": { + "north": {"uv": [4, 37], "uv_size": [0.75, 1.25]}, + "east": {"uv": [0, 25], "uv_size": [1.75, 1.25]}, + "south": {"uv": [5, 37], "uv_size": [0.75, 1.25]}, + "west": {"uv": [2, 25], "uv_size": [1.75, 1.25]}, + "up": {"uv": [20, 33], "uv_size": [0.75, 1.75]}, + "down": {"uv": [22, 34.75], "uv_size": [0.75, -1.75]} + } + }, + { + "origin": [6.13822, -4.96151, 6.14546], + "size": [0.72356, 1.14106, 1.70987], + "pivot": [7.04904, -4.91853, 5.59642], + "rotation": [-45, 0, 0], + "uv": { + "north": {"uv": [6, 37], "uv_size": [0.75, 1.25]}, + "east": {"uv": [4, 25], "uv_size": [1.75, 1.25]}, + "south": {"uv": [8, 37], "uv_size": [0.75, 1.25]}, + "west": {"uv": [25, 4], "uv_size": [1.75, 1.25]}, + "up": {"uv": [1, 35], "uv_size": [0.75, 1.75]}, + "down": {"uv": [2, 36.75], "uv_size": [0.75, -1.75]} + } + }, + { + "origin": [6.13822, -3.92942, 7.08264], + "size": [0.72356, 1.14106, 1.70987], + "pivot": [7.04904, -3.88644, 6.53359], + "rotation": [-22.5, 0, 0], + "uv": { + "north": {"uv": [9, 37], "uv_size": [0.75, 1.25]}, + "east": {"uv": [6, 25], "uv_size": [1.75, 1.25]}, + "south": {"uv": [10, 37], "uv_size": [0.75, 1.25]}, + "west": {"uv": [25, 6], "uv_size": [1.75, 1.25]}, + "up": {"uv": [6, 35], "uv_size": [0.75, 1.75]}, + "down": {"uv": [8, 36.75], "uv_size": [0.75, -1.75]} + } + }, + { + "origin": [6.13822, -5.36053, 6.72135], + "size": [0.72356, 1.14106, 1.70987], + "pivot": [6.5, -4.79, 7.57629], + "rotation": [-33.75, 0, 0], + "uv": { + "north": {"uv": [11, 37], "uv_size": [0.75, 1.25]}, + "east": {"uv": [25, 8], "uv_size": [1.75, 1.25]}, + "south": {"uv": [12, 37], "uv_size": [0.75, 1.25]}, + "west": {"uv": [25, 10], "uv_size": [1.75, 1.25]}, + "up": {"uv": [10, 35], "uv_size": [0.75, 1.75]}, + "down": {"uv": [11, 36.75], "uv_size": [0.75, -1.75]} + } + }, + { + "origin": [6.13822, -3.58057, 7.45864], + "size": [0.72356, 1.14106, 1.70987], + "pivot": [6.5, -3.01004, 8.31357], + "rotation": [-11.25, 0, 0], + "uv": { + "north": {"uv": [37, 14], "uv_size": [0.75, 1.25]}, + "east": {"uv": [25, 12], "uv_size": [1.75, 1.25]}, + "south": {"uv": [16, 37], "uv_size": [0.75, 1.25]}, + "west": {"uv": [25, 21], "uv_size": [1.75, 1.25]}, + "up": {"uv": [12, 35], "uv_size": [0.75, 1.75]}, + "down": {"uv": [35, 13.75], "uv_size": [0.75, -1.75]} + } + }, + { + "origin": [6.1226, -2.02742, 7.77227], + "size": [0.75481, 0.55903, 1.40909], + "uv": { + "north": {"uv": [44, 32], "uv_size": [0.75, 0.5]}, + "east": {"uv": [39, 34], "uv_size": [1.5, 0.5]}, + "south": {"uv": [33, 44], "uv_size": [0.75, 0.5]}, + "west": {"uv": [39, 35], "uv_size": [1.5, 0.5]}, + "up": {"uv": [34, 36], "uv_size": [0.75, 1.5]}, + "down": {"uv": [36, 36.5], "uv_size": [0.75, -1.5]} + } + }, + { + "origin": [6.13822, -5.55639, 4.88466], + "size": [0.72356, 1.14106, 1.70987], + "pivot": [7.04904, -5.51341, 4.33562], + "rotation": [-67.5, 0, 0], + "uv": { + "north": {"uv": [37, 16], "uv_size": [0.75, 1.25]}, + "east": {"uv": [25, 23], "uv_size": [1.75, 1.25]}, + "south": {"uv": [18, 37], "uv_size": [0.75, 1.25]}, + "west": {"uv": [25, 25], "uv_size": [1.75, 1.25]}, + "up": {"uv": [16, 35], "uv_size": [0.75, 1.75]}, + "down": {"uv": [18, 36.75], "uv_size": [0.75, -1.75]} + } + }, + { + "origin": [6.13822, -2.61726, 7.55352], + "size": [0.72356, 1.14106, 1.70987], + "uv": { + "north": {"uv": [19, 37], "uv_size": [0.75, 1.25]}, + "east": {"uv": [13, 26], "uv_size": [1.75, 1.25]}, + "south": {"uv": [20, 37], "uv_size": [0.75, 1.25]}, + "west": {"uv": [15, 26], "uv_size": [1.75, 1.25]}, + "up": {"uv": [19, 35], "uv_size": [0.75, 1.75]}, + "down": {"uv": [20, 36.75], "uv_size": [0.75, -1.75]} + } + } + ] + }, + { + "name": "bullet2", + "parent": "magazine2", + "pivot": [6.50283, -1.48462, 8.49848], + "cubes": [ + { + "origin": [6.3238, -1.66365, 7.91758], + "size": [0.35805, 0.35805, 0.9922], + "uv": { + "north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}, + "down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]} + } + }, + { + "origin": [6.37, -1.61745, 7.51838], + "size": [0.26565, 0.26565, 1.53], + "uv": { + "north": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [2.75, 81.625], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]}, + "down": {"uv": [2, 78.375], "uv_size": [0.75, 3.25]} + } + }, + { + "origin": [6.3238, -1.66365, 9.00218], + "size": [0.35805, 0.35805, 0.0924], + "uv": { + "north": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "east": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "south": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "west": {"uv": [1.5, 81.625], "uv_size": [-0.75, -3.25]}, + "up": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]}, + "down": {"uv": [0.75, 78.375], "uv_size": [0.75, 3.25]} + } + } + ] + }, + { + "name": "Righthand", + "parent": "0", + "pivot": [-3.50399, -4.80334, 12.29138], + "rotation": [72.76553, -13.26214, 6.20185], + "cubes": [ + { + "origin": [-4.50399, -3.80334, 10.29138], "size": [3, 12, 4], "uv": { "north": {"uv": [7, 12], "uv_size": [3, 12]}, @@ -8409,6 +9101,26 @@ } } ] + }, + { + "name": "Lefthand", + "parent": "0", + "pivot": [5.9, -4.6, 1.6], + "rotation": [63.02145, 26.28878, -12.70535], + "cubes": [ + { + "origin": [4.3, -4.6, -0.15], + "size": [3, 12, 4], + "uv": { + "north": {"uv": [12, 0], "uv_size": [3, 12]}, + "east": {"uv": [0, 0], "uv_size": [4, 12]}, + "south": {"uv": [4, 12], "uv_size": [3, 12]}, + "west": {"uv": [4, 0], "uv_size": [4, 12]}, + "up": {"uv": [13, 12], "uv_size": [3, 4]}, + "down": {"uv": [15, 4], "uv_size": [3, -4]} + } + } + ] } ] } diff --git a/src/main/resources/assets/target/sounds/ak_47/ak_47_reload_empty.ogg b/src/main/resources/assets/target/sounds/ak_47/ak_47_reload_empty.ogg index df5485f9a..73cddfda3 100644 Binary files a/src/main/resources/assets/target/sounds/ak_47/ak_47_reload_empty.ogg and b/src/main/resources/assets/target/sounds/ak_47/ak_47_reload_empty.ogg differ diff --git a/src/main/resources/assets/target/sounds/ak_47/ak_47_reload_normal.ogg b/src/main/resources/assets/target/sounds/ak_47/ak_47_reload_normal.ogg index 04459ef4b..2e939c678 100644 Binary files a/src/main/resources/assets/target/sounds/ak_47/ak_47_reload_normal.ogg and b/src/main/resources/assets/target/sounds/ak_47/ak_47_reload_normal.ogg differ diff --git a/src/main/resources/assets/target/textures/item/ak47.png b/src/main/resources/assets/target/textures/item/ak47.png index fa1ff7010..331d114cc 100644 Binary files a/src/main/resources/assets/target/textures/item/ak47.png and b/src/main/resources/assets/target/textures/item/ak47.png differ