diff --git a/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java index e7829c71e..bfdaecfe8 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/GunEventHandler.java @@ -53,7 +53,7 @@ public class GunEventHandler { } /** - * 通用的武器开火流程 + * 拉大栓 */ private static void handleGunBolt(Player player) { ItemStack stack = player.getMainHandItem(); diff --git a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java index 5c00cfef8..958a93de7 100644 --- a/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java +++ b/src/main/java/net/mcreator/superbwarfare/event/PlayerEventHandler.java @@ -198,7 +198,7 @@ public class PlayerEventHandler { */ private static void handlePlayerSprint(Player player) { if (player.getMainHandItem().getOrCreateTag().getInt("flash_time") > 0 || player.getMainHandItem().getOrCreateTag().getInt("fire_animation") > 0) { - player.getPersistentData().putDouble("noRun", 40); + player.getPersistentData().putDouble("noRun", 20); } if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).holdFire) { @@ -342,6 +342,7 @@ public class PlayerEventHandler { } else { stack.getOrCreateTag().putInt("ammo", stack.getOrCreateTag().getInt("mag") + stack.getOrCreateTag().getInt("customMag")); } + stack.getOrCreateTag().putBoolean("HoldOpen", false); } } } diff --git a/src/main/resources/assets/superbwarfare/animations/m98b.animation.json b/src/main/resources/assets/superbwarfare/animations/m98b.animation.json index e10d64f4a..72f2c29bc 100644 --- a/src/main/resources/assets/superbwarfare/animations/m98b.animation.json +++ b/src/main/resources/assets/superbwarfare/animations/m98b.animation.json @@ -22,60 +22,46 @@ "0": { "rotation": { "0.0": { - "vector": [-14.82442, -57.81517, 38.62375] + "vector": [-11.21437, -61.1557, 19.97401], + "easing": "easeOutSine" }, "0.2": { - "vector": [-16.82442, -57.81517, 38.62375], + "vector": [-12.73271, -63.70616, 18.1189], "easing": "easeInSine" }, "0.4": { - "vector": [-14.82442, -57.81517, 38.62375], + "vector": [-13.84893, -61.57945, 20.17056], "easing": "easeOutSine" }, "0.6": { - "vector": [-12.82442, -57.81517, 38.62375], + "vector": [5.81019, -61.85456, -1.03283], "easing": "easeInSine" }, "0.8": { - "vector": [-14.82442, -57.81517, 38.62375] + "vector": [-11.21437, -61.1557, 19.97401], + "easing": "easeOutSine" } }, "position": { "0.0": { - "vector": [5.5, -3, 0] + "vector": [3.5, -2, 3], + "easing": "easeOutSine" }, "0.2": { - "vector": [3.75, -2.5, 0], + "vector": [1.75, -1.5, 3], "easing": "easeInSine" }, "0.4": { - "vector": [2.5, -3, 0], + "vector": [-0.5, -2, 3], "easing": "easeOutSine" }, "0.6": { - "vector": [3.75, -2.5, 0], + "vector": [1.75, -1.5, 3], "easing": "easeInSine" }, "0.8": { - "vector": [5.5, -3, 0] - } - } - }, - "Righthand": { - "rotation": { - "0.0": { - "vector": [0.2073, 21.47939, -6.84655] - }, - "0.8": { - "vector": [0.2073, 21.47939, -6.84655] - } - }, - "position": { - "0.0": { - "vector": [4.1, 0, 0] - }, - "0.8": { - "vector": [4.1, 0, 0] + "vector": [3.5, -2, 3], + "easing": "easeOutSine" } } }, @@ -107,63 +93,47 @@ "0": { "rotation": { "0.0": { - "vector": [-71.5441, 21.19359, 4.89071] + "vector": [-40.22249, -46.4793, 37.4509] }, "0.175": { - "vector": [-70.81031, 14.38777, 10.95347], - "easing": "easeInSine" + "vector": [-52.41973, -45.43811, 49.66922], + "easing": "linear" }, "0.35": { - "vector": [-71.6528, 13.72572, 4.64286], - "easing": "easeOutSine" + "vector": [-40.22249, -46.4793, 37.4509], + "easing": "linear" }, "0.525": { - "vector": [-71.51765, 24.09022, 2.19363], - "easing": "easeInSine" + "vector": [-29.15604, -45.73107, 25.36033], + "easing": "linear" }, "0.7": { - "vector": [-71.72375, 21.2133, 4.79361] + "vector": [-40.22249, -46.4793, 37.4509], + "easing": "linear" } }, "position": { "0.0": { - "vector": [-4.52807, -0.71605, 0.288], - "easing": "easeOutSine" + "vector": [4.5, -3, 1] }, "0.175": { - "vector": [-5.57571, 1.65883, 0.2116], + "vector": [1.75, -1.75, 1], "easing": "easeInSine" }, "0.35": { - "vector": [-7.57844, -0.8779, -1.22187], - "easing": "easeOutSine" + "vector": [-0.5, -3, 1], + "easing": "easeInSine" }, "0.525": { - "vector": [-5.75027, 1.85577, 0.23384], + "vector": [1.75, -1.75, 1], "easing": "easeInSine" }, "0.7": { - "vector": [-4.52807, -0.71605, 0.288], - "easing": "easeOutSine" + "vector": [4.5, -3, 1], + "easing": "easeInSine" } } }, - "Lefthand": { - "rotation": { - "vector": [-1.41476, -16.33468, -1.66483] - }, - "position": { - "vector": [6, -13, 49] - } - }, - "Righthand": { - "rotation": { - "vector": [-0.9113, -14.0962, -8.80599] - }, - "position": { - "vector": [2.87519, -0.6965, 0.78255] - } - }, "camera": { "rotation": { "0.0": { @@ -544,92 +514,97 @@ "0.05": { "vector": [2.2309, 1.32745, 5.98455] }, - "0.425": { - "vector": [-24.01, 2.98, -9.37], - "easing": "easeInOutSine" + "0.275": { + "vector": [-7.87, -0.79, -6.55] }, - "0.475": { - "vector": [-22.25012, 1.71575, -15.23679] + "0.45": { + "vector": [-5.97, -0.73, -4.46] }, - "0.525": { - "vector": [-23.67625, 0.53753, -20.43357] - }, - "0.625": { - "vector": [-27.27359, 1.63911, -16.2464] + "0.675": { + "vector": [-5.27, -0.66, -6.19] }, "0.725": { - "vector": [-25.02119, 0.16741, -19.71243] + "vector": [-3.36, -0.64, -6.04] }, "0.825": { - "vector": [-22.36586, -0.75486, -21.85957] + "vector": [-5.27, -0.66, -6.19] }, - "0.9": { - "vector": [-13.42984, -0.39385, -15.87027] + "0.925": { + "vector": [1.32892, -0.54226, -9.54007], + "easing": "easeInElastic" }, "1.075": { - "vector": [-22.35117, -0.9689, -22.83651] - }, - "1.225": { - "vector": [-26.3817, -0.19101, -19.94063] - }, - "1.4": { - "vector": [-21.33329, -1.14849, -23.82073] - }, - "1.55": { - "vector": [-18.24, -1.53, -25.8] - }, - "1.85": { - "vector": [-10.66408, -4.02619, -38.55877], - "easing": "easeInSine" - }, - "1.925": { - "vector": [-13.44223, -4.57576, -41.51634] - }, - "2.025": { - "vector": [-10.27854, -4.93547, -43.49053] - }, - "2.1": { - "vector": [-19.33014, -4.0613, -42.67664] - }, - "2.25": { - "vector": [-17.01373, -1.99374, -36.83067] - }, - "2.4": { - "vector": [-12.09992, 3.01404, -13.77342] - }, - "2.675": { - "vector": [-7.40059, 2.13505, 2.35223] - }, - "2.85": { - "vector": [-6.51035, 1.75117, 0.30854] - }, - "3.0": { - "vector": [-5.22334, 2.78078, 12.97442] - }, - "3.175": { - "vector": [-9.62459, 3.44337, 11.29843] - }, - "3.25": { - "vector": [-3.52825, 1.15456, -0.01567] - }, - "3.35": { - "vector": [-2.59087, 0.51593, -2.26254] - }, - "3.475": { - "vector": [-2.96513, 0.06632, -7.37447], + "vector": [-3.36, -0.64, -6.04], "easing": "easeOutSine" }, - "3.6": { - "vector": [0, 0, 4.5], + "1.275": { + "vector": [-2.82, -0.56, -4.07] + }, + "1.5": { + "vector": [-2.90784, -0.58745, -13.30425] + }, + "1.825": { + "vector": [-2.02821, -0.64163, -15.52377] + }, + "1.925": { + "vector": [-4.71789, -0.40805, -11.87923] + }, + "2.0": { + "vector": [-2.02481, -0.35859, -10.46963] + }, + "2.075": { + "vector": [-5.50329, -0.29676, -8.70762], + "easing": "easeInElastic" + }, + "2.325": { + "vector": [0.83211, -0.29243, 1.36717], + "easing": "easeOutSine" + }, + "2.45": { + "vector": [0.91062, -0.15192, 1.05858] + }, + "2.65": { + "vector": [-1.88189, -0.05561, -2.26152] + }, + "2.85": { + "vector": [-0.14728, 0.00431, 0.0395] + }, + "3.025": { + "vector": [-0.1989, 0.02091, -0.9412], + "easing": "easeInElastic" + }, + "3.125": { + "vector": [-0.2584, -0.4688, 5.16075], + "easing": "easeInSine" + }, + "3.175": { + "vector": [-0.1745, -0.1155, 4.6568], + "easing": "easeInElastic" + }, + "3.275": { + "vector": [-0.6993, -0.252, -1.4861], + "easing": "easeInElastic" + }, + "3.425": { + "vector": [-2.25, -1, 4.82] + }, + "3.475": { + "vector": [-0.25, -0.5, 4.82] + }, + "3.525": { + "vector": [0.53655, 1.56915, 2.11954] + }, + "3.575": { + "vector": [0.9659, 0.52169, -2.4819], "easing": "easeInOutSine" }, - "3.775": { - "vector": [1, 0, -0.25] + "3.675": { + "vector": [0.7935, 0.19563, -2.80573] }, - "4.0": { - "vector": [-0.5, 0, -0.1] + "3.725": { + "vector": [0.49, 0, 0] }, - "4.075": { + "3.825": { "vector": [0, 0, 0] } }, @@ -640,106 +615,102 @@ "0.075": { "vector": [-0.04, 0.41, 0.04] }, - "0.375": { - "vector": [-1.1, 0.3, 0.9], - "easing": "easeInQuad" + "0.2": { + "vector": [-0.04, 0.38, 0.49] }, - "0.475": { - "vector": [-1.1, 0, 0.2], - "easing": "easeOutSine" + "0.3": { + "vector": [0, 0.5, 0] }, - "0.525": { - "vector": [-1.13656, 0.11648, 0.43653] + "0.55": { + "vector": [0, 0.45, 0.09406] }, - "0.65": { - "vector": [-1.11162, 0.03023, 0.28738] + "0.675": { + "vector": [0, 0.42, 0.04] + }, + "0.725": { + "vector": [0, 0.45297, 0.12156] }, "0.825": { - "vector": [-0.96981, -0.32115, 0.20478] + "vector": [0, 0.40656, 0.06828] }, - "0.9": { - "vector": [-0.75494, -0.64671, -0.12279] + "0.925": { + "vector": [0.56719, -0.03016, 0.52] }, - "0.975": { - "vector": [-1.1, 0, 0.3] + "1.1": { + "vector": [0, 0.51937, 0.28563] }, - "1.15": { - "vector": [-0.95347, -0.36221, 0.21435] + "1.5": { + "vector": [0.2, 0.19, 0.05] }, - "1.325": { - "vector": [-0.84854, -0.60732, 0.04107] - }, - "1.475": { - "vector": [-0.88449, -0.56099, 0.25543] - }, - "1.65": { - "vector": [-0.79, -0.44, 0.2] - }, - "1.85": { - "vector": [-0.89507, -0.06932, 0.3549] + "1.825": { + "vector": [0.3, 0.35, 0.3] }, "1.925": { - "vector": [-1.16342, 0.21638, 0.44269] + "vector": [0.4, 0.37719, 0.2] }, - "2.025": { - "vector": [-1.03823, 0.0689, 0.38061] + "2.0": { + "vector": [0.19, 0.25, 0.1] }, - "2.1": { - "vector": [-1.27235, 0.41208, 0.43655], - "easing": "easeInSine" + "2.075": { + "vector": [0.16, 0.41, 0.47], + "easing": "easeInElastic" }, - "2.225": { - "vector": [-0.8044, 0.0239, 0.36148], + "2.325": { + "vector": [0.09, 0.06, -0.11], "easing": "easeOutSine" }, - "2.3": { - "vector": [-0.55391, 0.01857, 0.28596], - "easing": "easeInSine" + "2.525": { + "vector": [0.06, 0.04, 0.2] }, - "2.475": { - "vector": [-0.27874, -0.05921, 0.2782] + "2.775": { + "vector": [0.03, 0.02, -0.19] }, - "2.625": { - "vector": [-0.38027, -0.15396, -0.28202] + "2.975": { + "vector": [0, 0, 0], + "easing": "linear" }, - "2.8": { - "vector": [-0.21, -0.24, -0.04] + "3.125": { + "vector": [-0.41, -0.23, 0.32] }, - "3.0": { - "vector": [-0.19, 0.19, -0.04] - }, - "3.2": { - "vector": [-0.16, -0.18, 1.11], + "3.275": { + "vector": [-0.1, -0.5, 0.3], "easing": "easeInElastic" }, "3.375": { - "vector": [-0.14, -0.16, -0.54], - "easing": "easeInElastic" + "vector": [-0.1, -0.5, 0.6] + }, + "3.425": { + "vector": [-0.3, -0.5, -0.6] }, "3.475": { - "vector": [-0.02, -0.13, -0.17] + "vector": [-0.3, -0.5, -0.6] }, - "3.7": { - "vector": [0.05, -0.08, -0.02] - }, - "3.875": { - "vector": [0.1, -0.1, 0.3], + "3.525": { + "vector": [-0.1, -0.2, 0.1], "easing": "easeInElastic" }, - "4.0": { - "vector": [0, 0.07, -0.21] + "3.625": { + "vector": [0.2, -0.3, -0.1] }, - "4.075": { - "vector": [0, 0, 0] + "3.675": { + "vector": [0.14, -0.05, 0.2], + "easing": "easeInSine" + }, + "3.725": { + "vector": [0.04, 0.1, 0.24478] + }, + "3.825": { + "vector": [0, 0, 0], + "easing": "easeOutSine" } } }, "Righthand": { "rotation": { - "2.775": { + "2.7": { "vector": [0, 0, 0] }, - "2.825": { + "2.875": { "vector": [10.1345, -14.1905, -4.87335] }, "2.975": { @@ -767,7 +738,7 @@ } }, "position": { - "2.775": { + "2.7": { "vector": [0, 0, 0] }, "2.875": { @@ -777,7 +748,7 @@ "vector": [0.7, 0.5, -2.5], "easing": "easeInSine" }, - "3.075": { + "3.125": { "vector": [0.7, 0.5, 1.6], "easing": "easeInElastic" }, @@ -785,7 +756,7 @@ "vector": [0.7, 0.5, 1.6], "easing": "linear" }, - "3.275": { + "3.325": { "vector": [0.7, 0.5, -2.5], "easing": "easeInElastic" }, @@ -793,20 +764,20 @@ "vector": [0.15, 0.35, -1.6], "easing": "easeInElastic" }, - "3.575": { + "3.525": { "vector": [0, 0, 0] } } }, "Lefthand": { "rotation": { - "0.375": { + "0.425": { "vector": [0, 0, 0] }, "0.525": { "vector": [-6.834, -0.4789, -0.57224] }, - "0.65": { + "0.625": { "vector": [-14.0389, -15.2121, 3.24877] }, "0.9": { @@ -818,21 +789,21 @@ "1.575": { "vector": [-11, 0, 0] }, - "2.3": { + "2.375": { "vector": [-11, 0, 0] }, - "2.525": { + "2.475": { "vector": [-7.5151, 4.8353, 3.16822] }, - "2.675": { + "2.625": { "vector": [0, 0, 0] } }, "position": { - "0.375": { + "0.425": { "vector": [0, 0, 0] }, - "0.65": { + "0.625": { "vector": [2.3, 0.3, 6.1], "easing": "easeInSine" }, @@ -847,10 +818,10 @@ "1.575": { "vector": [0.6, 0.1, 6.4] }, - "2.3": { + "2.375": { "vector": [0.6, 0.1, 6.4] }, - "2.675": { + "2.625": { "vector": [0, 0, 0], "easing": "easeInElastic" } @@ -941,18 +912,18 @@ }, "bolt": { "rotation": { - "2.875": { + "2.825": { "vector": [0, 0, 0] }, "2.975": { "vector": [0, 0, 57], "easing": "easeInSine" }, - "3.275": { + "3.125": { "vector": [0, 0, 57], "easing": "easeInSine" }, - "3.375": { + "3.175": { "vector": [0, 0, 0], "easing": "easeInElastic" } @@ -961,7 +932,7 @@ "2.975": { "vector": [0, 0, 0] }, - "3.075": { + "3.125": { "vector": [0, 0, 4.1], "easing": "easeInElastic" }, @@ -969,7 +940,7 @@ "vector": [0, 0, 4.1], "easing": "easeInSine" }, - "3.275": { + "3.325": { "vector": [0, 0, 0], "easing": "easeInElastic" }, @@ -1253,32 +1224,25 @@ "easing": "easeOutSine" }, "2.925": { - "vector": [0.2, 0, 2] + "vector": [0.4, 0.4, 0.7] }, - "3.05": { - "vector": [1, 2, 1.8] + "2.975": { + "vector": [-0.5, -0.8, -0.5] }, - "3.1": { - "vector": [-1.5, -3, -1.5] + "3.125": { + "vector": [0.2, 0.4, 3] }, "3.275": { - "vector": [0.2, 1.5, 3] - }, - "3.425": { - "vector": [0, 0, -2], + "vector": [-0.1, -0.2, -2], "easing": "easeInElastic" }, - "3.575": { + "3.425": { "vector": [0, 0, 1.5] }, - "3.675": { + "3.525": { "vector": [0, 0, -0.75] }, - "3.875": { - "vector": [0, 0, 0.4], - "easing": "linear" - }, - "4.075": { + "3.675": { "vector": [0, 0, 0] } } @@ -1292,7 +1256,7 @@ }, "animation.m98b.reload_normal": { "loop": "hold_on_last_frame", - "animation_length": 3, + "animation_length": 3.3, "override_previous_animation": true, "bones": { "0": { @@ -1303,66 +1267,62 @@ "0.05": { "vector": [2.2309, 1.32745, 5.98455] }, - "0.425": { - "vector": [-24.01, 2.98, -9.37], - "easing": "easeInOutSine" + "0.275": { + "vector": [-7.87, -0.79, -6.55] }, - "0.475": { - "vector": [-22.25012, 1.71575, -15.23679] + "0.45": { + "vector": [-5.97, -0.73, -4.46] }, - "0.525": { - "vector": [-23.67625, 0.53753, -20.43357] - }, - "0.625": { - "vector": [-27.27359, 1.63911, -16.2464] + "0.675": { + "vector": [-5.27, -0.66, -6.19] }, "0.725": { - "vector": [-25.02119, 0.16741, -19.71243] + "vector": [-3.36, -0.64, -6.04] }, "0.825": { - "vector": [-22.36586, -0.75486, -21.85957] + "vector": [-5.27, -0.66, -6.19] }, - "0.9": { - "vector": [-13.42984, -0.39385, -15.87027] + "0.925": { + "vector": [1.32892, -0.54226, -9.54007], + "easing": "easeInElastic" }, "1.075": { - "vector": [-22.35117, -0.9689, -22.83651] + "vector": [-3.36, -0.64, -6.04], + "easing": "easeOutSine" }, - "1.225": { - "vector": [-26.3817, -0.19101, -19.94063] + "1.275": { + "vector": [-2.82, -0.56, -4.07] }, - "1.4": { - "vector": [-21.33329, -1.14849, -23.82073] + "1.5": { + "vector": [-2.90784, -0.58745, -13.30425] }, - "1.55": { - "vector": [-18.24, -1.53, -25.8] - }, - "1.85": { - "vector": [-10.66408, -4.02619, -38.55877], - "easing": "easeInSine" + "1.825": { + "vector": [-2.02821, -0.64163, -15.52377] }, "1.925": { - "vector": [-13.44223, -4.57576, -41.51634] + "vector": [-4.71789, -0.40805, -11.87923] }, - "2.025": { - "vector": [-10.27854, -4.93547, -43.49053] + "2.0": { + "vector": [-2.02481, -0.35859, -10.46963] }, - "2.1": { - "vector": [-19.33014, -4.0613, -42.67664] + "2.075": { + "vector": [-5.50329, -0.29676, -8.70762], + "easing": "easeInElastic" }, - "2.25": { - "vector": [-17.01373, -1.99374, -36.83067] + "2.325": { + "vector": [0.81566, -0.33558, 4.36691], + "easing": "easeOutSine" }, - "2.4": { - "vector": [-12.09992, 3.01404, -13.77342] + "2.45": { + "vector": [0.91537, -0.12005, -0.94118] }, - "2.675": { + "2.6": { "vector": [1, 0, -0.25] }, - "2.9": { + "2.825": { "vector": [-0.5, 0, -0.1] }, - "2.975": { + "2.9": { "vector": [0, 0, 0] } }, @@ -1373,82 +1333,70 @@ "0.075": { "vector": [-0.04, 0.41, 0.04] }, - "0.375": { - "vector": [-1.1, 0.3, 0.9], - "easing": "easeInQuad" + "0.2": { + "vector": [-0.04, 0.38, 0.49] }, - "0.475": { - "vector": [-1.1, 0, 0.2], - "easing": "easeOutSine" + "0.3": { + "vector": [0, 0.5, 0] }, - "0.525": { - "vector": [-1.13656, 0.11648, 0.43653] + "0.55": { + "vector": [0, 0.45, 0.09406] }, - "0.65": { - "vector": [-1.11162, 0.03023, 0.28738] + "0.675": { + "vector": [0, 0.42, 0.04] + }, + "0.725": { + "vector": [0, 0.45297, 0.12156] }, "0.825": { - "vector": [-0.96981, -0.32115, 0.20478] + "vector": [0, 0.40656, 0.06828] }, - "0.9": { - "vector": [-0.75494, -0.64671, -0.12279] + "0.925": { + "vector": [0.56719, -0.03016, 0.52] }, - "0.975": { - "vector": [-1.1, 0, 0.3] + "1.1": { + "vector": [0, 0.51937, 0.28563] }, - "1.15": { - "vector": [-0.95347, -0.36221, 0.21435] + "1.5": { + "vector": [0.2, 0.19, 0.05] }, - "1.325": { - "vector": [-0.84854, -0.60732, 0.04107] - }, - "1.475": { - "vector": [-0.88449, -0.56099, 0.25543] - }, - "1.65": { - "vector": [-0.79, -0.44, 0.2] - }, - "1.85": { - "vector": [-0.89507, -0.06932, 0.3549] + "1.825": { + "vector": [0.3, 0.35, 0.3] }, "1.925": { - "vector": [-1.16342, 0.21638, 0.44269] + "vector": [0.4, 0.37719, 0.2] }, - "2.025": { - "vector": [-1.03823, 0.0689, 0.38061] + "2.0": { + "vector": [0.19, 0.25, 0.1] }, - "2.1": { - "vector": [-1.27235, 0.41208, 0.43655], - "easing": "easeInSine" + "2.075": { + "vector": [0.16, 0.41, 0.47], + "easing": "easeInElastic" }, - "2.225": { - "vector": [-0.8044, 0.0239, 0.36148], + "2.325": { + "vector": [0.09, 0.06, -0.11], "easing": "easeOutSine" }, - "2.3": { - "vector": [-0.55391, 0.01857, 0.28596], - "easing": "easeInSine" - }, - "2.675": { + "2.6": { "vector": [0, 0, -0.65] }, - "2.775": { + "2.7": { "vector": [0, 0, 0.33] }, - "2.975": { + "2.9": { "vector": [0, 0, 0] } } }, "Lefthand": { "rotation": { - "0.375": { + "0.425": { "vector": [0, 0, 0] }, "0.525": { "vector": [-6.834, -0.4789, -0.57224] }, - "0.65": { + "0.625": { "vector": [-14.0389, -15.2121, 3.24877] }, "0.9": { @@ -1460,21 +1408,21 @@ "1.575": { "vector": [-11, 0, 0] }, - "2.3": { + "2.325": { "vector": [-11, 0, 0] }, - "2.525": { + "2.425": { "vector": [-7.5151, 4.8353, 3.16822] }, - "2.675": { + "2.575": { "vector": [0, 0, 0] } }, "position": { - "0.375": { + "0.425": { "vector": [0, 0, 0] }, - "0.65": { + "0.625": { "vector": [2.3, 0.3, 6.1], "easing": "easeInSine" }, @@ -1489,10 +1437,10 @@ "1.575": { "vector": [0.6, 0.1, 6.4] }, - "2.3": { + "2.325": { "vector": [0.6, 0.1, 6.4] }, - "2.675": { + "2.575": { "vector": [0, 0, 0], "easing": "easeInElastic" } diff --git a/src/main/resources/assets/superbwarfare/textures/item/armor_plate_infinity.png b/src/main/resources/assets/superbwarfare/textures/item/armor_plate_infinity.png new file mode 100644 index 000000000..f79af8bb3 Binary files /dev/null and b/src/main/resources/assets/superbwarfare/textures/item/armor_plate_infinity.png differ diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json index 61962aac7..531c74f9d 100644 --- a/src/main/resources/data/superbwarfare/guns/m_98b.json +++ b/src/main/resources/data/superbwarfare/guns/m_98b.json @@ -18,9 +18,9 @@ "burst": 0, "auto": 0, "burst_size": 1, - "normal_reload_time": 64, - "empty_reload_time": 86, + "normal_reload_time": 60, + "empty_reload_time": 78, "BypassesArmor": 0.6, "SoundRadius": 18, - "rpm": 240 + "rpm": 180 } \ No newline at end of file