diff --git a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java index 514ce7a9a..8aaef1066 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/ClientEventHandler.java @@ -745,21 +745,21 @@ public class ClientEventHandler { int gripType = GunsTool.getAttachmentType(player.getMainHandItem(), GunsTool.AttachmentType.GRIP); double recoil = switch (barrelType) { - case 1 -> 0.9; - case 2 -> 1.3; - default -> 1.8; + case 1 -> 1.5; + case 2 -> 2.2; + default -> 2.4; }; double gripRecoilX = switch (gripType) { - case 1 -> 0.95; - case 2 -> 0.65; - default -> 1; + case 1 -> 1.25; + case 2 -> 0.25; + default -> 1.5; }; double gripRecoilY = switch (gripType) { - case 1 -> 0.6; - case 2 -> 0.95; - default -> 1; + case 1 -> 0.7; + case 2 -> 2.25; + default -> 2.5; }; double cusWeight = player.getMainHandItem().getOrCreateTag().getDouble("CustomWeight"); diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java index 8fec73371..b1dd2eb09 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/rifle/MarlinItem.java @@ -106,7 +106,11 @@ public class MarlinItem extends GunItem implements GeoItem, AnimatedItem { if (transformType != null && transformType.firstPerson()) { - if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) { + if (player.isSprinting() + && player.onGround() + && player.getPersistentData().getDouble("noRun") == 0 + && ClientEventHandler.drawTime < 0.01 + && !stack.getOrCreateTag().getBoolean("reloading")) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.marlin.run_fast")); } else { diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/M870Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/M870Item.java index 99c82e46c..7111707b2 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/M870Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/shotgun/M870Item.java @@ -109,7 +109,11 @@ public class M870Item extends GunItem implements GeoItem, AnimatedItem { ItemStack stack = player.getMainHandItem(); if (!stack.is(ModTags.Items.GUN)) return PlayState.STOP; - if (player.isSprinting() && player.onGround() && player.getPersistentData().getDouble("noRun") == 0 && ClientEventHandler.drawTime < 0.01) { + if (player.isSprinting() + && player.onGround() + && player.getPersistentData().getDouble("noRun") == 0 + && ClientEventHandler.drawTime < 0.01 + && !stack.getOrCreateTag().getBoolean("reloading")) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED)) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.m870.run_fast")); } else { diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/K98Item.java b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/K98Item.java index bf9f0eee7..fdd0f2d34 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/K98Item.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/K98Item.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.item.gun.sniper; import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.client.PoseTool; import net.mcreator.superbwarfare.client.renderer.item.K98ItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; @@ -11,7 +12,6 @@ import net.mcreator.superbwarfare.item.gun.GunItem; import net.mcreator.superbwarfare.perk.Perk; import net.mcreator.superbwarfare.perk.PerkHelper; import net.mcreator.superbwarfare.tools.GunsTool; -import net.mcreator.superbwarfare.client.PoseTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -112,7 +112,8 @@ public class K98Item extends GunItem implements GeoItem, AnimatedItem { && stack.getOrCreateTag().getInt("reload_stage") != 1 && stack.getOrCreateTag().getInt("reload_stage") != 2 && stack.getOrCreateTag().getInt("reload_stage") != 3 - && ClientEventHandler.drawTime < 0.01) { + && ClientEventHandler.drawTime < 0.01 + && !stack.getOrCreateTag().getBoolean("reloading")) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.k98.run_fast")); } else { diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/MosinNagantItem.java b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/MosinNagantItem.java index 9b8a3e7ba..e8d162aa8 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/MosinNagantItem.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/sniper/MosinNagantItem.java @@ -1,6 +1,7 @@ package net.mcreator.superbwarfare.item.gun.sniper; import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.client.PoseTool; import net.mcreator.superbwarfare.client.renderer.item.MosinNagantItemRenderer; import net.mcreator.superbwarfare.event.ClientEventHandler; import net.mcreator.superbwarfare.init.ModItems; @@ -11,7 +12,6 @@ import net.mcreator.superbwarfare.item.gun.GunItem; import net.mcreator.superbwarfare.perk.Perk; import net.mcreator.superbwarfare.perk.PerkHelper; import net.mcreator.superbwarfare.tools.GunsTool; -import net.mcreator.superbwarfare.client.PoseTool; import net.minecraft.client.Minecraft; import net.minecraft.client.model.HumanoidModel; import net.minecraft.client.player.LocalPlayer; @@ -112,7 +112,8 @@ public class MosinNagantItem extends GunItem implements GeoItem, AnimatedItem { && stack.getOrCreateTag().getInt("reload_stage") != 1 && stack.getOrCreateTag().getInt("reload_stage") != 2 && stack.getOrCreateTag().getInt("reload_stage") != 3 - && ClientEventHandler.drawTime < 0.01) { + && ClientEventHandler.drawTime < 0.01 + && !stack.getOrCreateTag().getBoolean("reloading")) { if (player.hasEffect(MobEffects.MOVEMENT_SPEED) && stack.getOrCreateTag().getInt("bolt_action_anim") == 0) { return event.setAndContinue(RawAnimation.begin().thenLoop("animation.mosin.run_fast")); } else { diff --git a/src/main/resources/assets/superbwarfare/animations/hk416.animation.json b/src/main/resources/assets/superbwarfare/animations/hk416.animation.json index 9f0d9660d..973d16003 100644 --- a/src/main/resources/assets/superbwarfare/animations/hk416.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/hk416.animation.json @@ -253,38 +253,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -331,14 +328,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -349,18 +346,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -676,38 +673,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -743,14 +737,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -761,18 +755,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -900,13 +894,13 @@ "1.0": { "vector": [-5.07467, -4.34545, 18.85219] }, - "1.9167": { + "1.9583": { "vector": [-5.07467, -4.34545, 18.85219] }, "2.0417": { "vector": [3.8193, 8.5936, -9.17363] }, - "2.2917": { + "2.2083": { "vector": [0, 0, 0], "easing": "easeInElastic" } @@ -933,13 +927,13 @@ "1.0": { "vector": [-2.59201, -5.82147, 4.73796] }, - "1.9167": { + "1.9583": { "vector": [-2.59201, -5.82147, 4.73796] }, "2.0417": { "vector": [1.89205, -2.68839, 4.36626] }, - "2.2917": { + "2.2083": { "vector": [0, 0, 0], "easing": "easeInElastic" } @@ -1014,38 +1008,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -1092,14 +1083,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -1110,18 +1101,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -1422,38 +1413,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -1489,14 +1477,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -1507,18 +1495,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -1742,38 +1730,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -1820,14 +1805,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -1838,18 +1823,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -2165,38 +2150,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -2232,14 +2214,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -2250,18 +2232,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -2504,38 +2486,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -2582,14 +2561,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -2600,18 +2579,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -2918,38 +2897,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -2985,14 +2961,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -3003,18 +2979,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { diff --git a/src/main/resources/assets/superbwarfare/animations/m4.animation.json b/src/main/resources/assets/superbwarfare/animations/m4.animation.json index c584e3f35..d510164f0 100644 --- a/src/main/resources/assets/superbwarfare/animations/m4.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/m4.animation.json @@ -390,38 +390,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -468,14 +465,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -486,18 +483,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -770,38 +767,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -848,14 +842,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -866,18 +860,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -1150,38 +1144,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-11.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -1202,29 +1193,29 @@ "1.875": { "vector": [-17.49684, -6.85391, -51.27861] }, - "2.125": { + "2.0417": { "vector": [-9.53304, 1.46221, -17.39249], "easing": "easeInSine" }, - "2.25": { + "2.1667": { "vector": [-3.8135, -0.9118, -6.85724] }, - "2.4167": { + "2.3333": { "vector": [0, 0, -2] }, - "2.5417": { + "2.4583": { "vector": [0, 0, 0] } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -1235,18 +1226,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -1268,20 +1259,20 @@ "vector": [-1.65765, 0.66955, 1.6243], "easing": "easeInSine" }, - "2.0417": { + "2.0": { "vector": [-0.74327, -0.11758, 1.00447], "easing": "easeInSine" }, - "2.1667": { + "2.0833": { "vector": [-0.47388, 0.04235, 0.71917] }, - "2.3333": { + "2.25": { "vector": [0, 0, 0.93] }, - "2.4583": { + "2.375": { "vector": [0, 0, -0.3] }, - "2.5417": { + "2.4583": { "vector": [0, 0, 0] } } @@ -1362,13 +1353,13 @@ "0.5417": { "vector": [24.40417, 24.84569, -52.44665] }, - "1.9167": { + "1.9583": { "vector": [24.40417, 24.84569, -52.44665] }, "2.0417": { "vector": [-2.12612, 9.10639, -13.34983] }, - "2.2917": { + "2.2083": { "vector": [0, 0, 0] } }, @@ -1382,13 +1373,13 @@ "0.5417": { "vector": [-0.5, -5, 5.8] }, - "1.9167": { + "1.9583": { "vector": [-0.5, -5, 5.8] }, "2.0417": { "vector": [1.89205, -2.68839, 4.36626] }, - "2.2917": { + "2.2083": { "vector": [0, 0, 0] } } @@ -1462,38 +1453,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -1529,14 +1517,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -1547,18 +1535,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -1674,13 +1662,13 @@ "0.5417": { "vector": [24.40417, 24.84569, -52.44665] }, - "1.9167": { + "1.9583": { "vector": [24.40417, 24.84569, -52.44665] }, "2.0417": { "vector": [-2.12612, 9.10639, -13.34983] }, - "2.2917": { + "2.2083": { "vector": [18.72964, 13.16247, -36.72252] } }, @@ -1694,13 +1682,13 @@ "0.5417": { "vector": [-0.5, -5, 5.8] }, - "1.9167": { + "1.9583": { "vector": [-0.5, -5, 5.8] }, "2.0417": { "vector": [1.89205, -2.68839, 4.36626] }, - "2.2917": { + "2.2083": { "vector": [-0.14932, -2.86727, -2.96224] } } @@ -1774,38 +1762,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -1852,14 +1837,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -1870,18 +1855,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -2154,38 +2139,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -2232,14 +2214,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -2250,18 +2232,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -2534,38 +2516,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -2601,14 +2580,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -2619,18 +2598,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -2746,13 +2725,13 @@ "0.5417": { "vector": [-5.60563, 18.81195, 4.69542] }, - "1.9167": { + "1.9583": { "vector": [-5.60563, 18.81195, 4.69542] }, "2.0417": { "vector": [-5.60563, 18.81195, 4.69542] }, - "2.2917": { + "2.2083": { "vector": [0, 0, 0] } }, @@ -2766,13 +2745,13 @@ "0.5417": { "vector": [0.23233, -3.61235, 5.14571] }, - "1.9167": { + "1.9583": { "vector": [0.23233, -3.61235, 5.14571] }, "2.0417": { "vector": [0.23233, -3.61235, 5.14571] }, - "2.2917": { + "2.2083": { "vector": [0, 0, 0] } } @@ -2846,38 +2825,35 @@ "bones": { "0": { "rotation": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.125": { + "0.2083": { "vector": [1.18324, 1.40448, 3.98547] }, - "0.3333": { + "0.375": { "vector": [-14.01, 2.98, -9.37] }, - "0.4167": { + "0.4583": { "vector": [-12.25012, 1.71575, -15.23679] }, - "0.5": { + "0.5417": { "vector": [-13.67625, 0.53753, -20.43357] }, - "0.5417": { - "vector": [-14.36146, -0.34228, -23.99804] - }, "0.625": { - "vector": [-15.36586, -0.75486, -21.85957] + "vector": [-13.67625, 0.53753, -20.43357] }, "0.7083": { - "vector": [-3.42984, -0.39385, -15.87027] + "vector": [-5.29583, 1.39646, -17.18653] }, - "0.875": { - "vector": [-12.35117, -0.9689, -22.83651] + "0.8333": { + "vector": [-13.625, -1.01385, -17.67833] }, - "1.0417": { - "vector": [-16.3817, -0.19101, -19.94063] + "0.9583": { + "vector": [-8.32758, 0.97324, -12.02548] }, "1.2083": { - "vector": [-11.33329, -1.14849, -23.82073] + "vector": [-11.34535, 1.02073, -13.03609] }, "1.4167": { "vector": [-10.66408, -4.02619, -38.55877], @@ -2913,14 +2889,14 @@ } }, "position": { - "0.0417": { + "0.125": { "vector": [0, 0, 0] }, - "0.2917": { + "0.375": { "vector": [-1.1, 0.3, 1.9], "easing": "easeInQuad" }, - "0.4167": { + "0.4583": { "vector": [-1.1, 0, 1.2], "easing": "easeOutSine" }, @@ -2931,18 +2907,18 @@ "vector": [-1.1, 0, 1.3] }, "0.7083": { - "vector": [-0.75494, -0.64671, 0.87721] + "vector": [-0.77291, -0.71305, 1.34101] }, "0.7917": { - "vector": [-1.1, 0, 1.3] + "vector": [-0.8, -0.13672, 1.3] }, "0.9583": { "vector": [-0.95347, -0.36221, 1.21435] }, - "1.125": { + "1.0417": { "vector": [-0.84854, -0.60732, 1.04107] }, - "1.2917": { + "1.1667": { "vector": [-0.88449, -0.56099, 1.25543] }, "1.4167": { @@ -3058,13 +3034,13 @@ "0.5417": { "vector": [-5.60563, 18.81195, 4.69542] }, - "1.9167": { + "1.9583": { "vector": [-5.60563, 18.81195, 4.69542] }, "2.0417": { "vector": [-5.60563, 18.81195, 4.69542] }, - "2.2917": { + "2.2083": { "vector": [18.72964, 13.16247, -36.72252] } }, @@ -3078,13 +3054,13 @@ "0.5417": { "vector": [0.23233, -3.61235, 5.14571] }, - "1.9167": { + "1.9583": { "vector": [0.23233, -3.61235, 5.14571] }, "2.0417": { "vector": [0.23233, -3.61235, 5.14571] }, - "2.2917": { + "2.2083": { "vector": [-0.14932, -2.86727, -2.96224] } } diff --git a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_1p.ogg b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_1p.ogg index c8c1a0f02..c6ff03bdb 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_1p.ogg and b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_1p.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg index b09dca005..1ba5eacc5 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg and b/src/main/resources/assets/superbwarfare/sounds/ak_12/ak_12_fire_3p.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/rpk/rpk_fire_1p.ogg b/src/main/resources/assets/superbwarfare/sounds/rpk/rpk_fire_1p.ogg index 235a6f36a..24067283b 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/rpk/rpk_fire_1p.ogg and b/src/main/resources/assets/superbwarfare/sounds/rpk/rpk_fire_1p.ogg differ diff --git a/src/main/resources/assets/superbwarfare/sounds/rpk/rpk_fire_3p.ogg b/src/main/resources/assets/superbwarfare/sounds/rpk/rpk_fire_3p.ogg index 9b678df16..b2353ee71 100644 Binary files a/src/main/resources/assets/superbwarfare/sounds/rpk/rpk_fire_3p.ogg and b/src/main/resources/assets/superbwarfare/sounds/rpk/rpk_fire_3p.ogg differ diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json index b7ed72ab4..3dd4ad8c8 100644 --- a/src/main/resources/data/superbwarfare/guns/aa_12.json +++ b/src/main/resources/data/superbwarfare/guns/aa_12.json @@ -4,7 +4,7 @@ "recoil_y": 0.018, "damage": 2.5, "headshot": 1.5, - "velocity": 13, + "velocity": 17, "mag": 25, "projectile_amount": 12, "weight": 7, diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json index 9032bf8f6..68c068628 100644 --- a/src/main/resources/data/superbwarfare/guns/abekiri.json +++ b/src/main/resources/data/superbwarfare/guns/abekiri.json @@ -4,7 +4,7 @@ "recoil_y": 0.026, "damage": 3, "headshot": 1.5, - "velocity": 12, + "velocity": 15, "mag": 2, "projectile_amount": 12, "weight": 1, diff --git a/src/main/resources/data/superbwarfare/guns/ak_12.json b/src/main/resources/data/superbwarfare/guns/ak_12.json index cbdd5e595..97b8253f1 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_12.json +++ b/src/main/resources/data/superbwarfare/guns/ak_12.json @@ -6,7 +6,7 @@ "recoil_y": 0.01, "damage": 7.7, "headshot": 2, - "velocity": 23, + "velocity": 44.5, "mag": 30, "projectile_amount": 1, "weight": 4, diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json index 1c529e04d..3058361d2 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_47.json +++ b/src/main/resources/data/superbwarfare/guns/ak_47.json @@ -6,7 +6,7 @@ "recoil_y": 0.012, "damage": 8.5, "headshot": 2, - "velocity": 22, + "velocity": 36, "mag": 30, "projectile_amount": 1, "weight": 5, diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json index 277a2f38e..55dc8ed8f 100644 --- a/src/main/resources/data/superbwarfare/guns/devotion.json +++ b/src/main/resources/data/superbwarfare/guns/devotion.json @@ -5,7 +5,7 @@ "recoil_y": 0.01, "damage": 9.5, "headshot": 2, - "velocity": 25, + "velocity": 40, "mag": 55, "projectile_amount": 1, "weight": 6, diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json index 7cd2f9a81..ca56cb181 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_17.json +++ b/src/main/resources/data/superbwarfare/guns/glock_17.json @@ -4,7 +4,7 @@ "recoil_y": 0.013, "damage": 5.5, "headshot": 1.5, - "velocity": 16, + "velocity": 17, "mag": 17, "projectile_amount": 1, "weight": 1, diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json index 0706a7e7d..496bc1264 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_18.json +++ b/src/main/resources/data/superbwarfare/guns/glock_18.json @@ -4,7 +4,7 @@ "recoil_y": 0.013, "damage": 5.5, "headshot": 1.5, - "velocity": 16, + "velocity": 17, "mag": 17, "projectile_amount": 1, "weight": 1, diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json index 9d7343027..1b9f2390f 100644 --- a/src/main/resources/data/superbwarfare/guns/hk_416.json +++ b/src/main/resources/data/superbwarfare/guns/hk_416.json @@ -6,7 +6,7 @@ "recoil_y": 0.009, "damage": 7.5, "headshot": 2, - "velocity": 24, + "velocity": 44, "mag": 30, "projectile_amount": 1, "weight": 4, diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json index 80921fca4..1671bdedf 100644 --- a/src/main/resources/data/superbwarfare/guns/m_1911.json +++ b/src/main/resources/data/superbwarfare/guns/m_1911.json @@ -4,7 +4,7 @@ "recoil_y": 0.018, "damage": 9.5, "headshot": 1.5, - "velocity": 14, + "velocity": 15, "mag": 7, "projectile_amount": 1, "weight": 2, diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json index 8d65fdc49..ca60d6fc5 100644 --- a/src/main/resources/data/superbwarfare/guns/m_4.json +++ b/src/main/resources/data/superbwarfare/guns/m_4.json @@ -6,7 +6,7 @@ "recoil_y": 0.011, "damage": 7, "headshot": 2, - "velocity": 24, + "velocity": 44, "mag": 30, "projectile_amount": 1, "weight": 4, diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json index e35b64e7a..fa1c44192 100644 --- a/src/main/resources/data/superbwarfare/guns/m_60.json +++ b/src/main/resources/data/superbwarfare/guns/m_60.json @@ -4,7 +4,7 @@ "recoil_y": 0.014, "damage": 9, "headshot": 2, - "velocity": 22, + "velocity": 43, "mag": 100, "projectile_amount": 1, "weight": 8, diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index 740f771f7..cc3792c21 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -4,7 +4,7 @@ "recoil_y": 0.04, "damage": 3, "headshot": 1.5, - "velocity": 13, + "velocity": 17, "mag": 8, "force_stop_reloading": 1, "projectile_amount": 12, diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index 123bcd978..82cd8bbe0 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -4,7 +4,7 @@ "recoil_y": 0.031, "damage": 16, "headshot": 2.5, - "velocity": 23, + "velocity": 38, "mag": 8, "force_stop_reloading": 1, "projectile_amount": 1, diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json index 891d2950a..6021acd82 100644 --- a/src/main/resources/data/superbwarfare/guns/minigun.json +++ b/src/main/resources/data/superbwarfare/guns/minigun.json @@ -4,7 +4,7 @@ "recoil_y": 0.04, "damage": 8, "headshot": 2, - "velocity": 24, + "velocity": 46, "weight": 10, "FireMode": 2, "projectile_amount": 1, diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json index 834b488c0..1e14ad52f 100644 --- a/src/main/resources/data/superbwarfare/guns/mk_14.json +++ b/src/main/resources/data/superbwarfare/guns/mk_14.json @@ -5,7 +5,7 @@ "recoil_y": 0.014, "damage": 12, "headshot": 2.5, - "velocity": 25, + "velocity": 42.5, "mag": 20, "projectile_amount": 1, "weight": 5, diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json index 7d409804e..d21162475 100644 --- a/src/main/resources/data/superbwarfare/guns/ntw_20.json +++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json @@ -5,7 +5,7 @@ "recoil_y": 0.038, "damage": 100, "headshot": 3, - "velocity": 31, + "velocity": 36, "projectile_amount": 1, "mag": 3, "bolt_action_time": 37, diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json index ddcd86783..cb5f8bf22 100644 --- a/src/main/resources/data/superbwarfare/guns/qbz_95.json +++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json @@ -4,7 +4,7 @@ "recoil_y": 0.009, "damage": 8.25, "headshot": 2, - "velocity": 27, + "velocity": 46, "mag": 30, "projectile_amount": 1, "weight": 4, diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json index 33edbfd71..00b13c5a3 100644 --- a/src/main/resources/data/superbwarfare/guns/rpk.json +++ b/src/main/resources/data/superbwarfare/guns/rpk.json @@ -4,7 +4,7 @@ "recoil_y": 0.012, "damage": 8.75, "headshot": 2, - "velocity": 24, + "velocity": 38, "mag": 75, "projectile_amount": 1, "weight": 6, diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json index 7009758bd..49ec38fc9 100644 --- a/src/main/resources/data/superbwarfare/guns/sentinel.json +++ b/src/main/resources/data/superbwarfare/guns/sentinel.json @@ -7,7 +7,7 @@ "mag": 5, "projectile_amount": 1, "headshot": 3, - "velocity": 39, + "velocity": 70, "bolt_action_time": 22, "weight": 7, "FireMode": 0, diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json index 3fe1a5ab6..a254b1c06 100644 --- a/src/main/resources/data/superbwarfare/guns/sks.json +++ b/src/main/resources/data/superbwarfare/guns/sks.json @@ -4,7 +4,7 @@ "recoil_y": 0.015, "damage": 9.5, "headshot": 2, - "velocity": 23, + "velocity": 36, "mag": 20, "projectile_amount": 1, "weight": 4, diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json index 0ab4ab15a..8d52b9682 100644 --- a/src/main/resources/data/superbwarfare/guns/svd.json +++ b/src/main/resources/data/superbwarfare/guns/svd.json @@ -5,7 +5,7 @@ "recoil_y": 0.009, "damage": 18, "headshot": 2, - "velocity": 25, + "velocity": 42, "mag": 10, "projectile_amount": 1, "weight": 5,